react-native-tvos 0.77.0-0rc5 → 0.77.2-0

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

@@ -52,8 +52,29 @@ BOOL RCTIsAttributedStringEffectivelySame(
     NSDictionary<NSAttributedStringKey, id> *insensitiveAttributes,
     const facebook::react::TextAttributes &baseTextAttributes);
 
-@interface RCTWeakEventEmitterWrapper : NSObject
-@property (nonatomic, assign) facebook::react::SharedEventEmitter eventEmitter;
-@end
+static inline NSData *RCTWrapEventEmitter(const facebook::react::SharedEventEmitter &eventEmitter)
+{
+  auto eventEmitterPtr = new std::weak_ptr<const facebook::react::EventEmitter>(eventEmitter);
+  return [[NSData alloc] initWithBytesNoCopy:eventEmitterPtr
+                                      length:sizeof(eventEmitterPtr)
+                                 deallocator:^(void *ptrToDelete, NSUInteger) {
+                                   delete (std::weak_ptr<facebook::react::EventEmitter> *)ptrToDelete;
+                                 }];
+}
+
+static inline facebook::react::SharedEventEmitter RCTUnwrapEventEmitter(NSData *data)
+{
+  if (data.length == 0) {
+    return nullptr;
+  }
+
+  auto weakPtr = dynamic_cast<std::weak_ptr<const facebook::react::EventEmitter> *>(
+      (std::weak_ptr<const facebook::react::EventEmitter> *)data.bytes);
+  if (weakPtr) {
+    return weakPtr->lock();
+  }
+
+  return nullptr;
+}
 
 NS_ASSUME_NONNULL_END

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

@@ -16,45 +16,6 @@
 
 using namespace facebook::react;
 
-@implementation RCTWeakEventEmitterWrapper {
-  std::weak_ptr<const EventEmitter> _weakEventEmitter;
-}
-
-- (void)setEventEmitter:(SharedEventEmitter)eventEmitter
-{
-  _weakEventEmitter = eventEmitter;
-}
-
-- (SharedEventEmitter)eventEmitter
-{
-  return _weakEventEmitter.lock();
-}
-
-- (void)dealloc
-{
-  _weakEventEmitter.reset();
-}
-
-- (BOOL)isEqual:(id)object
-{
-  // We consider the underlying EventEmitter as the identity
-  if (![object isKindOfClass:[self class]]) {
-    return NO;
-  }
-
-  auto thisEventEmitter = [self eventEmitter];
-  auto otherEventEmitter = [((RCTWeakEventEmitterWrapper *)object) eventEmitter];
-  return thisEventEmitter == otherEventEmitter;
-}
-
-- (NSUInteger)hash
-{
-  // We consider the underlying EventEmitter as the identity
-  return (NSUInteger)_weakEventEmitter.lock().get();
-}
-
-@end
-
 inline static UIFontWeight RCTUIFontWeightFromInteger(NSInteger fontWeight)
 {
   assert(fontWeight > 50);
@@ -139,6 +100,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 +108,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,10 +370,8 @@ 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;
+    auto eventEmitterWrapper = RCTWrapEventEmitter(fragment.parentShadowView.eventEmitter);
 
     NSDictionary<NSAttributedStringKey, id> *additionalTextAttributes =
         @{RCTAttributedStringEventEmitterKey : eventEmitterWrapper};
@@ -418,7 +379,6 @@ static NSMutableAttributedString *RCTNSAttributedStringFragmentWithAttributesFro
     [nsAttributedStringFragment addAttributes:additionalTextAttributes
                                         range:NSMakeRange(0, nsAttributedStringFragment.length)];
   }
-#endif
 
   return nsAttributedStringFragment;
 }

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

@@ -280,11 +280,10 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
   // after (fraction == 1.0) the last character, then the attribute is valid.
   if (textStorage.length > 0 && (fraction > 0 || characterIndex > 0) &&
       (fraction < 1 || characterIndex < textStorage.length - 1)) {
-    RCTWeakEventEmitterWrapper *eventEmitterWrapper =
-        (RCTWeakEventEmitterWrapper *)[textStorage attribute:RCTAttributedStringEventEmitterKey
-                                                     atIndex:characterIndex
-                                              effectiveRange:NULL];
-    return eventEmitterWrapper.eventEmitter;
+    NSData *eventEmitterWrapper = (NSData *)[textStorage attribute:RCTAttributedStringEventEmitterKey
+                                                           atIndex:characterIndex
+                                                    effectiveRange:NULL];
+    return RCTUnwrapEventEmitter(eventEmitterWrapper);
   }
 
   return nil;

package/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 # Android versions
-minSdk = "24"
+minSdk = "22"
 targetSdk = "35"
 compileSdk = "35"
 buildTools = "35.0.0"

package/package.json

