Merge pull request #31 from intern0t/inconsistent-page-title

scrollIntoView fix, set page title on new message notification.
intern0t · Jan 13, 2019 · 73a72a7 · 73a72a7
2 parents 0d15168 + f1221f2
commit 73a72a7
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/src/components/pages/Conversation.js b/src/components/pages/Conversation.js
@@ -49,6 +49,11 @@ class Conversation extends Component {
                 // Room exists, simply change the room!
                 changeActiveRoom(match.params.roomid || "r-general");
             }
+
+            let documentTitle = document.title;
+            if (documentTitle && documentTitle.includes(match.params.roomid)) {
+                document.title = "Veiled";
+            }
         }
 
         console.log(
@@ -197,10 +202,6 @@ class Conversation extends Component {
         }
     };
 
-    changed = () => {
-        console.log("Something changed!");
-    };
-
     render() {
         let otherUser = "Anonymous";
         return (
@@ -311,7 +312,6 @@ class Conversation extends Component {
                                     darkMode ? "darkmode" : ""
                                 }`}
                                 id="conversation-window"
-                                onChange={this.changed}
                             >
                                 {messages
                                     .filter(
@@ -332,7 +332,9 @@ class Conversation extends Component {
                                                 timestamp={messageEntry.date}
                                                 message={messageEntry.message}
                                                 darkMode={darkMode}
-                                                attachRef={attachRefToNewMessage}
+                                                attachRef={
+                                                    attachRefToNewMessage
+                                                }
                                             />
                                         );
                                     })}

diff --git a/src/contexts/ConversationProvider.js b/src/contexts/ConversationProvider.js
@@ -93,6 +93,7 @@ export class ConversationProvider extends Component {
     };
 
     onMessageReceived = messageEntry => {
+        this.setBrowserTitle(messageEntry.roomid);
         this.addNewMessage(messageEntry);
         this.scrollToMyRef();
     };
@@ -102,7 +103,10 @@ export class ConversationProvider extends Component {
      * @memberof ConversationProvider
      */
     scrollToMyRef = () => {
-        if (this.scrollToRef) {
+        if (
+            this.scrollToRef &&
+            typeof this.scrollToRef.scrollIntoView === "function"
+        ) {
             this.scrollToRef.scrollIntoView({
                 behavior: "smooth",
                 block: "end",
@@ -344,6 +348,17 @@ export class ConversationProvider extends Component {
         );
     };
 
+    setBrowserTitle = messageOnRoom => {
+        if (
+            messageOnRoom.includes("r-") &&
+            messageOnRoom !== this.state.activeRoomID
+        ) {
+            document.title = `Veiled${
+                messageOnRoom ? ` - New message on ${messageOnRoom}.` : ""
+            }`;
+        }
+    };
+
     render() {
         const { children } = this.props;