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

package/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.cpp

@@ -7,7 +7,6 @@
 
 #include "HostPlatformScrollViewProps.h"
 
-#include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/components/scrollview/conversions.h>
 #include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/debug/debugStringConvertibleUtils.h>
@@ -21,51 +20,36 @@ HostPlatformScrollViewProps::HostPlatformScrollViewProps(
     const HostPlatformScrollViewProps& sourceProps,
     const RawProps& rawProps)
     : BaseScrollViewProps(context, sourceProps, rawProps),
-      sendMomentumEvents(
-          ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
-              ? sourceProps.sendMomentumEvents
-              : convertRawProp(
-                    context,
-                    rawProps,
-                    "sendMomentumEvents",
-                    sourceProps.sendMomentumEvents,
-                    true)),
-      nestedScrollEnabled(
-          ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
-              ? sourceProps.nestedScrollEnabled
-              : convertRawProp(
-                    context,
-                    rawProps,
-                    "nestedScrollEnabled",
-                    sourceProps.nestedScrollEnabled,
-                    true)),
-      fadingEdgeLength(
-          ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
-              ? sourceProps.fadingEdgeLength
-              : convertRawProp(
-                    context,
-                    rawProps,
-                    "fadingEdgeLength",
-                    sourceProps.fadingEdgeLength,
-                    nullptr)),
-      overScrollMode(
-          ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
-              ? sourceProps.overScrollMode
-              : convertRawProp(
-                    context,
-                    rawProps,
-                    "overScrollMode",
-                    sourceProps.overScrollMode,
-                    "auto")),
-      endFillColor(
-          ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
-              ? sourceProps.endFillColor
-              : convertRawProp(
-                    context,
-                    rawProps,
-                    "endFillColor",
-                    sourceProps.endFillColor,
-                    clearColor())) {}
+      sendMomentumEvents(convertRawProp(
+          context,
+          rawProps,
+          "sendMomentumEvents",
+          sourceProps.sendMomentumEvents,
+          true)),
+      nestedScrollEnabled(convertRawProp(
+          context,
+          rawProps,
+          "nestedScrollEnabled",
+          sourceProps.nestedScrollEnabled,
+          true)),
+      fadingEdgeLength(convertRawProp(
+          context,
+          rawProps,
+          "fadingEdgeLength",
+          sourceProps.fadingEdgeLength,
+          nullptr)),
+      overScrollMode(convertRawProp(
+          context,
+          rawProps,
+          "overScrollMode",
+          sourceProps.overScrollMode,
+          "auto")),
+      endFillColor(convertRawProp(
+          context,
+          rawProps,
+          "endFillColor",
+          sourceProps.endFillColor,
+          clearColor())) {}
 
 void HostPlatformScrollViewProps::setProp(
     const PropsParserContext& context,

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

@@ -7,7 +7,6 @@
 
 #include "BaseParagraphProps.h"
 
-#include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/attributedstring/primitives.h>
 #include <react/renderer/core/propsConversions.h>
@@ -23,32 +22,23 @@ BaseParagraphProps::BaseParagraphProps(
     const RawProps& rawProps)
     : ViewProps(context, sourceProps, rawProps),
       BaseTextProps(context, sourceProps, rawProps),
-      paragraphAttributes(
-          ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
-              ? sourceProps.paragraphAttributes
-              : convertRawProp(
-                    context,
-                    rawProps,
-                    sourceProps.paragraphAttributes,
-                    {})),
-      isSelectable(
-          ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
-              ? sourceProps.isSelectable
-              : convertRawProp(
-                    context,
-                    rawProps,
-                    "selectable",
-                    sourceProps.isSelectable,
-                    false)),
-      onTextLayout(
-          ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
-              ? sourceProps.onTextLayout
-              : convertRawProp(
-                    context,
-                    rawProps,
-                    "onTextLayout",
-                    sourceProps.onTextLayout,
-                    {})) {
+      paragraphAttributes(convertRawProp(
+          context,
+          rawProps,
+          sourceProps.paragraphAttributes,
+          {})),
+      isSelectable(convertRawProp(
+          context,
+          rawProps,
+          "selectable",
+          sourceProps.isSelectable,
+          false)),
+      onTextLayout(convertRawProp(
+          context,
+          rawProps,
+          "onTextLayout",
+          sourceProps.onTextLayout,
+          {})) {
   /*
    * These props are applied to `View`, therefore they must not be a part of
    * base text attributes.

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

@@ -7,7 +7,6 @@
 
 #include "BaseTextProps.h"
 
-#include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/core/propsConversions.h>
@@ -230,14 +229,11 @@ BaseTextProps::BaseTextProps(
     const PropsParserContext& context,
     const BaseTextProps& sourceProps,
     const RawProps& rawProps)
-    : textAttributes(
-          ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
-              ? sourceProps.textAttributes
-              : convertRawProp(
-                    context,
-                    rawProps,
-                    sourceProps.textAttributes,
-                    TextAttributes{})) {};
+    : textAttributes(convertRawProp(
+          context,
+          rawProps,
+          sourceProps.textAttributes,
+          TextAttributes{})) {};
 
 void BaseTextProps::setProp(
     const PropsParserContext& context,
@@ -273,6 +269,8 @@ void BaseTextProps::setProp(
         textAttributes,
         maxFontSizeMultiplier,
         "maxFontSizeMultiplier");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults, value, textAttributes, dynamicTypeRamp, "dynamicTypeRamp");
     REBUILD_FIELD_SWITCH_CASE(
         defaults, value, textAttributes, letterSpacing, "letterSpacing");
     REBUILD_FIELD_SWITCH_CASE(
@@ -286,7 +284,7 @@ void BaseTextProps::setProp(
         value,
         textAttributes,
         baseWritingDirection,
-        "baseWritingDirection");
+        "writingDirection");
     REBUILD_FIELD_SWITCH_CASE(
         defaults,
         value,

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

@@ -9,6 +9,7 @@
 
 #include <react/renderer/components/text/RawTextProps.h>
 #include <react/renderer/components/text/RawTextShadowNode.h>
+#include <react/renderer/components/text/TextEffectShadowNode.h>
 #include <react/renderer/components/text/TextProps.h>
 #include <react/renderer/components/text/TextShadowNode.h>
 #include <react/renderer/mounting/ShadowView.h>
@@ -70,6 +71,24 @@ void BaseTextShadowNode::buildAttributedString(
       continue;
     }
 
+    // TextEffectShadowNode
+    auto textEffectNode =
+        dynamic_cast<const TextEffectShadowNode*>(childNode.get());
+    if (textEffectNode != nullptr) {
+      auto localTextAttributes = baseTextAttributes;
+      const auto& effectProps = textEffectNode->getConcreteProps();
+      localTextAttributes.textEffects.push_back(
+          TextEffectInfo{
+              .name = effectProps.effectName,
+              .props = effectProps.effectProps});
+      buildAttributedString(
+          localTextAttributes,
+          *textEffectNode,
+          outAttributedString,
+          outAttachments);
+      continue;
+    }
+
     // Any *other* kind of ShadowNode
     auto fragment = AttributedString::Fragment{};
     fragment.string = AttributedString::Fragment::AttachmentCharacter();

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

@@ -0,0 +1,17 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include <react/renderer/components/text/TextEffectShadowNode.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+namespace facebook::react {
+
+using TextEffectComponentDescriptor = ConcreteComponentDescriptor<TextEffectShadowNode>;
+
+} // namespace facebook::react

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

@@ -0,0 +1,59 @@
+/*
+ * 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 "TextEffectProps.h"
+
+#include <react/renderer/core/propsConversions.h>
+
+namespace facebook::react {
+
+TextEffectProps::TextEffectProps(
+    const PropsParserContext& context,
+    const TextEffectProps& sourceProps,
+    const RawProps& rawProps)
+    : Props(context, sourceProps, rawProps),
+      effectName(convertRawProp(
+          context,
+          rawProps,
+          "effectName",
+          sourceProps.effectName,
+          std::string{})),
+      effectProps(convertRawProp(
+          context,
+          rawProps,
+          "effectProps",
+          sourceProps.effectProps,
+          folly::dynamic(nullptr))) {}
+
+#ifdef RN_SERIALIZABLE_STATE
+
+ComponentName TextEffectProps::getDiffPropsImplementationTarget() const {
+  return "TextEffect";
+}
+
+folly::dynamic TextEffectProps::getDiffProps(const Props* prevProps) const {
+  folly::dynamic result = folly::dynamic::object();
+
+  static const auto defaultProps = TextEffectProps();
+
+  const TextEffectProps* oldProps = prevProps == nullptr
+      ? &defaultProps
+      : static_cast<const TextEffectProps*>(prevProps);
+
+  if (effectName != oldProps->effectName) {
+    result["effectName"] = effectName;
+  }
+  if (effectProps != oldProps->effectProps) {
+    result["effectProps"] = effectProps;
+  }
+
+  return result;
+}
+
+#endif
+
+} // namespace facebook::react

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

@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include <folly/dynamic.h>
+#include <react/renderer/core/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
+
+namespace facebook::react {
+
+class TextEffectProps : public Props {
+ public:
+  TextEffectProps() = default;
+  TextEffectProps(const PropsParserContext &context, const TextEffectProps &sourceProps, const RawProps &rawProps);
+
+  std::string effectName;
+  folly::dynamic effectProps;
+
+#ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+  folly::dynamic getDiffProps(const Props *prevProps) const override;
+#endif
+};
+
+} // namespace facebook::react

package/{Libraries/Text/VirtualText/RCTVirtualTextView.mm → ReactCommon/react/renderer/components/text/TextEffectShadowNode.cpp}

@@ -5,12 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <React/RCTVirtualTextView.h>
+#include "TextEffectShadowNode.h"
 
-#ifndef RCT_REMOVE_LEGACY_ARCH
+namespace facebook::react {
 
-@implementation RCTVirtualTextView
+extern const char TextEffectComponentName[] = "TextEffect";
 
-@end
-
-#endif // RCT_REMOVE_LEGACY_ARCH
+} // namespace facebook::react

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

@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include <react/renderer/components/text/TextEffectProps.h>
+#include <react/renderer/components/view/ViewEventEmitter.h>
+#include <react/renderer/core/ConcreteShadowNode.h>
+
+namespace facebook::react {
+
+extern const char TextEffectComponentName[];
+
+using TextEffectEventEmitter = TouchEventEmitter;
+
+class TextEffectShadowNode
+    : public ConcreteShadowNode<TextEffectComponentName, ShadowNode, TextEffectProps, TextEffectEventEmitter> {
+ public:
+  using ConcreteShadowNode::ConcreteShadowNode;
+};
+
+} // namespace facebook::react

package/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/HostPlatformParagraphProps.cpp

@@ -7,7 +7,6 @@
 
 #include "HostPlatformParagraphProps.h"
 
-#include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/attributedstring/primitives.h>
 #include <react/renderer/components/text/conversions.h>
@@ -24,33 +23,24 @@ HostPlatformParagraphProps::HostPlatformParagraphProps(
     const HostPlatformParagraphProps& sourceProps,
     const RawProps& rawProps)
     : BaseParagraphProps(context, sourceProps, rawProps),
-      disabled(
-          ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
-              ? sourceProps.disabled
-              : convertRawProp(
-                    context,
-                    rawProps,
-                    "disabled",
-                    sourceProps.disabled,
-                    false)),
-      selectionColor(
-          ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
-              ? sourceProps.selectionColor
-              : convertRawProp(
-                    context,
-                    rawProps,
-                    "selectionColor",
-                    sourceProps.selectionColor,
-                    {})),
-      dataDetectorType(
-          ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
-              ? sourceProps.dataDetectorType
-              : convertRawProp(
-                    context,
-                    rawProps,
-                    "dataDetectorType",
-                    sourceProps.dataDetectorType,
-                    {}))
+      disabled(convertRawProp(
+          context,
+          rawProps,
+          "disabled",
+          sourceProps.disabled,
+          false)),
+      selectionColor(convertRawProp(
+          context,
+          rawProps,
+          "selectionColor",
+          sourceProps.selectionColor,
+          {})),
+      dataDetectorType(convertRawProp(
+          context,
+          rawProps,
+          "dataDetectorType",
+          sourceProps.dataDetectorType,
+          {}))
 
 {};
 

package/ReactCommon/react/renderer/components/text/tests/BaseTextShadowNodeTest.cpp

@@ -9,6 +9,8 @@
 #include <react/renderer/element/ComponentBuilder.h>
 
 #include <gtest/gtest.h>
+#include <react/renderer/attributedstring/conversions.h>
+#include <react/renderer/core/RawValue.h>
 #include <react/renderer/element/Element.h>
 #include <react/renderer/element/testUtils.h>
 
@@ -22,8 +24,21 @@ Element<RawTextShadowNode> rawTextElement(const char* text) {
   return Element<RawTextShadowNode>().props(rawTextProps);
 }
 
+std::string roundTripTextAlignment(const char* textAlignment) {
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+  TextAlignment result = TextAlignment::Natural;
+  fromRawValue(parserContext, RawValue{folly::dynamic{textAlignment}}, result);
+  return toString(result);
+}
+
 } // namespace
 
+TEST(BaseTextShadowNodeTest, textAlignmentStartAndEndRoundTrip) {
+  EXPECT_EQ(roundTripTextAlignment("start"), "start");
+  EXPECT_EQ(roundTripTextAlignment("end"), "end");
+}
+
 TEST(BaseTextShadowNodeTest, fragmentsWithDifferentAttributes) {
   ContextContainer contextContainer{};
   PropsParserContext parserContext{-1, contextContainer};