react-native-tvos 0.77.1-0 → 0.78.0-0

package/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputShadowNode.cpp

@@ -7,155 +7,8 @@
 
 #include "TextInputShadowNode.h"
 
-#include <react/debug/react_native_assert.h>
-#include <react/featureflags/ReactNativeFeatureFlags.h>
-#include <react/renderer/attributedstring/AttributedStringBox.h>
-#include <react/renderer/attributedstring/TextAttributes.h>
-#include <react/renderer/core/LayoutConstraints.h>
-#include <react/renderer/core/LayoutContext.h>
-#include <react/renderer/core/conversions.h>
-#include <react/renderer/textlayoutmanager/TextLayoutContext.h>
-
 namespace facebook::react {
 
 extern const char TextInputComponentName[] = "TextInput";
 
-AttributedStringBox TextInputShadowNode::attributedStringBoxToMeasure(
-    const LayoutContext& layoutContext) const {
-  bool hasMeaningfulState =
-      getState() && getState()->getRevision() != State::initialRevisionValue;
-
-  if (hasMeaningfulState) {
-    auto attributedStringBox = getStateData().attributedStringBox;
-    if (attributedStringBox.getMode() ==
-            AttributedStringBox::Mode::OpaquePointer ||
-        !attributedStringBox.getValue().isEmpty()) {
-      return getStateData().attributedStringBox;
-    }
-  }
-
-  auto attributedString = hasMeaningfulState
-      ? AttributedString{}
-      : getAttributedString(layoutContext);
-
-  if (attributedString.isEmpty()) {
-    auto placeholder = getConcreteProps().placeholder;
-    // Note: `zero-width space` is insufficient in some cases (e.g. when we need
-    // to measure the "hight" of the font).
-    // TODO T67606511: We will redefine the measurement of empty strings as part
-    // of T67606511
-    auto string = !placeholder.empty()
-        ? placeholder
-        : BaseTextShadowNode::getEmptyPlaceholder();
-    auto textAttributes = getConcreteProps().getEffectiveTextAttributes(
-        layoutContext.fontSizeMultiplier);
-    attributedString.appendFragment({string, textAttributes, {}});
-  }
-
-  return AttributedStringBox{attributedString};
-}
-
-AttributedString TextInputShadowNode::getAttributedString(
-    const LayoutContext& layoutContext) const {
-  auto textAttributes = getConcreteProps().getEffectiveTextAttributes(
-      layoutContext.fontSizeMultiplier);
-  auto attributedString = AttributedString{};
-
-  attributedString.appendFragment(AttributedString::Fragment{
-      .string = getConcreteProps().text,
-      .textAttributes = textAttributes,
-      // TODO: Is this really meant to be by value?
-      .parentShadowView = ShadowView(*this)});
-
-  auto attachments = Attachments{};
-  BaseTextShadowNode::buildAttributedString(
-      textAttributes, *this, attributedString, attachments);
-  attributedString.setBaseTextAttributes(textAttributes);
-
-  return attributedString;
-}
-
-void TextInputShadowNode::setTextLayoutManager(
-    std::shared_ptr<const TextLayoutManager> textLayoutManager) {
-  ensureUnsealed();
-  textLayoutManager_ = std::move(textLayoutManager);
-}
-
-void TextInputShadowNode::updateStateIfNeeded(
-    const LayoutContext& layoutContext) {
-  ensureUnsealed();
-
-  auto reactTreeAttributedString = getAttributedString(layoutContext);
-  const auto& state = getStateData();
-
-  react_native_assert(textLayoutManager_);
-  react_native_assert(
-      (!state.layoutManager || state.layoutManager == textLayoutManager_) &&
-      "`StateData` refers to a different `TextLayoutManager`");
-
-  if (state.reactTreeAttributedString.isContentEqual(
-          reactTreeAttributedString) &&
-      state.layoutManager == textLayoutManager_) {
-    return;
-  }
-
-  auto newState = TextInputState{};
-  newState.attributedStringBox = AttributedStringBox{reactTreeAttributedString};
-  newState.paragraphAttributes = getConcreteProps().paragraphAttributes;
-  newState.reactTreeAttributedString = reactTreeAttributedString;
-  newState.layoutManager = textLayoutManager_;
-  newState.mostRecentEventCount = getConcreteProps().mostRecentEventCount;
-  setStateData(std::move(newState));
-}
-
-#pragma mark - LayoutableShadowNode
-
-Size TextInputShadowNode::measureContent(
-    const LayoutContext& layoutContext,
-    const LayoutConstraints& layoutConstraints) const {
-  TextLayoutContext textLayoutContext{};
-  textLayoutContext.pointScaleFactor = layoutContext.pointScaleFactor;
-  return textLayoutManager_
-      ->measure(
-          attributedStringBoxToMeasure(layoutContext),
-          getConcreteProps().getEffectiveParagraphAttributes(),
-          textLayoutContext,
-          layoutConstraints)
-      .size;
-}
-
-Float TextInputShadowNode::baseline(
-    const LayoutContext& layoutContext,
-    Size size) const {
-  auto attributedString = getAttributedString(layoutContext);
-
-  if (attributedString.isEmpty()) {
-    auto placeholderString = !getConcreteProps().placeholder.empty()
-        ? getConcreteProps().placeholder
-        : BaseTextShadowNode::getEmptyPlaceholder();
-    auto textAttributes = getConcreteProps().getEffectiveTextAttributes(
-        layoutContext.fontSizeMultiplier);
-    attributedString.appendFragment(
-        {std::move(placeholderString), textAttributes, {}});
-  }
-
-  // Yoga expects a baseline relative to the Node's border-box edge instead of
-  // the content, so we need to adjust by the padding and border widths, which
-  // have already been set by the time of baseline alignment
-  auto top = YGNodeLayoutGetBorder(&yogaNode_, YGEdgeTop) +
-      YGNodeLayoutGetPadding(&yogaNode_, YGEdgeTop);
-
-  AttributedStringBox attributedStringBox{std::move(attributedString)};
-  return textLayoutManager_->baseline(
-             attributedStringBox,
-             getConcreteProps().getEffectiveParagraphAttributes(),
-             size) +
-      top;
-}
-
-void TextInputShadowNode::layout(LayoutContext layoutContext) {
-  updateStateIfNeeded(layoutContext);
-  ConcreteViewShadowNode::layout(layoutContext);
-}
-
 } // namespace facebook::react

