Support iterator-style prop parsing in ImageProps

Summary: Support iterator-style prop parsing in ImageProps Changelog: [Internal] Reviewed By: javache Differential Revision: D38834100 fbshipit-source-id: 69274595cca8e6f40cd5e0ad9aac1582f57acc61
fabOnReact · Oct 2, 2022 · 2319f75 · 2319f75
1 parent 4766755
commit 2319f75
Show file tree

Hide file tree

Showing 3 changed files with 94 additions and 44 deletions.
diff --git a/ReactCommon/react/renderer/components/image/ImageProps.cpp b/ReactCommon/react/renderer/components/image/ImageProps.cpp
@@ -18,43 +18,83 @@ ImageProps::ImageProps(
     const RawProps &rawProps)
     : ViewProps(context, sourceProps, rawProps),
       sources(
-          convertRawProp(context, rawProps, "source", sourceProps.sources, {})),
-      defaultSources(convertRawProp(
-          context,
-          rawProps,
-          "defaultSource",
-          sourceProps.defaultSources,
-          {})),
-      resizeMode(convertRawProp(
-          context,
-          rawProps,
-          "resizeMode",
-          sourceProps.resizeMode,
-          ImageResizeMode::Stretch)),
-      blurRadius(convertRawProp(
-          context,
-          rawProps,
-          "blurRadius",
-          sourceProps.blurRadius,
-          {})),
-      capInsets(convertRawProp(
-          context,
-          rawProps,
-          "capInsets",
-          sourceProps.capInsets,
-          {})),
-      tintColor(convertRawProp(
-          context,
-          rawProps,
-          "tintColor",
-          sourceProps.tintColor,
-          {})),
-      internal_analyticTag(convertRawProp(
-          context,
-          rawProps,
-          "internal_analyticTag",
-          sourceProps.internal_analyticTag,
-          {})) {}
+          Props::enablePropIteratorSetter ? sourceProps.sources
+                                          : convertRawProp(
+                                                context,
+                                                rawProps,
+                                                "source",
+                                                sourceProps.sources,
+                                                {})),
+      defaultSources(
+          Props::enablePropIteratorSetter ? sourceProps.defaultSources
+                                          : convertRawProp(
+                                                context,
+                                                rawProps,
+                                                "defaultSource",
+                                                sourceProps.defaultSources,
+                                                {})),
+      resizeMode(
+          Props::enablePropIteratorSetter ? sourceProps.resizeMode
+                                          : convertRawProp(
+                                                context,
+                                                rawProps,
+                                                "resizeMode",
+                                                sourceProps.resizeMode,
+                                                ImageResizeMode::Stretch)),
+      blurRadius(
+          Props::enablePropIteratorSetter ? sourceProps.blurRadius
+                                          : convertRawProp(
+                                                context,
+                                                rawProps,
+                                                "blurRadius",
+                                                sourceProps.blurRadius,
+                                                {})),
+      capInsets(
+          Props::enablePropIteratorSetter ? sourceProps.capInsets
+                                          : convertRawProp(
+                                                context,
+                                                rawProps,
+                                                "capInsets",
+                                                sourceProps.capInsets,
+                                                {})),
+      tintColor(
+          Props::enablePropIteratorSetter ? sourceProps.tintColor
+                                          : convertRawProp(
+                                                context,
+                                                rawProps,
+                                                "tintColor",
+                                                sourceProps.tintColor,
+                                                {})),
+      internal_analyticTag(
+          Props::enablePropIteratorSetter
+              ? sourceProps.internal_analyticTag
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "internal_analyticTag",
+                    sourceProps.internal_analyticTag,
+                    {})) {}
+
+void ImageProps::setProp(
+    const PropsParserContext &context,
+    RawPropsPropNameHash hash,
+    const char *propName,
+    RawValue const &value) {
+  // All Props structs setProp methods must always, unconditionally,
+  // call all super::setProp methods, since multiple structs may
+  // reuse the same values.
+  ViewProps::setProp(context, hash, propName, value);
+
+  switch (hash) {
+    RAW_SET_PROP_SWITCH_CASE(sources, "source", {});
+    RAW_SET_PROP_SWITCH_CASE(defaultSources, "defaultSource", {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(resizeMode, ImageResizeMode::Stretch);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(blurRadius, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(capInsets, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(tintColor, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(internal_analyticTag, {});
+  }
+}
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/renderer/components/image/ImageProps.h b/ReactCommon/react/renderer/components/image/ImageProps.h
@@ -22,15 +22,21 @@ class ImageProps final : public ViewProps {
       const ImageProps &sourceProps,
       const RawProps &rawProps);
 
+  void setProp(
+      const PropsParserContext &context,
+      RawPropsPropNameHash hash,
+      const char *propName,
+      RawValue const &value);
+
 #pragma mark - Props
 
-  const ImageSources sources{};
-  const ImageSources defaultSources{};
-  const ImageResizeMode resizeMode{ImageResizeMode::Stretch};
-  const Float blurRadius{};
-  const EdgeInsets capInsets{};
-  const SharedColor tintColor{};
-  const std::string internal_analyticTag{};
+  ImageSources sources{};
+  ImageSources defaultSources{};
+  ImageResizeMode resizeMode{ImageResizeMode::Stretch};
+  Float blurRadius{};
+  EdgeInsets capInsets{};
+  SharedColor tintColor{};
+  std::string internal_analyticTag{};
 };
 
 } // namespace react

diff --git a/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp b/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp
@@ -303,7 +303,11 @@ void ScrollViewProps::setProp(
     RawPropsPropNameHash hash,
     const char *propName,
     RawValue const &value) {
+  // All Props structs setProp methods must always, unconditionally,
+  // call all super::setProp methods, since multiple structs may
+  // reuse the same values.
   ViewProps::setProp(context, hash, propName, value);
+
   switch (hash) {
     RAW_SET_PROP_SWITCH_CASE_BASIC(alwaysBounceHorizontal, {});
     RAW_SET_PROP_SWITCH_CASE_BASIC(alwaysBounceVertical, {});