react-native-tvos 0.77.0-0rc1 → 0.77.1-0

package/ReactCommon/react/renderer/components/text/BaseTextProps.cpp

@@ -73,6 +73,12 @@ static TextAttributes convertRawProp(
       "allowFontScaling",
       sourceTextAttributes.allowFontScaling,
       defaultTextAttributes.allowFontScaling);
+  textAttributes.maxFontSizeMultiplier = convertRawProp(
+      context,
+      rawProps,
+      "maxFontSizeMultiplier",
+      sourceTextAttributes.maxFontSizeMultiplier,
+      defaultTextAttributes.maxFontSizeMultiplier);
   textAttributes.dynamicTypeRamp = convertRawProp(
       context,
       rawProps,
@@ -266,6 +272,12 @@ void BaseTextProps::setProp(
         defaults, value, textAttributes, fontVariant, "fontVariant");
     REBUILD_FIELD_SWITCH_CASE(
         defaults, value, textAttributes, allowFontScaling, "allowFontScaling");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults,
+        value,
+        textAttributes,
+        maxFontSizeMultiplier,
+        "maxFontSizeMultiplier");
     REBUILD_FIELD_SWITCH_CASE(
         defaults, value, textAttributes, letterSpacing, "letterSpacing");
     REBUILD_FIELD_SWITCH_CASE(

package/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h

@@ -208,8 +208,7 @@ inline bool operator==(
   return areAttributedStringsEquivalentLayoutWise(
              lhs.attributedString, rhs.attributedString) &&
       lhs.paragraphAttributes == rhs.paragraphAttributes &&
-      lhs.layoutConstraints.maximumSize.width ==
-      rhs.layoutConstraints.maximumSize.width;
+      lhs.layoutConstraints == rhs.layoutConstraints;
 }
 
 inline bool operator!=(
@@ -243,7 +242,7 @@ struct hash<facebook::react::TextMeasureCacheKey> {
     return facebook::react::hash_combine(
         attributedStringHashLayoutWise(key.attributedString),
         key.paragraphAttributes,
-        key.layoutConstraints.maximumSize.width);
+        key.layoutConstraints);
   }
 };
 

package/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.mm

