mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 12:28:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Iterate PR first round

Browse source 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner 2021-09-13 18:23:37 +02:00
parent e4cf7314f5
commit 44141bf048
No known key found for this signature in database
GPG key ID: 55C211A1226CB17D
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/components/structures/EmbeddedPage.tsx
View file

@ -25,6 +25,7 @@ import { MatrixClientPeg } from '../../MatrixClientPeg';
import classnames from 'classnames';
import MatrixClientContext from "../../contexts/MatrixClientContext";
import AutoHideScrollbar from "./AutoHideScrollbar";
import { ActionPayload } from "../../dispatcher/payloads";
interface IProps {
// URL to request embedded page content from
@ -44,13 +45,11 @@ interface IState {
export default class EmbeddedPage extends React.PureComponent<IProps, IState> {
public static contextType = MatrixClientContext;
private unmounted = false;
private dispatcherRef: string;
private dispatcherRef: string = null;
constructor(props: IProps, context: typeof MatrixClientContext) {
super(props, context);
this.dispatcherRef = null;
this.state = {
page: '',
};
@ -105,7 +104,7 @@ export default class EmbeddedPage extends React.PureComponent<IProps, IState> {
if (this.dispatcherRef !== null) dis.unregister(this.dispatcherRef);
}
private onAction = (payload): void => {
private onAction = (payload: ActionPayload): void => {
// HACK: Workaround for the context's MatrixClient not being set up at render time.
if (payload.action === 'client_started') {
this.forceUpdate();

4
src/components/structures/GenericErrorPage.tsx
View file

@ -18,8 +18,8 @@ import React from 'react';
import { replaceableComponent } from "../../utils/replaceableComponent";
interface IProps {
title: JSX.Element;
message: JSX.Element;
title: React.ReactNode;
message: React.ReactNode;
}
@replaceableComponent("structures.GenericErrorPage")

1
src/components/structures/ViewSource.tsx
View file

@ -29,7 +29,6 @@ import { IDialogProps } from "../views/dialogs/IDialogProps";
import BaseDialog from "../views/dialogs/BaseDialog";
interface IProps extends IDialogProps {
onFinished: () => void;
mxEvent: MatrixEvent; // the MatrixEvent associated with the context menu
}