fix context menu

Expensify · Oct 5, 2024 · 2cd4727 · 2cd4727
1 parent 8595df0
commit 2cd4727
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 20 deletions.
diff --git a/src/components/Composer/index.native.tsx b/src/components/Composer/index.native.tsx
@@ -38,6 +38,7 @@ function Composer(
         selection,
         value,
         isGroupPolicyReport = false,
+        showSoftInputOnFocus = true,
         ...props
     }: ComposerProps,
     ref: ForwardedRef<TextInput>,
@@ -49,7 +50,6 @@ function Composer(
     const markdownStyle = useMarkdownStyle(value, !isGroupPolicyReport ? excludeReportMentionStyle : excludeNoStyles);
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
-    const [showSoftInputOnFocus, setShowSoftInputOnFocus] = useState(false);
 
     const [contextMenuHidden, setContextMenuHidden] = useState(true);
 
@@ -150,12 +150,6 @@ function Composer(
             onClear={onClear}
             showSoftInputOnFocus={showSoftInputOnFocus}
             contextMenuHidden={contextMenuHidden}
-            onTouchStart={() => {
-                if (showSoftInputOnFocus) {
-                    return;
-                }
-                setShowSoftInputOnFocus(true);
-            }}
         />
     );
 }

diff --git a/src/components/Composer/index.tsx b/src/components/Composer/index.tsx
@@ -73,6 +73,7 @@ function Composer(
         isComposerFullSize = false,
         shouldContainScroll = true,
         isGroupPolicyReport = false,
+        showSoftInputOnFocus = true,
         ...props
     }: ComposerProps,
     ref: ForwardedRef<TextInput | HTMLInputElement>,
@@ -103,7 +104,6 @@ function Composer(
     const isScrollBarVisible = useIsScrollBarVisible(textInput, value ?? '');
     const [prevScroll, setPrevScroll] = useState<number | undefined>();
     const isReportFlatListScrolling = useRef(false);
-    const [showSoftInputOnFocus, setShowSoftInputOnFocus] = useState(false);
 
     useEffect(() => {
         if (!!selection && selectionProp.start === selection.start && selectionProp.end === selection.end) {
@@ -399,18 +399,6 @@ function Composer(
                 }}
                 disabled={isDisabled}
                 onKeyPress={handleKeyPress}
-                onTouchStart={() => {
-                    if (showSoftInputOnFocus) {
-                        return;
-                    }
-                    if (Browser.isMobileSafari()) {
-                        setTimeout(() => {
-                            setShowSoftInputOnFocus(true);
-                        }, CONST.ANIMATED_TRANSITION);
-                        return;
-                    }
-                    setShowSoftInputOnFocus(true);
-                }}
             />
             {shouldCalculateCaretPosition && renderElementForCaretPosition}
         </>

diff --git a/src/components/Composer/types.ts b/src/components/Composer/types.ts
@@ -77,6 +77,8 @@ type ComposerProps = Omit<TextInputProps, 'onClear'> & {
 
     /** Indicates whether the composer is in a group policy report. Used for disabling report mentioning style in markdown input */
     isGroupPolicyReport?: boolean;
+
+    showSoftInputOnFocus?: boolean;
 };
 
 export type {TextSelection, ComposerProps, CustomSelectionChangeEvent};
diff --git a/...pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx b/...pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx
@@ -285,6 +285,8 @@ function ComposerWithSuggestions(
 
     const [composerHeight, setComposerHeight] = useState(0);
 
+    const [showSoftInputOnFocus, setShowSoftInputOnFocus] = useState(false);
+
     const textInputRef = useRef<TextInput | null>(null);
 
     const syncSelectionWithOnChangeTextRef = useRef<SyncSelection | null>(null);
@@ -772,6 +774,19 @@ function ComposerWithSuggestions(
                     onScroll={hideSuggestionMenu}
                     shouldContainScroll={Browser.isMobileSafari()}
                     isGroupPolicyReport={isGroupPolicyReport}
+                    showSoftInputOnFocus={showSoftInputOnFocus}
+                    onTouchStart={() => {
+                        if (showSoftInputOnFocus) {
+                            return;
+                        }
+                        if (Browser.isMobileSafari()) {
+                            setTimeout(() => {
+                                setShowSoftInputOnFocus(true);
+                            }, CONST.ANIMATED_TRANSITION);
+                            return;
+                        }
+                        setShowSoftInputOnFocus(true);
+                    }}
                 />
             </View>