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

Merge pull request #6975 from matrix-org/travis/runtime-errors

Browse source 
Fix runtime react errors for various parts of the app
This commit is contained in:
Travis Ralston 2021-10-19 07:35:15 -06:00 committed by GitHub
commit c0c5641181
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/components/views/elements/PersistentApp.tsx
View file

@ -25,17 +25,21 @@ import { EventSubscription } from 'fbemitter';
import AppTile from "./AppTile";
import { Room } from "matrix-js-sdk/src/models/room";
interface IProps {
// none
}
interface IState {
roomId: string;
persistentWidgetId: string;
}
@replaceableComponent("views.elements.PersistentApp")
export default class PersistentApp extends React.Component<{}, IState> {
export default class PersistentApp extends React.Component<IProps, IState> {
private roomStoreToken: EventSubscription;
constructor() {
super({});
constructor(props: IProps) {
super(props);
this.state = {
roomId: RoomViewStore.getRoomId(),

9
src/components/views/rooms/MessageComposer.tsx
View file

@ -116,7 +116,7 @@ const EmojiButton: React.FC<IEmojiButtonProps> = ({ addEmoji, menuPosition, narr
className={className}
onClick={openMenu}
title={!narrowMode && _t('Emoji picker')}
label={narrowMode && _t("Add emoji")}
label={narrowMode ? _t("Add emoji") : null}
/>
{ contextMenu }
@ -485,13 +485,14 @@ export default class MessageComposer extends React.Component<IProps, IState> {
className="mx_MessageComposer_button mx_MessageComposer_stickers"
onClick={() => this.showStickers(!this.state.showStickers)}
title={title}
label={this.state.narrowMode && _t("Send a sticker")}
label={this.state.narrowMode ? _t("Send a sticker") : null}
/>,
);
}
if (!this.state.haveRecording && !this.state.narrowMode) {
buttons.push(
<AccessibleTooltipButton
key="voice_message_send"
className="mx_MessageComposer_button mx_MessageComposer_voiceMessage"
onClick={() => this.voiceRecordingButton.current?.onRecordStartEndClick()}
title={_t("Send voice message")}
@ -615,7 +616,9 @@ export default class MessageComposer extends React.Component<IProps, IState> {
room={this.props.room}
showStickers={this.state.showStickers}
setShowStickers={this.showStickers}
menuPosition={menuPosition} />,
menuPosition={menuPosition}
key="stickers"
/>,
);
const showSendButton = !this.state.isComposerEmpty || this.state.haveRecording;

6
src/components/views/rooms/NewRoomIntro.tsx
View file

@ -106,7 +106,11 @@ const NewRoomIntro = () => {
topicText = _t("Topic: %(topic)s ", { topic });
} else if (canAddTopic) {
topicText = _t("<a>Add a topic</a> to help people know what it is about.", {}, {
a: sub => <AccessibleButton kind="link" onClick={onTopicClick}>{ sub }</AccessibleButton>,
a: sub => <AccessibleButton
kind="link"
element="span"
onClick={onTopicClick}
>{ sub }</AccessibleButton>,
});
}

5
src/components/views/rooms/RoomHeader.tsx
View file

@ -162,12 +162,14 @@ export default class RoomHeader extends React.Component<IProps> {
className="mx_RoomHeader_button mx_RoomHeader_voiceCallButton"
onClick={() => this.props.onCallPlaced(PlaceCallType.Voice)}
title={_t("Voice call")}
key="voice"
/>;
const videoCallButton = <AccessibleTooltipButton
className="mx_RoomHeader_button mx_RoomHeader_videoCallButton"
onClick={(ev: React.MouseEvent<Element>) => ev.shiftKey ?
this.displayInfoDialogAboutScreensharing() : this.props.onCallPlaced(PlaceCallType.Video)}
title={_t("Video call")}
key="video"
/>;
buttons.push(voiceCallButton, videoCallButton);
}
@ -177,6 +179,7 @@ export default class RoomHeader extends React.Component<IProps> {
className="mx_RoomHeader_button mx_RoomHeader_forgetButton"
onClick={this.props.onForgetClick}
title={_t("Forget room")}
key="forget"
/>;
buttons.push(forgetButton);
}
@ -188,6 +191,7 @@ export default class RoomHeader extends React.Component<IProps> {
})}
onClick={this.props.onAppsClick}
title={this.props.appsShown ? _t("Hide Widgets") : _t("Show Widgets")}
key="apps"
/>;
buttons.push(appsButton);
}
@ -197,6 +201,7 @@ export default class RoomHeader extends React.Component<IProps> {
className="mx_RoomHeader_button mx_RoomHeader_searchButton"
onClick={this.props.onSearchClick}
title={_t("Search")}
key="search"
/>;
buttons.push(searchButton);
}