Merge branch 'main' of github.com:facebook/react-native into pods

Author: Saadnajmi

.circleci/configurations/commands.yml

@@ -506,3 +506,53 @@ commands:
                 when: << parameters.when >>
                 path: << parameters.path >>
                 destination: << parameters.destination >>
+
+  prepare_ios_tests:
+    description: This command runs a set of commands to prepare iOS for running unit tests
+    steps:
+      - brew_install:
+          package: xcbeautify
+      - run:
+          name: Run Ruby Tests
+          command: |
+            cd packages/react-native/scripts
+            sh run_ruby_tests.sh
+      - run:
+          name: Boot iPhone Simulator
+          command: source scripts/.tests.env && xcrun simctl boot "$IOS_DEVICE" || true
+
+      - run:
+          name: Configure Environment Variables
+          command: |
+            echo 'export PATH=/usr/local/opt/node@18/bin:$PATH' >> $BASH_ENV
+            source $BASH_ENV
+
+      - run:
+          name: "Brew: Tap wix/brew"
+          command: brew tap wix/brew
+      - brew_install:
+          package: applesimutils watchman
+      - run:
+          name: Configure Watchman
+          command: echo "{}" > .watchmanconfig
+
+  run_ios_tests:
+    description: This command run iOS tests and collects results
+    steps:
+      - run:
+          name: "Run Tests: iOS Unit and Integration Tests"
+          command: node ./scripts/circleci/run_with_retry.js 3 yarn test-ios
+      - run:
+          name: Zip Derived data folder
+          when: always
+          command: |
+            echo "zipping tests results"
+            cd /Users/distiller/Library/Developer/Xcode
+            XCRESULT_PATH=$(find . -name '*.xcresult')
+            tar -zcvf xcresults.tar.gz $XCRESULT_PATH
+      - store_artifacts_if_needed:
+          path: /Users/distiller/Library/Developer/Xcode/xcresults.tar.gz
+      - report_bundle_size:
+          platform: ios
+      - store_test_results:
+          path: ./reports/junit

.circleci/configurations/jobs.yml

@@ -109,109 +109,6 @@ jobs:
       - store_test_results:
           path: ./reports/junit
 
-  # -------------------------
-  #     JOBS: iOS Unit Tests
-  # -------------------------
-  test_ios:
-    executor: reactnativeios
-    parameters:
-      run_unit_tests:
-        description: Specifies whether unit tests should run.
-        type: boolean
-        default: false
-      jsengine:
-        default: "Hermes"
-        description: Which JavaScript engine to use. Must be one of "Hermes", "JSC".
-        type: enum
-        enum: ["Hermes", "JSC"]
-      ruby_version:
-        default: "2.6.10"
-        description: The version of ruby that must be used
-        type: string
-    environment:
-      - REPORTS_DIR: "./reports/junit"
-    steps:
-      - checkout_code_with_cache
-      - setup_ruby:
-          ruby_version: << parameters.ruby_version >>
-      - brew_install:
-          package: xcbeautify
-      - run:
-          name: Run Ruby Tests
-          command: |
-            cd packages/react-native/scripts
-            sh run_ruby_tests.sh
-      - run_yarn
-      - *attach_hermes_workspace
-      - run: |
-          cd packages/rn-tester
-          bundle check || bundle install
-      - run:
-          name: Boot iPhone Simulator
-          command: source scripts/.tests.env && xcrun simctl boot "$IOS_DEVICE" || true
-
-      - run:
-          name: Configure Environment Variables
-          command: |
-            echo 'export PATH=/usr/local/opt/node@18/bin:$PATH' >> $BASH_ENV
-            source $BASH_ENV
-
-      - run:
-          name: "Brew: Tap wix/brew"
-          command: brew tap wix/brew
-      - brew_install:
-          package: applesimutils watchman
-
-      - run:
-          name: Configure Watchman
-          command: echo "{}" > .watchmanconfig
-
-      - run:
-          name: Setup the CocoaPods environment
-          command: |
-            bundle exec pod setup
-
-      - with_hermes_tarball_cache_span:
-          set_tarball_path: True
-          steps:
-            - with_rntester_pods_cache_span:
-                steps:
-                  - run:
-                      name: Generate RNTesterPods Workspace
-                      command: |
-                        if [[ << parameters.jsengine >> == "JSC" ]]; then
-                          export USE_HERMES=0
-                        fi
-
-                        cd packages/rn-tester
-                        bundle install
-                        bundle exec pod install --verbose
-
-      # -------------------------
-      # Runs iOS unit tests
-      - when:
-          condition: << parameters.run_unit_tests >>
-          steps:
-            - run:
-                name: "Run Tests: iOS Unit and Integration Tests"
-                command: node ./scripts/circleci/run_with_retry.js 3 yarn test-ios
-            - run:
-                name: Zip Derived data folder
-                when: always
-                command: |
-                  echo "zipping tests results"
-                  cd /Users/distiller/Library/Developer/Xcode
-                  XCRESULT_PATH=$(find . -name '*.xcresult')
-                  tar -zcvf xcresults.tar.gz $XCRESULT_PATH
-            - store_artifacts_if_needed:
-                path: /Users/distiller/Library/Developer/Xcode/xcresults.tar.gz
-      # -------------------------
-      # Collect Results
-      - report_bundle_size:
-          platform: ios
-      - store_test_results:
-          path: ./reports/junit
-
   # -------------------------
   #     JOBS: iOS E2E Tests
   # -------------------------
