Merge pull request #5175 from matrix-org/t3chguy/dpsah/6785.3

Migrate RoomView and RoomContext to Typescript

.eslintignore.errorfiles

@@ -2,7 +2,6 @@
 
 src/components/structures/RoomDirectory.js
 src/components/structures/RoomStatusBar.js
-src/components/structures/RoomView.js
 src/components/structures/ScrollPanel.js
 src/components/structures/SearchBox.js
 src/components/structures/UploadBar.js

src/components/structures/LoggedInView.tsx

@@ -76,7 +76,6 @@ interface IProps {
     hideToSRUsers: boolean;
     resizeNotifier: ResizeNotifier;
     middleDisabled: boolean;
-    initialEventPixelOffset: number;
     leftDisabled: boolean;
     rightDisabled: boolean;
     // eslint-disable-next-line camelcase
@@ -635,7 +634,6 @@ class LoggedInView extends React.Component<IProps, IState> {
                     thirdPartyInvite={this.props.thirdPartyInvite}
                     oobData={this.props.roomOobData}
                     viaServers={this.props.viaServers}
-                    eventPixelOffset={this.props.initialEventPixelOffset}
                     key={this.props.currentRoomId || 'roomview'}
                     disabled={this.props.middleDisabled}
                     ConferenceHandler={this.props.ConferenceHandler}

src/contexts/RoomContext.js

@@ -1,25 +0,0 @@
-/*
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import { createContext } from "react";
-
-const RoomContext = createContext({
-    canReact: undefined,
-    canReply: undefined,
-    room: undefined,
-});
-RoomContext.displayName = "RoomContext";
-export default RoomContext;

src/contexts/RoomContext.ts

@@ -0,0 +1,48 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { createContext } from "react";
+
+import {IState} from "../components/structures/RoomView";
+
+const RoomContext = createContext<IState>({
+    roomLoading: true,
+    peekLoading: false,
+    shouldPeek: true,
+    membersLoaded: false,
+    numUnreadMessages: 0,
+    draggingFile: false,
+    searching: false,
+    guestsCanJoin: false,
+    canPeek: false,
+    showApps: false,
+    isAlone: false,
+    isPeeking: false,
+    showingPinned: false,
+    showReadReceipts: true,
+    showRightPanel: true,
+    joining: false,
+    atEndOfLiveTimeline: true,
+    atEndOfLiveTimelineInit: false,
+    showTopUnreadMessagesBar: false,
+    statusBarVisible: false,
+    canReact: false,
+    canReply: false,
+    useIRCLayout: false,
+    matrixClientIsReady: false,
+});
+RoomContext.displayName = "RoomContext";
+export default RoomContext;

src/utils/ShieldUtils.ts

@@ -18,7 +18,13 @@ interface Room {
     roomId: string;
 }
 
-export async function shieldStatusForRoom(client: Client, room: Room): Promise<string> {
+export enum E2EStatus {
+    Warning = "warning",
+    Verified = "verified",
+    Normal = "normal"
+}
+
+export async function shieldStatusForRoom(client: Client, room: Room): Promise<E2EStatus> {
     const members = (await room.getEncryptionTargetMembers()).map(({userId}) => userId);
     const inDMMap = !!DMRoomMap.shared().getUserIdForRoomId(room.roomId);
 
@@ -33,7 +39,7 @@ export async function shieldStatusForRoom(client: Client, room: Room): Promise<s
     /* Alarm if any unverified users were verified before. */
     for (const userId of unverified) {
         if (client.checkUserTrust(userId).wasCrossSigningVerified()) {
-            return "warning";
+            return E2EStatus.Warning;
         }
     }
 
@@ -50,9 +56,9 @@ export async function shieldStatusForRoom(client: Client, room: Room): Promise<s
             return !client.checkDeviceTrust(userId, deviceId).isVerified();
         });
         if (anyDeviceNotVerified) {
-            return "warning";
+            return E2EStatus.Warning;
         }
     }
 
-    return unverified.length === 0 ? "verified" : "normal";
+    return unverified.length === 0 ? E2EStatus.Verified : E2EStatus.Normal;
 }