react-native 0.86.0 → 0.86.3

package/ReactCommon/react/nativemodule/dom/NativeDOM.cpp

@@ -198,10 +198,6 @@ jsi::Value NativeDOM::getParentNode(
   }
 
   auto shadowNode = getShadowNode(rt, nativeNodeReference);
-  if (isRootShadowNode(*shadowNode)) {
-    // The parent of the root node is the document.
-    return jsi::Value{shadowNode->getSurfaceId()};
-  }
 
   auto currentRevision =
       getCurrentShadowTreeRevision(rt, shadowNode->getSurfaceId());
@@ -209,6 +205,16 @@ jsi::Value NativeDOM::getParentNode(
     return jsi::Value::undefined();
   }
 
+  // The parent of the surface's root node is the document. Only the actual
+  // root node qualifies: nested nodes that carry the `RootNodeKind` trait
+  // (e.g. <Modal>, portals/overlays) still have a real parent in the shadow
+  // tree and must report it. Otherwise capture/bubble event propagation is
+  // silently severed at that boundary (a listener on an ancestor rendered
+  // above the modal would never receive descendant focus/blur, etc.).
+  if (ShadowNode::sameFamily(*currentRevision, *shadowNode)) {
+    return jsi::Value{shadowNode->getSurfaceId()};
+  }
+
   auto parentShadowNode = dom::getParentNode(currentRevision, *shadowNode);
   if (parentShadowNode == nullptr) {
     return jsi::Value::undefined();

package/ReactCommon/react/nativemodule/dom/React-domnativemodule.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/react/nativemodule/featureflags/React-featureflagsnativemodule.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/react/nativemodule/idlecallbacks/React-idlecallbacksnativemodule.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/react/nativemodule/intersectionobserver/React-intersectionobservernativemodule.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we're presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/react/nativemodule/microtasks/React-microtasksnativemodule.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/react/nativemodule/mutationobserver/React-mutationobservernativemodule.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we're presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/react/nativemodule/viewtransition/React-viewtransitionnativemodule.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we're presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/react/nativemodule/webperformance/React-webperformancenativemodule.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/react/networking/React-networking.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/react/performance/cdpmetrics/React-performancecdpmetrics.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/react/performance/timeline/React-performancetimeline.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/react/renderer/animated/internal/primitives.h

@@ -11,6 +11,6 @@
 namespace facebook::react::animated {
 // Indicates that the animated node identifier is not defined.
 // It is safe to use 0 because JavaScript starts assigning identifiers from 1.
-// https://github.com/facebook/react-native/blob/main/packages/react-native/src/private/animated/NativeAnimatedHelper.js#L35
+// https://github.com/react/react-native/blob/main/packages/react-native/src/private/animated/NativeAnimatedHelper.js#L35
 constexpr static Tag undefinedAnimatedNodeIdentifier = 0;
 } // namespace facebook::react::animated

package/ReactCommon/react/renderer/consistency/React-rendererconsistency.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

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

@@ -134,11 +134,19 @@ void EventEmitter::dispatchEvent(
     return;
   }
 
+  SharedEventTarget eventTarget;
+  std::weak_ptr<const ShadowNodeFamily> shadowNodeFamily;
+  {
+    std::scoped_lock lock(DispatchMutex());
+    eventTarget = eventTarget_;
+    shadowNodeFamily = shadowNodeFamily_;
+  }
+
   eventDispatcher->dispatchEvent(RawEvent(
       normalizeEventType(std::move(type)),
       std::move(payload),
-      eventTarget_,
-      shadowNodeFamily_,
+      std::move(eventTarget),
+      std::move(shadowNodeFamily),
       category,
       false,
       eventTimestamp));
@@ -180,11 +188,19 @@ void EventEmitter::dispatchUniqueEvent(
     return;
   }
 
+  SharedEventTarget eventTarget;
+  std::weak_ptr<const ShadowNodeFamily> shadowNodeFamily;
+  {
+    std::scoped_lock lock(DispatchMutex());
+    eventTarget = eventTarget_;
+    shadowNodeFamily = shadowNodeFamily_;
+  }
+
   eventDispatcher->dispatchUniqueEvent(RawEvent(
       normalizeEventType(std::move(type)),
       std::move(payload),
-      eventTarget_,
-      shadowNodeFamily_,
+      std::move(eventTarget),
+      std::move(shadowNodeFamily),
       RawEvent::Category::Continuous,
       true,
       eventTimestamp));

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

@@ -137,27 +137,35 @@ std::shared_ptr<ShadowNode> ShadowNode::clone(
     const ShadowNodeFragment& fragment) const {
   const auto& family = *family_;
   const auto& componentDescriptor = family.componentDescriptor_;
-  if (family.nativeProps_DEPRECATED != nullptr) {
-    auto propsParserContext = PropsParserContext{family_->getSurfaceId(), {}};
-    if (fragment.props == ShadowNodeFragment::propsPlaceholder()) {
-      // Clone existing `props_` with `family.nativeProps_DEPRECATED` to apply
-      // previously set props via `setNativeProps` API.
-      auto props = componentDescriptor.cloneProps(
-          propsParserContext, props_, RawProps(*family.nativeProps_DEPRECATED));
-      auto clonedNode = componentDescriptor.cloneShadowNode(
-          *this,
-          {.props = props,
-           .children = fragment.children,
-           .state = fragment.state});
-      return clonedNode;
-    } else {
-      // TODO: We might need to merge fragment.props with
-      // `family.nativeProps_DEPRECATED`.
-      return componentDescriptor.cloneShadowNode(*this, fragment);
+
+  std::optional<RawProps> propsOverride;
+  {
+    std::lock_guard<std::mutex> lock(family.nativePropsMutex);
+    if (family.nativeProps_DEPRECATED != nullptr) {
+      if (fragment.props == ShadowNodeFragment::propsPlaceholder()) {
+        propsOverride.emplace(*family.nativeProps_DEPRECATED);
+      } else {
+        // TODO: We might need to merge fragment.props with
+        // `family.nativeProps_DEPRECATED`.
+      }
     }
-  } else {
-    return componentDescriptor.cloneShadowNode(*this, fragment);
   }
+
+  if (propsOverride) {
+    // Clone existing `props_` with `family.nativeProps_DEPRECATED` to
+    // apply previously set props via `setNativeProps` API. The parsed
+    // result escapes the lock so the rest of the clone work runs
+    // unblocked.
+    auto propsParserContext = PropsParserContext{family_->getSurfaceId(), {}};
+    return componentDescriptor.cloneShadowNode(
+        *this,
+        {.props = componentDescriptor.cloneProps(
+             propsParserContext, props_, std::move(*propsOverride)),
+         .children = fragment.children,
+         .state = fragment.state});
+  }
+
+  return componentDescriptor.cloneShadowNode(*this, fragment);
 }
 
 std::shared_ptr<const ContextContainer> ShadowNode::getContextContainer()

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

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <memory>
+#include <mutex>
 #include <shared_mutex>
 
 #include <react/renderer/core/EventEmitter.h>
@@ -114,6 +115,7 @@ class ShadowNodeFamily final : public jsi::NativeState {
    * architecture and will be removed in the future.
    */
   mutable std::unique_ptr<folly::dynamic> nativeProps_DEPRECATED;
+  mutable std::mutex nativePropsMutex;
 
   /**
    * @return tag for the ShadowNodeFamily.

package/ReactCommon/react/renderer/css/React-renderercss.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/react/renderer/debug/React-rendererdebug.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/react/renderer/graphics/React-graphics.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/react/renderer/mounting/internal/CullingContext.cpp

@@ -52,7 +52,7 @@ CullingContext CullingContext::adjustCullingContextIfNeeded(
           // In RTL, content offset is flipped horizontally.
           // We need to flip the culling context frame to match.
           // See:
-          // https://github.com/facebook/react-native/blob/c2f39cfdd87c32b9a59efe8a788b8a03f02b0ea0/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm#L579
+          // https://github.com/react/react-native/blob/c2f39cfdd87c32b9a59efe8a788b8a03f02b0ea0/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm#L579
           auto stateData = scrollViewShadowNode->getStateData();
           cullingContext.frame.origin.x =
               stateData.contentBoundingRect.size.width -

package/ReactCommon/react/renderer/runtimescheduler/React-runtimescheduler.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

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

@@ -361,7 +361,7 @@ UIFont *RCTFontWithFontProperties(RCTFontProperties fontProperties)
       font = [UIFont fontWithName:fontProperties.family size:effectiveFontSize];
       if (font != nullptr) {
         fontNames = [UIFont fontNamesForFamilyName:font.familyName];
-        fontWeight = (fontWeight != 0.0) ?: RCTGetFontWeight(font);
+        fontWeight = (fontWeight != 0.0) ? fontWeight : RCTGetFontWeight(font);
       } else {
         // Failback to system font.
         font = RCTDefaultFontWithFontProperties(fontProperties);

package/ReactCommon/react/renderer/uimanager/UIManager.cpp

@@ -118,49 +118,51 @@ std::shared_ptr<ShadowNode> UIManager::cloneNode(
 
   auto& componentDescriptor = shadowNode.getComponentDescriptor();
   auto& family = shadowNode.getFamily();
-  auto props = ShadowNodeFragment::propsPlaceholder();
 
+  auto props = ShadowNodeFragment::propsPlaceholder();
   if (!rawProps.isEmpty()) {
-    if (family.nativeProps_DEPRECATED != nullptr) {
-      // 1. update the nativeProps_DEPRECATED props.
-      //
-      // In this step, we want the most recent value for the props
-      // managed by setNativeProps.
-      // Values in `rawProps` patch (take precedence over)
-      // `nativeProps_DEPRECATED`. For example, if both
-      // `nativeProps_DEPRECATED` and `rawProps` contain key 'A'.
-      // Value from `rawProps` overrides what was previously in
-      // `nativeProps_DEPRECATED`. Notice that the `nativeProps_DEPRECATED`
-      // patch will not get more props from `rawProps`: if the key is not
-      // present in `nativeProps_DEPRECATED`, it will not be added.
-      //
-      // The result of this operation is the new `nativeProps_DEPRECATED`.
-      family.nativeProps_DEPRECATED =
-          std::make_unique<folly::dynamic>(mergeDynamicProps(
-              *family.nativeProps_DEPRECATED, // source
-              (folly::dynamic)rawProps, // patch
-              NullValueStrategy::Ignore));
-
-      // 2. Compute the final set of props.
-      //
-      // This step takes the new props handled by `setNativeProps` and
-      // merges them in the `rawProps` managed by React.
-      // The new props handled by `nativeProps` now takes precedence
-      // on the props handled by React, as we want to make sure that
-      // all the props are applied to the component.
-      // We use these finalProps as source of truth for the component.
-      auto finalProps = mergeDynamicProps(
-          (folly::dynamic)rawProps, // source
-          *family.nativeProps_DEPRECATED, // patch
-          NullValueStrategy::Override);
-
-      // 3. Clone the props by using finalProps.
-      props = componentDescriptor.cloneProps(
-          propsParserContext, shadowNode.getProps(), RawProps(finalProps));
-    } else {
-      props = componentDescriptor.cloneProps(
-          propsParserContext, shadowNode.getProps(), std::move(rawProps));
+    std::optional<folly::dynamic> finalProps;
+    {
+      std::lock_guard<std::mutex> lock(family.nativePropsMutex);
+      if (family.nativeProps_DEPRECATED != nullptr) {
+        // 1. update the nativeProps_DEPRECATED props.
+        //
+        // In this step, we want the most recent value for the props
+        // managed by setNativeProps.
+        // Values in `rawProps` patch (take precedence over)
+        // `nativeProps_DEPRECATED`. For example, if both
+        // `nativeProps_DEPRECATED` and `rawProps` contain key 'A'.
+        // Value from `rawProps` overrides what was previously in
+        // `nativeProps_DEPRECATED`. Notice that the `nativeProps_DEPRECATED`
+        // patch will not get more props from `rawProps`: if the key is not
+        // present in `nativeProps_DEPRECATED`, it will not be added.
+        //
+        // The result of this operation is the new `nativeProps_DEPRECATED`.
+        family.nativeProps_DEPRECATED =
+            std::make_unique<folly::dynamic>(mergeDynamicProps(
+                *family.nativeProps_DEPRECATED, // source
+                (folly::dynamic)rawProps, // patch
+                NullValueStrategy::Ignore));
+
+        // 2. Compute the final set of props.
+        //
+        // This step takes the new props handled by `setNativeProps` and
+        // merges them in the `rawProps` managed by React.
+        // The new props handled by `nativeProps` now takes precedence
+        // on the props handled by React, as we want to make sure that
+        // all the props are applied to the component.
+        // We use these finalProps as source of truth for the component.
+        finalProps = mergeDynamicProps(
+            (folly::dynamic)rawProps, // source
+            *family.nativeProps_DEPRECATED, // patch
+            NullValueStrategy::Override);
+      }
     }
+
+    props = componentDescriptor.cloneProps(
+        propsParserContext,
+        shadowNode.getProps(),
+        finalProps ? RawProps(std::move(*finalProps)) : std::move(rawProps));
   }
 
   auto clonedShadowNode = componentDescriptor.cloneShadowNode(
@@ -439,19 +441,22 @@ void UIManager::setNativeProps_DEPRECATED(
     const std::shared_ptr<const ShadowNode>& shadowNode,
     RawProps rawProps) const {
   auto& family = shadowNode->getFamily();
-  if (family.nativeProps_DEPRECATED) {
-    // Values in `rawProps` patch (take precedence over)
-    // `nativeProps_DEPRECATED`. For example, if both `nativeProps_DEPRECATED`
-    // and `rawProps` contain key 'A'. Value from `rawProps` overrides what
-    // was previously in `nativeProps_DEPRECATED`.
-    family.nativeProps_DEPRECATED =
-        std::make_unique<folly::dynamic>(mergeDynamicProps(
-            *family.nativeProps_DEPRECATED,
-            (folly::dynamic)rawProps,
-            NullValueStrategy::Override));
-  } else {
-    family.nativeProps_DEPRECATED =
-        std::make_unique<folly::dynamic>((folly::dynamic)rawProps);
+  {
+    std::lock_guard<std::mutex> lock(family.nativePropsMutex);
+    if (family.nativeProps_DEPRECATED) {
+      // Values in `rawProps` patch (take precedence over)
+      // `nativeProps_DEPRECATED`. For example, if both
+      // `nativeProps_DEPRECATED` and `rawProps` contain key 'A'. Value from
+      // `rawProps` overrides what was previously in `nativeProps_DEPRECATED`.
+      family.nativeProps_DEPRECATED =
+          std::make_unique<folly::dynamic>(mergeDynamicProps(
+              *family.nativeProps_DEPRECATED,
+              (folly::dynamic)rawProps,
+              NullValueStrategy::Override));
+    } else {
+      family.nativeProps_DEPRECATED =
+          std::make_unique<folly::dynamic>((folly::dynamic)rawProps);
+    }
   }
 
   shadowTreeRegistry_.visit(