@@ -1,19 +1,22 @@
 {
   "name": "react-native-tvos",
-  "version": "0.77.0-0rc5",
+  "version": "0.77.2-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.5",
-    "@react-native/codegen": "0.77.0-rc.5",
-    "@react-native/community-cli-plugin": "0.77.0-rc.5",
-    "@react-native/gradle-plugin": "0.77.0-rc.5",
-    "@react-native/js-polyfills": "0.77.0-rc.5",
-    "@react-native/normalize-colors": "0.77.0-rc.5",
-    "@react-native-tvos/virtualized-lists": "0.77.0-0rc5",
+    "@react-native/assets-registry": "0.77.2",
+    "@react-native/codegen": "0.77.2",
+    "@react-native/community-cli-plugin": "0.77.2",
+    "@react-native/gradle-plugin": "0.77.2",
+    "@react-native/js-polyfills": "0.77.2",
+    "@react-native/normalize-colors": "0.77.2",
+    "@react-native-tvos/virtualized-lists": "0.77.2-0",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
@@ -131,8 +134,8 @@
     "jest-environment-node": "^29.6.3",
     "jsc-android": "^250231.0.0",
     "memoize-one": "^5.0.0",
-    "metro-runtime": "^0.81.0",
-    "metro-source-map": "^0.81.0",
+    "metro-runtime": "^0.81.3",
+    "metro-source-map": "^0.81.3",
     "nullthrows": "^1.1.1",
     "pretty-format": "^29.7.0",
     "promise": "^8.3.0",

package/react-native.config.js

@@ -44,27 +44,11 @@ try {
 
 const commands = [];
 
-try {
-  const {
-    bundleCommand,
-    startCommand,
-  } = require('@react-native/community-cli-plugin');
-  commands.push(bundleCommand, startCommand);
-} catch (e) {
-  const known =
-    e.code === 'MODULE_NOT_FOUND' &&
-    e.message.includes('@react-native-community/cli-server-api');
-
-  if (!known) {
-    throw e;
-  }
-
-  if (verbose) {
-    console.warn(
-      '@react-native-community/cli-server-api not found, the react-native.config.js may be unusable.',
-    );
-  }
-}
+const {
+  bundleCommand,
+  startCommand,
+} = require('@react-native/community-cli-plugin');
+commands.push(bundleCommand, startCommand);
 
 const codegenCommand = {
   name: 'codegen',
@@ -84,12 +68,18 @@ const codegenCommand = {
       name: '--outputPath <path>',
       description: 'Path where generated artifacts will be output to.',
     },
+    {
+      name: '--source <string>',
+      description: 'Whether the script is invoked from an `app` or a `library`',
+      default: 'app',
+    },
   ],
   func: (argv, config, args) =>
     require('./scripts/codegen/generate-artifacts-executor').execute(
       args.path,
       args.platform,
       args.outputPath,
+      args.source,
     ),
 };
 

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

@@ -900,11 +900,12 @@ function generateFBReactNativeSpecIOS(projectRoot /*: string */) /*: void*/ {
  * @parameter projectRoot: the directory with the app source code, where the package.json lives.
  * @parameter baseOutputPath: the base output path for the CodeGen.
  * @parameter targetPlatform: the target platform. Supported values: 'android', 'ios', 'all'.
+ * @parameter source: the source that is invoking codegen. Supported values: 'app', 'library'.
  * @throws If it can't find a config file for react-native.
  * @throws If it can't find a CodeGen configuration in the file.
  * @throws If it can't find a cli for the CodeGen.
  */
-function execute(projectRoot, targetPlatform, baseOutputPath) {
+function execute(projectRoot, targetPlatform, baseOutputPath, source) {
   try {
     codegenLog(`Analyzing ${path.join(projectRoot, 'package.json')}`);
 
@@ -952,9 +953,12 @@ function execute(projectRoot, targetPlatform, baseOutputPath) {
         platform,
       );
 
-      generateRCTThirdPartyComponents(libraries, outputPath);
-      generateCustomURLHandlers(libraries, outputPath);
-      generateAppDependencyProvider(outputPath);
+      if (source === 'app') {
+        // These components are only required by apps, not by libraries
+        generateRCTThirdPartyComponents(libraries, outputPath);
+        generateCustomURLHandlers(libraries, outputPath);
+        generateAppDependencyProvider(outputPath);
+      }
 
       cleanupEmptyFilesAndFolders(outputPath);
     }

package/scripts/generate-codegen-artifacts.js

@@ -25,7 +25,12 @@ const argv = yargs
     alias: 'outputPath',
     description: 'Path where generated artifacts will be output to.',
   })
+  .option('s', {
+    alias: 'source',
+    description: 'Whether the script is invoked from an `app` or a `library`',
+    default: 'app',
+  })
   .usage('Usage: $0 -p [path to app] -t [target platform] -o [output path]')
   .demandOption(['p', 't']).argv;
 
-executor.execute(argv.path, argv.targetPlatform, argv.outputPath);
+executor.execute(argv.path, argv.targetPlatform, argv.outputPath, argv.source);

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