package/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputShadowNode.h

@@ -7,14 +7,10 @@
 
 #pragma once
 
-#include <react/renderer/attributedstring/AttributedString.h>
 #include <react/renderer/components/iostextinput/TextInputProps.h>
-#include <react/renderer/components/iostextinput/TextInputState.h>
-#include <react/renderer/components/text/BaseTextShadowNode.h>
+#include <react/renderer/components/textinput/BaseTextInputShadowNode.h>
 #include <react/renderer/components/textinput/TextInputEventEmitter.h>
-#include <react/renderer/components/view/ConcreteViewShadowNode.h>
-#include <react/renderer/textlayoutmanager/TextLayoutManager.h>
-#include <react/utils/ContextContainer.h>
+#include <react/renderer/components/textinput/TextInputState.h>
 
 namespace facebook::react {
 
@@ -23,61 +19,13 @@ extern const char TextInputComponentName[];
 /*
  * `ShadowNode` for <TextInput> component.
  */
-class TextInputShadowNode final : public ConcreteViewShadowNode<
+class TextInputShadowNode final : public BaseTextInputShadowNode<
                                       TextInputComponentName,
                                       TextInputProps,
                                       TextInputEventEmitter,
-                                      TextInputState>,
-                                  public BaseTextShadowNode {
+                                      TextInputState> {
  public:
-  using ConcreteViewShadowNode::ConcreteViewShadowNode;
-
-  static ShadowNodeTraits BaseTraits() {
-    auto traits = ConcreteViewShadowNode::BaseTraits();
-    traits.set(ShadowNodeTraits::Trait::LeafYogaNode);
-    traits.set(ShadowNodeTraits::Trait::MeasurableYogaNode);
-    traits.set(ShadowNodeTraits::Trait::BaselineYogaNode);
-    return traits;
-  }
-
-  /*
-   * Associates a shared `TextLayoutManager` with the node.
-   * `TextInputShadowNode` uses the manager to measure text content
-   * and construct `TextInputState` objects.
-   */
-  void setTextLayoutManager(
-      std::shared_ptr<const TextLayoutManager> textLayoutManager);
-
-#pragma mark - LayoutableShadowNode
-
-  Size measureContent(
-      const LayoutContext& layoutContext,
-      const LayoutConstraints& layoutConstraints) const override;
-  void layout(LayoutContext layoutContext) override;
-
-  Float baseline(const LayoutContext& layoutContext, Size size) const override;
-
- private:
-  /*
-   * Creates a `State` object if needed.
-   */
-  void updateStateIfNeeded(const LayoutContext& layoutContext);
-
-  /*
-   * Returns a `AttributedString` which represents text content of the node.
-   */
-  AttributedString getAttributedString(
-      const LayoutContext& layoutContext) const;
-
-  /*
-   * Returns an `AttributedStringBox` which represents text content that should
-   * be used for measuring purposes. It might contain actual text value,
-   * placeholder value or some character that represents the size of the font.
-   */
-  AttributedStringBox attributedStringBoxToMeasure(
-      const LayoutContext& layoutContext) const;
-
-  std::shared_ptr<const TextLayoutManager> textLayoutManager_;
+  using BaseTextInputShadowNode::BaseTextInputShadowNode;
 };
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/components/view/BaseViewProps.cpp

@@ -53,8 +53,9 @@ std::array<float, 3> getTranslateForTransformOrigin(
 BaseViewProps::BaseViewProps(
     const PropsParserContext& context,
     const BaseViewProps& sourceProps,
-    const RawProps& rawProps)
-    : YogaStylableProps(context, sourceProps, rawProps),
+    const RawProps& rawProps,
+    const std::function<bool(const std::string&)>& filterObjectKeys)
+    : YogaStylableProps(context, sourceProps, rawProps, filterObjectKeys),
       AccessibilityProps(context, sourceProps, rawProps),
 #if TARGET_OS_TV
       isTVSelectable(ReactNativeFeatureFlags::enableCppPropsIteratorSetter() ? sourceProps.isTVSelectable : convertRawProp(
@@ -416,16 +417,7 @@ BaseViewProps::BaseViewProps(
                     rawProps,
                     "removeClippedSubviews",
                     sourceProps.removeClippedSubviews,
-                    false)),
-      experimental_layoutConformance(
-          ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
-              ? sourceProps.experimental_layoutConformance
-              : convertRawProp(
-                    context,
-                    rawProps,
-                    "experimental_layoutConformance",
-                    sourceProps.experimental_layoutConformance,
-                    {})) {}
+                    false)) {}
 
 #define VIEW_EVENT_CASE(eventType)                      \
   case CONSTEXPR_RAW_PROPS_KEY_HASH("on" #eventType): { \
@@ -471,27 +463,27 @@ void BaseViewProps::setProp(
     RAW_SET_PROP_SWITCH_CASE_BASIC(collapsable);
     RAW_SET_PROP_SWITCH_CASE_BASIC(collapsableChildren);
     RAW_SET_PROP_SWITCH_CASE_BASIC(removeClippedSubviews);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(experimental_layoutConformance);
     RAW_SET_PROP_SWITCH_CASE_BASIC(cursor);
     RAW_SET_PROP_SWITCH_CASE_BASIC(outlineColor);
     RAW_SET_PROP_SWITCH_CASE_BASIC(outlineOffset);
     RAW_SET_PROP_SWITCH_CASE_BASIC(outlineStyle);
     RAW_SET_PROP_SWITCH_CASE_BASIC(outlineWidth);
-    RAW_SET_PROP_SWITCH_CASE(filter, "filter");
-    RAW_SET_PROP_SWITCH_CASE(boxShadow, "boxShadow");
+    RAW_SET_PROP_SWITCH_CASE_BASIC(filter);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(boxShadow);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(mixBlendMode);
 #if TARGET_OS_TV
-      RAW_SET_PROP_SWITCH_CASE_BASIC(isTVSelectable);
-      RAW_SET_PROP_SWITCH_CASE_BASIC(hasTVPreferredFocus);
-      RAW_SET_PROP_SWITCH_CASE_BASIC(tvParallaxProperties);
-      RAW_SET_PROP_SWITCH_CASE_BASIC(nextFocusUp);
-      RAW_SET_PROP_SWITCH_CASE_BASIC(nextFocusDown);
-      RAW_SET_PROP_SWITCH_CASE_BASIC(nextFocusLeft);
-      RAW_SET_PROP_SWITCH_CASE_BASIC(nextFocusRight);
-      RAW_SET_PROP_SWITCH_CASE_BASIC(autoFocus);
-      RAW_SET_PROP_SWITCH_CASE_BASIC(trapFocusUp);
-      RAW_SET_PROP_SWITCH_CASE_BASIC(trapFocusDown);
-      RAW_SET_PROP_SWITCH_CASE_BASIC(trapFocusLeft);
-      RAW_SET_PROP_SWITCH_CASE_BASIC(trapFocusRight);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(isTVSelectable);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(hasTVPreferredFocus);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(tvParallaxProperties);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(nextFocusUp);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(nextFocusDown);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(nextFocusLeft);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(nextFocusRight);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(autoFocus);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(trapFocusUp);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(trapFocusDown);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(trapFocusLeft);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(trapFocusRight);
 #endif
     // events field
     VIEW_EVENT_CASE(PointerEnter);
@@ -534,54 +526,52 @@ static BorderRadii ensureNoOverlap(const BorderRadii& radii, const Size& size) {
   // the used values of all border radii until none of them overlap."
   // Source: https://www.w3.org/TR/css-backgrounds-3/#corner-overlap
 
-  auto insets = EdgeInsets{
-      .left = radii.topLeft.horizontal + radii.bottomLeft.horizontal,
-      .top = radii.topLeft.vertical + radii.topRight.vertical,
-      .right = radii.topRight.horizontal + radii.bottomRight.horizontal,
-      .bottom = radii.bottomLeft.vertical + radii.bottomRight.vertical,
-  };
-
-  auto insetsScale = EdgeInsets{
-      .left =
-          insets.left > 0 ? std::min((Float)1.0, size.height / insets.left) : 0,
-      .top = insets.top > 0 ? std::min((Float)1.0, size.width / insets.top) : 0,
-      .right = insets.right > 0
-          ? std::min((Float)1.0, size.height / insets.right)
-          : 0,
-      .bottom = insets.bottom > 0
-          ? std::min((Float)1.0, size.width / insets.bottom)
-          : 0,
-  };
+  float leftEdgeRadii = radii.topLeft.vertical + radii.bottomLeft.vertical;
+  float topEdgeRadii = radii.topLeft.horizontal + radii.topRight.horizontal;
+  float rightEdgeRadii = radii.topRight.vertical + radii.bottomRight.vertical;
+  float bottomEdgeRadii =
+      radii.bottomLeft.horizontal + radii.bottomRight.horizontal;
+
+  float leftEdgeRadiiScale =
+      (leftEdgeRadii > 0) ? std::min(size.height / leftEdgeRadii, (Float)1) : 0;
+  float topEdgeRadiiScale =
+      (topEdgeRadii > 0) ? std::min(size.width / topEdgeRadii, (Float)1) : 0;
+  float rightEdgeRadiiScale = (rightEdgeRadii > 0)
+      ? std::min(size.height / rightEdgeRadii, (Float)1)
+      : 0;
+  float bottomEdgeRadiiScale = (bottomEdgeRadii > 0)
+      ? std::min(size.width / bottomEdgeRadii, (Float)1)
+      : 0;
 
   return BorderRadii{
       .topLeft =
           {static_cast<float>(
-               radii.topLeft.horizontal *
-               std::min(insetsScale.top, insetsScale.left)),
-           static_cast<float>(
                radii.topLeft.vertical *
-               std::min(insetsScale.top, insetsScale.left))},
+               std::min(topEdgeRadiiScale, leftEdgeRadiiScale)),
+           static_cast<float>(
+               radii.topLeft.horizontal *
+               std::min(topEdgeRadiiScale, leftEdgeRadiiScale))},
       .topRight =
           {static_cast<float>(
-               radii.topRight.horizontal *
-               std::min(insetsScale.top, insetsScale.right)),
-           static_cast<float>(
                radii.topRight.vertical *
-               std::min(insetsScale.top, insetsScale.right))},
+               std::min(topEdgeRadiiScale, rightEdgeRadiiScale)),
+           static_cast<float>(
+               radii.topRight.horizontal *
+               std::min(topEdgeRadiiScale, rightEdgeRadiiScale))},
       .bottomLeft =
           {static_cast<float>(
-               radii.bottomLeft.horizontal *
-               std::min(insetsScale.bottom, insetsScale.left)),
-           static_cast<float>(
                radii.bottomLeft.vertical *
-               std::min(insetsScale.bottom, insetsScale.left))},
+               std::min(bottomEdgeRadiiScale, leftEdgeRadiiScale)),
+           static_cast<float>(
+               radii.bottomLeft.horizontal *
+               std::min(bottomEdgeRadiiScale, leftEdgeRadiiScale))},
       .bottomRight =
           {static_cast<float>(
-               radii.bottomRight.horizontal *
-               std::min(insetsScale.bottom, insetsScale.right)),
-           static_cast<float>(
                radii.bottomRight.vertical *
-               std::min(insetsScale.bottom, insetsScale.right))},
+               std::min(bottomEdgeRadiiScale, rightEdgeRadiiScale)),
+           static_cast<float>(
+               radii.bottomRight.horizontal *
+               std::min(bottomEdgeRadiiScale, rightEdgeRadiiScale))},
   };
 }
 
