react-native 0.69.3 → 0.70.0-rc.2

package/ReactCommon/react/renderer/components/text/BaseTextProps.cpp

@@ -12,9 +12,27 @@
 #include <react/renderer/debug/DebugStringConvertibleItem.h>
 #include <react/renderer/graphics/conversions.h>
 
+#define GET_FIELD_VALUE(field, fieldName, defaultValue, rawValue) \
+  (rawValue.hasValue() ? ({                                       \
+    decltype(defaultValue) res;                                   \
+    fromRawValue(context, rawValue, res);                         \
+    res;                                                          \
+  })                                                              \
+                       : defaultValue)
+
+#define REBUILD_FIELD_SWITCH_CASE(                                   \
+    defaults, rawValue, property, field, fieldName)                  \
+  case CONSTEXPR_RAW_PROPS_KEY_HASH(fieldName): {                    \
+    property.field =                                                 \
+        GET_FIELD_VALUE(field, fieldName, defaults.field, rawValue); \
+    return;                                                          \
+  }
+
 namespace facebook {
 namespace react {
 
+bool BaseTextProps::enablePropIteratorSetter = false;
+
 static TextAttributes convertRawProp(
     PropsParserContext const &context,
     RawProps const &rawProps,
@@ -22,25 +40,13 @@ static TextAttributes convertRawProp(
     TextAttributes const &defaultTextAttributes) {
   auto textAttributes = TextAttributes{};
 
-  // Color
+  // Color (not accessed by ViewProps)
   textAttributes.foregroundColor = convertRawProp(
       context,
       rawProps,
       "color",
       sourceTextAttributes.foregroundColor,
       defaultTextAttributes.foregroundColor);
-  textAttributes.backgroundColor = convertRawProp(
-      context,
-      rawProps,
-      "backgroundColor",
-      sourceTextAttributes.backgroundColor,
-      defaultTextAttributes.backgroundColor);
-  textAttributes.opacity = convertRawProp(
-      context,
-      rawProps,
-      "opacity",
-      sourceTextAttributes.opacity,
-      defaultTextAttributes.opacity);
 
   // Font
   textAttributes.fontFamily = convertRawProp(
@@ -166,6 +172,16 @@ static TextAttributes convertRawProp(
       sourceTextAttributes.isHighlighted,
       defaultTextAttributes.isHighlighted);
 
+  // In general, we want this class to access props in the same order
+  // that ViewProps accesses them in, so that RawPropParser can optimize
+  // accesses. This is both theoretical, and ParagraphProps takes advantage
+  // of this.
+  // In particular: accessibilityRole, opacity, and backgroundColor also
+  // are parsed first by ViewProps (and indirectly AccessibilityProps).
+  // However, since RawPropsParser will always store these props /before/
+  // the unique BaseTextProps props, it is most efficient to parse these, in
+  // order, /after/ all of the other BaseTextProps, so that the RawPropsParser
+  // index rolls over only once instead of twice.
   textAttributes.accessibilityRole = convertRawProp(
       context,
       rawProps,
@@ -173,6 +189,20 @@ static TextAttributes convertRawProp(
       sourceTextAttributes.accessibilityRole,
       defaultTextAttributes.accessibilityRole);
 
+  // Color (accessed in this order by ViewProps)
+  textAttributes.opacity = convertRawProp(
+      context,
+      rawProps,
+      "opacity",
+      sourceTextAttributes.opacity,
+      defaultTextAttributes.opacity);
+  textAttributes.backgroundColor = convertRawProp(
+      context,
+      rawProps,
+      "backgroundColor",
+      sourceTextAttributes.backgroundColor,
+      defaultTextAttributes.backgroundColor);
+
   return textAttributes;
 }
 
@@ -180,11 +210,95 @@ BaseTextProps::BaseTextProps(
     const PropsParserContext &context,
     const BaseTextProps &sourceProps,
     const RawProps &rawProps)
-    : textAttributes(convertRawProp(
-          context,
-          rawProps,
-          sourceProps.textAttributes,
-          TextAttributes{})){};
+    : textAttributes(
+          BaseTextProps::enablePropIteratorSetter
+              ? sourceProps.textAttributes
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    sourceProps.textAttributes,
+                    TextAttributes{})){};
+
+void BaseTextProps::setProp(
+    const PropsParserContext &context,
+    RawPropsPropNameHash hash,
+    const char *propName,
+    RawValue const &value) {
+  static auto defaults = TextAttributes{};
+
+  switch (hash) {
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults, value, textAttributes, foregroundColor, "color");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults, value, textAttributes, fontFamily, "fontFamily");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults, value, textAttributes, fontSize, "fontSize");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults,
+        value,
+        textAttributes,
+        fontSizeMultiplier,
+        "fontSizeMultiplier");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults, value, textAttributes, fontWeight, "fontWeight");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults, value, textAttributes, fontStyle, "fontStyle");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults, value, textAttributes, fontVariant, "fontVariant");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults, value, textAttributes, allowFontScaling, "allowFontScaling");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults, value, textAttributes, letterSpacing, "letterSpacing");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults, value, textAttributes, textTransform, "textTransform");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults, value, textAttributes, lineHeight, "lineHeight");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults, value, textAttributes, alignment, "textAlign");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults,
+        value,
+        textAttributes,
+        baseWritingDirection,
+        "baseWritingDirection");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults,
+        value,
+        textAttributes,
+        textDecorationColor,
+        "textDecorationColor");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults,
+        value,
+        textAttributes,
+        textDecorationLineType,
+        "textDecorationLine");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults,
+        value,
+        textAttributes,
+        textDecorationStyle,
+        "textDecorationStyle");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults, value, textAttributes, textShadowOffset, "textShadowOffset");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults, value, textAttributes, textShadowRadius, "textShadowRadius");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults, value, textAttributes, textShadowColor, "textShadowColor");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults, value, textAttributes, isHighlighted, "isHighlighted");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults,
+        value,
+        textAttributes,
+        accessibilityRole,
+        "accessibilityRole");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults, value, textAttributes, opacity, "opacity");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults, value, textAttributes, backgroundColor, "backgroundColor");
+  }
+}
 
 #pragma mark - DebugStringConvertible
 

