react-native 0.0.0-263478b91 → 0.0.0-268efb102

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

@@ -9,6 +9,7 @@
 
 #include <react/renderer/attributedstring/TextAttributes.h>
 #include <react/renderer/core/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/graphics/Color.h>
 #include <react/renderer/graphics/Geometry.h>
 
@@ -22,7 +23,10 @@ namespace react {
 class BaseTextProps {
  public:
   BaseTextProps() = default;
-  BaseTextProps(const BaseTextProps &sourceProps, const RawProps &rawProps);
+  BaseTextProps(
+      const PropsParserContext &context,
+      const BaseTextProps &sourceProps,
+      const RawProps &rawProps);
 
 #pragma mark - Props
 

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

@@ -33,7 +33,7 @@ void BaseTextShadowNode::buildAttributedString(
   for (auto const &childNode : parentNode.getChildren()) {
     // RawShadowNode
     auto rawTextShadowNode =
-        std::dynamic_pointer_cast<RawTextShadowNode const>(childNode);
+        traitCast<RawTextShadowNode const *>(childNode.get());
     if (rawTextShadowNode) {
       auto fragment = AttributedString::Fragment{};
       fragment.string = rawTextShadowNode->getConcreteProps().text;
@@ -49,8 +49,7 @@ void BaseTextShadowNode::buildAttributedString(
     }
 
     // TextShadowNode
-    auto textShadowNode =
-        std::dynamic_pointer_cast<TextShadowNode const>(childNode);
+    auto textShadowNode = traitCast<TextShadowNode const *>(childNode.get());
     if (textShadowNode) {
       auto localTextAttributes = baseTextAttributes;
       localTextAttributes.apply(

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

@@ -7,11 +7,8 @@
 
 #pragma once
 
-#include "ParagraphShadowNode.h"
-
-#include <react/config/ReactNativeConfig.h>
 #include <react/debug/react_native_assert.h>
-#include <react/renderer/components/view/ViewPropsInterpolation.h>
+#include <react/renderer/components/text/ParagraphShadowNode.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 #include <react/renderer/textlayoutmanager/TextLayoutManager.h>
 #include <react/utils/ContextContainer.h>
@@ -32,18 +29,6 @@ class ParagraphComponentDescriptor final
     textLayoutManager_ = std::make_shared<TextLayoutManager>(contextContainer_);
   }
 
-  virtual SharedProps interpolateProps(
-      float animationProgress,
-      const SharedProps &props,
-      const SharedProps &newProps) const override {
-    SharedProps interpolatedPropsShared = cloneProps(newProps, {});
-
-    interpolateViewProps(
-        animationProgress, props, newProps, interpolatedPropsShared);
-
-    return interpolatedPropsShared;
-  };
-
  protected:
   void adopt(ShadowNode::Unshared const &shadowNode) const override {
     ConcreteComponentDescriptor::adopt(shadowNode);

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

@@ -18,18 +18,24 @@ namespace facebook {
 namespace react {
 
 ParagraphProps::ParagraphProps(
+    const PropsParserContext &context,
     ParagraphProps const &sourceProps,
     RawProps const &rawProps)
-    : ViewProps(sourceProps, rawProps),
-      BaseTextProps(sourceProps, rawProps),
-      paragraphAttributes(
-          convertRawProp(rawProps, sourceProps.paragraphAttributes, {})),
+    : ViewProps(context, sourceProps, rawProps),
+      BaseTextProps(context, sourceProps, rawProps),
+      paragraphAttributes(convertRawProp(
+          context,
+          rawProps,
+          sourceProps.paragraphAttributes,
+          {})),
       isSelectable(convertRawProp(
+          context,
           rawProps,
           "selectable",
           sourceProps.isSelectable,
           false)),
       onTextLayout(convertRawProp(
+          context,
           rawProps,
           "onTextLayout",
           sourceProps.onTextLayout,

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

@@ -14,6 +14,7 @@
 #include <react/renderer/components/text/BaseTextProps.h>
 #include <react/renderer/components/view/ViewProps.h>
 #include <react/renderer/core/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -26,7 +27,10 @@ namespace react {
 class ParagraphProps : public ViewProps, public BaseTextProps {
  public:
   ParagraphProps() = default;
-  ParagraphProps(ParagraphProps const &sourceProps, RawProps const &rawProps);
+  ParagraphProps(
+      const PropsParserContext &context,
+      ParagraphProps const &sourceProps,
+      RawProps const &rawProps);
 
 #pragma mark - Props
 

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

@@ -78,8 +78,8 @@ Content ParagraphShadowNode::getContentWithMeasuredAttachments(
         laytableShadowNode->measure(layoutContext, localLayoutConstraints);
 
     // Rounding to *next* value on the pixel grid.
-    size.width += 0.01;
-    size.height += 0.01;
+    size.width += 0.01f;
+    size.height += 0.01f;
     size = roundToPixel<&ceil>(size, layoutContext.pointScaleFactor);
 
     auto fragmentLayoutMetrics = LayoutMetrics{};
@@ -186,7 +186,7 @@ void ParagraphShadowNode::layout(LayoutContext layoutContext) {
   react_native_assert(
       content.attachments.size() == measurement.attachments.size());
 
-  for (auto i = 0; i < content.attachments.size(); i++) {
+  for (size_t i = 0; i < content.attachments.size(); i++) {
     auto &attachment = content.attachments.at(i);
 
     if (!traitCast<LayoutableShadowNode const *>(attachment.shadowNode)) {

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

@@ -14,10 +14,11 @@ namespace facebook {
 namespace react {
 
 RawTextProps::RawTextProps(
+    const PropsParserContext &context,
     const RawTextProps &sourceProps,
     const RawProps &rawProps)
-    : Props(sourceProps, rawProps),
-      text(convertRawProp(rawProps, "text", sourceProps.text, {})){};
+    : Props(context, sourceProps, rawProps),
+      text(convertRawProp(context, rawProps, "text", sourceProps.text, {})){};
 
 #pragma mark - DebugStringConvertible
 

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

@@ -10,6 +10,7 @@
 #include <memory>
 
 #include <react/renderer/core/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook {
@@ -22,7 +23,10 @@ using SharedRawTextProps = std::shared_ptr<const RawTextProps>;
 class RawTextProps : public Props {
  public:
   RawTextProps() = default;
-  RawTextProps(const RawTextProps &sourceProps, const RawProps &rawProps);
+  RawTextProps(
+      const PropsParserContext &context,
+      const RawTextProps &sourceProps,
+      const RawProps &rawProps);
 
 #pragma mark - Props
 

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

@@ -21,8 +21,42 @@ extern const char RawTextComponentName[];
  * is represented as `<RawText text="Hello!"/>`.
  * <RawText> component must not have any children.
  */
-using RawTextShadowNode =
-    ConcreteShadowNode<RawTextComponentName, ShadowNode, RawTextProps>;
+class RawTextShadowNode : public ConcreteShadowNode<
+                              RawTextComponentName,
+                              ShadowNode,
+                              RawTextProps> {
+ public:
+  using ConcreteShadowNode::ConcreteShadowNode;
+  static ShadowNodeTraits BaseTraits() {
+    auto traits = ConcreteShadowNode::BaseTraits();
+    traits.set(ShadowNodeTraits::Trait::RawText);
+    return traits;
+  }
+};
+
+template <>
+inline RawTextShadowNode const &traitCast<RawTextShadowNode const &>(
+    ShadowNode const &shadowNode) {
+  bool castable =
+      shadowNode.getTraits().check(ShadowNodeTraits::Trait::RawText);
+  react_native_assert(castable);
+  (void)castable;
+  return static_cast<RawTextShadowNode const &>(shadowNode);
+}
+
+template <>
+inline RawTextShadowNode const *traitCast<RawTextShadowNode const *>(
+    ShadowNode const *shadowNode) {
+  if (!shadowNode) {
+    return nullptr;
+  }
+  bool castable =
+      shadowNode->getTraits().check(ShadowNodeTraits::Trait::RawText);
+  if (!castable) {
+    return nullptr;
+  }
+  return static_cast<RawTextShadowNode const *>(shadowNode);
+}
 
 } // namespace react
 } // namespace facebook

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

@@ -10,9 +10,12 @@
 namespace facebook {
 namespace react {
 
-TextProps::TextProps(const TextProps &sourceProps, const RawProps &rawProps)
-    : Props(sourceProps, rawProps),
-      BaseTextProps::BaseTextProps(sourceProps, rawProps){};
+TextProps::TextProps(
+    const PropsParserContext &context,
+    const TextProps &sourceProps,
+    const RawProps &rawProps)
+    : Props(context, sourceProps, rawProps),
+      BaseTextProps::BaseTextProps(context, sourceProps, rawProps){};
 
 #pragma mark - DebugStringConvertible
 

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

@@ -10,6 +10,7 @@
 #include <react/renderer/attributedstring/TextAttributes.h>
 #include <react/renderer/components/text/BaseTextProps.h>
 #include <react/renderer/core/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/graphics/Color.h>
 #include <react/renderer/graphics/Geometry.h>
 
@@ -19,7 +20,10 @@ namespace react {
 class TextProps : public Props, public BaseTextProps {
  public:
   TextProps() = default;
-  TextProps(const TextProps &sourceProps, const RawProps &rawProps);
+  TextProps(
+      const PropsParserContext &context,
+      const TextProps &sourceProps,
+      const RawProps &rawProps);
 
 #pragma mark - DebugStringConvertible
 

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

@@ -34,6 +34,7 @@ class TextShadowNode : public ConcreteShadowNode<
 #ifdef ANDROID
     traits.set(ShadowNodeTraits::Trait::FormsView);
 #endif
+    traits.set(ShadowNodeTraits::Trait::Text);
 
     return traits;
   }
@@ -57,5 +58,27 @@ class TextShadowNode : public ConcreteShadowNode<
 #endif
 };
 
+template <>
+inline TextShadowNode const &traitCast<TextShadowNode const &>(
+    ShadowNode const &shadowNode) {
+  bool castable = shadowNode.getTraits().check(ShadowNodeTraits::Trait::Text);
+  react_native_assert(castable);
+  (void)castable;
+  return static_cast<TextShadowNode const &>(shadowNode);
+}
+
+template <>
+inline TextShadowNode const *traitCast<TextShadowNode const *>(
+    ShadowNode const *shadowNode) {
+  if (!shadowNode) {
+    return nullptr;
+  }
+  bool castable = shadowNode->getTraits().check(ShadowNodeTraits::Trait::Text);
+  if (!castable) {
+    return nullptr;
+  }
+  return static_cast<TextShadowNode const *>(shadowNode);
+}
+
 } // namespace react
 } // namespace facebook

package/ReactCommon/react/renderer/components/textinput/Android.mk

@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_mounting libreact_render_componentregistry libreact_render_debug libreact_render_graphics libreact_render_uimanager libreact_render_imagemanager libreact_render_textlayoutmanager libreact_render_attributedstring librrc_text librrc_image librrc_view libreact_utils libreact_debug libreact_render_mapbuffer
+LOCAL_SHARED_LIBRARIES := libjsi libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_mounting libreact_render_componentregistry libreact_render_debug libreact_render_graphics libreact_render_uimanager libreact_render_imagemanager libreact_render_textlayoutmanager libreact_render_attributedstring librrc_text librrc_image librrc_view libreact_utils libreact_debug libreact_render_mapbuffer
 
 include $(BUILD_SHARED_LIBRARY)
 

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

@@ -37,215 +37,182 @@ static bool hasValue(
 }
 
 AndroidTextInputProps::AndroidTextInputProps(
+    const PropsParserContext &context,
     const AndroidTextInputProps &sourceProps,
     const RawProps &rawProps)
-    : ViewProps(sourceProps, rawProps),
-      BaseTextProps(sourceProps, rawProps),
-      autoCompleteType(convertRawProp(
+    : ViewProps(context, sourceProps, rawProps),
+      BaseTextProps(context, sourceProps, rawProps),
+      autoComplete(convertRawProp(
+          context,
           rawProps,
-          "autoCompleteType",
-          sourceProps.autoCompleteType,
+          "autoComplete",
+          sourceProps.autoComplete,
           {})),
-      returnKeyLabel(convertRawProp(
-          rawProps,
+      returnKeyLabel(convertRawProp(context, rawProps,
           "returnKeyLabel",
           sourceProps.returnKeyLabel,
           {})),
-      numberOfLines(convertRawProp(
-          rawProps,
+      numberOfLines(convertRawProp(context, rawProps,
           "numberOfLines",
           sourceProps.numberOfLines,
           {0})),
-      disableFullscreenUI(convertRawProp(
-          rawProps,
+      disableFullscreenUI(convertRawProp(context, rawProps,
           "disableFullscreenUI",
           sourceProps.disableFullscreenUI,
           {false})),
-      textBreakStrategy(convertRawProp(
-          rawProps,
+      textBreakStrategy(convertRawProp(context, rawProps,
           "textBreakStrategy",
           sourceProps.textBreakStrategy,
           {})),
-      underlineColorAndroid(convertRawProp(
-          rawProps,
+      underlineColorAndroid(convertRawProp(context, rawProps,
           "underlineColorAndroid",
           sourceProps.underlineColorAndroid,
           {})),
-      inlineImageLeft(convertRawProp(
-          rawProps,
+      inlineImageLeft(convertRawProp(context, rawProps,
           "inlineImageLeft",
           sourceProps.inlineImageLeft,
           {})),
-      inlineImagePadding(convertRawProp(
-          rawProps,
+      inlineImagePadding(convertRawProp(context, rawProps,
           "inlineImagePadding",
           sourceProps.inlineImagePadding,
           {0})),
-      importantForAutofill(convertRawProp(
-          rawProps,
+      importantForAutofill(convertRawProp(context, rawProps,
           "importantForAutofill",
           sourceProps.importantForAutofill,
           {})),
-      showSoftInputOnFocus(convertRawProp(
-          rawProps,
+      showSoftInputOnFocus(convertRawProp(context, rawProps,
           "showSoftInputOnFocus",
           sourceProps.showSoftInputOnFocus,
           {false})),
-      autoCapitalize(convertRawProp(
-          rawProps,
+      autoCapitalize(convertRawProp(context, rawProps,
           "autoCapitalize",
           sourceProps.autoCapitalize,
           {})),
-      autoCorrect(convertRawProp(
-          rawProps,
+      autoCorrect(convertRawProp(context, rawProps,
           "autoCorrect",
           sourceProps.autoCorrect,
           {false})),
-      autoFocus(convertRawProp(
-          rawProps,
+      autoFocus(convertRawProp(context, rawProps,
           "autoFocus",
           sourceProps.autoFocus,
           {false})),
-      allowFontScaling(convertRawProp(
-          rawProps,
+      allowFontScaling(convertRawProp(context, rawProps,
           "allowFontScaling",
           sourceProps.allowFontScaling,
           {false})),
-      maxFontSizeMultiplier(convertRawProp(
-          rawProps,
+      maxFontSizeMultiplier(convertRawProp(context, rawProps,
           "maxFontSizeMultiplier",
           sourceProps.maxFontSizeMultiplier,
           {0.0})),
       editable(
-          convertRawProp(rawProps, "editable", sourceProps.editable, {false})),
-      keyboardType(convertRawProp(
-          rawProps,
+          convertRawProp(context, rawProps, "editable", sourceProps.editable, {false})),
+      keyboardType(convertRawProp(context, rawProps,
           "keyboardType",
           sourceProps.keyboardType,
           {})),
-      returnKeyType(convertRawProp(
-          rawProps,
+      returnKeyType(convertRawProp(context, rawProps,
           "returnKeyType",
           sourceProps.returnKeyType,
           {})),
       maxLength(
-          convertRawProp(rawProps, "maxLength", sourceProps.maxLength, {0})),
-      multiline(convertRawProp(
-          rawProps,
+          convertRawProp(context, rawProps, "maxLength", sourceProps.maxLength, {0})),
+      multiline(convertRawProp(context, rawProps,
           "multiline",
           sourceProps.multiline,
           {false})),
       placeholder(
-          convertRawProp(rawProps, "placeholder", sourceProps.placeholder, {})),
-      placeholderTextColor(convertRawProp(
-          rawProps,
+          convertRawProp(context, rawProps, "placeholder", sourceProps.placeholder, {})),
+      placeholderTextColor(convertRawProp(context, rawProps,
           "placeholderTextColor",
           sourceProps.placeholderTextColor,
           {})),
-      secureTextEntry(convertRawProp(
-          rawProps,
+      secureTextEntry(convertRawProp(context, rawProps,
           "secureTextEntry",
           sourceProps.secureTextEntry,
           {false})),
-      selectionColor(convertRawProp(
-          rawProps,
+      selectionColor(convertRawProp(context, rawProps,
           "selectionColor",
           sourceProps.selectionColor,
           {})),
       selection(
-          convertRawProp(rawProps, "selection", sourceProps.selection, {})),
-      value(convertRawProp(rawProps, "value", sourceProps.value, {})),
-      defaultValue(convertRawProp(
-          rawProps,
+          convertRawProp(context, rawProps, "selection", sourceProps.selection, {})),
+      value(convertRawProp(context, rawProps, "value", sourceProps.value, {})),
+      defaultValue(convertRawProp(context, rawProps,
           "defaultValue",
           sourceProps.defaultValue,
           {})),
-      selectTextOnFocus(convertRawProp(
-          rawProps,
+      selectTextOnFocus(convertRawProp(context, rawProps,
           "selectTextOnFocus",
           sourceProps.selectTextOnFocus,
           {false})),
-      blurOnSubmit(convertRawProp(
-          rawProps,
+      blurOnSubmit(convertRawProp(context, rawProps,
           "blurOnSubmit",
           sourceProps.blurOnSubmit,
           {false})),
-      caretHidden(convertRawProp(
-          rawProps,
+      caretHidden(convertRawProp(context, rawProps,
           "caretHidden",
           sourceProps.caretHidden,
           {false})),
-      contextMenuHidden(convertRawProp(
-          rawProps,
+      contextMenuHidden(convertRawProp(context, rawProps,
           "contextMenuHidden",
           sourceProps.contextMenuHidden,
           {false})),
-      textShadowColor(convertRawProp(
-          rawProps,
+      textShadowColor(convertRawProp(context, rawProps,
           "textShadowColor",
           sourceProps.textShadowColor,
           {})),
-      textShadowRadius(convertRawProp(
-          rawProps,
+      textShadowRadius(convertRawProp(context, rawProps,
           "textShadowRadius",
           sourceProps.textShadowRadius,
           {0.0})),
-      textDecorationLine(convertRawProp(
-          rawProps,
+      textDecorationLine(convertRawProp(context, rawProps,
           "textDecorationLine",
           sourceProps.textDecorationLine,
           {})),
       fontStyle(
-          convertRawProp(rawProps, "fontStyle", sourceProps.fontStyle, {})),
-      textShadowOffset(convertRawProp(
-          rawProps,
+          convertRawProp(context, rawProps, "fontStyle", sourceProps.fontStyle, {})),
+      textShadowOffset(convertRawProp(context, rawProps,
           "textShadowOffset",
           sourceProps.textShadowOffset,
           {})),
-      lineHeight(convertRawProp(
-          rawProps,
+      lineHeight(convertRawProp(context, rawProps,
           "lineHeight",
           sourceProps.lineHeight,
           {0.0})),
-      textTransform(convertRawProp(
-          rawProps,
+      textTransform(convertRawProp(context, rawProps,
           "textTransform",
           sourceProps.textTransform,
           {})),
-      color(convertRawProp(rawProps, "color", sourceProps.color, {0})),
-      letterSpacing(convertRawProp(
-          rawProps,
+      color(0 /*convertRawProp(context, rawProps, "color", sourceProps.color, {0})*/),
+      letterSpacing(convertRawProp(context, rawProps,
           "letterSpacing",
           sourceProps.letterSpacing,
           {0.0})),
       fontSize(
-          convertRawProp(rawProps, "fontSize", sourceProps.fontSize, {0.0})),
+          convertRawProp(context, rawProps, "fontSize", sourceProps.fontSize, {0.0})),
       textAlign(
-          convertRawProp(rawProps, "textAlign", sourceProps.textAlign, {})),
-      includeFontPadding(convertRawProp(
-          rawProps,
+          convertRawProp(context, rawProps, "textAlign", sourceProps.textAlign, {})),
+      includeFontPadding(convertRawProp(context, rawProps,
           "includeFontPadding",
           sourceProps.includeFontPadding,
           {false})),
       fontWeight(
-          convertRawProp(rawProps, "fontWeight", sourceProps.fontWeight, {})),
+          convertRawProp(context, rawProps, "fontWeight", sourceProps.fontWeight, {})),
       fontFamily(
-          convertRawProp(rawProps, "fontFamily", sourceProps.fontFamily, {})),
-      textAlignVertical(convertRawProp(
-          rawProps,
+          convertRawProp(context, rawProps, "fontFamily", sourceProps.fontFamily, {})),
+      textAlignVertical(convertRawProp(context, rawProps,
           "textAlignVertical",
           sourceProps.textAlignVertical,
           {})),
       cursorColor(
-          convertRawProp(rawProps, "cursorColor", sourceProps.cursorColor, {})),
-      mostRecentEventCount(convertRawProp(
-          rawProps,
+          convertRawProp(context, rawProps, "cursorColor", sourceProps.cursorColor, {})),
+      mostRecentEventCount(convertRawProp(context, rawProps,
           "mostRecentEventCount",
           sourceProps.mostRecentEventCount,
           {0})),
-      text(convertRawProp(rawProps, "text", sourceProps.text, {})),
+      text(convertRawProp(context, rawProps, "text", sourceProps.text, {})),
       paragraphAttributes(
-          convertRawProp(rawProps, sourceProps.paragraphAttributes, {})),
+          convertRawProp(context, rawProps, sourceProps.paragraphAttributes, {})),
       // See AndroidTextInputComponentDescriptor for usage
       // TODO T63008435: can these, and this feature, be removed entirely?
       hasPadding(hasValue(rawProps, sourceProps.hasPadding, "", "padding", "")),
@@ -294,7 +261,7 @@ AndroidTextInputProps::AndroidTextInputProps(
 // TODO T53300085: support this in codegen; this was hand-written
 folly::dynamic AndroidTextInputProps::getDynamic() const {
   folly::dynamic props = folly::dynamic::object();
-  props["autoCompleteType"] = autoCompleteType;
+  props["autoComplete"] = autoComplete;
   props["returnKeyLabel"] = returnKeyLabel;
   props["numberOfLines"] = numberOfLines;
   props["disableFullscreenUI"] = disableFullscreenUI;
@@ -332,7 +299,7 @@ folly::dynamic AndroidTextInputProps::getDynamic() const {
   props["textShadowOffset"] = toDynamic(textShadowOffset);
   props["lineHeight"] = lineHeight;
   props["textTransform"] = textTransform;
-  props["color"] = color;
+  props["color"] = toDynamic(color);
   props["letterSpacing"] = letterSpacing;
   props["fontSize"] = fontSize;
   props["textAlign"] = textAlign;