@@ -590,17 +580,17 @@ static BorderRadii radiiPercentToPoint(
     const Size& size) {
   return BorderRadii{
       .topLeft =
-          {radii.topLeft.resolve(size.width),
-           radii.topLeft.resolve(size.height)},
+          {radii.topLeft.resolve(size.height),
+           radii.topLeft.resolve(size.width)},
       .topRight =
-          {radii.topRight.resolve(size.width),
-           radii.topRight.resolve(size.height)},
+          {radii.topRight.resolve(size.height),
+           radii.topRight.resolve(size.width)},
       .bottomLeft =
-          {radii.bottomLeft.resolve(size.width),
-           radii.bottomLeft.resolve(size.height)},
+          {radii.bottomLeft.resolve(size.height),
+           radii.bottomLeft.resolve(size.width)},
       .bottomRight =
-          {radii.bottomRight.resolve(size.width),
-           radii.bottomRight.resolve(size.height)},
+          {radii.bottomRight.resolve(size.height),
+           radii.bottomRight.resolve(size.width)},
   };
 }
 
@@ -657,7 +647,7 @@ Transform BaseViewProps::resolveTransform(
     for (const auto& operation : transform.operations) {
       transformMatrix = transformMatrix *
           Transform::FromTransformOperation(
-                            operation, layoutMetrics.frame.size);
+                            operation, layoutMetrics.frame.size, transform);
     }
   }
 

