react-native 0.72.0-rc.2 → 0.72.0-rc.3

package/Libraries/Core/ReactNativeVersion.js

@@ -13,5 +13,5 @@ exports.version = {
   major: 0,
   minor: 72,
   patch: 0,
-  prerelease: 'rc.2',
+  prerelease: 'rc.3',
 };

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(72),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"rc.2",
+                  RCTVersionPrerelease: @"rc.3",
                   };
   });
   return __rnVersion;

package/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm

@@ -14,6 +14,7 @@
 #import <react/renderer/components/image/ImageComponentDescriptor.h>
 #import <react/renderer/components/image/ImageEventEmitter.h>
 #import <react/renderer/components/image/ImageProps.h>
+#import <react/renderer/core/CoreFeatures.h>
 #import <react/renderer/imagemanager/ImageRequest.h>
 #import <react/renderer/imagemanager/RCTImagePrimitivesConversions.h>
 
@@ -97,8 +98,18 @@ using namespace facebook::react;
 - (void)_setStateAndResubscribeImageResponseObserver:(ImageShadowNode::ConcreteState::Shared const &)state
 {
   if (_state) {
-    auto &observerCoordinator = _state->getData().getImageRequest().getObserverCoordinator();
+    auto const &imageRequest = _state->getData().getImageRequest();
+    auto &observerCoordinator = imageRequest.getObserverCoordinator();
     observerCoordinator.removeObserver(_imageResponseObserverProxy);
+    if (CoreFeatures::cancelImageDownloadsOnRecycle) {
+      // Cancelling image request because we are no longer observing it.
+      // This is not 100% correct place to do this because we may want to
+      // re-create RCTImageComponentView with the same image and if it
+      // was cancelled before downloaded, download is not resumed.
+      // This will only become issue if we decouple life cycle of a
+      // ShadowNode from ComponentView, which is not something we do now.
+      imageRequest.cancel();
+    }
   }
 
   _state = state;

package/React/Fabric/RCTSurfacePresenter.mm

@@ -285,6 +285,10 @@ static BackgroundExecutor RCTGetBackgroundExecutor()
     CoreFeatures::cacheNSTextStorage = true;
   }
 
+  if (reactNativeConfig && reactNativeConfig->getBool("react_fabric:cancel_image_downloads_on_recycle")) {
+    CoreFeatures::cancelImageDownloadsOnRecycle = true;
+  }
+
   auto componentRegistryFactory =
       [factory = wrapManagedObject(_mountingManager.componentViewRegistry.componentViewFactory)](
           EventDispatcher::Weak const &eventDispatcher, ContextContainer::Shared const &contextContainer) {

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.72.0-rc.2
+VERSION_NAME=0.72.0-rc.3
 GROUP=com.facebook.react
 
 # JVM Versions

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

@@ -18,5 +18,5 @@ public class ReactNativeVersion {
       "major", 0,
       "minor", 72,
       "patch", 0,
-      "prerelease", "rc.2");
+      "prerelease", "rc.3");
 }

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -18,7 +18,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 72;
   int32_t Patch = 0;
-  std::string_view Prerelease = "rc.2";
+  std::string_view Prerelease = "rc.3";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/core/CoreFeatures.cpp

@@ -16,6 +16,7 @@ bool CoreFeatures::blockPaintForUseLayoutEffect = false;
 bool CoreFeatures::useNativeState = false;
 bool CoreFeatures::cacheNSTextStorage = false;
 bool CoreFeatures::cacheLastTextMeasurement = false;
+bool CoreFeatures::cancelImageDownloadsOnRecycle = false;
 
 } // namespace react
 } // namespace facebook

package/ReactCommon/react/renderer/core/CoreFeatures.h

@@ -44,6 +44,10 @@ class CoreFeatures {
   // This flag enables a caching mechanism to avoid subsequents measurements
   // of the same Text with the same constrainst.
   static bool cacheLastTextMeasurement;
+
+  // Fabric was not cancelling image downloads when <ImageView /> was removed
+  // from view hierarchy. This feature flag enables this feature.
+  static bool cancelImageDownloadsOnRecycle;
 };
 
 } // namespace react

package/ReactCommon/react/renderer/imagemanager/ImageRequest.h

