fix focus issue

ElenaDiachenko · ElenaDiachenko · commit 8c9d97b62a84 · 2025-03-17T23:37:34.000+02:00
diff --git a/packages/app-harness/src/app/index.tsx b/packages/app-harness/src/app/index.tsx
@@ -72,10 +72,7 @@ const AppContent = () => {
         if (isWebBased && isFactorTv && focusableRefs[0]?.current) {
             focusableRefs[0].current.focus();
             setFocusedIndex(0);
-        } else if (!isWebBased) {
-            // Set the initial AndroidTV and tvOS focus to be on the button
-            focusableRefs[0]?.current?.setNativeProps({ hasTVPreferredFocus: true });
-        }
+        } 
         return () => {
             removeNotificationListeners(handleNotification);
         };
@@ -161,6 +158,7 @@ const AppContent = () => {
                                 focusedIndex === 0 && styles.buttonFocused,
                                 isWebBased && isFactorTv && { outline: 'none' },
                             ]}
+                            hasTVPreferredFocus={!isWebBased && isFactorTv}
                         />
                     </TestCase>
                     <TestCase id={3} title="Orientation support ">
diff --git a/packages/app-harness/src/components/NewModuleButton/index.native.tsx b/packages/app-harness/src/components/NewModuleButton/index.native.tsx
@@ -6,7 +6,7 @@ import { testProps } from '../../config';
 
 type ButtonProps = TouchableOpacityProps;
 export const NewModuleButton = forwardRef<React.ElementRef<typeof TouchableOpacity>, ButtonProps>(
-    ({ onBlur, onFocus, style }, ref) => {
+    ({ onBlur, onFocus, style,hasTVPreferredFocus }, ref) => {
         const { TestNativeModule } = NativeModules;
         const { logDebug } = useLoggerContext();
         const callback = (error: any, result: string) => {
@@ -24,7 +24,7 @@ export const NewModuleButton = forwardRef<React.ElementRef<typeof TouchableOpaci
             }
         };
         return (
-            <TouchableOpacity ref={ref} onPress={onPress} onFocus={onFocus} onBlur={onBlur} style={style}>
+            <TouchableOpacity ref={ref} onPress={onPress} onFocus={onFocus} onBlur={onBlur} style={style} hasTVPreferredFocus={hasTVPreferredFocus}>
                 <Text style={styles.buttonTitle} {...testProps('app-harness-home-native-call-button')}>
                     Click to invoke native module!
                 </Text>
diff --git a/packages/app-harness/src/components/PhotoEditor/index.ios.mobile.tsx b/packages/app-harness/src/components/PhotoEditor/index.ios.mobile.tsx