package/ReactCommon/react/renderer/components/text/BaseTextProps.h

@@ -28,6 +28,14 @@ class BaseTextProps {
       const BaseTextProps &sourceProps,
       const RawProps &rawProps);
 
+  void setProp(
+      const PropsParserContext &context,
+      RawPropsPropNameHash hash,
+      const char *propName,
+      RawValue const &value);
+
+  static bool enablePropIteratorSetter;
+
 #pragma mark - Props
 
   TextAttributes textAttributes{};

package/ReactCommon/react/renderer/components/text/ParagraphProps.cpp

@@ -48,6 +48,25 @@ ParagraphProps::ParagraphProps(
   textAttributes.backgroundColor = {};
 };
 
+void ParagraphProps::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);
+  BaseTextProps::setProp(context, hash, propName, value);
+
+  /*
+   * These props are applied to `View`, therefore they must not be a part of
+   * base text attributes.
+   */
+  textAttributes.opacity = std::numeric_limits<Float>::quiet_NaN();
+  textAttributes.backgroundColor = {};
+}
+
 #pragma mark - DebugStringConvertible
 
 #if RN_DEBUG_STRING_CONVERTIBLE

package/ReactCommon/react/renderer/components/text/ParagraphProps.h

@@ -32,6 +32,12 @@ class ParagraphProps : public ViewProps, public BaseTextProps {
       ParagraphProps const &sourceProps,
       RawProps const &rawProps);
 
