added desktop file and updated focus manager

Signed-off-by: Ayaz Alavi <ayaz.alavi@gmail.com>
Expensify · Oct 9, 2023 · 2cc1e12 · 2cc1e12
1 parent 83dfeb6
commit 2cc1e12
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 4 deletions.
diff --git a/src/libs/actions/InputFocus/index.desktop.ts b/src/libs/actions/InputFocus/index.desktop.ts
@@ -0,0 +1,30 @@
+import Onyx from 'react-native-onyx';
+import ONYXKEYS from '../../../ONYXKEYS';
+import * as Browser from '../../Browser';
+import ReportActionComposeFocusManager from '../../ReportActionComposeFocusManager';
+
+function inputFocusChange(focus: boolean) {
+    Onyx.set(ONYXKEYS.INPUT_FOCUSED, focus);
+}
+
+let refSave: HTMLElement | undefined;
+function composerFocusKeepFocusOn(ref: HTMLElement, isFocused: boolean, modal: { willAlertModalBecomeVisible: boolean; isVisible: boolean }, onyxFocused: boolean) {
+    if (isFocused && !onyxFocused) {
+        inputFocusChange(true);
+        ref.focus();
+    }   
+    if (isFocused) {
+        refSave = ref;
+    }
+    if (!isFocused && !onyxFocused && !modal.willAlertModalBecomeVisible && !modal.isVisible && refSave) {        
+        if (!ReportActionComposeFocusManager.isFocused()) {
+            refSave.focus();
+        } else { 
+            refSave = undefined;
+        }
+    }
+}
+
+const callback = (method: () => void) => method();
+
+export {composerFocusKeepFocusOn, inputFocusChange, callback};
diff --git a/src/libs/actions/InputFocus/index.website.ts b/src/libs/actions/InputFocus/index.website.ts
@@ -1,6 +1,7 @@
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../../ONYXKEYS';
 import * as Browser from '../../Browser';
+import ReportActionComposeFocusManager from '../../ReportActionComposeFocusManager';
 
 function inputFocusChange(focus: boolean) {
     if (Browser.isMobile()) {
@@ -10,19 +11,23 @@ function inputFocusChange(focus: boolean) {
 }
 
 let refSave: HTMLElement | undefined;
-function composerFocusKeepFocusOn(ref: HTMLElement, isFocused: boolean, modal: {willAlertModalBecomeVisible: boolean; isVisible: boolean}, onyxFocused: boolean) {
+function composerFocusKeepFocusOn(ref: HTMLElement, isFocused: boolean, modal: { willAlertModalBecomeVisible: boolean; isVisible: boolean }, onyxFocused: boolean) {
     if (Browser.isMobile()) {
         return;
     }
     if (isFocused && !onyxFocused) {
         inputFocusChange(true);
         ref.focus();
-    }
+    }   
     if (isFocused) {
         refSave = ref;
     }
-    if (!isFocused && !onyxFocused && !modal.willAlertModalBecomeVisible && !modal.isVisible && refSave) {
-        refSave.focus();
+    if (!isFocused && !onyxFocused && !modal.willAlertModalBecomeVisible && !modal.isVisible && refSave) {        
+        if (!ReportActionComposeFocusManager.isFocused()) {
+            refSave.focus();
+        } else { 
+            refSave = undefined;
+        }
     }
 }
 

diff --git a/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions.js b/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions.js
@@ -374,6 +374,7 @@ function ComposerWithSuggestions({
         if (!suggestionsRef.current) {
             return false;
         }
+        InputFocus.inputFocusChange(false)
         return suggestionsRef.current.setShouldBlockSuggestionCalc(false);
     }, [suggestionsRef]);