1 files changed, 35 insertions, 15 deletions

diff --git a/web/react/components/sidebar_right.jsx b/web/react/components/sidebar_right.jsx
index e2ef60959..ac1049da0 100644
--- a/web/react/components/sidebar_right.jsx
+++ b/web/react/components/sidebar_right.jsx
@@ -1,15 +1,13 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var SearchResults = require('./search_results.jsx');
-var RhsThread = require('./rhs_thread.jsx');
-var SearchStore = require('../stores/search_store.jsx');
-var PostStore = require('../stores/post_store.jsx');
-var Utils = require('../utils/utils.jsx');
+import SearchResults from './search_results.jsx';
+import RhsThread from './rhs_thread.jsx';
+import SearchStore from '../stores/search_store.jsx';
+import PostStore from '../stores/post_store.jsx';
+import * as Utils from '../utils/utils.jsx';
 
-function getStateFromStores() {
-    return {search_visible: SearchStore.getSearchResults() != null, post_right_visible: PostStore.getSelectedPost() != null, is_mention_search: SearchStore.getIsMentionSearch()};
-}
+const SIDEBAR_SCROLL_DELAY = 500;
 
 export default class SidebarRight extends React.Component {
     constructor(props) {
@@ -19,22 +17,37 @@ export default class SidebarRight extends React.Component {
 
         this.onSelectedChange = this.onSelectedChange.bind(this);
         this.onSearchChange = this.onSearchChange.bind(this);
+        this.onShowSearch = this.onShowSearch.bind(this);
 
         this.doStrangeThings = this.doStrangeThings.bind(this);
 
-        this.state = getStateFromStores();
+        this.state = this.getStateFromStores();
+    }
+    getStateFromStores() {
+        return {
+            search_visible: SearchStore.getSearchResults() != null,
+            post_right_visible: PostStore.getSelectedPost() != null,
+            is_mention_search: SearchStore.getIsMentionSearch()
+        };
     }
     componentDidMount() {
         SearchStore.addSearchChangeListener(this.onSearchChange);
         PostStore.addSelectedPostChangeListener(this.onSelectedChange);
+        SearchStore.addShowSearchListener(this.onShowSearch);
         this.doStrangeThings();
     }
     componentWillUnmount() {
         SearchStore.removeSearchChangeListener(this.onSearchChange);
         PostStore.removeSelectedPostChangeListener(this.onSelectedChange);
+        SearchStore.removeShowSearchListener(this.onShowSearch);
     }
-    componentWillUpdate() {
-        PostStore.jumpPostsViewSidebarOpen();
+    componentWillUpdate(nextProps, nextState) {
+        const isOpen = this.state.search_visible || this.state.post_right_visible;
+        const willOpen = nextState.search_visible || nextState.post_right_visible;
+
+        if (!isOpen && willOpen) {
+            setTimeout(() => PostStore.jumpPostsViewSidebarOpen(), SIDEBAR_SCROLL_DELAY);
+        }
     }
     doStrangeThings() {
         // We should have a better way to do this stuff
@@ -64,18 +77,25 @@ export default class SidebarRight extends React.Component {
         this.doStrangeThings();
     }
     onSelectedChange(fromSearch) {
-        var newState = getStateFromStores(fromSearch);
+        var newState = this.getStateFromStores(fromSearch);
         newState.from_search = fromSearch;
-        if (!Utils.areStatesEqual(newState, this.state)) {
+        if (!Utils.areObjectsEqual(newState, this.state)) {
             this.setState(newState);
         }
     }
     onSearchChange() {
-        var newState = getStateFromStores();
-        if (!Utils.areStatesEqual(newState, this.state)) {
+        var newState = this.getStateFromStores();
+        if (!Utils.areObjectsEqual(newState, this.state)) {
             this.setState(newState);
         }
     }
+    onShowSearch() {
+        if (!this.state.search_visible) {
+            this.setState({
+                search_visible: true
+            });
+        }
+    }
     render() {
         var content = '';