package/ReactCommon/react/renderer/components/view/BaseViewProps.h

@@ -31,7 +31,9 @@ class BaseViewProps : public YogaStylableProps, public AccessibilityProps {
   BaseViewProps(
       const PropsParserContext& context,
       const BaseViewProps& sourceProps,
-      const RawProps& rawProps);
+      const RawProps& rawProps,
+      const std::function<bool(const std::string&)>& filterObjectKeys =
+          nullptr);
 
   void setProp(
       const PropsParserContext& context,
@@ -121,8 +123,6 @@ class BaseViewProps : public YogaStylableProps, public AccessibilityProps {
 
   bool removeClippedSubviews{false};
 
-  LayoutConformance experimental_layoutConformance{};
-
 #pragma mark - Convenience Methods
 
   CascadedBorderWidths getBorderWidths() const;

package/ReactCommon/react/renderer/components/view/LayoutConformanceComponentDescriptor.h

@@ -0,0 +1,18 @@
+/*
+ * 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/view/LayoutConformanceShadowNode.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+namespace facebook::react {
+
+using LayoutConformanceComponentDescriptor =
+    ConcreteComponentDescriptor<LayoutConformanceShadowNode>;
+
+} // namespace facebook::react

package/ReactCommon/react/renderer/components/view/LayoutConformanceProps.h

@@ -0,0 +1,36 @@
+/*
+ * 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/view/YogaStylableProps.h>
+#include <react/renderer/components/view/propsConversions.h>
+
+namespace facebook::react {
+
+struct LayoutConformanceProps final : public YogaStylableProps {
+  /**
+   * Whether to layout the subtree with strict conformance to W3C standard
+   * (YGErrataNone) or for compatibility with legacy RN bugs (YGErrataAll)
+   */
+  LayoutConformance mode{LayoutConformance::Strict};
+
+  LayoutConformanceProps() = default;
+  LayoutConformanceProps(
+      const PropsParserContext& context,
+      const LayoutConformanceProps& sourceProps,
+      const RawProps& rawProps)
+      : YogaStylableProps(context, sourceProps, rawProps),
+        mode{convertRawProp(
+            context,
+            rawProps,
+            "mode",
+            mode,
+            LayoutConformance::Strict)} {}
+};
+
+} // namespace facebook::react