@@ -139,6 +139,7 @@ inline static CGFloat RCTBaseSizeForDynamicTypeRamp(const DynamicTypeRamp &dynam
 inline static CGFloat RCTEffectiveFontSizeMultiplierFromTextAttributes(const TextAttributes &textAttributes)
 {
   if (textAttributes.allowFontScaling.value_or(true)) {
+    CGFloat fontSizeMultiplier = !isnan(textAttributes.fontSizeMultiplier) ? textAttributes.fontSizeMultiplier : 1.0;
     if (textAttributes.dynamicTypeRamp.has_value()) {
       DynamicTypeRamp dynamicTypeRamp = textAttributes.dynamicTypeRamp.value();
       UIFontMetrics *fontMetrics =
@@ -146,10 +147,11 @@ inline static CGFloat RCTEffectiveFontSizeMultiplierFromTextAttributes(const Tex
       // Using a specific font size reduces rounding errors from -scaledValueForValue:
       CGFloat requestedSize =
           isnan(textAttributes.fontSize) ? RCTBaseSizeForDynamicTypeRamp(dynamicTypeRamp) : textAttributes.fontSize;
-      return [fontMetrics scaledValueForValue:requestedSize] / requestedSize;
-    } else {
-      return textAttributes.fontSizeMultiplier;
+      fontSizeMultiplier = [fontMetrics scaledValueForValue:requestedSize] / requestedSize;
     }
+    CGFloat maxFontSizeMultiplier =
+        !isnan(textAttributes.maxFontSizeMultiplier) ? textAttributes.maxFontSizeMultiplier : 0.0;
+    return maxFontSizeMultiplier >= 1.0 ? fminf(maxFontSizeMultiplier, fontSizeMultiplier) : fontSizeMultiplier;
   } else {
     return 1.0;
   }
@@ -407,6 +409,7 @@ static NSMutableAttributedString *RCTNSAttributedStringFragmentWithAttributesFro
 {
   auto nsAttributedStringFragment = RCTNSAttributedStringFragmentFromFragment(fragment, placeholderImage);
 
+#if !TARGET_OS_MACCATALYST
   if (fragment.parentShadowView.componentHandle) {
     RCTWeakEventEmitterWrapper *eventEmitterWrapper = [RCTWeakEventEmitterWrapper new];
     eventEmitterWrapper.eventEmitter = fragment.parentShadowView.eventEmitter;
@@ -417,6 +420,7 @@ static NSMutableAttributedString *RCTNSAttributedStringFragmentWithAttributesFro
     [nsAttributedStringFragment addAttributes:additionalTextAttributes
                                         range:NSMakeRange(0, nsAttributedStringFragment.length)];
   }
+#endif
 
   return nsAttributedStringFragment;
 }

package/ReactCommon/react/runtime/ReactInstance.cpp

@@ -236,47 +236,51 @@ std::string simpleBasename(const std::string& path) {
  */
 void ReactInstance::loadScript(
     std::unique_ptr<const JSBigString> script,
-    const std::string& sourceURL) {
+    const std::string& sourceURL,
+    std::function<void(jsi::Runtime& runtime)>&& completion) {
   auto buffer = std::make_shared<BigStringBuffer>(std::move(script));
   std::string scriptName = simpleBasename(sourceURL);
 
-  runtimeScheduler_->scheduleWork(
-      [this,
-       scriptName,
-       sourceURL,
-       buffer = std::move(buffer),
-       weakBufferedRuntimeExecuter = std::weak_ptr<BufferedRuntimeExecutor>(
-           bufferedRuntimeExecutor_)](jsi::Runtime& runtime) {
-        SystraceSection s("ReactInstance::loadScript");
-        bool hasLogger(ReactMarker::logTaggedMarkerBridgelessImpl);
-        if (hasLogger) {
-          ReactMarker::logTaggedMarkerBridgeless(
-              ReactMarker::RUN_JS_BUNDLE_START, scriptName.c_str());
-        }
+  runtimeScheduler_->scheduleWork([this,
+                                   scriptName,
+                                   sourceURL,
+                                   buffer = std::move(buffer),
+                                   weakBufferedRuntimeExecuter =
+                                       std::weak_ptr<BufferedRuntimeExecutor>(
+                                           bufferedRuntimeExecutor_),
+                                   completion](jsi::Runtime& runtime) {
+    SystraceSection s("ReactInstance::loadScript");
+    bool hasLogger(ReactMarker::logTaggedMarkerBridgelessImpl);
+    if (hasLogger) {
+      ReactMarker::logTaggedMarkerBridgeless(
+          ReactMarker::RUN_JS_BUNDLE_START, scriptName.c_str());
+    }
 
-        runtime.evaluateJavaScript(buffer, sourceURL);
+    runtime.evaluateJavaScript(buffer, sourceURL);
 
-        /**
-         * TODO(T183610671): We need a safe/reliable way to enable the js
-         * pipeline from javascript. Remove this after we figure that out, or
-         * after we just remove the js pipeline.
-         */
-        if (!jsErrorHandler_->hasHandledFatalError()) {
-          jsErrorHandler_->setRuntimeReady();
-        }
+    /**
+     * TODO(T183610671): We need a safe/reliable way to enable the js
+     * pipeline from javascript. Remove this after we figure that out, or
+     * after we just remove the js pipeline.
+     */
+    if (!jsErrorHandler_->hasHandledFatalError()) {
+      jsErrorHandler_->setRuntimeReady();
+    }
 
-        if (hasLogger) {
-          ReactMarker::logTaggedMarkerBridgeless(
-              ReactMarker::RUN_JS_BUNDLE_STOP, scriptName.c_str());
-          ReactMarker::logMarkerBridgeless(
-              ReactMarker::INIT_REACT_RUNTIME_STOP);
-          ReactMarker::logMarkerBridgeless(ReactMarker::APP_STARTUP_STOP);
-        }
-        if (auto strongBufferedRuntimeExecuter =
-                weakBufferedRuntimeExecuter.lock()) {
-          strongBufferedRuntimeExecuter->flush();
-        }
-      });
+    if (hasLogger) {
+      ReactMarker::logTaggedMarkerBridgeless(
+          ReactMarker::RUN_JS_BUNDLE_STOP, scriptName.c_str());
+      ReactMarker::logMarkerBridgeless(ReactMarker::INIT_REACT_RUNTIME_STOP);
+      ReactMarker::logMarkerBridgeless(ReactMarker::APP_STARTUP_STOP);
+    }
+    if (auto strongBufferedRuntimeExecuter =
+            weakBufferedRuntimeExecuter.lock()) {
+      strongBufferedRuntimeExecuter->flush();
+    }
+    if (completion) {
+      completion(runtime);
+    }
+  });
 }
 
 /*

package/ReactCommon/react/runtime/ReactInstance.h

@@ -49,7 +49,8 @@ class ReactInstance final : private jsinspector_modern::InstanceTargetDelegate {
 
   void loadScript(
       std::unique_ptr<const JSBigString> script,
-      const std::string& sourceURL);
+      const std::string& sourceURL,
+      std::function<void(jsi::Runtime& runtime)>&& completion = nullptr);
 
   void registerSegment(uint32_t segmentId, const std::string& segmentPath);
 

package/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTInstance.mm

@@ -472,8 +472,9 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags)
 
   auto script = std::make_unique<NSDataBigString>(source.data);
   const auto *url = deriveSourceURL(source.url).UTF8String;
-  _reactInstance->loadScript(std::move(script), url);
-  [[NSNotificationCenter defaultCenter] postNotificationName:@"RCTInstanceDidLoadBundle" object:nil];
+  _reactInstance->loadScript(std::move(script), url, [](jsi::Runtime &_) {
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"RCTInstanceDidLoadBundle" object:nil];
+  });
 }
 
 - (void)_handleJSError:(const JsErrorHandler::ParsedError &)error withRuntime:(jsi::Runtime &)runtime

package/index.js

@@ -43,6 +43,11 @@ import typeof TouchableHighlight from './Libraries/Components/Touchable/Touchabl
 import typeof TouchableNativeFeedback from './Libraries/Components/Touchable/TouchableNativeFeedback';
 import typeof TouchableOpacity from './Libraries/Components/Touchable/TouchableOpacity';
 import typeof TouchableWithoutFeedback from './Libraries/Components/Touchable/TouchableWithoutFeedback';
+import typeof TVEventControl from './Libraries/Components/TV/TVEventControl';
+import typeof TVEventHandler from './Libraries/Components/TV/TVEventHandler';
+import typeof TVFocusGuideView from './Libraries/Components/TV/TVFocusGuideView';
+import typeof TVTextScrollView from './Libraries/Components/TV/TVTextScrollView';
+import typeof useTVEventHandler from './Libraries/Components/TV/useTVEventHandler';
 import typeof View from './Libraries/Components/View/View';
 import typeof RegisterCallableModule from './Libraries/Core/registerCallableModule';
 import typeof NativeEventEmitter from './Libraries/EventEmitter/NativeEventEmitter';
@@ -92,13 +97,8 @@ import typeof DevSettings from './Libraries/Utilities/DevSettings';
 import typeof Dimensions from './Libraries/Utilities/Dimensions';
 import typeof PixelRatio from './Libraries/Utilities/PixelRatio';
 import typeof Platform from './Libraries/Utilities/Platform';
-import typeof TVEventHandler from './Libraries/Components/TV/TVEventHandler';
-import typeof TVFocusGuideView from './Libraries/Components/TV/TVFocusGuideView';
-import typeof TVEventControl from './Libraries/Components/TV/TVEventControl';
-import typeof TVTextScrollView from './Libraries/Components/TV/TVTextScrollView';
 import typeof useColorScheme from './Libraries/Utilities/useColorScheme';
 import typeof useWindowDimensions from './Libraries/Utilities/useWindowDimensions';
-import typeof useTVEventHandler from './Libraries/Components/TV/useTVEventHandler';
 import typeof Vibration from './Libraries/Vibration/Vibration';
 import typeof YellowBox from './Libraries/YellowBox/YellowBoxDeprecated';
 import typeof DevMenu from './src/private/devmenu/DevMenu';

package/package.json

@@ -1,19 +1,22 @@
 {
   "name": "react-native-tvos",
-  "version": "0.77.0-0rc1",
+  "version": "0.77.1-0",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/facebook/react-native.git",
+    "url": "git+https://github.com/react-native-tvos/react-native-tvos.git",
     "directory": "packages/react-native"
   },
-  "homepage": "https://reactnative.dev/",
+  "homepage": "https://github.com/react-native-tvos/react-native-tvos/wiki",
   "keywords": [
     "react",
     "react-native",
     "android",
     "ios",
+    "tvos",
+    "apple tv",
+    "android tv",
     "mobile",
     "cross-platform",
     "app-framework",
@@ -109,13 +112,13 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.6.3",
-    "@react-native/assets-registry": "0.77.0-rc.1",
-    "@react-native/codegen": "0.77.0-rc.1",
-    "@react-native/community-cli-plugin": "0.77.0-rc.1",
-    "@react-native/gradle-plugin": "0.77.0-rc.1",
-    "@react-native/js-polyfills": "0.77.0-rc.1",
-    "@react-native/normalize-colors": "0.77.0-rc.1",
-    "@react-native-tvos/virtualized-lists": "0.77.0-0rc1",
+    "@react-native/assets-registry": "0.77.1",
+    "@react-native/codegen": "0.77.1",
+    "@react-native/community-cli-plugin": "0.77.1",
+    "@react-native/gradle-plugin": "0.77.1",
+    "@react-native/js-polyfills": "0.77.1",
+    "@react-native/normalize-colors": "0.77.1",
+    "@react-native-tvos/virtualized-lists": "0.77.1-0",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",

package/scripts/cocoapods/utils.rb

@@ -44,10 +44,10 @@ class ReactNativePodsUtils
     end
 
     def self.set_gcc_preprocessor_definition_for_React_hermes(installer)
-        self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "HERMES_ENABLE_DEBUGGER=1", "React-hermes", "Debug")
-        self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "HERMES_ENABLE_DEBUGGER=1", "React-jsinspector", "Debug")
-        self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "HERMES_ENABLE_DEBUGGER=1", "hermes-engine", "Debug")
-        self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "HERMES_ENABLE_DEBUGGER=1", "React-RuntimeHermes", "Debug")
+        self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "HERMES_ENABLE_DEBUGGER=1", "React-hermes", :debug)
+        self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "HERMES_ENABLE_DEBUGGER=1", "React-jsinspector", :debug)
+        self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "HERMES_ENABLE_DEBUGGER=1", "hermes-engine", :debug)
+        self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "HERMES_ENABLE_DEBUGGER=1", "React-RuntimeHermes", :debug)
     end
 
     def self.turn_off_resource_bundle_react_core(installer)
@@ -193,11 +193,11 @@ class ReactNativePodsUtils
 
     private
 
-    def self.add_build_settings_to_pod(installer, settings_name, settings_value, target_pod_name, configuration)
+    def self.add_build_settings_to_pod(installer, settings_name, settings_value, target_pod_name, configuration_type)
         installer.target_installation_results.pod_target_installation_results.each do |pod_name, target_installation_result|
             if pod_name.to_s == target_pod_name
                 target_installation_result.native_target.build_configurations.each do |config|
-                        if configuration == nil || (configuration != nil && config.name.include?(configuration))
+                        if configuration_type == nil || (configuration_type != nil && config.type == configuration_type)
                             config.build_settings[settings_name] ||= '$(inherited) '
                             config.build_settings[settings_name] << settings_value
                         end

package/scripts/codegen/generate-artifacts-executor.js

@@ -764,6 +764,16 @@ function findFilesWithExtension(filePath, extension) {
   const dir = fs.readdirSync(filePath);
   dir.forEach(file => {
     const absolutePath = path.join(filePath, file);
+    // Exclude files provided by react-native
+    if (absolutePath.includes(`${path.sep}react-native${path.sep}`)) {
+      return null;
+    }
+
+    // Skip hidden folders, that starts with `.`
+    if (absolutePath.includes(`${path.sep}.`)) {
+      return null;
+    }
+
     if (
       fs.existsSync(absolutePath) &&
       fs.statSync(absolutePath).isDirectory()

package/sdks/hermes-engine/hermes-engine.podspec

@@ -9,7 +9,7 @@ require_relative "./hermes-utils.rb"
 begin
   react_native_path = File.dirname(Pod::Executable.execute_command('node', ['-p',
     'require.resolve(
-    "react-native-tvos",
+    "react-native",
     {paths: [process.argv[1]]},
     )', __dir__]).strip
   )

package/sdks/hermes-engine/hermes-utils.rb

@@ -113,8 +113,8 @@ def core_version(version)
     prerelease = match[2]
     prerelease_match = prerelease.match(/0rc(\d+)/)
     if prerelease_match.nil?
-        hermes_log("core_version = #{version}")
-        return version
+        hermes_log("core_version = #{core_base_version}")
+        return core_base_version
     end
 
     cv = "#{core_base_version}-rc.#{prerelease_match[1]}"

package/src/private/featureflags/ReactNativeFeatureFlags.js

@@ -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<<83b5798ee1c7a28fffbf110e19641d69>>
+ * @generated SignedSource<<aa51de14d1f085127ad410580beb15f6>>
  * @flow strict
  */
 
@@ -170,7 +170,7 @@ export const shouldUseSetNativePropsInFabric: Getter<boolean> = createJavaScript
 /**
  * Changes construction of the animation graph to `useInsertionEffect` instead of `useLayoutEffect`.
  */
-export const useInsertionEffectsForAnimations: Getter<boolean> = createJavaScriptFlagGetter('useInsertionEffectsForAnimations', true);
+export const useInsertionEffectsForAnimations: Getter<boolean> = createJavaScriptFlagGetter('useInsertionEffectsForAnimations', false);
 
 /**
  * Enable a variant of TextInput that moves some state to refs to avoid unnecessary re-renders

package/types/public/ReactNativeTVTypes.d.ts

@@ -2,6 +2,8 @@ import * as React from 'react';
 import type { View, ScrollViewProps, HostComponent, EventSubscription } from 'react-native';
 
 declare module 'react-native' {
+  export type FocusDestination = null | number | React.Component<any, any> | React.ComponentClass<any>;
+
   interface ViewProps {
   /**
    * Android TV only prop
@@ -10,29 +12,29 @@ declare module 'react-native' {
   /**
    * TV next focus down (see documentation for the View component).
    */
-  nextFocusDown?: number | undefined,
+  nextFocusDown?: FocusDestination | undefined,
 
   /**
    * TV next focus forward (see documentation for the View component).
    *
    * @platform android
    */
-  nextFocusForward?: number | undefined,
+  nextFocusForward?: FocusDestination | undefined,
 
   /**
    * TV next focus left (see documentation for the View component).
    */
-  nextFocusLeft?: number | undefined,
+  nextFocusLeft?: FocusDestination | undefined,
 
   /**
    * TV next focus right (see documentation for the View component).
    */
-  nextFocusRight?: number | undefined,
+  nextFocusRight?: FocusDestination | undefined,
 
   /**
    * TV next focus up (see documentation for the View component).
    */
-  nextFocusUp?: number | undefined,
+  nextFocusUp?: FocusDestination | undefined,
   }
 
   export interface NativeMethods {
@@ -118,7 +120,7 @@ declare module 'react-native' {
     /**
      * Array of `Component`s to register as destinations with `UIFocusGuide`
      */
-    destinations?: (null | number | React.Component<any, any> | React.ComponentClass<any>)[] | undefined;
+    destinations?: FocusDestination[] | undefined;
     /**
      * If true, `TVFocusGuide` will automatically manage focus for you.
      * It will redirect the focus to the first focusable child on the first visit.
@@ -154,7 +156,7 @@ declare module 'react-native' {
 
   export type FocusGuideMethods = {
     setDestinations: (
-      destinations: (React.ElementRef<HostComponent<unknown>> | null | undefined)[],
+      destinations: FocusDestination[],
     ) => void;
   }