@depup/react-native 0.86.2-depup.0 → 0.87.0-depup.0

package/ReactCommon/react/renderer/core/tests/ComponentDescriptorTest.cpp

@@ -7,12 +7,20 @@
 
 #include <gtest/gtest.h>
 
+#include <react/renderer/core/Props.h>
 #include <react/renderer/core/PropsParserContext.h>
 
 #include "TestComponent.h"
 
 using namespace facebook::react;
 
+static_assert(
+    HasIteratorSetterCtor<Props>,
+    "base `Props` must itself satisfy `HasIteratorSetterCtor` — it is copy-constructible, "
+    "derived from itself, and declares its own `setProp`. If this fails, "
+    "`ConcreteComponentDescriptor::cloneProps` will silently fall back to the classic "
+    "path for any concrete props whose nearest setProp-declaring ancestor is `Props` itself.");
+
 TEST(ComponentDescriptorTest, createShadowNode) {
   auto eventDispatcher = std::shared_ptr<const EventDispatcher>();
   SharedComponentDescriptor descriptor =

package/ReactCommon/react/renderer/core/tests/FindNodeAtPointTest.cpp

@@ -126,7 +126,7 @@ TEST(FindNodeAtPointTest, viewIsScaled) {
           Element<ViewShadowNode>()
           .tag(3)
           .props([] {
-            auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+            auto sharedProps = std::make_shared<ViewProps>();
             sharedProps->transform = Transform::Scale(0.5, 0.5, 0);
             return sharedProps;
           })
@@ -199,7 +199,7 @@ TEST(FindNodeAtPointTest, overlappingViewsWithZIndex) {
         Element<ViewShadowNode>()
         .tag(2)
         .props([] {
-          auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+          auto sharedProps = std::make_shared<ViewProps>();
           sharedProps->zIndex = 1;
           auto &yogaStyle = sharedProps->yogaStyle;
           yogaStyle.setPositionType(yoga::PositionType::Absolute);
@@ -235,7 +235,7 @@ TEST(FindNodeAtPointTest, overlappingViewsWithParentPointerEventsBoxOnly) {
     Element<ViewShadowNode>()
       .tag(1)
       .props([] {
-        auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+        auto sharedProps = std::make_shared<ViewProps>();
         sharedProps->pointerEvents = PointerEventsMode::BoxOnly;
         return sharedProps;
       })
@@ -277,7 +277,7 @@ TEST(FindNodeAtPointTest, overlappingViewsWithParentPointerEventsBoxNone) {
     Element<ViewShadowNode>()
       .tag(1)
       .props([] {
-        auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+        auto sharedProps = std::make_shared<ViewProps>();
         sharedProps->pointerEvents = PointerEventsMode::BoxNone;
         return sharedProps;
       })
@@ -290,7 +290,7 @@ TEST(FindNodeAtPointTest, overlappingViewsWithParentPointerEventsBoxNone) {
         Element<ViewShadowNode>()
         .tag(2)
         .props([] {
-          auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+          auto sharedProps = std::make_shared<ViewProps>();
           sharedProps->zIndex = 1;
           auto &yogaStyle = sharedProps->yogaStyle;
           yogaStyle.setPositionType(yoga::PositionType::Absolute);
@@ -326,7 +326,7 @@ TEST(FindNodeAtPointTest, overlappingViewsWithParentPointerEventsNone) {
     Element<ViewShadowNode>()
       .tag(1)
       .props([] {
-        auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+        auto sharedProps = std::make_shared<ViewProps>();
         sharedProps->pointerEvents = PointerEventsMode::None;
         return sharedProps;
       })
@@ -339,7 +339,7 @@ TEST(FindNodeAtPointTest, overlappingViewsWithParentPointerEventsNone) {
         Element<ViewShadowNode>()
         .tag(2)
         .props([] {
-          auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+          auto sharedProps = std::make_shared<ViewProps>();
           sharedProps->zIndex = 1;
           auto &yogaStyle = sharedProps->yogaStyle;
           yogaStyle.setPositionType(yoga::PositionType::Absolute);

package/ReactCommon/react/renderer/core/tests/LayoutableShadowNodeTest.cpp

@@ -291,7 +291,7 @@ TEST(LayoutableShadowNodeTest, relativeLayoutMetricsOnTransformedNode) {
           shadowNode.setLayoutMetrics(layoutMetrics);
         })
         .props([] {
-          auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+          auto sharedProps = std::make_shared<ViewProps>();
           sharedProps->transform = Transform::Scale(0.5, 0.5, 1);
           return sharedProps;
         })
@@ -340,7 +340,7 @@ TEST(LayoutableShadowNodeTest, noOverflow) {
       }).children({
         Element<ViewShadowNode>()
         .props([=] {
-          auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+          auto sharedProps = std::make_shared<ViewProps>();
           auto &props = *sharedProps;
           auto &yogaStyle = props.yogaStyle;
           yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleSizeLength::points(100));
@@ -351,7 +351,7 @@ TEST(LayoutableShadowNodeTest, noOverflow) {
         .children({
           Element<ViewShadowNode>()
           .props([] {
-            auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+            auto sharedProps = std::make_shared<ViewProps>();
             auto &props = *sharedProps;
             auto &yogaStyle = props.yogaStyle;
             yogaStyle.setPositionType(yoga::PositionType::Absolute);
@@ -405,7 +405,7 @@ TEST(LayoutableShadowNodeTest, overflowInsetFrameToRightAndDown) {
       }).children({
         Element<ViewShadowNode>()
         .props([=] {
-          auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+          auto sharedProps = std::make_shared<ViewProps>();
           auto &props = *sharedProps;
           auto &yogaStyle = props.yogaStyle;
           yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleSizeLength::points(100));
@@ -416,7 +416,7 @@ TEST(LayoutableShadowNodeTest, overflowInsetFrameToRightAndDown) {
         .children({
           Element<ViewShadowNode>()
           .props([] {
-            auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+            auto sharedProps = std::make_shared<ViewProps>();
             auto &props = *sharedProps;
             auto &yogaStyle = props.yogaStyle;
             yogaStyle.setPositionType(yoga::PositionType::Absolute);
@@ -471,7 +471,7 @@ TEST(LayoutableShadowNodeTest, overflowInsetFrameToLeftAndTop) {
       }).children({
         Element<ViewShadowNode>()
         .props([=] {
-          auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+          auto sharedProps = std::make_shared<ViewProps>();
           auto &props = *sharedProps;
           auto &yogaStyle = props.yogaStyle;
           yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleSizeLength::points(100));
@@ -482,7 +482,7 @@ TEST(LayoutableShadowNodeTest, overflowInsetFrameToLeftAndTop) {
         .children({
           Element<ViewShadowNode>()
           .props([] {
-            auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+            auto sharedProps = std::make_shared<ViewProps>();
             auto &props = *sharedProps;
             auto &yogaStyle = props.yogaStyle;
             yogaStyle.setPositionType(yoga::PositionType::Absolute);
@@ -541,7 +541,7 @@ TEST(LayoutableShadowNodeTest, overflowInsetFrameToAllSides) {
       }).children({
         Element<ViewShadowNode>()
         .props([=] {
-          auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+          auto sharedProps = std::make_shared<ViewProps>();
           auto &props = *sharedProps;
           auto &yogaStyle = props.yogaStyle;
           yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleSizeLength::points(100));
@@ -552,7 +552,7 @@ TEST(LayoutableShadowNodeTest, overflowInsetFrameToAllSides) {
         .children({
           Element<ViewShadowNode>()
           .props([] {
-            auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+            auto sharedProps = std::make_shared<ViewProps>();
             auto &props = *sharedProps;
             auto &yogaStyle = props.yogaStyle;
             yogaStyle.setPositionType(yoga::PositionType::Absolute);
@@ -564,7 +564,7 @@ TEST(LayoutableShadowNodeTest, overflowInsetFrameToAllSides) {
           }),
           Element<ViewShadowNode>()
           .props([] {
-            auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+            auto sharedProps = std::make_shared<ViewProps>();
             auto &props = *sharedProps;
             auto &yogaStyle = props.yogaStyle;
             yogaStyle.setPositionType(yoga::PositionType::Absolute);
@@ -620,7 +620,7 @@ TEST(LayoutableShadowNodeTest, relativeLayoutMetricsOnTransformedParent) {
       .children({
         Element<ViewShadowNode>()
         .props([] {
-          auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+          auto sharedProps = std::make_shared<ViewProps>();
           sharedProps->transform = Transform::Scale(0.5, 0.5, 1);
           return sharedProps;
         })
@@ -755,7 +755,7 @@ TEST(
       .children({
         Element<ViewShadowNode>()
         .props([] {
-          auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+          auto sharedProps = std::make_shared<ViewProps>();
           sharedProps->transform = Transform::Scale(0.5, 0.5, 1);
           return sharedProps;
         })
@@ -840,7 +840,7 @@ TEST(LayoutableShadowNodeTest, relativeLayoutMetricsOnSameTransformedNode) {
   auto element =
     Element<ViewShadowNode>()
       .props([] {
-        auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+        auto sharedProps = std::make_shared<ViewProps>();
         sharedProps->transform = Transform::Scale(2, 2, 1);
         return sharedProps;
       })
@@ -1017,7 +1017,7 @@ TEST(LayoutableShadowNodeTest, invertedVerticalView) {
   auto element =
         Element<ViewShadowNode>()
           .props([] {
-            auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+            auto sharedProps = std::make_shared<ViewProps>();
             sharedProps->transform = Transform::VerticalInversion(); // Inverted <ScrollView>
             return sharedProps;
           })
@@ -1093,7 +1093,7 @@ TEST(LayoutableShadowNodeTest, nestedInvertedVerticalView) {
   auto element =
     Element<ViewShadowNode>()
       .props([] {
-        auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+        auto sharedProps = std::make_shared<ViewProps>();
         sharedProps->transform = Transform::VerticalInversion(); // Inverted <ScrollView>
         return sharedProps;
       })
@@ -1179,7 +1179,7 @@ TEST(LayoutableShadowNodeTest, nestedDoubleInvertedVerticalView) {
   auto element =
     Element<ViewShadowNode>()
       .props([] {
-        auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+        auto sharedProps = std::make_shared<ViewProps>();
         sharedProps->transform = Transform::VerticalInversion(); // Inverted
         return sharedProps;
       })
@@ -1195,7 +1195,7 @@ TEST(LayoutableShadowNodeTest, nestedDoubleInvertedVerticalView) {
                 layoutMetrics.frame.size = {.width=100, .height=200};
                 shadowNode.setLayoutMetrics(layoutMetrics);
               }).props([] {
-                  auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+                  auto sharedProps = std::make_shared<ViewProps>();
                   sharedProps->transform = Transform::VerticalInversion(); // Inverted
                   return sharedProps;
                 }).children({
@@ -1259,7 +1259,7 @@ TEST(LayoutableShadowNodeTest, invertedHorizontalView) {
   auto element =
         Element<ViewShadowNode>()
           .props([] {
-            auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+            auto sharedProps = std::make_shared<ViewProps>();
             sharedProps->transform = Transform::HorizontalInversion(); // Inverted <ScrollView>
             return sharedProps;
           })
@@ -1331,7 +1331,7 @@ TEST(LayoutableShadowNodeTest, nestedInvertedHorizontalView) {
   auto element =
     Element<ViewShadowNode>()
       .props([] {
-        auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+        auto sharedProps = std::make_shared<ViewProps>();
         sharedProps->transform = Transform::HorizontalInversion(); // Inverted <ScrollView>
         return sharedProps;
       })

package/ReactCommon/react/renderer/core/tests/PropsConceptsTest.cpp

@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <gtest/gtest.h>
+#include <react/renderer/core/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
+#include <react/renderer/core/RawProps.h>
+#include <react/renderer/core/propsConversions.h>
+
+using namespace facebook::react;
+
+namespace {
+
+// Mimics the shape the React Native codegen emits for
+// `codegenNativeComponent<NativeProps>(...)` (see
+// `react-native-codegen/src/generators/components/GeneratePropsH.js`
+// `ClassTemplate`): default ctor, the 3-arg classic ctor with
+// `convertRawProp` in its initializer list, public prop fields, and
+// NO `setProp` override.
+class CodegenStyleProps : public Props {
+ public:
+  CodegenStyleProps() = default;
+  CodegenStyleProps(
+      const PropsParserContext& context,
+      const CodegenStyleProps& sourceProps,
+      const RawProps& rawProps)
+      : Props(context, sourceProps, rawProps),
+        customField(convertRawProp(
+            context,
+            rawProps,
+            "customField",
+            sourceProps.customField,
+            0)) {}
+
+  int customField{0};
+};
+
+// Mimics a hand-written Props subclass that opts in to the
+// iterator-setter path by declaring its own `setProp`.
+class HandWrittenSetPropProps : public Props {
+ public:
+  HandWrittenSetPropProps() = default;
+  HandWrittenSetPropProps(
+      const PropsParserContext& context,
+      const HandWrittenSetPropProps& sourceProps,
+      const RawProps& rawProps)
+      : Props(context, sourceProps, rawProps),
+        customField(sourceProps.customField) {}
+
+  void setProp(
+      const PropsParserContext& context,
+      RawPropsPropNameHash hash,
+      const char* propName,
+      const RawValue& value) {
+    Props::setProp(context, hash, propName, value);
+    switch (hash) {
+      case CONSTEXPR_RAW_PROPS_KEY_HASH("customField"):
+        fromRawValue(context, value, customField, 0);
+        return;
+    }
+  }
+
+  int customField{0};
+};
+
+// A subclass of a hand-written setProp class that does NOT redeclare
+// `setProp`. Acts like a downstream specialization (e.g. how
+// `ViewShadowNodeProps` extends `ViewProps`). The concept must reject
+// this — otherwise the iterator-setter dispatch would silently miss
+// `extraField`.
+class InheritedSetPropProps : public HandWrittenSetPropProps {
+ public:
+  InheritedSetPropProps() = default;
+  InheritedSetPropProps(
+      const PropsParserContext& context,
+      const InheritedSetPropProps& sourceProps,
+      const RawProps& rawProps)
+      : HandWrittenSetPropProps(context, sourceProps, rawProps),
+        extraField(sourceProps.extraField) {}
+
+  int extraField{0};
+};
+
+// `using Base::setProp;` is sugar — it doesn't constitute "own"
+// declaration. Concept must still reject.
+class UsingDeclSetPropProps : public HandWrittenSetPropProps {
+ public:
+  using HandWrittenSetPropProps::setProp;
+};
+
+// Concept axioms — fail the build if the iterator-setter dispatch ever
+// regresses to silently accepting classes that inherit `setProp`.
+static_assert(
+    !DeclaresOwnSetProp<CodegenStyleProps>,
+    "Codegen'd Props classes don't declare setProp — concept must reject them.");
+static_assert(
+    !HasSetProp<CodegenStyleProps>,
+    "HasSetProp requires DeclaresOwnSetProp.");
+static_assert(
+    !HasIteratorSetterCtor<CodegenStyleProps>,
+    "Codegen'd Props must fall through to the classic cloneProps path. "
+    "If this fires, the iterator-setter would skip every field the codegen'd "
+    "ctor populates via convertRawProp, leaving the component unrendered.");
+
+static_assert(DeclaresOwnSetProp<HandWrittenSetPropProps>);
+static_assert(HasSetProp<HandWrittenSetPropProps>);
+static_assert(HasIteratorSetterCtor<HandWrittenSetPropProps>);
+
+static_assert(
+    !DeclaresOwnSetProp<InheritedSetPropProps>,
+    "A subclass that inherits setProp without redeclaring it must not "
+    "satisfy the concept — its new fields would be skipped.");
+static_assert(!HasIteratorSetterCtor<InheritedSetPropProps>);
+
+static_assert(
+    !DeclaresOwnSetProp<UsingDeclSetPropProps>,
+    "`using Base::setProp;` is not an own declaration.");
+static_assert(!HasIteratorSetterCtor<UsingDeclSetPropProps>);
+
+// Baselines: `Props` itself owns `setProp`, so it satisfies the concept.
+static_assert(DeclaresOwnSetProp<Props>);
+static_assert(HasIteratorSetterCtor<Props>);
+
+} // namespace
+
+// gtest entry so the file participates in the test binary (the
+// static_asserts above are the real check — this just keeps gtest's
+// test discovery happy).
+TEST(PropsConceptsTest, ConceptAxiomsCompile) {
+  SUCCEED();
+}

package/ReactCommon/react/renderer/core/tests/RawPropsTest.cpp

@@ -175,7 +175,7 @@ TEST(RawPropsTest, handleRawPropsSingleString) {
   parser.prepare<Props>();
   raw.parse(parser);
 
-  std::string value = (std::string)*raw.at("nativeID", nullptr, nullptr);
+  std::string value = (std::string)*raw.at("nativeID");
 
   EXPECT_STREQ(value.c_str(), "abc");
 }
@@ -189,7 +189,7 @@ TEST(RawPropsTest, handleRawPropsSingleFloat) {
   parser.prepare<PropsSingleFloat>();
   raw.parse(parser);
 
-  auto value = (float)*raw.at("floatValue", nullptr, nullptr);
+  auto value = (float)*raw.at("floatValue");
 
   EXPECT_NEAR(value, 42.42, 0.00001);
 }
@@ -203,7 +203,7 @@ TEST(RawPropsTest, handleRawPropsSingleDouble) {
   parser.prepare<PropsSingleDouble>();
   raw.parse(parser);
 
-  auto value = (double)*raw.at("doubleValue", nullptr, nullptr);
+  auto value = (double)*raw.at("doubleValue");
 
   EXPECT_NEAR(value, 42.42, 0.00001);
 }
@@ -217,7 +217,7 @@ TEST(RawPropsTest, handleRawPropsSingleInt) {
   parser.prepare<PropsSingleInt>();
   raw.parse(parser);
 
-  int value = (int)*raw.at("intValue", nullptr, nullptr);
+  int value = (int)*raw.at("intValue");
 
   EXPECT_EQ(value, 42);
 }
@@ -231,9 +231,9 @@ TEST(RawPropsTest, handleRawPropsSingleIntGetManyTimes) {
   parser.prepare<PropsSingleInt>();
   raw.parse(parser);
 
-  EXPECT_EQ((int)*raw.at("intValue", nullptr, nullptr), 42);
-  EXPECT_EQ((int)*raw.at("intValue", nullptr, nullptr), 42);
-  EXPECT_EQ((int)*raw.at("intValue", nullptr, nullptr), 42);
+  EXPECT_EQ((int)*raw.at("intValue"), 42);
+  EXPECT_EQ((int)*raw.at("intValue"), 42);
+  EXPECT_EQ((int)*raw.at("intValue"), 42);
 }
 
 TEST(RawPropsTest, handleRawPropsPrimitiveTypes) {
@@ -249,13 +249,11 @@ TEST(RawPropsTest, handleRawPropsPrimitiveTypes) {
   parser.prepare<PropsPrimitiveTypes>();
   raw.parse(parser);
 
-  EXPECT_EQ((int)*raw.at("intValue", nullptr, nullptr), 42);
-  EXPECT_NEAR((double)*raw.at("doubleValue", nullptr, nullptr), 17.42, 0.0001);
-  EXPECT_NEAR((float)*raw.at("floatValue", nullptr, nullptr), 66.67, 0.00001);
-  EXPECT_STREQ(
-      ((std::string)*raw.at("stringValue", nullptr, nullptr)).c_str(),
-      "helloworld");
-  EXPECT_EQ((bool)*raw.at("boolValue", nullptr, nullptr), true);
+  EXPECT_EQ((int)*raw.at("intValue"), 42);
+  EXPECT_NEAR((double)*raw.at("doubleValue"), 17.42, 0.0001);
+  EXPECT_NEAR((float)*raw.at("floatValue"), 66.67, 0.00001);
+  EXPECT_STREQ(((std::string)*raw.at("stringValue")).c_str(), "helloworld");
+  EXPECT_EQ((bool)*raw.at("boolValue"), true);
 }
 
 TEST(RawPropsTest, handleRawPropsPrimitiveTypesGetTwice) {
@@ -271,21 +269,17 @@ TEST(RawPropsTest, handleRawPropsPrimitiveTypesGetTwice) {
   parser.prepare<PropsPrimitiveTypes>();
   raw.parse(parser);
 
-  EXPECT_EQ((int)*raw.at("intValue", nullptr, nullptr), 42);
-  EXPECT_NEAR((double)*raw.at("doubleValue", nullptr, nullptr), 17.42, 0.0001);
-  EXPECT_NEAR((float)*raw.at("floatValue", nullptr, nullptr), 66.67, 0.00001);
-  EXPECT_STREQ(
-      ((std::string)*raw.at("stringValue", nullptr, nullptr)).c_str(),
-      "helloworld");
-  EXPECT_EQ((bool)*raw.at("boolValue", nullptr, nullptr), true);
-
-  EXPECT_EQ((int)*raw.at("intValue", nullptr, nullptr), 42);
-  EXPECT_NEAR((double)*raw.at("doubleValue", nullptr, nullptr), 17.42, 0.0001);
-  EXPECT_NEAR((float)*raw.at("floatValue", nullptr, nullptr), 66.67, 0.00001);
-  EXPECT_STREQ(
-      ((std::string)*raw.at("stringValue", nullptr, nullptr)).c_str(),
-      "helloworld");
-  EXPECT_EQ((bool)*raw.at("boolValue", nullptr, nullptr), true);
+  EXPECT_EQ((int)*raw.at("intValue"), 42);
+  EXPECT_NEAR((double)*raw.at("doubleValue"), 17.42, 0.0001);
+  EXPECT_NEAR((float)*raw.at("floatValue"), 66.67, 0.00001);
+  EXPECT_STREQ(((std::string)*raw.at("stringValue")).c_str(), "helloworld");
+  EXPECT_EQ((bool)*raw.at("boolValue"), true);
+
+  EXPECT_EQ((int)*raw.at("intValue"), 42);
+  EXPECT_NEAR((double)*raw.at("doubleValue"), 17.42, 0.0001);
+  EXPECT_NEAR((float)*raw.at("floatValue"), 66.67, 0.00001);
+  EXPECT_STREQ(((std::string)*raw.at("stringValue")).c_str(), "helloworld");
+  EXPECT_EQ((bool)*raw.at("boolValue"), true);
 }
 
 TEST(RawPropsTest, handleRawPropsPrimitiveTypesGetOutOfOrder) {
@@ -301,21 +295,17 @@ TEST(RawPropsTest, handleRawPropsPrimitiveTypesGetOutOfOrder) {
   parser.prepare<PropsPrimitiveTypes>();
   raw.parse(parser);
 
-  EXPECT_EQ((int)*raw.at("intValue", nullptr, nullptr), 42);
-  EXPECT_NEAR((double)*raw.at("doubleValue", nullptr, nullptr), 17.42, 0.0001);
-  EXPECT_NEAR((float)*raw.at("floatValue", nullptr, nullptr), 66.67, 0.00001);
-  EXPECT_STREQ(
-      ((std::string)*raw.at("stringValue", nullptr, nullptr)).c_str(),
-      "helloworld");
-  EXPECT_EQ((bool)*raw.at("boolValue", nullptr, nullptr), true);
-
-  EXPECT_NEAR((double)*raw.at("doubleValue", nullptr, nullptr), 17.42, 0.0001);
-  EXPECT_EQ((int)*raw.at("intValue", nullptr, nullptr), 42);
-  EXPECT_NEAR((float)*raw.at("floatValue", nullptr, nullptr), 66.67, 0.00001);
-  EXPECT_STREQ(
-      ((std::string)*raw.at("stringValue", nullptr, nullptr)).c_str(),
-      "helloworld");
-  EXPECT_EQ((bool)*raw.at("boolValue", nullptr, nullptr), true);
+  EXPECT_EQ((int)*raw.at("intValue"), 42);
+  EXPECT_NEAR((double)*raw.at("doubleValue"), 17.42, 0.0001);
+  EXPECT_NEAR((float)*raw.at("floatValue"), 66.67, 0.00001);
+  EXPECT_STREQ(((std::string)*raw.at("stringValue")).c_str(), "helloworld");
+  EXPECT_EQ((bool)*raw.at("boolValue"), true);
+
+  EXPECT_NEAR((double)*raw.at("doubleValue"), 17.42, 0.0001);
+  EXPECT_EQ((int)*raw.at("intValue"), 42);
+  EXPECT_NEAR((float)*raw.at("floatValue"), 66.67, 0.00001);
+  EXPECT_STREQ(((std::string)*raw.at("stringValue")).c_str(), "helloworld");
+  EXPECT_EQ((bool)*raw.at("boolValue"), true);
 }
 
 TEST(RawPropsTest, handleRawPropsPrimitiveTypesIncomplete) {
@@ -328,13 +318,13 @@ TEST(RawPropsTest, handleRawPropsPrimitiveTypesIncomplete) {
   parser.prepare<PropsPrimitiveTypes>();
   raw.parse(parser);
 
-  EXPECT_EQ((int)*raw.at("intValue", nullptr, nullptr), 42);
-  EXPECT_EQ(raw.at("doubleValue", nullptr, nullptr), nullptr);
-  EXPECT_EQ(raw.at("floatValue", nullptr, nullptr), nullptr);
-  EXPECT_EQ((int)*raw.at("intValue", nullptr, nullptr), 42);
-  EXPECT_EQ(raw.at("stringValue", nullptr, nullptr), nullptr);
-  EXPECT_EQ(raw.at("boolValue", nullptr, nullptr), nullptr);
-  EXPECT_EQ((int)*raw.at("intValue", nullptr, nullptr), 42);
+  EXPECT_EQ((int)*raw.at("intValue"), 42);
+  EXPECT_EQ(raw.at("doubleValue"), nullptr);
+  EXPECT_EQ(raw.at("floatValue"), nullptr);
+  EXPECT_EQ((int)*raw.at("intValue"), 42);
+  EXPECT_EQ(raw.at("stringValue"), nullptr);
+  EXPECT_EQ(raw.at("boolValue"), nullptr);
+  EXPECT_EQ((int)*raw.at("intValue"), 42);
 }
 
 #ifdef REACT_NATIVE_DEBUG
@@ -351,8 +341,8 @@ TEST(RawPropsTest, handleRawPropsPrimitiveTypesIncorrectLookup) {
   // Before D18662135, looking up an invalid key would trigger
   // an infinite loop. This is out of contract, so we should only
   // test this in debug.
-  EXPECT_EQ(raw.at("flurb", nullptr, nullptr), nullptr);
-  EXPECT_EQ((int)*raw.at("intValue", nullptr, nullptr), 42);
+  EXPECT_EQ(raw.at("flurb"), nullptr);
+  EXPECT_EQ((int)*raw.at("intValue"), 42);
 }
 #endif
 

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/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/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/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/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/element/tests/ElementTest.cpp

@@ -26,7 +26,7 @@ TEST(ElementTest, testNormalCases) {
   auto shadowNodeAB = std::shared_ptr<ViewShadowNode>{};
   auto shadowNodeABA = std::shared_ptr<ViewShadowNode>{};
 
-  auto propsAA = std::make_shared<ViewShadowNodeProps>();
+  auto propsAA = std::make_shared<ViewProps>();
   propsAA->nativeId = "node AA";
 
   // clang-format off
@@ -51,7 +51,7 @@ TEST(ElementTest, testNormalCases) {
             .reference(shadowNodeAB)
             .tag(3)
             .props([]() {
-               auto props = std::make_shared<ViewShadowNodeProps>();
+               auto props = std::make_shared<ViewProps>();
                props->nativeId = "node AB";
                return props;
             })
@@ -60,7 +60,7 @@ TEST(ElementTest, testNormalCases) {
                 .reference(shadowNodeABA)
                 .tag(4)
                 .props([]() {
-                  auto props = std::make_shared<ViewShadowNodeProps>();
+                  auto props = std::make_shared<ViewProps>();
                   props->nativeId = "node ABA";
                   return props;
                 })

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/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/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/android/react/renderer/imagemanager/conversions.h

@@ -37,12 +37,29 @@ constexpr MapBuffer::Key IS_KEY_ANALYTIC_TAG = 14;
 constexpr MapBuffer::Key IS_KEY_TAG = 15;
 constexpr MapBuffer::Key IS_KEY_VIEW_WIDTH = 16;
 constexpr MapBuffer::Key IS_KEY_VIEW_HEIGHT = 17;
+constexpr MapBuffer::Key IS_KEY_CACHE_CONTROL = 18;
+
+inline std::string cacheStrategyToString(ImageSource::CacheStategy cache)
+{
+  switch (cache) {
+    case ImageSource::CacheStategy::Reload:
+      return "reload";
+    case ImageSource::CacheStategy::ForceCache:
+      return "force-cache";
+    case ImageSource::CacheStategy::OnlyIfCached:
+      return "only-if-cached";
+    case ImageSource::CacheStategy::Default:
+    default:
+      return "default";
+  }
+}
 
 inline void serializeImageSource(MapBufferBuilder &builder, const ImageSource &imageSource)
 {
   builder.putString(IS_KEY_URI, imageSource.uri);
   builder.putInt(IS_KEY_IMAGE_WIDTH, static_cast<int32_t>(imageSource.size.width));
   builder.putInt(IS_KEY_IMAGE_HEIGHT, static_cast<int32_t>(imageSource.size.height));
+  builder.putString(IS_KEY_CACHE_CONTROL, cacheStrategyToString(imageSource.cache));
 }
 
 inline void serializeImageRequestParams(MapBufferBuilder &builder, const ImageRequestParams &imageRequestParams)

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/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/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/renderer/imagemanager/RCTSyncImageManager.mm

@@ -76,7 +76,7 @@ using namespace facebook::react;
     observerCoordinator->nativeImageResponseProgress((float)progress / (float)total, progress, total);
   };
 
-  RCTImageURLLoaderRequest *loaderRequest =
+  RCTImageURLLoaderRequest *__unused loaderRequest =
       [self->_imageLoader loadImageWithURLRequest:request
                                              size:CGSizeMake(imageSource.size.width, imageSource.size.height)
                                             scale:imageSource.scale