package/ReactCommon/react/renderer/components/view/LayoutConformanceShadowNode.h

@@ -0,0 +1,28 @@
+/*
+ * 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/view/ConcreteViewShadowNode.h>
+#include <react/renderer/components/view/LayoutConformanceProps.h>
+#include <react/renderer/components/view/YogaLayoutableShadowNode.h>
+
+namespace facebook::react {
+
+constexpr const char LayoutConformanceShadowNodeComponentName[] =
+    "LayoutConformance";
+
+class LayoutConformanceShadowNode final
+    : public ConcreteShadowNode<
+          LayoutConformanceShadowNodeComponentName,
+          YogaLayoutableShadowNode,
+          LayoutConformanceProps> {
+ public:
+  using ConcreteShadowNode::ConcreteShadowNode;
+};
+
+} // namespace facebook::react

package/ReactCommon/react/renderer/components/view/ViewPropsInterpolation.h

@@ -10,6 +10,10 @@
 #include <react/renderer/components/view/ViewProps.h>
 #include <react/renderer/graphics/Transform.h>
 
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#endif
+
 namespace facebook::react {
 
 /**

package/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp

@@ -6,7 +6,6 @@
  */
 
 #include "ViewShadowNode.h"
-#include <react/config/ReactNativeConfig.h>
 #include <react/renderer/components/view/HostPlatformViewTraitsInitializer.h>
 #include <react/renderer/components/view/primitives.h>