react-native-tvos 0.81.1-1 → 0.81.1-3

package/Libraries/Components/TV/TVFocusGuideView.js

@@ -12,7 +12,7 @@ import type {ViewProps} from '../View/ViewPropTypes';
 import type {ComponentOrHandleType} from './tagForComponentOrHandle';
 
 import Platform from '../../Utilities/Platform';
-import setAndForwardRef from '../../Utilities/setAndForwardRef';
+import useMergeRefs from '../../Utilities/useMergeRefs';
 import View from '../View/View';
 import {Commands} from '../View/ViewNativeComponent';
 import tagForComponentOrHandle from './tagForComponentOrHandle';
@@ -57,17 +57,15 @@ export type TVFocusGuideViewImperativeMethods = $ReadOnly<{
   setDestinations: (destinations: (ComponentOrHandleType | number)[]) => void,
 }>;
 
-function TVFocusGuideView(
-  {
-    enabled = true,
-    safePadding,
-    destinations: destinationsProp,
-    autoFocus,
-    focusable,
-    ...props
-  }: TVFocusGuideViewProps,
-  forwardedRef: any,
-): React.Node {
+function TVFocusGuideView({
+  enabled = true,
+  safePadding,
+  destinations: destinationsProp,
+  autoFocus,
+  focusable,
+  ref,
+  ...props
+}: TVFocusGuideViewProps): React.Node {
   const focusGuideRef = React.useRef<React.ElementRef<typeof View> | null>(
     null,
   );
@@ -78,7 +76,7 @@ function TVFocusGuideView(
         const dests: number[] = (destinations || [])
           .map((destination: any) => tagForComponentOrHandle(destination))
           .filter(Boolean);
-  
+
         if (focusGuideRef.current != null) {
           Commands.setDestinations(focusGuideRef.current, dests);
         }
@@ -87,26 +85,23 @@ function TVFocusGuideView(
     [],
   );
 
-  const _setNativeRef = React.useMemo(() => {
-    return setAndForwardRef({
-      getForwardedRef: () => forwardedRef,
-      setLocalRef: ref => {
-        focusGuideRef.current = ref;
-
-        // This is a hack. Ideally we would forwardRef to the underlying
-        // host component. However, since TVFocusGuide has its own methods that can be
-        // called as well, if we used the standard forwardRef then these
-        // methods wouldn't be accessible
-        //
-        // Here we mutate the ref, so that the user can use the standard native
-        // methods like `focus()`, `blur()`, etc. while also having access to
-        // imperative methods of this component like `setDestinations()`.
-        if (ref) {
-          ref.setDestinations = setDestinations;
-        }
-      },
-    })
-  }, [forwardedRef, setDestinations]);
+  const setLocalRef = React.useCallback(
+    (instance: HostInstance | null) => {
+      // $FlowExpectedError[incompatible-type]
+      focusGuideRef.current = instance;
+
+      if (instance != null) {
+        // $FlowFixMe[prop-missing]
+        // $FlowFixMe[unsafe-object-assign]
+        Object.assign(instance, {
+          setDestinations,
+        });
+      }
+    },
+    [setDestinations],
+  );
+
+  const mergedRef = useMergeRefs(setLocalRef, ref);
 
   React.useEffect(() => {
     if (destinationsProp !== null && destinationsProp !== undefined) {
@@ -127,7 +122,7 @@ function TVFocusGuideView(
     <View
       {...props}
       style={style}
-      ref={_setNativeRef}
+      ref={mergedRef}
       collapsable={false}
       autoFocus={autoFocus}
       // tvOS only prop

package/Libraries/Components/View/View.js

@@ -12,7 +12,7 @@ import type {ViewProps} from './ViewPropTypes';
 
 import * as ReactNativeFeatureFlags from '../../../src/private/featureflags/ReactNativeFeatureFlags';
 import TextAncestorContext from '../../Text/TextAncestorContext';
-import setAndForwardRef from '../../Utilities/setAndForwardRef';
+import useMergeRefs from '../../Utilities/useMergeRefs';
 import ViewNativeComponent from './ViewNativeComponent';
 import {Commands} from './ViewNativeComponent';
 import * as React from 'react';
@@ -39,26 +39,23 @@ component View(
     }
   }, []);
 
-  const _setNativeRef = React.useMemo(() => {
-    return setAndForwardRef({
-      getForwardedRef: () => viewRef.current,
-      setLocalRef: _ref => {
-        viewRef.current = _ref;
-
-        // This is a hack. Ideally we would forwardRef to the underlying
-        // host component. However, since TVFocusGuide has its own methods that can be
-        // called as well, if we used the standard forwardRef then these
-        // methods wouldn't be accessible
-        //
-        // Here we mutate the ref, so that the user can use the standart native
-        // methods like `measureLayout()` etc. while also having access to
-        // imperative methods of this component like `requestTVFocus()`.
-        if (_ref) {
-          _ref.requestTVFocus = requestTVFocus;
-        }
-      },
-    })
-  }, [requestTVFocus]);
+  const setLocalRef = React.useCallback(
+    (instance: HostInstance | null) => {
+      // $FlowExpectedError[incompatible-type]
+      viewRef.current = instance;
+
+      if (instance != null) {
+        // $FlowFixMe[prop-missing]
+        // $FlowFixMe[unsafe-object-assign]
+        Object.assign(instance, {
+          requestTVFocus,
+        });
+      }
+    },
+    [requestTVFocus],
+  );
+
+  const mergedRef = useMergeRefs(setLocalRef, ref);
 
   let actualView;
   if (ReactNativeFeatureFlags.reduceDefaultPropsInView()) {
@@ -151,7 +148,7 @@ component View(
       ref == null ? (
         <ViewNativeComponent {...processedProps} />
       ) : (
-        <ViewNativeComponent {...processedProps} ref={ref} />
+        <ViewNativeComponent {...processedProps} ref={mergedRef} />
       );
   } else {
     const {
@@ -232,7 +229,7 @@ component View(
             : importantForAccessibility
         }
         nativeID={id ?? nativeID}
-        ref={_setNativeRef}
+        ref={mergedRef}
       />
     );
   }

package/Libraries/Core/ReactNativeVersion.js

@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @flow strict
+ * @noformat
  * @generated by scripts/releases/set-version.js
  */
 
@@ -17,5 +18,5 @@ export const version: $ReadOnly<{
   major: 0,
   minor: 81,
   patch: 1,
-  prerelease: '1',
+  prerelease: '3',
 };

package/React/Base/RCTVersion.m

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by scripts/releases/set-rn-version.js
+ * @generated by scripts/releases/set-version.js
  */
 
 #import "RCTVersion.h"
@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(81),
                   RCTVersionPatch: @(1),
-                  RCTVersionPrerelease: @"1",
+                  RCTVersionPrerelease: @"3",
                   };
   });
   return __rnVersion;

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.81.1-1
+VERSION_NAME=0.81.1-3
 react.internal.publishingGroup=io.github.react-native-tvos
 
 android.useAndroidX=true

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.kt

@@ -15,6 +15,6 @@ public object ReactNativeVersion {
     "major" to 0,
     "minor" to 81,
     "patch" to 1,
-    "prerelease" to null
+    "prerelease" to "3"
   )
 }

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by scripts/releases/set-rn-version.js
+ * @generated by scripts/releases/set-version.js
  */
 
 #pragma once
@@ -12,13 +12,17 @@
 #include <cstdint>
 #include <string_view>
 
+#define REACT_NATIVE_VERSION_MAJOR 0
+#define REACT_NATIVE_VERSION_MINOR 81
+#define REACT_NATIVE_VERSION_PATCH 1
+
 namespace facebook::react {
 
 constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 81;
   int32_t Patch = 1;
-  std::string_view Prerelease = "1";
+  std::string_view Prerelease = "3";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.81.1-1",
+  "version": "0.81.1-3",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -198,7 +198,7 @@
     "whatwg-fetch": "^3.0.0",
     "ws": "^6.2.3",
     "yargs": "^17.6.2",
-    "@react-native-tvos/virtualized-lists": "0.81.1-1"
+    "@react-native-tvos/virtualized-lists": "0.81.1-3"
   },
   "codegenConfig": {
     "libraries": [

package/sdks/hermesc/osx-bin/hermes-lit

@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+import os
+import sys
+
+# Make sure we can find the lit package.
+sys.path.insert(0, os.path.join("/Users/runner/work/react-native/react-native/packages/react-native/sdks/hermes/external/llvh", 'utils', 'lit'))
+
+if __name__=='__main__':
+    from lit.main import main
+    main({})

package/types_generated/Libraries/Components/TV/TVFocusGuideView.d.ts

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<dce51078df5fd03980baaac9a31ca8a0>>
+ * @generated SignedSource<<6a73d474d9a2542964617b14e756698c>>
  *
  * This file was translated from Flow by scripts/build-types/index.js.
  * Original file: packages/react-native/Libraries/Components/TV/TVFocusGuideView.js
@@ -65,7 +65,7 @@ type TVFocusGuideViewProps = Readonly<Omit<ViewProps, keyof {
 export type TVFocusGuideViewImperativeMethods = Readonly<{
   setDestinations: (destinations: (ComponentOrHandleType | number)[]) => void;
 }>;
-declare function TVFocusGuideView($$PARAM_0$$: TVFocusGuideViewProps, forwardedRef: any): React.ReactNode;
+declare function TVFocusGuideView($$PARAM_0$$: TVFocusGuideViewProps): React.ReactNode;
 declare const $$TVFocusGuideView: typeof TVFocusGuideView;
 declare type $$TVFocusGuideView = typeof $$TVFocusGuideView;
 export default $$TVFocusGuideView;