compose [nfc]: Factor new topicSelectionAllowed out of topicInputVisible

We'll use topicSelectionAllowed soon, for zulip#5718.
chrisbobbe · Sep 13, 2023 · a3db1f8 · a3db1f8
1 parent 1f894d4
commit a3db1f8
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/compose/ComposeBox.js b/src/compose/ComposeBox.js
@@ -263,15 +263,17 @@ const ComposeBox: React$AbstractComponent<Props, ImperativeHandle> = forwardRef(
     setFocusState(state => ({ ...state, either: state.message || state.topic }));
   }, []);
 
-  const topicInputVisible = useMemo(() => {
+  const topicSelectionAllowed = useMemo(() => {
     if (isEditing) {
       return isStreamOrTopicNarrow(narrow);
     }
     if (!isStreamNarrow(narrow)) {
       return false;
     }
-    return focusState.either;
-  }, [isEditing, narrow, focusState.either]);
+    return true;
+  }, [isEditing, narrow]);
+
+  const topicInputVisible = topicSelectionAllowed && (focusState.either || isEditing);
 
   /**
    * Inserts text at the message input's cursor position.