@@ -35,20 +35,24 @@ class ImageRequest final {
   /*
    * The move constructor.
    */
-  ImageRequest(ImageRequest &&other) noexcept;
+  ImageRequest(ImageRequest &&other) noexcept = default;
 
   /*
    * `ImageRequest` does not support copying by design.
    */
   ImageRequest(const ImageRequest &other) = delete;
 
-  ~ImageRequest();
-
   /**
    * Set cancelation function.
    */
   void setCancelationFunction(std::function<void(void)> cancelationFunction);
 
+  /*
+   * Calls cancel function if one is defined. Should be when downloading
+   * image isn't needed anymore. E.g. <ImageView /> was removed.
+   */
+  void cancel() const;
+
   /*
    * Returns the Image Source associated with the request.
    */

package/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequest.cpp

@@ -18,17 +18,6 @@ ImageRequest::ImageRequest(
   // Not implemented.
 }
 
-ImageRequest::ImageRequest(ImageRequest &&other) noexcept
-    : imageSource_(std::move(other.imageSource_)),
-      telemetry_(std::move(other.telemetry_)),
-      coordinator_(std::move(other.coordinator_)) {
-  // Not implemented.
-}
-
-ImageRequest::~ImageRequest() {
-  // Not implemented.
-}
-
 const ImageResponseObserverCoordinator &ImageRequest::getObserverCoordinator()
     const {
   // Not implemented

package/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageRequest.cpp

@@ -17,27 +17,17 @@ ImageRequest::ImageRequest(
   coordinator_ = std::make_shared<ImageResponseObserverCoordinator>();
 }
 
-ImageRequest::ImageRequest(ImageRequest &&other) noexcept
-    : imageSource_(std::move(other.imageSource_)),
-      telemetry_(std::move(other.telemetry_)),
-      coordinator_(std::move(other.coordinator_)) {
-  other.coordinator_ = nullptr;
-  other.cancelRequest_ = nullptr;
-  other.telemetry_ = nullptr;
-  other.imageSource_ = {};
+void ImageRequest::setCancelationFunction(
+    std::function<void(void)> cancelationFunction) {
+  cancelRequest_ = cancelationFunction;
 }
 
-ImageRequest::~ImageRequest() {
+void ImageRequest::cancel() const {
   if (cancelRequest_) {
     cancelRequest_();
   }
 }
 
-void ImageRequest::setCancelationFunction(
-    std::function<void(void)> cancelationFunction) {
-  cancelRequest_ = cancelationFunction;
-}
-
 const ImageSource &ImageRequest::getImageSource() const {
   return imageSource_;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.72.0-rc.2",
+  "version": "0.72.0-rc.3",
   "bin": "./cli.js",
   "description": "A framework for building native apps using React",
   "license": "MIT",
@@ -79,12 +79,12 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.2.1",
-    "@react-native-community/cli": "11.2.1",
-    "@react-native-community/cli-platform-android": "11.2.1",
-    "@react-native-community/cli-platform-ios": "11.2.1",
+    "@react-native-community/cli": "11.2.3",
+    "@react-native-community/cli-platform-android": "11.2.3",
+    "@react-native-community/cli-platform-ios": "11.2.3",
     "@react-native/assets-registry": "^0.72.0",
     "@react-native/codegen": "^0.72.4",
-    "@react-native/gradle-plugin": "^0.72.6",
+    "@react-native/gradle-plugin": "^0.72.7",
     "@react-native/js-polyfills": "^0.72.1",
     "@react-native/normalize-colors": "^0.72.0",
     "@react-native/virtualized-lists": "^0.72.4",
@@ -98,8 +98,8 @@
     "jest-environment-node": "^29.2.1",
     "jsc-android": "^250231.0.0",
     "memoize-one": "^5.0.0",
-    "metro-runtime": "0.76.2",
-    "metro-source-map": "0.76.2",
+    "metro-runtime": "0.76.4",
+    "metro-source-map": "0.76.4",
     "mkdirp": "^0.5.1",
     "nullthrows": "^1.1.1",
     "pretty-format": "^26.5.2",
@@ -108,7 +108,7 @@
     "react-refresh": "^0.4.0",
     "react-shallow-renderer": "^16.15.0",
     "regenerator-runtime": "^0.13.2",
-    "scheduler": "^0.23.0",
+    "scheduler": "0.24.0-canary-efb381bbf-20230505",
     "stacktrace-parser": "^0.1.10",
     "use-sync-external-store": "^1.0.0",
     "whatwg-fetch": "^3.0.0",

package/scripts/cocoapods/__tests__/flipper-test.rb

@@ -82,7 +82,7 @@ class FlipperTests < Test::Unit::TestCase
             assert_equal(config.build_settings['SWIFT_VERSION'], '4.1')
         end
 
-        reactCore_target = installer.target_with_name("React-Core")
+        reactCore_target = installer.target_with_name("React-RCTAppDelegate")
         reactCore_target.build_configurations.each do |config|
             if config.name == 'Debug' || config.name == 'CustomConfig' then
                 assert_equal(config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'], ['$(inherited)', 'FB_SONARKIT_ENABLED=1'])
@@ -144,6 +144,14 @@ class FlipperTests < Test::Unit::TestCase
                             BuildConfigurationMock.new("Release", is_debug: false),
                             BuildConfigurationMock.new("CustomConfig", is_debug: true),
                         ]
+                    ),
+                    TargetMock.new(
+                        "React-RCTAppDelegate",
+                        [
+                            BuildConfigurationMock.new("Debug", is_debug: true),
+                            BuildConfigurationMock.new("Release", is_debug: false),
+                            BuildConfigurationMock.new("CustomConfig", is_debug: true),
+                        ]
                     )
                 ]
             )

package/scripts/cocoapods/__tests__/utils-test.rb

@@ -677,74 +677,6 @@ class UtilsTests < Test::Unit::TestCase
             assert_equal(config.build_settings["OTHER_CFLAGS"], "$(inherited)")
         end
     end
-
-    # ============================= #
-    # Test - Enable Hermes Profiler #
-    # ============================= #
-
-    def test_enableHermesProfiler_whenEnableHermesProfileIsTrue_setsFlagsInRelease
-        # Arrange
-        first_target = prepare_target("FirstTarget")
-        second_target = prepare_target("SecondTarget")
-        third_target = prepare_target("ThirdTarget", "com.apple.product-type.bundle")
-        user_project_mock = UserProjectMock.new("a/path", [
-                prepare_config("Debug"),
-                prepare_config("Release"),
-            ],
-            :native_targets => [
-                first_target,
-                second_target
-            ]
-        )
-        pods_projects_mock = PodsProjectMock.new([third_target], {"hermes-engine" => {}})
-        installer = InstallerMock.new(pods_projects_mock, [
-            AggregatedProjectMock.new(user_project_mock)
-        ])
-
-         # Act
-         ReactNativePodsUtils.enable_hermes_profiler(installer, enable_hermes_profiler: true)
-
-         # Assert
-         installer.target_installation_results.pod_target_installation_results.each do |pod_name, target_installation_result|
-            target_installation_result.native_target.build_configurations.each do |config|
-                if config.name != "Release"
-                    assert_nil(config.build_settings["OTHER_CFLAGS"])
-                else
-                    assert_equal(config.build_settings["OTHER_CFLAGS"], "$(inherited) -DRCT_REMOTE_PROFILE=1")
-                end
-            end
-         end
-    end
-
-    def test_enableHermesProfiler_whenEnableHermesProfileIsFalse_doesNothing
-        # Arrange
-        first_target = prepare_target("FirstTarget")
-        second_target = prepare_target("SecondTarget")
-        third_target = prepare_target("ThirdTarget", "com.apple.product-type.bundle")
-        user_project_mock = UserProjectMock.new("a/path", [
-                prepare_config("Debug"),
-                prepare_config("Release"),
-            ],
-            :native_targets => [
-                first_target,
-                second_target
-            ]
-        )
-        pods_projects_mock = PodsProjectMock.new([third_target], {"hermes-engine" => {}})
-        installer = InstallerMock.new(pods_projects_mock, [
-            AggregatedProjectMock.new(user_project_mock)
-        ])
-
-         # Act
-         ReactNativePodsUtils.enable_hermes_profiler(installer)
-
-         # Assert
-         installer.target_installation_results.pod_target_installation_results.each do |pod_name, target_installation_result|
-            target_installation_result.native_target.build_configurations.each do |config|
-                assert_nil(config.build_settings["OTHER_CFLAGS"])
-            end
-         end
-    end
 end
 
 # ===== #

package/scripts/cocoapods/flipper.rb

@@ -77,8 +77,8 @@ def flipper_post_install(installer)
             end
         end
 
-        # Enable flipper for React-Core Debug configuration
-        if target.name == 'React-Core'
+        # Enable flipper for React-RCTAppDelegate Debug configuration
+        if target.name == 'React-RCTAppDelegate'
             target.build_configurations.each do |config|
                 if config.debug?
                     config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = ['$(inherited)', 'FB_SONARKIT_ENABLED=1']

package/scripts/cocoapods/utils.rb

@@ -220,13 +220,6 @@ class ReactNativePodsUtils
         end
     end
 
-    def self.enable_hermes_profiler(installer, enable_hermes_profiler: false)
-        return if !enable_hermes_profiler
-
-        Pod::UI.puts "[Hermes Profiler] Enable Hermes Sample profiler"
-        self.add_compiler_flag_to_pods(installer, "-DRCT_REMOTE_PROFILE=1", configuration: "Release")
-    end
-
     # ========= #
     # Utilities #
     # ========= #

package/scripts/react_native_pods.rb

@@ -222,11 +222,10 @@ end
 # - mac_catalyst_enabled: whether we are running the Pod on a Mac Catalyst project or not.
 # - enable_hermes_profiler: whether the hermes profiler should be turned on in Release mode
 def react_native_post_install(
-  installer, react_native_path = "../node_modules/react-native",
-  mac_catalyst_enabled: false,
-  enable_hermes_profiler: false
+  installer,
+  react_native_path = "../node_modules/react-native",
+  mac_catalyst_enabled: false
 )
-  enable_hermes_profiler = enable_hermes_profiler || ENV["ENABLE_HERMES_PROFILER"] == "1"
   ReactNativePodsUtils.turn_off_resource_bundle_react_core(installer)
 
   ReactNativePodsUtils.apply_mac_catalyst_patches(installer) if mac_catalyst_enabled
@@ -242,13 +241,11 @@ def react_native_post_install(
   ReactNativePodsUtils.update_search_paths(installer)
   ReactNativePodsUtils.set_node_modules_user_settings(installer, react_native_path)
   ReactNativePodsUtils.apply_flags_for_fabric(installer, fabric_enabled: fabric_enabled)
-  ReactNativePodsUtils.enable_hermes_profiler(installer, enable_hermes_profiler: enable_hermes_profiler)
 
   NewArchitectureHelper.set_clang_cxx_language_standard_if_needed(installer)
   is_new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == "1"
   NewArchitectureHelper.modify_flags_for_new_architecture(installer, is_new_arch_enabled)
 
-
   Pod::UI.puts "Pod install took #{Time.now.to_i - $START_TIME} [s] to run".green
 end
 

package/template/package.json

@@ -11,22 +11,22 @@
   },
   "dependencies": {
     "react": "18.2.0",
-    "react-native": "0.72.0-rc.2"
+    "react-native": "0.72.0-rc.3"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
     "@babel/preset-env": "^7.20.0",
     "@babel/runtime": "^7.12.5",
     "@react-native/eslint-config": "^0.72.1",
-    "@react-native/metro-config": "^0.72.1",
+    "@react-native/metro-config": "^0.72.5",
     "@tsconfig/react-native": "^3.0.0",
-    "@types/metro-config": "^0.76.2",
+    "@types/metro-config": "^0.76.3",
     "@types/react": "^18.0.24",
     "@types/react-test-renderer": "^18.0.0",
     "babel-jest": "^29.2.1",
     "eslint": "^8.19.0",
     "jest": "^29.2.1",
-    "metro-react-native-babel-preset": "0.76.2",
+    "metro-react-native-babel-preset": "0.76.4",
     "prettier": "^2.4.1",
     "react-test-renderer": "18.2.0",
     "typescript": "4.8.4"