respect hasPrefferedFocus property on component even it's added not i…

…n first render cycle
flexn-io · Oct 26, 2023 · b5ca64e · b5ca64e
1 parent c1f2d95
commit b5ca64e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/packages/create/src/focusManager/model/screen.ts b/packages/create/src/focusManager/model/screen.ts
@@ -148,9 +148,14 @@ class Screen extends FocusModel {
 
     public setFocus(model: View | null) {
         if (model) {
-            CoreManager.getCurrentFocus()?.getScreen()?.onBlur?.();
+            const screenIsDifferent = CoreManager.getCurrentFocus()?.getScreen()?.getId() !== model.getScreen()?.getId();
+            if (screenIsDifferent) {
+                CoreManager.getCurrentFocus()?.getScreen()?.onBlur?.();
+            }
             CoreManager.executeFocus(model);
-            model.getScreen()?.onFocus();
+            if (screenIsDifferent) {
+                model.getScreen()?.onFocus();
+            }
             if (model.getParent()?.getId() !== model.getScreen()?.getId()) {
                 model.getParent()?.onFocus();
             }

diff --git a/packages/create/src/focusManager/model/view.ts b/packages/create/src/focusManager/model/view.ts
@@ -29,9 +29,9 @@ class View extends FocusModel {
     private _horizontalContentContainerGap = 0;
     private _repeatContext:
         | {
-              focusContext: FocusModel;
-              index: number;
-          }
+            focusContext: FocusModel;
+            index: number;
+        }
         | undefined;
 
     private _onPress?: () => void;
@@ -124,6 +124,9 @@ class View extends FocusModel {
     private async _onLayout() {
         await measureAsync({ model: this });
         this.getScreen()?.removeComponentFromPendingLayoutMap(this.getId());
+        if (this.hasPreferredFocus()) {
+            this.getScreen()?.setFocus(this);
+        }
     }
 
     // END EVENTS