react-native-tvos 0.75.2-0rc0 → 0.76.0-0rc0

package/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp

@@ -10,6 +10,7 @@
 #include <cfloat>
 #include <cmath>
 #include <cstring>
+#include <string>
 
 #include <yoga/Yoga.h>
 
@@ -661,6 +662,13 @@ static float distributeFreeSpaceSecondPass(
       }
     }
 
+    yoga::assertFatalWithNode(
+        currentLineChild,
+        yoga::isDefined(updatedMainSize),
+        ("updatedMainSize is undefined. mainAxisownerSize: " +
+         std::to_string(mainAxisownerSize))
+            .c_str());
+
     deltaFreeSpace += updatedMainSize - childFlexBasis;
 
     const float marginMain = currentLineChild->style().computeMarginForAxis(
@@ -749,6 +757,20 @@ static float distributeFreeSpaceSecondPass(
     const bool isLayoutPass = performLayout && !requiresStretchLayout;
     // Recursively call the layout algorithm for this child with the updated
     // main size.
+
+    yoga::assertFatalWithNode(
+        currentLineChild,
+        yoga::isUndefined(childMainSize)
+            ? childMainSizingMode == SizingMode::MaxContent
+            : true,
+        "childMainSize is undefined so childMainSizingMode must be MaxContent");
+    yoga::assertFatalWithNode(
+        currentLineChild,
+        yoga::isUndefined(childCrossSize)
+            ? childCrossSizingMode == SizingMode::MaxContent
+            : true,
+        "childCrossSize is undefined so childCrossSizingMode must be MaxContent");
+
     calculateLayoutInternal(
         currentLineChild,
         childWidth,
@@ -1037,7 +1059,8 @@ static void justifyMainAxis(
       continue;
     }
     if (childStyle.positionType() == PositionType::Absolute &&
-        child->style().isFlexStartPositionDefined(mainAxis, direction)) {
+        child->style().isFlexStartPositionDefined(mainAxis, direction) &&
+        !child->style().isFlexStartPositionAuto(mainAxis, direction)) {
       if (performLayout) {
         // In case the child is position absolute and has left/top being
         // defined, we override the position to whatever the user said (and
@@ -1607,7 +1630,8 @@ static void calculateLayoutImpl(
           // top/left/bottom/right set, override all the previously computed
           // positions to set it correctly.
           const bool isChildLeadingPosDefined =
-              child->style().isFlexStartPositionDefined(crossAxis, direction);
+              child->style().isFlexStartPositionDefined(crossAxis, direction) &&
+              !child->style().isFlexStartPositionAuto(crossAxis, direction);
           if (isChildLeadingPosDefined) {
             child->setLayoutPosition(
                 child->style().computeFlexStartPosition(
@@ -2140,6 +2164,7 @@ bool calculateLayoutInternal(
 
   const bool needToVisitNode =
       (node->isDirty() && layout->generationCount != generationCount) ||
+      layout->configVersion != node->getConfig()->getVersion() ||
       layout->lastOwnerDirection != ownerDirection;
 
   if (needToVisitNode) {
@@ -2255,6 +2280,7 @@ bool calculateLayoutInternal(
         reason);
 
     layout->lastOwnerDirection = ownerDirection;
+    layout->configVersion = node->getConfig()->getVersion();
 
     if (cachedResults == nullptr) {
       layoutMarkerData.maxMeasureCache = std::max(

package/ReactCommon/yoga/yoga/config/Config.cpp

@@ -31,7 +31,10 @@ bool Config::useWebDefaults() const {
 void Config::setExperimentalFeatureEnabled(
     ExperimentalFeature feature,
     bool enabled) {
-  experimentalFeatures_.set(static_cast<size_t>(feature), enabled);
+  if (isExperimentalFeatureEnabled(feature) != enabled) {
+    experimentalFeatures_.set(static_cast<size_t>(feature), enabled);
+    version_++;
+  }
 }
 
 bool Config::isExperimentalFeatureEnabled(ExperimentalFeature feature) const {
@@ -43,15 +46,24 @@ ExperimentalFeatureSet Config::getEnabledExperiments() const {
 }
 
 void Config::setErrata(Errata errata) {
-  errata_ = errata;
+  if (errata_ != errata) {
+    errata_ = errata;
+    version_++;
+  }
 }
 
 void Config::addErrata(Errata errata) {
-  errata_ |= errata;
+  if (!hasErrata(errata)) {
+    errata_ |= errata;
+    version_++;
+  }
 }
 
 void Config::removeErrata(Errata errata) {
-  errata_ &= (~errata);
+  if (hasErrata(errata)) {
+    errata_ &= (~errata);
+    version_++;
+  }
 }
 
 Errata Config::getErrata() const {
@@ -63,7 +75,10 @@ bool Config::hasErrata(Errata errata) const {
 }
 
 void Config::setPointScaleFactor(float pointScaleFactor) {
-  pointScaleFactor_ = pointScaleFactor;
+  if (pointScaleFactor_ != pointScaleFactor) {
+    pointScaleFactor_ = pointScaleFactor;
+    version_++;
+  }
 }
 
 float Config::getPointScaleFactor() const {
@@ -78,6 +93,10 @@ void* Config::getContext() const {
   return context_;
 }
 
+uint32_t Config::getVersion() const noexcept {
+  return version_;
+}
+
 void Config::setLogger(YGLogger logger) {
   logger_ = logger;
 }

package/ReactCommon/yoga/yoga/config/Config.h

@@ -53,6 +53,8 @@ class YG_EXPORT Config : public ::YGConfig {
   void setContext(void* context);
   void* getContext() const;
 
+  uint32_t getVersion() const noexcept;
+
   void setLogger(YGLogger logger);
   void log(
       const yoga::Node* node,
@@ -72,6 +74,7 @@ class YG_EXPORT Config : public ::YGConfig {
 
   bool useWebDefaults_ : 1 = false;
 
+  uint32_t version_ = 0;
   ExperimentalFeatureSet experimentalFeatures_{};
   Errata errata_ = Errata::None;
   float pointScaleFactor_ = 1.0f;

package/ReactCommon/yoga/yoga/node/LayoutResults.cpp

@@ -21,6 +21,7 @@ bool LayoutResults::operator==(LayoutResults layout) const {
       direction() == layout.direction() &&
       hadOverflow() == layout.hadOverflow() &&
       lastOwnerDirection == layout.lastOwnerDirection &&
+      configVersion == layout.configVersion &&
       nextCachedMeasurementsIndex == layout.nextCachedMeasurementsIndex &&
       cachedLayout == layout.cachedLayout &&
       computedFlexBasis == layout.computedFlexBasis;

package/ReactCommon/yoga/yoga/node/LayoutResults.h

@@ -30,6 +30,7 @@ struct LayoutResults {
   // Instead of recomputing the entire layout every single time, we cache some
   // information to break early when nothing changed
   uint32_t generationCount = 0;
+  uint32_t configVersion = 0;
   Direction lastOwnerDirection = Direction::Inherit;
 
   uint32_t nextCachedMeasurementsIndex = 0;

package/ReactCommon/yoga/yoga/node/Node.cpp

@@ -136,6 +136,11 @@ void Node::setConfig(yoga::Config* config) {
 
   if (yoga::configUpdateInvalidatesLayout(*config_, *config)) {
     markDirtyAndPropagate();
+    layout_.configVersion = 0;
+  } else {
+    // If the config is functionally the same, then align the configVersion so
+    // that we can reuse the layout cache
+    layout_.configVersion = config->getVersion();
   }
 
   config_ = config;
@@ -221,7 +226,8 @@ float Node::relativePosition(
   if (style_.positionType() == PositionType::Static) {
     return 0;
   }
-  if (style_.isInlineStartPositionDefined(axis, direction)) {
+  if (style_.isInlineStartPositionDefined(axis, direction) &&
+      !style_.isInlineStartPositionAuto(axis, direction)) {
     return style_.computeInlineStartPosition(axis, direction, axisSize);
   }
 

package/ReactCommon/yoga/yoga/style/Style.h

@@ -223,22 +223,40 @@ class YG_EXPORT Style {
     return computePosition(flexStartEdge(axis), direction).isDefined();
   }
 
+  bool isFlexStartPositionAuto(FlexDirection axis, Direction direction) const {
+    return computePosition(flexStartEdge(axis), direction).isAuto();
+  }
+
   bool isInlineStartPositionDefined(FlexDirection axis, Direction direction)
       const {
     return computePosition(inlineStartEdge(axis, direction), direction)
         .isDefined();
   }
 
+  bool isInlineStartPositionAuto(FlexDirection axis, Direction direction)
+      const {
+    return computePosition(inlineStartEdge(axis, direction), direction)
+        .isAuto();
+  }
+
   bool isFlexEndPositionDefined(FlexDirection axis, Direction direction) const {
     return computePosition(flexEndEdge(axis), direction).isDefined();
   }
 
+  bool isFlexEndPositionAuto(FlexDirection axis, Direction direction) const {
+    return computePosition(flexEndEdge(axis), direction).isAuto();
+  }
+
   bool isInlineEndPositionDefined(FlexDirection axis, Direction direction)
       const {
     return computePosition(inlineEndEdge(axis, direction), direction)
         .isDefined();
   }
 
+  bool isInlineEndPositionAuto(FlexDirection axis, Direction direction) const {
+    return computePosition(inlineEndEdge(axis, direction), direction).isAuto();
+  }
+
   float computeFlexStartPosition(
       FlexDirection axis,
       Direction direction,

package/flow/jest.js

@@ -251,7 +251,7 @@ type EnzymeMatchersType = {
   toContainMatchingElement(selector: string): void,
   toContainMatchingElements(n: number, selector: string): void,
   toContainExactlyOneMatchingElement(selector: string): void,
-  toContainReact(element: React$Element<any>): void,
+  toContainReact(element: React.MixedElement): void,
   toExist(): void,
   toHaveClassName(className: string): void,
   toHaveHTML(html: string): void,
@@ -267,7 +267,7 @@ type EnzymeMatchersType = {
   toHaveValue(value: any): void,
   toIncludeText(text: string): void,
   toMatchElement(
-    element: React$Element<any>,
+    element: React.MixedElement,
     options?: {|ignoreProps?: boolean, verbose?: boolean|},
   ): void,
   toMatchSelector(selector: string): void,

package/gradle/libs.versions.toml

@@ -1,12 +1,12 @@
 [versions]
 # Android versions
-minSdk = "23"
+minSdk = "24"
 targetSdk = "34"
-compileSdk = "34"
-buildTools = "34.0.0"
+compileSdk = "35"
+buildTools = "35.0.0"
 ndkVersion = "26.1.10909125"
 # Dependencies versions
-agp = "8.5.0"
+agp = "8.6.0"
 androidx-annotation = "1.6.0"
 androidx-appcompat = "1.6.1"
 androidx-autofill = "1.1.0"
@@ -29,7 +29,6 @@ nexus-publish = "1.3.0"
 okhttp = "4.9.2"
 okio = "2.9.0"
 robolectric = "4.9.2"
-soloader = "0.11.0"
 xstream = "1.4.20"
 yoga-proguard-annotations = "1.19.0"
 # Native Dependencies
@@ -56,7 +55,6 @@ fresco-middleware = { module = "com.facebook.fresco:middleware", version.ref = "
 fresco-imagepipeline-okhttp3 = { module = "com.facebook.fresco:imagepipeline-okhttp3", version.ref = "fresco" }
 fresco-ui-common = { module = "com.facebook.fresco:ui-common", version.ref = "fresco" }
 infer-annotation = { module = "com.facebook.infer.annotation:infer-annotation", version.ref = "infer-annotation" }
-soloader = { module = "com.facebook.soloader:soloader", version.ref = "soloader" }
 yoga-proguard-annotations = { module = "com.facebook.yoga:proguard-annotations", version.ref = "yoga-proguard-annotations" }
 
 jsr305 = { module = "com.google.code.findbugs:jsr305", version.ref = "jsr305" }

package/index.js

@@ -9,6 +9,7 @@
  */
 
 'use strict';
+'use client';
 
 // APIs
 import typeof ActionSheetIOS from './Libraries/ActionSheetIOS/ActionSheetIOS';
@@ -59,6 +60,7 @@ import typeof VirtualizedList from './Libraries/Lists/VirtualizedList';
 import typeof VirtualizedSectionList from './Libraries/Lists/VirtualizedSectionList';
 import typeof LogBox from './Libraries/LogBox/LogBox';
 import typeof Modal from './Libraries/Modal/Modal';
+// $FlowFixMe[invalid-exported-annotation]
 import typeof NativeDialogManagerAndroid from './Libraries/NativeModules/specs/NativeDialogManagerAndroid';
 import typeof Networking from './Libraries/Network/RCTNetworking';
 import typeof * as Systrace from './Libraries/Performance/Systrace';
@@ -80,14 +82,14 @@ import typeof StyleSheet from './Libraries/StyleSheet/StyleSheet';
 import typeof Text from './Libraries/Text/Text';
 import typeof * as TurboModuleRegistry from './Libraries/TurboModule/TurboModuleRegistry';
 import typeof UTFSequence from './Libraries/UTFSequence';
-import typeof Appearance from './Libraries/Utilities/Appearance';
+import typeof * as Appearance from './Libraries/Utilities/Appearance';
 import typeof BackHandler from './Libraries/Utilities/BackHandler';
 import typeof DeviceInfo from './Libraries/Utilities/DeviceInfo';
 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 TabBarIOS from './Libraries/Components/TabBarIOS/TabBarIOS';
+// import typeof TabBarIOS from './Libraries/Components/TabBarIOS/TabBarIOS';
 import typeof TVEventHandler from './Libraries/Components/TV/TVEventHandler';
 import typeof TVFocusGuideView from './Libraries/Components/TV/TVFocusGuideView';
 import typeof TVEventControl from './Libraries/Components/TV/TVEventControl';
@@ -174,7 +176,7 @@ module.exports = {
   get Switch(): Switch {
     return require('./Libraries/Components/Switch/Switch').default;
   },
-  get TabBarIOS(): TabBarIOS {
+  get TabBarIOS(): any {
     return require('./Libraries/Components/TabBarIOS/TabBarIOS');
   },
   get Text(): Text {
@@ -334,7 +336,7 @@ module.exports = {
   get TVMenuControl(): TVEventControl {
     warnOnce(
       'TVMenuControl-moved',
-      'TVMenuControl has been moved to TVEventControl, and now supports enabling/disabling both menu key events and pan gesture events.'
+      'TVMenuControl has been moved to TVEventControl, and now supports enabling/disabling both menu key events and pan gesture events.',
     );
     return require('./Libraries/Components/TV/TVEventControl');
   },

package/jest/mockComponent.js

@@ -16,7 +16,10 @@ module.exports = (moduleName, instanceMethods, isESModule) => {
   const React = require('react');
 
   const SuperClass =
-    typeof RealComponent === 'function' ? RealComponent : React.Component;
+    typeof RealComponent === 'function' &&
+    RealComponent.prototype.constructor instanceof React.Component
+      ? RealComponent
+      : React.Component;
 
   const name =
     RealComponent.displayName ||

package/jest/mockModal.js

@@ -12,13 +12,11 @@
 
 'use strict';
 
-import typeof Modal from '../Libraries/Modal/Modal';
-
 const React = require('react');
 
 function mockModal(BaseComponent: $FlowFixMe) {
   class ModalMock extends BaseComponent {
-    render(): React.Element<Modal> | null {
+    render(): React.MixedElement | null {
       if (this.props.visible === false) {
         return null;
       }

package/jest/mockScrollView.js

@@ -20,7 +20,7 @@ const RCTScrollView: $FlowFixMe = requireNativeComponent('RCTScrollView');
 
 function mockScrollView(BaseComponent: $FlowFixMe) {
   class ScrollViewMock extends BaseComponent {
-    render(): React.Element<typeof RCTScrollView> {
+    render(): React.MixedElement {
       return (
         <RCTScrollView {...this.props}>
           {this.props.refreshControl}

package/jest/renderer.js

@@ -16,7 +16,7 @@ import * as React from 'react';
 import TestRenderer from 'react-test-renderer';
 
 export async function create(
-  Component: React.Element<any>,
+  Component: React.MixedElement,
 ): Promise<ReactTestRenderer> {
   let component;
   await TestRenderer.act(async () => {
@@ -33,7 +33,7 @@ export async function unmount(testRenderer: ReactTestRenderer) {
 
 export async function update(
   testRenderer: ReactTestRenderer,
-  element: React.Element<any>,
+  element: React.MixedElement,
 ) {
   await TestRenderer.act(async () => {
     testRenderer.update(element);

package/jest/setup.js

@@ -146,17 +146,17 @@ jest
         remove: jest.fn(),
       })),
       announceForAccessibility: jest.fn(),
-      isAccessibilityServiceEnabled: jest.fn(),
-      isBoldTextEnabled: jest.fn(),
-      isGrayscaleEnabled: jest.fn(),
-      isInvertColorsEnabled: jest.fn(),
-      isReduceMotionEnabled: jest.fn(),
-      prefersCrossFadeTransitions: jest.fn(),
-      isReduceTransparencyEnabled: jest.fn(),
+      isAccessibilityServiceEnabled: jest.fn(() => Promise.resolve(false)),
+      isBoldTextEnabled: jest.fn(() => Promise.resolve(false)),
+      isGrayscaleEnabled: jest.fn(() => Promise.resolve(false)),
+      isInvertColorsEnabled: jest.fn(() => Promise.resolve(false)),
+      isReduceMotionEnabled: jest.fn(() => Promise.resolve(false)),
+      prefersCrossFadeTransitions: jest.fn(() => Promise.resolve(false)),
+      isReduceTransparencyEnabled: jest.fn(() => Promise.resolve(false)),
       isScreenReaderEnabled: jest.fn(() => Promise.resolve(false)),
       setAccessibilityFocus: jest.fn(),
       sendAccessibilityEvent: jest.fn(),
-      getRecommendedTimeoutMillis: jest.fn(),
+      getRecommendedTimeoutMillis: jest.fn(() => Promise.resolve(false)),
     },
   }))
   .mock('../Libraries/Components/Clipboard/Clipboard', () => ({
@@ -287,7 +287,14 @@ jest
     },
     PlatformConstants: {
       getConstants() {
-        return {};
+        return {
+          reactNativeVersion: {
+            major: 1000,
+            minor: 0,
+            patch: 0,
+            prerelease: undefined,
+          },
+        };
       },
     },
     PushNotificationManager: {
@@ -385,10 +392,6 @@ jest
   .mock('../Libraries/ReactNative/requireNativeComponent', () => {
     return jest.requireActual('./mockNativeComponent');
   })
-  .mock(
-    '../Libraries/Utilities/verifyComponentAttributeEquivalence',
-    () => function () {},
-  )
   .mock('../Libraries/Vibration/Vibration', () => ({
     vibrate: jest.fn(),
     cancel: jest.fn(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.75.2-0rc0",
+  "version": "0.76.0-0rc0",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -83,6 +83,7 @@
     "scripts/react-native-xcode.sh",
     "sdks/.hermesversion",
     "sdks/hermes-engine",
+    "sdks/ossonly-soloader",
     "sdks/hermesc",
     "settings.gradle.kts",
     "src",
@@ -110,21 +111,19 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.6.3",
-    "@react-native-community/cli": "14.0.0",
-    "@react-native-community/cli-platform-android": "14.0.0",
-    "@react-native-community/cli-platform-ios": "14.0.0",
-    "@react-native/assets-registry": "0.75.2",
-    "@react-native/codegen": "0.75.2",
-    "@react-native/community-cli-plugin": "0.75.2",
-    "@react-native/gradle-plugin": "0.75.2",
-    "@react-native/js-polyfills": "0.75.2",
-    "@react-native/normalize-colors": "0.75.2",
-    "@react-native-tvos/virtualized-lists": "0.75.2-0rc0",
+    "@react-native/assets-registry": "0.76.0-rc.0",
+    "@react-native/codegen": "0.76.0-rc.0",
+    "@react-native/community-cli-plugin": "0.76.0-rc.0",
+    "@react-native/gradle-plugin": "0.76.0-rc.0",
+    "@react-native/js-polyfills": "0.76.0-rc.0",
+    "@react-native/normalize-colors": "0.76.0-rc.0",
+    "@react-native-tvos/virtualized-lists": "0.76.0-0rc0",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
     "base64-js": "^1.5.1",
     "chalk": "^4.0.0",
+    "commander": "^12.0.0",
     "event-target-shim": "^5.0.1",
     "flow-enums-runtime": "^0.0.6",
     "glob": "^7.1.1",
@@ -132,11 +131,11 @@
     "jest-environment-node": "^29.6.3",
     "jsc-android": "^250231.0.0",
     "memoize-one": "^5.0.0",
-    "metro-runtime": "^0.80.3",
-    "metro-source-map": "^0.80.3",
+    "metro-runtime": "^0.80.10",
+    "metro-source-map": "^0.80.10",
     "mkdirp": "^0.5.1",
     "nullthrows": "^1.1.1",
-    "pretty-format": "^26.5.2",
+    "pretty-format": "^29.7.0",
     "promise": "^8.3.0",
     "react-devtools-core": "^5.3.1",
     "react-refresh": "^0.14.0",
@@ -145,7 +144,7 @@
     "semver": "^7.1.3",
     "stacktrace-parser": "^0.1.10",
     "whatwg-fetch": "^3.0.0",
-    "ws": "^6.2.2",
+    "ws": "^6.2.3",
     "yargs": "^17.6.2"
   },
   "codegenConfig": {

package/react-native.config.js

@@ -42,10 +42,29 @@ try {
   }
 }
 
-const {
-  bundleCommand,
-  startCommand,
-} = require('@react-native/community-cli-plugin');
+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 codegenCommand = {
   name: 'codegen',
@@ -74,8 +93,10 @@ const codegenCommand = {
     ),
 };
 
+commands.push(codegenCommand);
+
 const config = {
-  commands: [bundleCommand, startCommand, codegenCommand],
+  commands,
   platforms: {},
 };
 

package/scripts/bundle.js

@@ -12,10 +12,13 @@
 
 const {bundleCommand: bc} = require('@react-native/community-cli-plugin');
 const {execSync} = require('child_process');
-const program = require('commander');
-const {existsSync, readFileSync} = require('fs');
+const commander = require('commander');
+const {readFileSync} = require('fs');
 const path = require('path');
 
+// Commander 12.0.0 changes from the global to named export
+const program = commander.program ?? commander;
+
 program.version(
   JSON.parse(
     readFileSync(path.resolve(__dirname, '..', 'package.json'), 'utf8'),
@@ -31,6 +34,8 @@ program
     'npx react-native config',
   )
   .option('--load-config <string>', 'JSON project config')
+  .option('--verbose', 'Additional logs', () => true, false)
+  .allowUnknownOption()
   .action(async function handleAction() {
     let config = null;
     let options = program.opts();

package/scripts/cocoapods/autolinking.rb

@@ -73,6 +73,7 @@ def list_native_modules!(config_command)
     found_pods.push({
       "configurations": configurations,
       "name": name,
+      "root": package["root"],
       "path": relative_path.to_path,
       "podspec_path": podspec_path,
       "script_phases": script_phases
@@ -168,7 +169,7 @@ def link_native_modules!(config)
 
         # Support passing in a path relative to the root of the package
         if phase["path"]
-          phase["script"] = File.read(File.expand_path(phase["path"], package[:path]))
+          phase["script"] = File.read(File.expand_path(phase["path"], package[:root]))
           phase.delete("path")
         end