This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 833
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1375 from matrix-org/dbkr/active_room_observer
Avoid re-rendering RoomList on room switch
- Loading branch information
Showing
4 changed files
with
188 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| /* | ||
| Copyright 2017 New Vector Ltd | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| import RoomViewStore from './stores/RoomViewStore'; | ||
|
|
||
| /** | ||
| * Consumes changes from the RoomViewStore and notifies specific things | ||
| * about when the active room changes. Unlike listening for RoomViewStore | ||
| * changes, you can subscribe to only changes relevant to a particular | ||
| * room. | ||
| * | ||
| * TODO: If we introduce an observer for something else, factor out | ||
| * the adding / removing of listeners & emitting into a common class. | ||
| */ | ||
| class ActiveRoomObserver { | ||
| constructor() { | ||
| this._listeners = {}; | ||
|
|
||
| this._activeRoomId = RoomViewStore.getRoomId(); | ||
| // TODO: We could self-destruct when the last listener goes away, or at least | ||
| // stop listening. | ||
| this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate.bind(this)); | ||
| } | ||
|
|
||
| addListener(roomId, listener) { | ||
| if (!this._listeners[roomId]) this._listeners[roomId] = []; | ||
| this._listeners[roomId].push(listener); | ||
| } | ||
|
|
||
| removeListener(roomId, listener) { | ||
| if (this._listeners[roomId]) { | ||
| const i = this._listeners[roomId].indexOf(listener); | ||
| if (i > -1) { | ||
| this._listeners[roomId].splice(i, 1); | ||
| } | ||
| } else { | ||
| console.warn("Unregistering unrecognised listener (roomId=" + roomId + ")"); | ||
| } | ||
| } | ||
|
|
||
| _emit(roomId) { | ||
| if (!this._listeners[roomId]) return; | ||
|
|
||
| for (const l of this._listeners[roomId]) { | ||
| l.call(); | ||
| } | ||
| } | ||
|
|
||
| _onRoomViewStoreUpdate() { | ||
| // emit for the old room ID | ||
| if (this._activeRoomId) this._emit(this._activeRoomId); | ||
|
|
||
| // update our cache | ||
| this._activeRoomId = RoomViewStore.getRoomId(); | ||
|
|
||
| // and emit for the new one | ||
| if (this._activeRoomId) this._emit(this._activeRoomId); | ||
| } | ||
| } | ||
|
|
||
| if (global.mx_ActiveRoomObserver === undefined) { | ||
| global.mx_ActiveRoomObserver = new ActiveRoomObserver(); | ||
| } | ||
| export default global.mx_ActiveRoomObserver; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| /* | ||
| Copyright 2017 New Vector Ltd | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| import React from 'react'; | ||
| import RoomViewStore from '../../../stores/RoomViewStore'; | ||
| import CallHandler from '../../../CallHandler'; | ||
| import dis from '../../../dispatcher'; | ||
| import sdk from '../../../index'; | ||
|
|
||
| module.exports = React.createClass({ | ||
| displayName: 'CallPreview', | ||
|
|
||
| propTypes: { | ||
| // A Conference Handler implementation | ||
| // Must have a function signature: | ||
| // getConferenceCallForRoom(roomId: string): MatrixCall | ||
| ConferenceHandler: React.PropTypes.object, | ||
| }, | ||
|
|
||
| getInitialState: function() { | ||
| return { | ||
| roomId: RoomViewStore.getRoomId(), | ||
| activeCall: CallHandler.getAnyActiveCall(), | ||
| }; | ||
| }, | ||
|
|
||
| componentWillMount: function() { | ||
| this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate); | ||
| this.dispatcherRef = dis.register(this._onAction); | ||
| }, | ||
|
|
||
| componentWillUnmount: function() { | ||
| if (this._roomStoreToken) { | ||
| this._roomStoreToken.remove(); | ||
| } | ||
| dis.unregister(this.dispatcherRef); | ||
| }, | ||
|
|
||
| _onRoomViewStoreUpdate: function(payload) { | ||
| if (RoomViewStore.getRoomId() === this.state.roomId) return; | ||
| this.setState({ | ||
| roomId: RoomViewStore.getRoomId(), | ||
| }); | ||
| }, | ||
|
|
||
| _onAction: function(payload) { | ||
| switch (payload.action) { | ||
| // listen for call state changes to prod the render method, which | ||
| // may hide the global CallView if the call it is tracking is dead | ||
| case 'call_state': | ||
| this.setState({ | ||
| activeCall: CallHandler.getAnyActiveCall(), | ||
| }); | ||
| break; | ||
| } | ||
| }, | ||
|
|
||
| _onCallViewClick: function() { | ||
| const call = CallHandler.getAnyActiveCall(); | ||
| if (call) { | ||
| dis.dispatch({ | ||
| action: 'view_room', | ||
| room_id: call.groupRoomId || call.roomId, | ||
| }); | ||
| } | ||
| }, | ||
|
|
||
| render: function() { | ||
| const callForRoom = CallHandler.getCallForRoom(this.state.roomId); | ||
| const showCall = (this.state.activeCall && this.state.activeCall.call_state === 'connected' && !callForRoom); | ||
|
|
||
| if (showCall) { | ||
| const CallView = sdk.getComponent('voip.CallView'); | ||
| return ( | ||
| <CallView | ||
| className="mx_LeftPanel_callView" showVoice={true} onClick={this._onCallViewClick} | ||
| ConferenceHandler={this.props.ConferenceHandler} | ||
| /> | ||
| ); | ||
| } | ||
| return null; | ||
| }, | ||
| }); | ||
|
|