@@ -627,6 +524,10 @@ jobs:
         default: "2.6.10"
         description: The version of ruby that must be used
         type: string
+      run_unit_tests:
+        description: whether unit tests should run or not.
+        default: false
+        type: boolean
     steps:
       - checkout_code_with_cache
       - run_yarn
@@ -641,6 +542,10 @@ jobs:
           command: sudo rm -rf /Library/Developer/CoreSimulator/Profiles/Runtimes/
       - setup_ruby:
           ruby_version: << parameters.ruby_version >>
+      - when:
+          condition: << parameters.run_unit_tests >>
+          steps:
+            - prepare_ios_tests
       - with_hermes_tarball_cache_span:
           set_tarball_path: True
           steps:
@@ -666,13 +571,24 @@ jobs:
 
                         bundle install
                         bundle exec pod install
-                  - run:
-                      name: Build RNTester
-                      command: |
-                        xcodebuild build \
-                          -workspace packages/rn-tester/RNTesterPods.xcworkspace \
-                          -scheme RNTester \
-                          -sdk iphonesimulator
+                  - when:
+                      condition:
+                        # The run_ios_test will also build RNTester so we don't nee to build it
+                        # here if we run tests
+                        equal: [ false, << parameters.run_unit_tests >> ]
+
+                      steps:
+                          - run:
+                              name: Build RNTester
+                              command: |
+                                xcodebuild build \
+                                  -workspace packages/rn-tester/RNTesterPods.xcworkspace \
+                                  -scheme RNTester \
+                                  -sdk iphonesimulator
+                  - when:
+                      condition: << parameters.run_unit_tests >>
+                      steps:
+                          - run_ios_tests
 
   # -------------------------
   #    JOBS: Windows

.circleci/configurations/test_workflows/testAll.yml

@@ -169,14 +169,11 @@
               - architecture: "OldArch"
                 jsengine: "JSC"
                 use_frameworks: "StaticLibraries"
-      - test_ios:
-          name: "Test iOS with Ruby 3.2.0"
-          run_unit_tests: true
-          requires:
-            - build_hermes_macos
-          ruby_version: "3.2.0"
-      - test_ios:
+      - test_ios_rntester:
           run_unit_tests: true
+          architecture: "OldArch"
+          use_frameworks: "StaticLibraries"
+          ruby_version: "2.6.10"
           requires:
             - build_hermes_macos
           matrix:

.circleci/configurations/test_workflows/testIOS.yml

@@ -160,14 +160,11 @@
               - architecture: "OldArch"
                 jsengine: "JSC"
                 use_frameworks: "StaticLibraries"
-      - test_ios:
-          name: "Test iOS with Ruby 3.2.0"
-          run_unit_tests: true
-          requires:
-            - build_hermes_macos
-          ruby_version: "3.2.0"
-      - test_ios:
+      - test_ios_rntester:
           run_unit_tests: true
+          architecture: "OldArch"
+          use_frameworks: "StaticLibraries"
+          ruby_version: "2.6.10"
           requires:
             - build_hermes_macos
           matrix:

.circleci/configurations/top_level.yml

@@ -83,8 +83,8 @@ references:
     # Hermes iOS
     hermesc_apple_cache_key: &hermesc_apple_cache_key v2-hermesc-apple-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
     hermes_apple_slices_cache_key: &hermes_apple_slices_cache_key v2-hermes-apple-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}-{{ checksum "packages/react-native/sdks/hermes-engine/utils/build-apple-framework.sh" }}
-    hermes_tarball_debug_cache_key: &hermes_tarball_debug_cache_key v4-hermes-tarball-debug-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
-    hermes_tarball_release_cache_key: &hermes_tarball_release_cache_key v3-hermes-tarball-release-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
+    hermes_tarball_debug_cache_key: &hermes_tarball_debug_cache_key v4-hermes-tarball-debug-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}-{{ checksum "packages/react-native/sdks/hermes-engine/utils/build-apple-framework.sh" }}
+    hermes_tarball_release_cache_key: &hermes_tarball_release_cache_key v3-hermes-tarball-release-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}-{{ checksum "packages/react-native/sdks/hermes-engine/utils/build-apple-framework.sh" }}
     hermes_macosx_bin_release_cache_key: &hermes_macosx_bin_release_cache_key v1-hermes-release-macosx-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
     hermes_macosx_bin_debug_cache_key: &hermes_macosx_bin_debug_cache_key v1-hermes-debug-macosx-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
     hermes_dsym_debug_cache_key: &hermes_dsym_debug_cache_key v1-hermes-debug-dsym-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}

