PLT-3366 Holding down the ALT key and clicking on a message adds a new messages indicator (squashed) (#3374)

1 files changed, 14 insertions, 0 deletions

diff --git a/webapp/components/post_view/post_view_controller.jsx b/webapp/components/post_view/post_view_controller.jsx
index 17c3e94ae..3aba569fe 100644
--- a/webapp/components/post_view/post_view_controller.jsx
+++ b/webapp/components/post_view/post_view_controller.jsx
@@ -27,6 +27,7 @@ export default class PostViewController extends React.Component {
         this.onPostsChange = this.onPostsChange.bind(this);
         this.onEmojisChange = this.onEmojisChange.bind(this);
         this.onPostsViewJumpRequest = this.onPostsViewJumpRequest.bind(this);
+        this.onSetNewMessageIndicator = this.onSetNewMessageIndicator.bind(this);
         this.onPostListScroll = this.onPostListScroll.bind(this);
         this.onActivate = this.onActivate.bind(this);
         this.onDeactivate = this.onDeactivate.bind(this);
@@ -50,6 +51,7 @@ export default class PostViewController extends React.Component {
             profiles,
             atTop: PostStore.getVisibilityAtTop(channel.id),
             lastViewed,
+            ownNewMessage: false,
             scrollType: ScrollTypes.NEW_MESSAGE,
             displayNameType: PreferenceStore.get(Preferences.CATEGORY_DISPLAY_SETTINGS, 'name_format', 'false'),
             displayPostsInCenter: PreferenceStore.get(Preferences.CATEGORY_DISPLAY_SETTINGS, Preferences.CHANNEL_DISPLAY_MODE, Preferences.CHANNEL_DISPLAY_MODE_DEFAULT) === Preferences.CHANNEL_DISPLAY_MODE_CENTERED,
@@ -117,6 +119,7 @@ export default class PostViewController extends React.Component {
         PostStore.addChangeListener(this.onPostsChange);
         PostStore.addPostsViewJumpListener(this.onPostsViewJumpRequest);
         EmojiStore.addChangeListener(this.onEmojisChange);
+        ChannelStore.addLastViewedListener(this.onSetNewMessageIndicator);
     }
 
     onDeactivate() {
@@ -125,6 +128,7 @@ export default class PostViewController extends React.Component {
         PostStore.removeChangeListener(this.onPostsChange);
         PostStore.removePostsViewJumpListener(this.onPostsViewJumpRequest);
         EmojiStore.removeChangeListener(this.onEmojisChange);
+        ChannelStore.removeLastViewedListener(this.onSetNewMessageIndicator);
     }
 
     componentWillReceiveProps(nextProps) {
@@ -149,6 +153,7 @@ export default class PostViewController extends React.Component {
             this.setState({
                 channel,
                 lastViewed,
+                ownNewMessage: false,
                 profiles: JSON.parse(JSON.stringify(profiles)),
                 postList: JSON.parse(JSON.stringify(PostStore.getVisiblePosts(channel.id))),
                 displayNameType: PreferenceStore.get(Preferences.CATEGORY_DISPLAY_SETTINGS, 'name_format', 'false'),
@@ -178,6 +183,10 @@ export default class PostViewController extends React.Component {
         }
     }
 
+    onSetNewMessageIndicator(lastViewed, ownNewMessage) {
+        this.setState({lastViewed, ownNewMessage});
+    }
+
     onPostListScroll(atBottom) {
         if (atBottom) {
             this.setState({scrollType: ScrollTypes.BOTTOM});
@@ -219,6 +228,10 @@ export default class PostViewController extends React.Component {
             return true;
         }
 
+        if (nextState.ownNewMessage !== this.state.ownNewMessage) {
+            return true;
+        }
+
         if (nextState.showMoreMessagesTop !== this.state.showMoreMessagesTop) {
             return true;
         }
@@ -277,6 +290,7 @@ export default class PostViewController extends React.Component {
                     useMilitaryTime={this.state.useMilitaryTime}
                     lastViewed={this.state.lastViewed}
                     emojis={this.state.emojis}
+                    ownNewMessage={this.state.ownNewMessage}
                 />
             );
         }