Merge pull request #23 from intern0t/join-rooms

Join room works, yet to clean up & make the join process smooth.
intern0t · Jan 12, 2019 · e3d325c · e3d325c
2 parents f46056d + 87dd756
commit e3d325c
Show file tree

Hide file tree

Showing 6 changed files with 281 additions and 21 deletions.
diff --git a/src/components/Brightbar.js b/src/components/Brightbar.js
@@ -15,7 +15,8 @@ class Brightbar extends Component {
             note: "",
             key: "",
             keyVisible: false
-        }
+        },
+        newConversationModalDisplayed: false
     };
 
     onFilterChange = e => {
@@ -86,6 +87,13 @@ class Brightbar extends Component {
         }));
     };
 
+    toggleNewConversationModal = () => {
+        this.setState(prevState => ({
+            ...prevState,
+            newConversationModalDisplayed: !prevState.newConversationModalDisplayed
+        }));
+    };
+
     render() {
         return (
             <AppConsumer>
@@ -96,8 +104,6 @@ class Brightbar extends Component {
                                 rooms,
                                 messages,
                                 nickname,
-                                toggleNewConversationModal,
-                                newConversationModalDisplayed,
                                 generatedRoomID,
                                 generateRoomID,
                                 activeRoomID
@@ -114,7 +120,10 @@ class Brightbar extends Component {
                                         }}
                                     >
                                         <ConversationSearch
-                                            toggle={toggleNewConversationModal}
+                                            toggle={
+                                                this.state
+                                                    .toggleNewConversationModal
+                                            }
                                             onChange={this.onFilterChange}
                                             clearFilter={this.clearFilter}
                                             filterBy={this.state.filterBy}
@@ -142,7 +151,8 @@ class Brightbar extends Component {
                                         </ul>
                                         <Modal
                                             style={{
-                                                display: newConversationModalDisplayed
+                                                display: this.state
+                                                    .newConversationModalDisplayed
                                                     ? "flex"
                                                     : "none"
                                             }}
@@ -155,7 +165,8 @@ class Brightbar extends Component {
                                                     this.state.newRoomInfo.note
                                                 }
                                                 close={
-                                                    toggleNewConversationModal
+                                                    this.state
+                                                        .toggleNewConversationModal
                                                 }
                                                 generate={generateRoomID}
                                                 generated={generatedRoomID}