packages/react-native/Libraries/Utilities/useColorScheme.js

@@ -15,12 +15,11 @@ import type {ColorSchemeName} from './NativeAppearance';
 import Appearance from './Appearance';
 import {useSyncExternalStore} from 'react';
 
+const subscribe = (onStoreChange: () => void) => {
+  const appearanceSubscription = Appearance.addChangeListener(onStoreChange);
+  return () => appearanceSubscription.remove();
+};
+
 export default function useColorScheme(): ?ColorSchemeName {
-  return useSyncExternalStore(
-    callback => {
-      const appearanceSubscription = Appearance.addChangeListener(callback);
-      return () => appearanceSubscription.remove();
-    },
-    () => Appearance.getColorScheme(),
-  );
+  return useSyncExternalStore(subscribe, Appearance.getColorScheme);
 }

packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm

@@ -371,6 +371,11 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
     self.accessibilityIdentifier = RCTNSStringFromString(newViewProps.testId);
   }
 
+  // `zIndex`
+  if (oldViewProps.zIndex != newViewProps.zIndex) {
+    self.layer.zPosition = newViewProps.zIndex.value_or(0);
+  }
+
   _needsInvalidateLayer = _needsInvalidateLayer || needsInvalidateLayer;
 
   _props = std::static_pointer_cast<const ViewProps>(props);

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java

@@ -79,9 +79,9 @@ protected T prepareToRecycleView(@NonNull ThemedReactContext reactContext, T vie
     // setScaleX
     // setScaleY
     // setCameraDistance
-    setTransform(view, null);
+    setTransformProperty(view, null, null);
 
-    // RenderNode params not covered by setTransform above
+    // RenderNode params not covered by setTransformProperty above
     view.resetPivot();
     view.setTop(0);
     view.setBottom(0);
@@ -94,6 +94,7 @@ protected T prepareToRecycleView(@NonNull ThemedReactContext reactContext, T vie
     view.setTag(R.id.transform_origin, null);
     view.setTag(R.id.invalidate_transform, null);
     view.removeOnLayoutChangeListener(this);
+
     // setShadowColor
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
       view.setOutlineAmbientShadowColor(Color.BLACK);

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSpecTest.kt

@@ -26,6 +26,7 @@ class ReactPropForShadowNodeSpecTest {
   fun testMethodWithWrongNumberOfParams() {
     BaseViewManager(
             object : ReactShadowNodeImpl() {
+                  @Suppress("UNUSED_PARAMETER")
                   @ReactProp(name = "prop")
                   fun setterWithIncorrectNumberOfArgs(value: Boolean, anotherValue: Int) {}
                 }
@@ -47,7 +48,9 @@ class ReactPropForShadowNodeSpecTest {
   fun testUnsupportedValueType() {
     BaseViewManager(
             object : ReactShadowNodeImpl() {
-                  @ReactProp(name = "prop") fun setterWithMap(value: Map<*, *>) {}
+                  @Suppress("UNUSED_PARAMETER")
+                  @ReactProp(name = "prop")
+                  fun setterWithMap(value: Map<*, *>) {}
                 }
                 .javaClass)
         .nativeProps
@@ -57,6 +60,7 @@ class ReactPropForShadowNodeSpecTest {
   fun testGroupInvalidNumberOfParams() {
     BaseViewManager(
             object : ReactShadowNodeImpl() {
+                  @Suppress("UNUSED_PARAMETER")
                   @ReactPropGroup(names = ["prop1", "prop2"])
                   fun setterWithTooManyParams(index: Int, value: Float, boolean: Boolean) {}
                 }
@@ -68,6 +72,7 @@ class ReactPropForShadowNodeSpecTest {
   fun testGroupTooFewParams() {
     BaseViewManager(
             object : ReactShadowNodeImpl() {
+                  @Suppress("UNUSED_PARAMETER")
                   @ReactPropGroup(names = ["props1", "prop2"])
                   fun setterWithTooFewParams(index: Int) {}
                 }
@@ -79,6 +84,7 @@ class ReactPropForShadowNodeSpecTest {
   fun testGroupNoIndexParam() {
     BaseViewManager(
             object : ReactShadowNodeImpl() {
+                  @Suppress("UNUSED_PARAMETER")
                   @ReactPropGroup(names = ["prop1", "prop2"])
                   fun setterWithNoIndexParam(value: Float, boolean: Boolean) {}
                 }