Cleaned up logic for the unread indicators

3 files changed, 100 insertions, 108 deletions

diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index a16a0a8bb..87007edcc 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -11,19 +11,22 @@ var BrowserStore = require('../stores/browser_store.jsx');
 var Utils = require('../utils/utils.jsx');
 var SidebarHeader = require('./sidebar_header.jsx');
 var SearchBox = require('./search_bar.jsx');
-var UnreadChannelIndicators = require('./unread_channel_indicators.jsx');
 var Constants = require('../utils/constants.jsx');
 var NewChannelFlow = require('./new_channel_flow.jsx');
+var UnreadChannelIndicator = require('./unread_channel_indicator.jsx');
 
 export default class Sidebar extends React.Component {
     constructor(props) {
         super(props);
 
         this.badgesActive = false;
+        this.firstUnreadChannel = null;
+        this.lastUnreadChannel = null;
 
         this.onChange = this.onChange.bind(this);
         this.onScroll = this.onScroll.bind(this);
         this.onResize = this.onResize.bind(this);
+        this.updateUnreadIndicators = this.updateUnreadIndicators.bind(this);
         this.createChannelElement = this.createChannelElement.bind(this);
 
         this.state = this.getStateFromStores();
@@ -147,13 +150,23 @@ export default class Sidebar extends React.Component {
         $('.nav-pills__container').perfectScrollbar();
 
         this.updateTitle();
-        this.refs.unreadIndicators.onParentUpdate(this.refs);
+        this.updateUnreadIndicators();
 
         $(window).on('resize', this.onResize);
     }
+    shouldComponentUpdate(nextProps, nextState) {
+        if (!Utils.areStatesEqual(nextProps, this.props)) {
+            return true;
+        }
+
+        if (!Utils.areStatesEqual(nextState, this.state)) {
+            return true;
+        }
+        return false;
+    }
     componentDidUpdate() {
         this.updateTitle();
-        this.refs.unreadIndicators.onParentUpdate(this.refs);
+        this.updateUnreadIndicators();
     }
     componentWillUnmount() {
         $(window).off('resize', this.onResize);
@@ -266,12 +279,39 @@ export default class Sidebar extends React.Component {
         }
     }
     onScroll() {
-        this.refs.unreadIndicators.onParentUpdate(this.refs);
+        this.updateUnreadIndicators();
     }
     onResize() {
-        this.refs.unreadIndicators.onParentUpdate(this.refs);
+        this.updateUnreadIndicators();
     }
-    createChannelElement(unreadChannels, channel, index) {
+    updateUnreadIndicators() {
+        const container = $(React.findDOMNode(this.refs.container));
+
+        var showTopUnread = false;
+        var showBottomUnread = false;
+
+        if (this.firstUnreadChannel) {
+            var firstUnreadElement = $(React.findDOMNode(this.refs[this.firstUnreadChannel]));
+
+            if (firstUnreadElement.position().top + firstUnreadElement.height() < 0) {
+                showTopUnread = true;
+            }
+        }
+
+        if (this.lastUnreadChannel) {
+            var lastUnreadElement = $(React.findDOMNode(this.refs[this.lastUnreadChannel]));
+
+            if (lastUnreadElement.position().top > container.height()) {
+                showBottomUnread = true;
+            }
+        }
+
+        this.setState({
+            showTopUnread,
+            showBottomUnread
+        });
+    }
+    createChannelElement(channel, index) {
         var members = this.state.members;
         var activeId = this.state.activeId;
         var channelMember = members[channel.id];
@@ -293,7 +333,10 @@ export default class Sidebar extends React.Component {
             titleClass = 'unread-title';
 
             if (channel.id !== activeId) {
-                unreadChannels.push(channel);
+                if (!this.firstUnreadChannel) {
+                    this.firstUnreadChannel = channel.name;
+                }
+                this.lastUnreadChannel = channel.name;
             }
         }
 
@@ -399,17 +442,18 @@ export default class Sidebar extends React.Component {
     render() {
         this.badgesActive = false;
 
-        // keep track of unread channels so we can use them to set the unread indicators
-        const unreadChannels = [];
+        // keep track of the first and last unread channels so we can use them to set the unread indicators
+        this.firstUnreadChannel = null;
+        this.lastUnreadChannel = null;
 
         // create elements for all 3 types of channels
         const publicChannels = this.state.channels.filter((channel) => channel.type === 'O');
-        const publicChannelItems = publicChannels.map(this.createChannelElement.bind(this, unreadChannels));
+        const publicChannelItems = publicChannels.map(this.createChannelElement);
 
         const privateChannels = this.state.channels.filter((channel) => channel.type === 'P');
-        const privateChannelItems = privateChannels.map(this.createChannelElement.bind(this, unreadChannels));
+        const privateChannelItems = privateChannels.map(this.createChannelElement);
 
-        const directMessageItems = this.state.showDirectChannels.map(this.createChannelElement.bind(this, unreadChannels));
+        const directMessageItems = this.state.showDirectChannels.map(this.createChannelElement);
 
         // update the favicon to show if there are any notifications
         var link = document.createElement('link');
@@ -463,9 +507,15 @@ export default class Sidebar extends React.Component {
                 />
                 <SearchBox />
 
-                <UnreadChannelIndicators
-                    ref='unreadIndicators'
-                    unreadChannels={unreadChannels}
+                <UnreadChannelIndicator
+                    show={this.state.showTopUnread}
+                    extraClass='nav-pills__unread-indicator-top'
+                    text={'Unread post(s) above'}
+                />
+                <UnreadChannelIndicator
+                    show={this.state.showBottomUnread}
+                    extraClass='nav-pills__unread-indicator-bottom'
+                    text={'Unread post(s) below'}
                 />
 
                 <div
diff --git a/web/react/components/unread_channel_indicator.jsx b/web/react/components/unread_channel_indicator.jsx
new file mode 100644
index 000000000..12a67633e
--- /dev/null
+++ b/web/react/components/unread_channel_indicator.jsx
@@ -0,0 +1,35 @@
+// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+// Indicator for the left sidebar which indicate if there's unread posts in a channel that is not shown
+// because it is either above or below the screen
+export default class UnreadChannelIndicator extends React.Component {
+    constructor(props) {
+        super(props);
+    }
+    render() {
+        let displayValue = 'none';
+        if (this.props.show) {
+            displayValue = 'initial';
+        }
+        return (
+            <div
+                className={'nav-pills__unread-indicator ' + this.props.extraClass}
+                style={{display: displayValue}}
+            >
+                {this.props.text}
+            </div>
+        );
+    }
+}
+
+UnreadChannelIndicator.defaultProps = {
+    show: false,
+    extraClass: '',
+    text: ''
+};
+UnreadChannelIndicator.propTypes = {
+    show: React.PropTypes.bool,
+    extraClass: React.PropTypes.string,
+    text: React.PropTypes.string
+};
diff --git a/web/react/components/unread_channel_indicators.jsx b/web/react/components/unread_channel_indicators.jsx
deleted file mode 100644
index 852e0dbb7..000000000
--- a/web/react/components/unread_channel_indicators.jsx
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-// Indicators for the left sidebar which indicate if there's unread posts in a channel that is not shown
-// because it is either above or below the screen
-export default class UnreadChannelIndicators extends React.Component {
-    constructor(props) {
-        super(props);
-
-        this.getFirstLastUnreadChannels = this.getFirstLastUnreadChannels.bind(this);
-        this.onParentUpdate = this.onParentUpdate.bind(this);
-
-        this.state = this.getFirstLastUnreadChannels(props);
-    }
-
-    getFirstLastUnreadChannels(props) {
-        let firstUnreadChannel = null;
-        let lastUnreadChannel = null;
-
-        for (const unreadChannel of props.unreadChannels) {
-            if (!firstUnreadChannel) {
-                firstUnreadChannel = unreadChannel;
-            }
-            lastUnreadChannel = unreadChannel;
-        }
-
-        return {
-            firstUnreadChannel,
-            lastUnreadChannel
-        };
-    }
-
-    onParentUpdate(parentRefs) {
-        const container = $(React.findDOMNode(parentRefs.container));
-        const topUnreadIndicator = $(React.findDOMNode(this.refs.topIndicator));
-        const bottomUnreadIndicator = $(React.findDOMNode(this.refs.bottomIndicator));
-
-        if (this.state.firstUnreadChannel) {
-            var firstUnreadElement = $(React.findDOMNode(parentRefs[this.state.firstUnreadChannel.name]));
-
-            if (firstUnreadElement.position().top + firstUnreadElement.height() < 0) {
-                topUnreadIndicator.css('display', 'initial');
-            } else {
-                topUnreadIndicator.css('display', 'none');
-            }
-        } else {
-            topUnreadIndicator.css('display', 'none');
-        }
-
-        if (this.state.lastUnreadChannel) {
-            var lastUnreadElement = $(React.findDOMNode(parentRefs[this.state.lastUnreadChannel.name]));
-
-            if (lastUnreadElement.position().top > container.height()) {
-                bottomUnreadIndicator.css('display', 'initial');
-            } else {
-                bottomUnreadIndicator.css('display', 'none');
-            }
-        } else {
-            bottomUnreadIndicator.css('display', 'none');
-        }
-    }
-
-    componentWillReceiveProps(nextProps) {
-        this.setState(this.getFirstLastUnreadChannels(nextProps));
-    }
-
-    render() {
-        return (
-            <div>
-                <div
-                    ref='topIndicator'
-                    className='nav-pills__unread-indicator nav-pills__unread-indicator-top'
-                    style={{display: 'none'}}
-                >
-                    {'Unread post(s) above'}
-                </div>
-                <div
-                    ref='bottomIndicator'
-                    className='nav-pills__unread-indicator nav-pills__unread-indicator-bottom'
-                    style={{display: 'none'}}
-                >
-                    {'Unread post(s) below'}
-                </div>
-            </div>
-        );
-    }
-}
-
-UnreadChannelIndicators.propTypes = {
-
-    // a list of the unread channels displayed in the parent
-    unreadChannels: React.PropTypes.array.isRequired
-};