diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-05-16 07:54:38 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-05-16 07:54:38 -0400 |
| commit | dcba917d6067464094d45c81a82618b1bfe13225 (patch) | |
| tree | c6b98c39e73996b3e3b2dd2c468159333dc5fa03 /webapp/components | |
| parent | 6363fc5b7f875d3a214f738e883fa0916d45a845 (diff) | |
| parent | 9d94869cc6a0fb9f051879437c104ccd76094380 (diff) | |
| download | chat-dcba917d6067464094d45c81a82618b1bfe13225.tar.gz chat-dcba917d6067464094d45c81a82618b1bfe13225.tar.bz2 chat-dcba917d6067464094d45c81a82618b1bfe13225.zip | |
Merge branch 'release-3.0'
Diffstat (limited to 'webapp/components')
| -rw-r--r-- | webapp/components/filtered_user_list.jsx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/webapp/components/filtered_user_list.jsx b/webapp/components/filtered_user_list.jsx index 4270d3731..fca68a81a 100644 --- a/webapp/components/filtered_user_list.jsx +++ b/webapp/components/filtered_user_list.jsx @@ -43,6 +43,15 @@ class FilteredUserList extends React.Component { }; } + componentWillUpdate(nextProps) { + // assume the user list is immutable + if (this.props.users !== nextProps.users) { + this.setState({ + users: this.filterUsers(nextProps.teamMembers, nextProps.users) + }); + } + } + componentDidUpdate(prevProps, prevState) { if (prevState.filter !== this.state.filter) { $(ReactDOM.findDOMNode(this.refs.userList)).scrollTop(0); |