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

package/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.cpp

@@ -12,9 +12,10 @@ namespace facebook {
 namespace react {
 
 LegacyViewManagerInteropViewProps::LegacyViewManagerInteropViewProps(
+    const PropsParserContext &context,
     const LegacyViewManagerInteropViewProps &sourceProps,
     const RawProps &rawProps)
-    : ViewProps(sourceProps, rawProps),
+    : ViewProps(context, sourceProps, rawProps),
       otherProps(
           mergeDynamicProps(sourceProps.otherProps, (folly::dynamic)rawProps)) {
 }

package/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h

@@ -7,6 +7,7 @@
 
 #include <folly/dynamic.h>
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <unordered_map>
 
 namespace facebook {
@@ -16,6 +17,7 @@ class LegacyViewManagerInteropViewProps final : public ViewProps {
  public:
   LegacyViewManagerInteropViewProps() = default;
   LegacyViewManagerInteropViewProps(
+      const PropsParserContext &context,
       const LegacyViewManagerInteropViewProps &sourceProps,
       const RawProps &rawProps);
 

package/ReactCommon/react/renderer/components/root/BUCK

@@ -76,5 +76,6 @@ fb_xplat_cxx_test(
         ":root",
         "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
+        react_native_xplat_target("react/renderer/element:element"),
     ],
 )

package/ReactCommon/react/renderer/components/root/RootProps.cpp

@@ -13,10 +13,20 @@
 namespace facebook {
 namespace react {
 
-RootProps::RootProps(RootProps const &sourceProps, RawProps const &rawProps)
-    : ViewProps(sourceProps, rawProps) {}
+// Note that a default/empty context may be passed here from RootShadowNode.
+// If that's a problem and the context is necesary here, refactor RootShadowNode
+// first.
+RootProps::RootProps(
+    const PropsParserContext &context,
+    RootProps const &sourceProps,
+    RawProps const &rawProps)
+    : ViewProps(context, sourceProps, rawProps) {}
 
+// Note that a default/empty context may be passed here from RootShadowNode.
+// If that's a problem and the context is necesary here, refactor RootShadowNode
+// first.
 RootProps::RootProps(
+    const PropsParserContext &context,
     RootProps const &sourceProps,
     LayoutConstraints const &layoutConstraints,
     LayoutContext const &layoutContext)

package/ReactCommon/react/renderer/components/root/RootProps.h

@@ -12,6 +12,7 @@
 #include <react/renderer/components/view/ViewProps.h>
 #include <react/renderer/core/LayoutConstraints.h>
 #include <react/renderer/core/LayoutContext.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -19,8 +20,12 @@ namespace react {
 class RootProps final : public ViewProps {
  public:
   RootProps() = default;
-  RootProps(RootProps const &sourceProps, RawProps const &rawProps);
   RootProps(
+      const PropsParserContext &context,
+      RootProps const &sourceProps,
+      RawProps const &rawProps);
+  RootProps(
+      const PropsParserContext &context,
       RootProps const &sourceProps,
       LayoutConstraints const &layoutConstraints,
       LayoutContext const &layoutContext);

package/ReactCommon/react/renderer/components/root/RootShadowNode.cpp

@@ -39,10 +39,11 @@ Transform RootShadowNode::getTransform() const {
 }
 
 RootShadowNode::Unshared RootShadowNode::clone(
+    PropsParserContext const &propsParserContext,
     LayoutConstraints const &layoutConstraints,
     LayoutContext const &layoutContext) const {
   auto props = std::make_shared<RootProps const>(
-      getConcreteProps(), layoutConstraints, layoutContext);
+      propsParserContext, getConcreteProps(), layoutConstraints, layoutContext);
   auto newRootShadowNode = std::make_shared<RootShadowNode>(
       *this,
       ShadowNodeFragment{

package/ReactCommon/react/renderer/components/root/RootShadowNode.h

@@ -12,6 +12,7 @@
 #include <react/renderer/components/root/RootProps.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <react/renderer/core/LayoutContext.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -51,6 +52,7 @@ class RootShadowNode final
    * Clones the node with given `layoutConstraints` and `layoutContext`.
    */
   RootShadowNode::Unshared clone(
+      PropsParserContext const &propsParserContext,
       LayoutConstraints const &layoutConstraints,
       LayoutContext const &layoutContext) const;
 

package/ReactCommon/react/renderer/components/root/tests/RootShadowNodeTest.cpp

@@ -5,10 +5,42 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <memory>
+#include <react/renderer/components/root/RootComponentDescriptor.h>
+#include <react/renderer/core/PropsParserContext.h>
+#include <react/renderer/element/ComponentBuilder.h>
 
 #include <gtest/gtest.h>
+#include <react/renderer/element/Element.h>
+#include <react/renderer/element/testUtils.h>
 
-TEST(RootShadowNodeTest, testSomething) {
-  // TODO
+namespace facebook::react {
+
+TEST(RootShadowNodeTest, cloneWithLayoutConstraints) {
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  auto builder = simpleComponentBuilder();
+  std::shared_ptr<RootShadowNode> rootShadowNode;
+  LayoutConstraints defaultLayoutConstraints = {};
+
+  auto element =
+      Element<RootShadowNode>().reference(rootShadowNode).tag(1).props([&] {
+        auto sharedProps = std::make_shared<RootProps>();
+        sharedProps->layoutConstraints = defaultLayoutConstraints;
+        return sharedProps;
+      });
+
+  builder.build(element);
+
+  EXPECT_FALSE(rootShadowNode->getIsLayoutClean());
+  EXPECT_TRUE(rootShadowNode->layoutIfNeeded());
+  EXPECT_TRUE(rootShadowNode->getIsLayoutClean());
+
+  auto clonedWithDiffentLayoutConstraints = rootShadowNode->clone(
+      parserContext, LayoutConstraints{{0, 0}, {10, 10}}, {});
+
+  EXPECT_FALSE(clonedWithDiffentLayoutConstraints->getIsLayoutClean());
+  EXPECT_TRUE(clonedWithDiffentLayoutConstraints->layoutIfNeeded());
 }
+
+} // namespace facebook::react

package/ReactCommon/react/renderer/components/safeareaview/BUCK

@@ -34,7 +34,7 @@ rn_xplat_cxx_library(
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
-    platforms = (APPLE),
+    platforms = APPLE,
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",

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

@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_SHARED_LIBRARIES := libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug libreact_render_mapbuffer
+LOCAL_SHARED_LIBRARIES := libjsi libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug libreact_render_mapbuffer
 
 include $(BUILD_SHARED_LIBRARY)
 

package/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp

@@ -17,158 +17,204 @@ namespace facebook {
 namespace react {
 
 ScrollViewProps::ScrollViewProps(
+    const PropsParserContext &context,
     ScrollViewProps const &sourceProps,
     RawProps const &rawProps)
-    : ViewProps(sourceProps, rawProps),
+    : ViewProps(context, sourceProps, rawProps),
       alwaysBounceHorizontal(convertRawProp(
+          context,
           rawProps,
           "alwaysBounceHorizontal",
           sourceProps.alwaysBounceHorizontal,
           {})),
       alwaysBounceVertical(convertRawProp(
+          context,
           rawProps,
           "alwaysBounceVertical",
           sourceProps.alwaysBounceVertical,
           {})),
-      bounces(convertRawProp(rawProps, "bounces", sourceProps.bounces, true)),
+      bounces(convertRawProp(
+          context,
+          rawProps,
+          "bounces",
+          sourceProps.bounces,
+          true)),
       bouncesZoom(convertRawProp(
+          context,
           rawProps,
           "bouncesZoom",
           sourceProps.bouncesZoom,
           true)),
       canCancelContentTouches(convertRawProp(
+          context,
           rawProps,
           "canCancelContentTouches",
           sourceProps.canCancelContentTouches,
           true)),
       centerContent(convertRawProp(
+          context,
           rawProps,
           "centerContent",
           sourceProps.centerContent,
           {})),
       automaticallyAdjustContentInsets(convertRawProp(
+          context,
           rawProps,
           "automaticallyAdjustContentInsets",
           sourceProps.automaticallyAdjustContentInsets,
           {})),
+      automaticallyAdjustsScrollIndicatorInsets(convertRawProp(
+          context,
+          rawProps,
+          "automaticallyAdjustsScrollIndicatorInsets",
+          sourceProps.automaticallyAdjustsScrollIndicatorInsets,
+          true)),
       decelerationRate(convertRawProp(
+          context,
           rawProps,
           "decelerationRate",
           sourceProps.decelerationRate,
           (Float)0.998)),
       directionalLockEnabled(convertRawProp(
+          context,
           rawProps,
           "directionalLockEnabled",
           sourceProps.directionalLockEnabled,
           {})),
       indicatorStyle(convertRawProp(
+          context,
           rawProps,
           "indicatorStyle",
           sourceProps.indicatorStyle,
           {})),
       keyboardDismissMode(convertRawProp(
+          context,
           rawProps,
           "keyboardDismissMode",
           sourceProps.keyboardDismissMode,
           {})),
       maximumZoomScale(convertRawProp(
+          context,
           rawProps,
           "maximumZoomScale",
           sourceProps.maximumZoomScale,
           (Float)1.0)),
       minimumZoomScale(convertRawProp(
+          context,
           rawProps,
           "minimumZoomScale",
           sourceProps.minimumZoomScale,
           (Float)1.0)),
       scrollEnabled(convertRawProp(
+          context,
           rawProps,
           "scrollEnabled",
           sourceProps.scrollEnabled,
           true)),
       pagingEnabled(convertRawProp(
+          context,
           rawProps,
           "pagingEnabled",
           sourceProps.pagingEnabled,
           {})),
       pinchGestureEnabled(convertRawProp(
+          context,
           rawProps,
           "pinchGestureEnabled",
           sourceProps.pinchGestureEnabled,
           true)),
       scrollsToTop(convertRawProp(
+          context,
           rawProps,
           "scrollsToTop",
           sourceProps.scrollsToTop,
           true)),
       showsHorizontalScrollIndicator(convertRawProp(
+          context,
           rawProps,
           "showsHorizontalScrollIndicator",
           sourceProps.showsHorizontalScrollIndicator,
           true)),
       showsVerticalScrollIndicator(convertRawProp(
+          context,
           rawProps,
           "showsVerticalScrollIndicator",
           sourceProps.showsVerticalScrollIndicator,
           true)),
       scrollEventThrottle(convertRawProp(
+          context,
           rawProps,
           "scrollEventThrottle",
           sourceProps.scrollEventThrottle,
           {})),
       zoomScale(convertRawProp(
+          context,
           rawProps,
           "zoomScale",
           sourceProps.zoomScale,
           (Float)1.0)),
       contentInset(convertRawProp(
+          context,
           rawProps,
           "contentInset",
           sourceProps.contentInset,
           {})),
       contentOffset(convertRawProp(
+          context,
           rawProps,
           "contentOffset",
           sourceProps.contentOffset,
           {})),
       scrollIndicatorInsets(convertRawProp(
+          context,
           rawProps,
           "scrollIndicatorInsets",
           sourceProps.scrollIndicatorInsets,
           {})),
       snapToInterval(convertRawProp(
+          context,
           rawProps,
           "snapToInterval",
           sourceProps.snapToInterval,
           {})),
       snapToAlignment(convertRawProp(
+          context,
           rawProps,
           "snapToAlignment",
           sourceProps.snapToAlignment,
           {})),
       disableIntervalMomentum(convertRawProp(
+          context,
           rawProps,
           "disableIntervalMomentum",
           sourceProps.disableIntervalMomentum,
           {})),
       snapToOffsets(convertRawProp(
+          context,
           rawProps,
           "snapToOffsets",
           sourceProps.snapToOffsets,
           {})),
       snapToStart(convertRawProp(
+          context,
           rawProps,
           "snapToStart",
           sourceProps.snapToStart,
           true)),
-      snapToEnd(
-          convertRawProp(rawProps, "snapToEnd", sourceProps.snapToEnd, true)),
+      snapToEnd(convertRawProp(
+          context,
+          rawProps,
+          "snapToEnd",
+          sourceProps.snapToEnd,
+          true)),
       contentInsetAdjustmentBehavior(convertRawProp(
+          context,
           rawProps,
           "contentInsetAdjustmentBehavior",
           sourceProps.contentInsetAdjustmentBehavior,
           {ContentInsetAdjustmentBehavior::Never})),
       scrollToOverflowEnabled(convertRawProp(
+          context,
           rawProps,
           "scrollToOverflowEnabled",
           sourceProps.scrollToOverflowEnabled,
@@ -206,6 +252,10 @@ SharedDebugStringConvertibleList ScrollViewProps::getDebugProps() const {
               "automaticallyAdjustContentInsets",
               automaticallyAdjustContentInsets,
               defaultScrollViewProps.automaticallyAdjustContentInsets),
+          debugStringConvertibleItem(
+              "automaticallyAdjustsScrollIndicatorInsets",
+              automaticallyAdjustsScrollIndicatorInsets,
+              defaultScrollViewProps.automaticallyAdjustsScrollIndicatorInsets),
           debugStringConvertibleItem(
               "decelerationRate",
               decelerationRate,

package/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h

@@ -9,6 +9,7 @@
 
 #include <react/renderer/components/scrollview/primitives.h>
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -17,7 +18,10 @@ namespace react {
 class ScrollViewProps final : public ViewProps {
  public:
   ScrollViewProps() = default;
-  ScrollViewProps(ScrollViewProps const &sourceProps, RawProps const &rawProps);
+  ScrollViewProps(
+      const PropsParserContext &context,
+      ScrollViewProps const &sourceProps,
+      RawProps const &rawProps);
 
 #pragma mark - Props
 
@@ -28,12 +32,13 @@ class ScrollViewProps final : public ViewProps {
   bool canCancelContentTouches{true};
   bool centerContent{};
   bool automaticallyAdjustContentInsets{};
-  Float decelerationRate{0.998};
+  bool automaticallyAdjustsScrollIndicatorInsets{true};
+  Float decelerationRate{0.998f};
   bool directionalLockEnabled{};
   ScrollViewIndicatorStyle indicatorStyle{};
   ScrollViewKeyboardDismissMode keyboardDismissMode{};
-  Float maximumZoomScale{1.0};
-  Float minimumZoomScale{1.0};
+  Float maximumZoomScale{1.0f};
+  Float minimumZoomScale{1.0f};
   bool scrollEnabled{true};
   bool pagingEnabled{};
   bool pinchGestureEnabled{true};
@@ -41,7 +46,7 @@ class ScrollViewProps final : public ViewProps {
   bool showsHorizontalScrollIndicator{true};
   bool showsVerticalScrollIndicator{true};
   Float scrollEventThrottle{};
-  Float zoomScale{1.0};
+  Float zoomScale{1.0f};
   EdgeInsets contentInset{};
   Point contentOffset{};
   EdgeInsets scrollIndicatorInsets{};

package/ReactCommon/react/renderer/components/scrollview/conversions.h

@@ -9,11 +9,13 @@
 
 #include <folly/dynamic.h>
 #include <react/renderer/components/scrollview/primitives.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
 
 inline void fromRawValue(
+    const PropsParserContext &context,
     const RawValue &value,
     ScrollViewSnapToAlignment &result) {
   auto string = (std::string)value;
@@ -33,6 +35,7 @@ inline void fromRawValue(
 }
 
 inline void fromRawValue(
+    const PropsParserContext &context,
     const RawValue &value,
     ScrollViewIndicatorStyle &result) {
   auto string = (std::string)value;
@@ -52,6 +55,7 @@ inline void fromRawValue(
 }
 
 inline void fromRawValue(
+    const PropsParserContext &context,
     const RawValue &value,
     ScrollViewKeyboardDismissMode &result) {
   auto string = (std::string)value;
@@ -71,6 +75,7 @@ inline void fromRawValue(
 }
 
 inline void fromRawValue(
+    const PropsParserContext &context,
     const RawValue &value,
     ContentInsetAdjustmentBehavior &result) {
   auto string = (std::string)value;

package/ReactCommon/react/renderer/components/text/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_debug libreact_render_graphics libreact_render_uimanager libreact_render_textlayoutmanager libreact_render_attributedstring libreact_render_mounting librrc_view libreact_utils libreact_debug libreact_render_mapbuffer
+LOCAL_SHARED_LIBRARIES := libjsi libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_uimanager libreact_render_textlayoutmanager libreact_render_attributedstring libreact_render_mounting librrc_view libreact_utils libreact_debug libreact_render_mapbuffer
 
 include $(BUILD_SHARED_LIBRARY)
 

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

@@ -16,6 +16,7 @@ namespace facebook {
 namespace react {
 
 static TextAttributes convertRawProp(
+    const PropsParserContext &context,
     const RawProps &rawProps,
     const TextAttributes sourceTextAttributes,
     const TextAttributes defaultTextAttributes) {
@@ -23,16 +24,19 @@ static TextAttributes convertRawProp(
 
   // Color
   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,
@@ -40,58 +44,75 @@ static TextAttributes convertRawProp(
 
   // Font
   textAttributes.fontFamily = convertRawProp(
+      context,
       rawProps,
       "fontFamily",
       sourceTextAttributes.fontFamily,
       defaultTextAttributes.fontFamily);
   textAttributes.fontSize = convertRawProp(
+      context,
       rawProps,
       "fontSize",
       sourceTextAttributes.fontSize,
       defaultTextAttributes.fontSize);
   textAttributes.fontSizeMultiplier = convertRawProp(
+      context,
       rawProps,
       "fontSizeMultiplier",
       sourceTextAttributes.fontSizeMultiplier,
       defaultTextAttributes.fontSizeMultiplier);
   textAttributes.fontWeight = convertRawProp(
+      context,
       rawProps,
       "fontWeight",
       sourceTextAttributes.fontWeight,
       defaultTextAttributes.fontWeight);
   textAttributes.fontStyle = convertRawProp(
+      context,
       rawProps,
       "fontStyle",
       sourceTextAttributes.fontStyle,
       defaultTextAttributes.fontStyle);
   textAttributes.fontVariant = convertRawProp(
+      context,
       rawProps,
       "fontVariant",
       sourceTextAttributes.fontVariant,
       defaultTextAttributes.fontVariant);
   textAttributes.allowFontScaling = convertRawProp(
+      context,
       rawProps,
       "allowFontScaling",
       sourceTextAttributes.allowFontScaling,
       defaultTextAttributes.allowFontScaling);
   textAttributes.letterSpacing = convertRawProp(
+      context,
       rawProps,
       "letterSpacing",
       sourceTextAttributes.letterSpacing,
       defaultTextAttributes.letterSpacing);
+  textAttributes.textTransform = convertRawProp(
+      context,
+      rawProps,
+      "textTransform",
+      sourceTextAttributes.textTransform,
+      defaultTextAttributes.textTransform);
 
   // Paragraph
   textAttributes.lineHeight = convertRawProp(
+      context,
       rawProps,
       "lineHeight",
       sourceTextAttributes.lineHeight,
       defaultTextAttributes.lineHeight);
   textAttributes.alignment = convertRawProp(
+      context,
       rawProps,
       "textAlign",
       sourceTextAttributes.alignment,
       defaultTextAttributes.alignment);
   textAttributes.baseWritingDirection = convertRawProp(
+      context,
       rawProps,
       "baseWritingDirection",
       sourceTextAttributes.baseWritingDirection,
@@ -99,21 +120,25 @@ static TextAttributes convertRawProp(
 
   // Decoration
   textAttributes.textDecorationColor = convertRawProp(
+      context,
       rawProps,
       "textDecorationColor",
       sourceTextAttributes.textDecorationColor,
       defaultTextAttributes.textDecorationColor);
   textAttributes.textDecorationLineType = convertRawProp(
+      context,
       rawProps,
       "textDecorationLine",
       sourceTextAttributes.textDecorationLineType,
       defaultTextAttributes.textDecorationLineType);
   textAttributes.textDecorationLineStyle = convertRawProp(
+      context,
       rawProps,
       "textDecorationLineStyle",
       sourceTextAttributes.textDecorationLineStyle,
       defaultTextAttributes.textDecorationLineStyle);
   textAttributes.textDecorationLinePattern = convertRawProp(
+      context,
       rawProps,
       "textDecorationLinePattern",
       sourceTextAttributes.textDecorationLinePattern,
@@ -121,16 +146,19 @@ static TextAttributes convertRawProp(
 
   // Shadow
   textAttributes.textShadowOffset = convertRawProp(
+      context,
       rawProps,
       "textShadowOffset",
       sourceTextAttributes.textShadowOffset,
       defaultTextAttributes.textShadowOffset);
   textAttributes.textShadowRadius = convertRawProp(
+      context,
       rawProps,
       "textShadowRadius",
       sourceTextAttributes.textShadowRadius,
       defaultTextAttributes.textShadowRadius);
   textAttributes.textShadowColor = convertRawProp(
+      context,
       rawProps,
       "textShadowColor",
       sourceTextAttributes.textShadowColor,
@@ -138,12 +166,14 @@ static TextAttributes convertRawProp(
 
   // Special
   textAttributes.isHighlighted = convertRawProp(
+      context,
       rawProps,
       "isHighlighted",
       sourceTextAttributes.isHighlighted,
       defaultTextAttributes.isHighlighted);
 
   textAttributes.accessibilityRole = convertRawProp(
+      context,
       rawProps,
       "accessibilityRole",
       sourceTextAttributes.accessibilityRole,
@@ -153,9 +183,11 @@ static TextAttributes convertRawProp(
 }
 
 BaseTextProps::BaseTextProps(
+    const PropsParserContext &context,
     const BaseTextProps &sourceProps,
     const RawProps &rawProps)
     : textAttributes(convertRawProp(
+          context,
           rawProps,
           sourceProps.textAttributes,
           TextAttributes{})){};