Add matrixClient to RoomContext

Signed-off-by: Šimon Brandner <[email protected]>

Author: SimonBrandner

src/components/structures/RoomView.tsx

@@ -2099,7 +2099,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         const showChatEffects = SettingsStore.getValue('showChatEffects');
 
         return (
-            <RoomContext.Provider value={this.state}>
+            <RoomContext.Provider value={{ matrixClient: this.context, ...this.state }}>
                 <main className={mainClasses} ref={this.roomView} onKeyDown={this.onReactKeyDown}>
                     { showChatEffects && this.roomView.current &&
                         <EffectsOverlay roomWidth={this.roomView.current.offsetWidth} />

src/contexts/RoomContext.ts

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import { createContext } from "react";
+import { MatrixClient } from "matrix-js-sdk/src/client";
 
 import { IRoomState } from "../components/structures/RoomView";
 import { Layout } from "../settings/Layout";
@@ -27,7 +28,11 @@ export enum TimelineRenderingType {
     Notification = "Notification",
 }
 
-const RoomContext = createContext<IRoomState>({
+export interface IRoomContext extends IRoomState {
+    matrixClient: MatrixClient;
+}
+
+const RoomContext = createContext<IRoomContext>({
     roomLoading: true,
     peekLoading: false,
     shouldPeek: true,
@@ -63,6 +68,7 @@ const RoomContext = createContext<IRoomState>({
     dragCounter: 0,
     timelineRenderingType: TimelineRenderingType.Room,
     liveTimeline: undefined,
+    matrixClient: undefined,
 });
 RoomContext.displayName = "RoomContext";
 export default RoomContext;