OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't wait for setState to run onHaveRoom 

onHaveRoom sets some more state (among other things) so putting it
in the setState callback so it could observe the new state caused
us to have to re-render again unnecessarily. Just give it the new
state as a parameter.
pull/21833/head
David Baker 2017-09-08 17:06:46 +01:00
parent 984d639a37
commit 1be35a77ec
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/components/structures/RoomView.js
View File

@ -211,16 +211,19 @@ module.exports = React.createClass({
newState.searchResults = null; newState.searchResults = null;
} }
this.setState(newState, () => { this.setState(newState);
// At this point, this.state.roomId could be null (e.g. the alias might not // At this point, newState.roomId could be null (e.g. the alias might not
// have been resolved yet) so anything called here must handle this case. // have been resolved yet) so anything called here must handle this case.
if (initial) { // We pass the new state into this function for it to read: it needs to
this._onHaveRoom(); // observe the new state but we don't want to put it in the setState
} // callback because this would prevent the setStates from being batched,
}); // ie. cause it to render RoomView twice rather than the once that is necessary.
if (initial) {
this._onHaveRoom(newState);
}
}, },
_onHaveRoom: function() { _onHaveRoom: function(state) {
// if this is an unknown room then we're in one of three states: // if this is an unknown room then we're in one of three states:
// - This is a room we can peek into (search engine) (we can /peek) // - This is a room we can peek into (search engine) (we can /peek)
// - This is a room we can publicly join or were invited to. (we can /join) // - This is a room we can publicly join or were invited to. (we can /join)
@ -236,7 +239,7 @@ module.exports = React.createClass({
// about it). We don't peek in the historical case where we were joined but are // about it). We don't peek in the historical case where we were joined but are
// now not joined because the js-sdk peeking API will clobber our historical room, // now not joined because the js-sdk peeking API will clobber our historical room,
// making it impossible to indicate a newly joined room. // making it impossible to indicate a newly joined room.
const room = this.state.room; const room = state.room;
if (room) { if (room) {
this.setState({ this.setState({
unsentMessageError: this._getUnsentMessageError(room), unsentMessageError: this._getUnsentMessageError(room),
@ -244,15 +247,15 @@ module.exports = React.createClass({
}); });
this._onRoomLoaded(room); this._onRoomLoaded(room);
} }
if (!this.state.joining && this.state.roomId) { if (!state.joining && state.roomId) {
if (this.props.autoJoin) { if (this.props.autoJoin) {
this.onJoinButtonClicked(); this.onJoinButtonClicked();
} else if (!room && this.state.shouldPeek) { } else if (!room && state.shouldPeek) {
console.log("Attempting to peek into room %s", this.state.roomId); console.log("Attempting to peek into room %s", state.roomId);
this.setState({ this.setState({
peekLoading: true, peekLoading: true,
}); });
MatrixClientPeg.get().peekInRoom(this.state.roomId).then((room) => { MatrixClientPeg.get().peekInRoom(state.roomId).then((room) => {
this.setState({ this.setState({
room: room, room: room,
peekLoading: false, peekLoading: false,