From 67193b0ea7803ebd837a8ef654ed033f07c410a4 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 7 Oct 2020 10:39:52 +0100 Subject: [PATCH 1/2] Fix StopGapWidget infinitely recursing Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/stores/widgets/StopGapWidget.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stores/widgets/StopGapWidget.ts b/src/stores/widgets/StopGapWidget.ts index 1c24f70d0d..9e4d124d5b 100644 --- a/src/stores/widgets/StopGapWidget.ts +++ b/src/stores/widgets/StopGapWidget.ts @@ -66,7 +66,7 @@ class ElementWidget extends Widget { if (WidgetType.JITSI.matches(this.type)) { return WidgetUtils.getLocalJitsiWrapperUrl({ forLocalRender: true, - auth: this.rawData?.auth, + auth: super.rawData?.auth, // this.rawData can call templateUrl, do this to prevent looping }); } return super.templateUrl; From 0e42fc45e2de8245dd3b8e7760fd8f5e55a857c6 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 7 Oct 2020 10:40:20 +0100 Subject: [PATCH 2/2] Resolve couple of React warnings/errors Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/elements/AccessibleTooltipButton.tsx | 3 ++- src/components/views/rooms/MessageComposer.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/views/elements/AccessibleTooltipButton.tsx b/src/components/views/elements/AccessibleTooltipButton.tsx index 0388c565ad..29e79dc396 100644 --- a/src/components/views/elements/AccessibleTooltipButton.tsx +++ b/src/components/views/elements/AccessibleTooltipButton.tsx @@ -62,7 +62,8 @@ export default class AccessibleTooltipButton extends React.PureComponent<IToolti }; render() { - const {title, tooltip, children, tooltipClassName, ...props} = this.props; + // eslint-disable-next-line @typescript-eslint/no-unused-vars + const {title, tooltip, children, tooltipClassName, forceHide, ...props} = this.props; const tip = this.state.hover ? <Tooltip className="mx_AccessibleTooltipButton_container" diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js index 71999fb04f..2ca1cc5aef 100644 --- a/src/components/views/rooms/MessageComposer.js +++ b/src/components/views/rooms/MessageComposer.js @@ -437,6 +437,7 @@ export default class MessageComposer extends React.Component { const canEndConf = WidgetUtils.canUserModifyWidgets(this.props.room.roomId); controls.push( <HangupButton + key="controls_hangup" roomId={this.props.room.roomId} isConference={true} canEndConference={canEndConf}