From 3c85092f1aff1f25981eeb7c5e996b3b5059f4c2 Mon Sep 17 00:00:00 2001 From: Germain Souquet Date: Fri, 16 Apr 2021 17:36:14 +0100 Subject: [PATCH] Cleanup unused state in MessageComposer --- src/components/views/rooms/MessageComposer.js | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js index 283b11a437..8910068d03 100644 --- a/src/components/views/rooms/MessageComposer.js +++ b/src/components/views/rooms/MessageComposer.js @@ -29,9 +29,7 @@ import {aboveLeftOf, ContextMenu, ContextMenuTooltipButton, useContextMenu} from import AccessibleTooltipButton from "../elements/AccessibleTooltipButton"; import ReplyPreview from "./ReplyPreview"; import {UIFeature} from "../../../settings/UIFeature"; -import WidgetStore from "../../../stores/WidgetStore"; import {UPDATE_EVENT} from "../../../stores/AsyncStore"; -import ActiveWidgetStore from "../../../stores/ActiveWidgetStore"; import {replaceableComponent} from "../../../utils/replaceableComponent"; import VoiceRecordComposerTile from "./VoiceRecordComposerTile"; import {VoiceRecordingStore} from "../../../stores/VoiceRecordingStore"; @@ -179,16 +177,12 @@ export default class MessageComposer extends React.Component { this._onRoomStateEvents = this._onRoomStateEvents.bind(this); this._onTombstoneClick = this._onTombstoneClick.bind(this); this.renderPlaceholderText = this.renderPlaceholderText.bind(this); - WidgetStore.instance.on(UPDATE_EVENT, this._onWidgetUpdate); - ActiveWidgetStore.on('update', this._onActiveWidgetUpdate); VoiceRecordingStore.instance.on(UPDATE_EVENT, this._onVoiceStoreUpdate); this._dispatcherRef = null; this.state = { tombstone: this._getRoomTombstone(), canSendMessages: this.props.room.maySendMessage(), - hasConference: WidgetStore.instance.doesRoomHaveConference(this.props.room), - joinedConference: WidgetStore.instance.isJoinedToConferenceIn(this.props.room), isComposerEmpty: true, haveRecording: false, }; @@ -206,14 +200,6 @@ export default class MessageComposer extends React.Component { } }; - _onWidgetUpdate = () => { - this.setState({hasConference: WidgetStore.instance.doesRoomHaveConference(this.props.room)}); - }; - - _onActiveWidgetUpdate = () => { - this.setState({joinedConference: WidgetStore.instance.isJoinedToConferenceIn(this.props.room)}); - }; - componentDidMount() { this.dispatcherRef = dis.register(this.onAction); MatrixClientPeg.get().on("RoomState.events", this._onRoomStateEvents); @@ -240,8 +226,6 @@ export default class MessageComposer extends React.Component { if (MatrixClientPeg.get()) { MatrixClientPeg.get().removeListener("RoomState.events", this._onRoomStateEvents); } - WidgetStore.instance.removeListener(UPDATE_EVENT, this._onWidgetUpdate); - ActiveWidgetStore.removeListener('update', this._onActiveWidgetUpdate); VoiceRecordingStore.instance.off(UPDATE_EVENT, this._onVoiceStoreUpdate); dis.unregister(this.dispatcherRef); }