From 842bf77409184a028e721cb50abb5a50c7b655fb Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Wed, 6 Nov 2019 10:32:20 +0100 Subject: [PATCH] prevent error when nextProps is null, cleanup As the FilePanel is now rendered as part of the RoomView, we don't need to respond to room changes, as RoomView has a key of the roomId, so the whole subtree would be recreated. --- src/components/structures/FilePanel.js | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js index c7e8295f80..f5a5912dd5 100644 --- a/src/components/structures/FilePanel.js +++ b/src/components/structures/FilePanel.js @@ -39,23 +39,10 @@ const FilePanel = createReactClass({ }; }, - componentWillMount: function() { + componentDidMount: function() { this.updateTimelineSet(this.props.roomId); }, - componentWillReceiveProps: function(nextProps) { - if (nextProps.roomId !== this.props.roomId) { - // otherwise we race between re-rendering the TimelinePanel and setting the new timelineSet. - // - // FIXME: this race only happens because of the promise returned by getOrCreateFilter(). - // We should only need to create the containsUrl filter once per login session, so in practice - // it shouldn't be being done here at all. Then we could just update the timelineSet directly - // without resetting it first, and speed up room-change. - this.setState({ timelineSet: null }); - this.updateTimelineSet(nextProps.roomId); - } - }, - updateTimelineSet: function(roomId) { const client = MatrixClientPeg.get(); const room = client.getRoom(roomId);