Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 709d33c

Browse files
authored
Merge pull request #5294 from matrix-org/t3chguy/fix/w2
Fix StopGapWidget infinitely recursing
2 parents 430bceb + 0e42fc4 commit 709d33c

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

src/components/views/elements/AccessibleTooltipButton.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ export default class AccessibleTooltipButton extends React.PureComponent<IToolti
6262
};
6363

6464
render() {
65-
const {title, tooltip, children, tooltipClassName, ...props} = this.props;
65+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
66+
const {title, tooltip, children, tooltipClassName, forceHide, ...props} = this.props;
6667

6768
const tip = this.state.hover ? <Tooltip
6869
className="mx_AccessibleTooltipButton_container"

src/components/views/rooms/MessageComposer.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,7 @@ export default class MessageComposer extends React.Component {
437437
const canEndConf = WidgetUtils.canUserModifyWidgets(this.props.room.roomId);
438438
controls.push(
439439
<HangupButton
440+
key="controls_hangup"
440441
roomId={this.props.room.roomId}
441442
isConference={true}
442443
canEndConference={canEndConf}

src/stores/widgets/StopGapWidget.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class ElementWidget extends Widget {
6666
if (WidgetType.JITSI.matches(this.type)) {
6767
return WidgetUtils.getLocalJitsiWrapperUrl({
6868
forLocalRender: true,
69-
auth: this.rawData?.auth,
69+
auth: super.rawData?.auth, // this.rawData can call templateUrl, do this to prevent looping
7070
});
7171
}
7272
return super.templateUrl;

0 commit comments

Comments
 (0)