+  void setProp(
+      const PropsParserContext &context,
+      RawPropsPropNameHash hash,
+      const char *propName,
+      RawValue const &value);
+
 #pragma mark - Props
 
   /*

package/ReactCommon/react/renderer/components/text/TextProps.cpp

@@ -17,6 +17,15 @@ TextProps::TextProps(
     : Props(context, sourceProps, rawProps),
       BaseTextProps::BaseTextProps(context, sourceProps, rawProps){};
 
+void TextProps::setProp(
+    const PropsParserContext &context,
+    RawPropsPropNameHash hash,
+    const char *propName,
+    RawValue const &value) {
+  BaseTextProps::setProp(context, hash, propName, value);
+  Props::setProp(context, hash, propName, value);
+}
+
 #pragma mark - DebugStringConvertible
 
 #if RN_DEBUG_STRING_CONVERTIBLE

package/ReactCommon/react/renderer/components/text/TextProps.h

@@ -25,6 +25,12 @@ class TextProps : public Props, public BaseTextProps {
       const TextProps &sourceProps,
       const RawProps &rawProps);
 
+  void setProp(
+      const PropsParserContext &context,
+      RawPropsPropNameHash hash,
+      const char *propName,
+      RawValue const &value);
+
 #pragma mark - DebugStringConvertible
 
 #if RN_DEBUG_STRING_CONVERTIBLE

package/ReactCommon/react/renderer/components/textinput/BUCK

@@ -54,7 +54,7 @@ rn_xplat_cxx_library(
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
         "//xplat/folly:container_evicting_cache_map",
-        "//xplat/folly:headers_only",
+        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         YOGA_CXX_TARGET,

package/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp

@@ -258,6 +258,15 @@ AndroidTextInputProps::AndroidTextInputProps(
           hasValue(rawProps, sourceProps.hasPaddingEnd, "End", "padding", "")) {
 }
 
+void AndroidTextInputProps::setProp(
+    const PropsParserContext &context,
+    RawPropsPropNameHash hash,
+    const char *propName,
+    RawValue const &value) {
+  ViewProps::setProp(context, hash, propName, value);
+  BaseTextProps::setProp(context, hash, propName, value);
+}
+
 // TODO T53300085: support this in codegen; this was hand-written
 folly::dynamic AndroidTextInputProps::getDynamic() const {
   folly::dynamic props = folly::dynamic::object();

package/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h

@@ -105,6 +105,12 @@ class AndroidTextInputProps final : public ViewProps, public BaseTextProps {
       const AndroidTextInputProps &sourceProps,
       const RawProps &rawProps);
 
+  void setProp(
+      const PropsParserContext &context,
+      RawPropsPropNameHash hash,
+      const char *propName,
+      RawValue const &value);
+
   folly::dynamic getDynamic() const;
 
 #pragma mark - Props

package/ReactCommon/react/renderer/components/textinput/iostextinput/BUCK

@@ -51,7 +51,7 @@ rn_xplat_cxx_library(
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
         "//xplat/folly:container_evicting_cache_map",
-        "//xplat/folly:headers_only",
+        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         YOGA_CXX_TARGET,

package/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.cpp

@@ -107,6 +107,15 @@ TextInputProps::TextInputProps(
           sourceProps.onChangeSync,
           {})){};
 
+void TextInputProps::setProp(
+    const PropsParserContext &context,
+    RawPropsPropNameHash hash,
+    const char *propName,
+    RawValue const &value) {
+  ViewProps::setProp(context, hash, propName, value);
+  BaseTextProps::setProp(context, hash, propName, value);
+}
+
 TextAttributes TextInputProps::getEffectiveTextAttributes(
     Float fontSizeMultiplier) const {
   auto result = TextAttributes::defaultTextAttributes();

package/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.h

@@ -31,6 +31,12 @@ class TextInputProps final : public ViewProps, public BaseTextProps {
       TextInputProps const &sourceProps,
       RawProps const &rawProps);
 
+  void setProp(
+      const PropsParserContext &context,
+      RawPropsPropNameHash hash,
+      const char *propName,
+      RawValue const &value);
+
 #pragma mark - Props
 
   TextInputTraits const traits{};

package/ReactCommon/react/renderer/components/unimplementedview/BUCK

@@ -46,7 +46,7 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only",
+        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         YOGA_CXX_TARGET,