react-native-tvos 0.74.3-0 → 0.75.2-0

package/ReactCommon/react/renderer/components/textinput/platform/android/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp

@@ -9,6 +9,7 @@
 
 #include <fbjni/fbjni.h>
 #include <react/debug/react_native_assert.h>
+#include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/jni/ReadableNativeMap.h>
 #include <react/renderer/attributedstring/AttributedStringBox.h>
 #include <react/renderer/attributedstring/TextAttributes.h>
@@ -26,6 +27,24 @@ namespace facebook::react {
 
 extern const char AndroidTextInputComponentName[] = "AndroidTextInput";
 
+AndroidTextInputShadowNode::AndroidTextInputShadowNode(
+    const ShadowNode& sourceShadowNode,
+    const ShadowNodeFragment& fragment)
+    : ConcreteViewShadowNode(sourceShadowNode, fragment) {
+  auto& sourceTextInputShadowNode =
+      static_cast<const AndroidTextInputShadowNode&>(sourceShadowNode);
+
+  if (ReactNativeFeatureFlags::enableCleanTextInputYogaNode()) {
+    if (!fragment.children && !fragment.props &&
+        sourceTextInputShadowNode.getIsLayoutClean()) {
+      // This ParagraphShadowNode was cloned but did not change
+      // in a way that affects its layout. Let's mark it clean
+      // to stop Yoga from traversing it.
+      cleanLayout();
+    }
+  }
+}
+
 void AndroidTextInputShadowNode::setContextContainer(
     ContextContainer* contextContainer) {
   ensureUnsealed();
@@ -191,8 +210,7 @@ Size AndroidTextInputShadowNode::measureContent(
           AttributedStringBox{attributedString},
           getConcreteProps().paragraphAttributes,
           textLayoutContext,
-          layoutConstraints,
-          nullptr)
+          layoutConstraints)
       .size;
 }
 

package/ReactCommon/react/renderer/components/textinput/platform/android/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.h

@@ -23,11 +23,13 @@ extern const char AndroidTextInputComponentName[];
 /*
  * `ShadowNode` for <AndroidTextInput> component.
  */
-class AndroidTextInputShadowNode final : public ConcreteViewShadowNode<
-                                             AndroidTextInputComponentName,
-                                             AndroidTextInputProps,
-                                             AndroidTextInputEventEmitter,
-                                             AndroidTextInputState> {
+class AndroidTextInputShadowNode final
+    : public ConcreteViewShadowNode<
+          AndroidTextInputComponentName,
+          AndroidTextInputProps,
+          AndroidTextInputEventEmitter,
+          AndroidTextInputState,
+          /* usesMapBufferForStateData */ true> {
  public:
   static ShadowNodeTraits BaseTraits() {
     auto traits = ConcreteViewShadowNode::BaseTraits();
@@ -37,6 +39,10 @@ class AndroidTextInputShadowNode final : public ConcreteViewShadowNode<
 
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
 
+  AndroidTextInputShadowNode(
+      const ShadowNode& sourceShadowNode,
+      const ShadowNodeFragment& fragment);
+
   void setContextContainer(ContextContainer* contextContainer);
 
   /*

package/ReactCommon/react/renderer/components/textinput/platform/android/react/renderer/components/androidtextinput/AndroidTextInputState.cpp

@@ -66,27 +66,16 @@ AndroidTextInputState::AndroidTextInputState(
                                     .getDouble()){};
 
 folly::dynamic AndroidTextInputState::getDynamic() const {
-  // Java doesn't need all fields, so we don't pass them all along.
-  folly::dynamic newState = folly::dynamic::object();
+  LOG(FATAL) << "Android TextInput state should only be read using MapBuffer";
+}
 
+MapBuffer AndroidTextInputState::getMapBuffer() const {
+  auto builder = MapBufferBuilder();
   // If we have a `cachedAttributedStringId` we know that we're (1) not trying
   // to set a new string, so we don't need to pass it along; (2) setState was
   // called from Java to trigger a relayout with a `cachedAttributedStringId`,
   // so Java has all up-to-date information and we should pass an empty map
   // through.
-  if (cachedAttributedStringId == 0) {
-    newState["mostRecentEventCount"] = mostRecentEventCount;
-    newState["attributedString"] = toDynamic(attributedString);
-    newState["hash"] = newState["attributedString"]["hash"];
-    newState["paragraphAttributes"] =
-        toDynamic(paragraphAttributes); // TODO: can we memoize this in Java?
-  }
-  return newState;
-}
-
-MapBuffer AndroidTextInputState::getMapBuffer() const {
-  auto builder = MapBufferBuilder();
-  // See comment in getDynamic block.
   if (cachedAttributedStringId == 0) {
     // TODO truncation
     builder.putInt(

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

@@ -11,7 +11,7 @@ namespace facebook::react {
 
 static jsi::Value textInputMetricsPayload(
     jsi::Runtime& runtime,
-    const TextInputMetrics& textInputMetrics) {
+    const TextInputEventEmitter::Metrics& textInputMetrics) {
   auto payload = jsi::Object(runtime);
 
   payload.setProperty(
@@ -38,7 +38,7 @@ static jsi::Value textInputMetricsPayload(
 
 static jsi::Value textInputMetricsScrollPayload(
     jsi::Runtime& runtime,
-    const TextInputMetrics& textInputMetrics) {
+    const TextInputEventEmitter::Metrics& textInputMetrics) {
   auto payload = jsi::Object(runtime);
 
   {
@@ -88,7 +88,7 @@ static jsi::Value textInputMetricsScrollPayload(
 
 static jsi::Value textInputMetricsContentSizePayload(
     jsi::Runtime& runtime,
-    const TextInputMetrics& textInputMetrics) {
+    const TextInputEventEmitter::Metrics& textInputMetrics) {
   auto payload = jsi::Object(runtime);
 
   {
@@ -105,7 +105,7 @@ static jsi::Value textInputMetricsContentSizePayload(
 
 static jsi::Value keyPressMetricsPayload(
     jsi::Runtime& runtime,
-    const KeyPressMetrics& keyPressMetrics) {
+    const TextInputEventEmitter::KeyPressMetrics& keyPressMetrics) {
   auto payload = jsi::Object(runtime);
   payload.setProperty(runtime, "eventCount", keyPressMetrics.eventCount);
 
@@ -126,70 +126,47 @@ static jsi::Value keyPressMetricsPayload(
   return payload;
 };
 
-void TextInputEventEmitter::onFocus(
-    const TextInputMetrics& textInputMetrics) const {
+void TextInputEventEmitter::onFocus(const Metrics& textInputMetrics) const {
   dispatchTextInputEvent("focus", textInputMetrics);
 }
 
-void TextInputEventEmitter::onBlur(
-    const TextInputMetrics& textInputMetrics) const {
+void TextInputEventEmitter::onBlur(const Metrics& textInputMetrics) const {
   dispatchTextInputEvent("blur", textInputMetrics);
 }
 
-void TextInputEventEmitter::onChange(
-    const TextInputMetrics& textInputMetrics) const {
+void TextInputEventEmitter::onChange(const Metrics& textInputMetrics) const {
   dispatchTextInputEvent("change", textInputMetrics);
 }
 
-void TextInputEventEmitter::onChangeSync(
-    const TextInputMetrics& textInputMetrics) const {
-  dispatchTextInputEvent(
-      "changeSync", textInputMetrics, EventPriority::SynchronousBatched);
-}
-
 void TextInputEventEmitter::onContentSizeChange(
-    const TextInputMetrics& textInputMetrics) const {
+    const Metrics& textInputMetrics) const {
   dispatchTextInputContentSizeChangeEvent(
       "contentSizeChange", textInputMetrics);
 }
 
 void TextInputEventEmitter::onSelectionChange(
-    const TextInputMetrics& textInputMetrics) const {
+    const Metrics& textInputMetrics) const {
   dispatchTextInputEvent("selectionChange", textInputMetrics);
 }
 
 void TextInputEventEmitter::onEndEditing(
-    const TextInputMetrics& textInputMetrics) const {
+    const Metrics& textInputMetrics) const {
   dispatchTextInputEvent("endEditing", textInputMetrics);
 }
 
 void TextInputEventEmitter::onSubmitEditing(
-    const TextInputMetrics& textInputMetrics) const {
+    const Metrics& textInputMetrics) const {
   dispatchTextInputEvent("submitEditing", textInputMetrics);
 }
 
 void TextInputEventEmitter::onKeyPress(
     const KeyPressMetrics& keyPressMetrics) const {
-  dispatchEvent(
-      "keyPress",
-      [keyPressMetrics](jsi::Runtime& runtime) {
-        return keyPressMetricsPayload(runtime, keyPressMetrics);
-      },
-      EventPriority::AsynchronousBatched);
-}
-
-void TextInputEventEmitter::onKeyPressSync(
-    const KeyPressMetrics& keyPressMetrics) const {
-  dispatchEvent(
-      "keyPressSync",
-      [keyPressMetrics](jsi::Runtime& runtime) {
-        return keyPressMetricsPayload(runtime, keyPressMetrics);
-      },
-      EventPriority::SynchronousBatched);
+  dispatchEvent("keyPress", [keyPressMetrics](jsi::Runtime& runtime) {
+    return keyPressMetricsPayload(runtime, keyPressMetrics);
+  });
 }
 
-void TextInputEventEmitter::onScroll(
-    const TextInputMetrics& textInputMetrics) const {
+void TextInputEventEmitter::onScroll(const Metrics& textInputMetrics) const {
   dispatchEvent("scroll", [textInputMetrics](jsi::Runtime& runtime) {
     return textInputMetricsScrollPayload(runtime, textInputMetrics);
   });
@@ -197,26 +174,18 @@ void TextInputEventEmitter::onScroll(
 
 void TextInputEventEmitter::dispatchTextInputEvent(
     const std::string& name,
-    const TextInputMetrics& textInputMetrics,
-    EventPriority priority) const {
-  dispatchEvent(
-      name,
-      [textInputMetrics](jsi::Runtime& runtime) {
-        return textInputMetricsPayload(runtime, textInputMetrics);
-      },
-      priority);
+    const Metrics& textInputMetrics) const {
+  dispatchEvent(name, [textInputMetrics](jsi::Runtime& runtime) {
+    return textInputMetricsPayload(runtime, textInputMetrics);
+  });
 }
 
 void TextInputEventEmitter::dispatchTextInputContentSizeChangeEvent(
     const std::string& name,
-    const TextInputMetrics& textInputMetrics,
-    EventPriority priority) const {
-  dispatchEvent(
-      name,
-      [textInputMetrics](jsi::Runtime& runtime) {
-        return textInputMetricsContentSizePayload(runtime, textInputMetrics);
-      },
-      priority);
+    const Metrics& textInputMetrics) const {
+  dispatchEvent(name, [textInputMetrics](jsi::Runtime& runtime) {
+    return textInputMetricsContentSizePayload(runtime, textInputMetrics);
+  });
 }
 
 } // namespace facebook::react

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

@@ -12,52 +12,46 @@
 
 namespace facebook::react {
 
-class TextInputMetrics {
- public:
-  std::string text;
-  AttributedString::Range selectionRange;
-  // ScrollView-like metrics
-  Size contentSize;
-  Point contentOffset;
-  EdgeInsets contentInset;
-  Size containerSize;
-  int eventCount;
-  Size layoutMeasurement;
-  float zoomScale;
-};
-
-class KeyPressMetrics {
- public:
-  std::string text;
-  int eventCount;
-};
-
 class TextInputEventEmitter : public ViewEventEmitter {
  public:
   using ViewEventEmitter::ViewEventEmitter;
 
-  void onFocus(const TextInputMetrics& textInputMetrics) const;
-  void onBlur(const TextInputMetrics& textInputMetrics) const;
-  void onChange(const TextInputMetrics& textInputMetrics) const;
-  void onChangeSync(const TextInputMetrics& textInputMetrics) const;
-  void onContentSizeChange(const TextInputMetrics& textInputMetrics) const;
-  void onSelectionChange(const TextInputMetrics& textInputMetrics) const;
-  void onEndEditing(const TextInputMetrics& textInputMetrics) const;
-  void onSubmitEditing(const TextInputMetrics& textInputMetrics) const;
+  struct Metrics {
+    std::string text;
+    AttributedString::Range selectionRange;
+    // ScrollView-like metrics
+    Size contentSize;
+    Point contentOffset;
+    EdgeInsets contentInset;
+    Size containerSize;
+    int eventCount;
+    Size layoutMeasurement;
+    Float zoomScale;
+  };
+
+  struct KeyPressMetrics {
+    std::string text;
+    int eventCount;
+  };
+
+  void onFocus(const Metrics& textInputMetrics) const;
+  void onBlur(const Metrics& textInputMetrics) const;
+  void onChange(const Metrics& textInputMetrics) const;
+  void onContentSizeChange(const Metrics& textInputMetrics) const;
+  void onSelectionChange(const Metrics& textInputMetrics) const;
+  void onEndEditing(const Metrics& textInputMetrics) const;
+  void onSubmitEditing(const Metrics& textInputMetrics) const;
   void onKeyPress(const KeyPressMetrics& keyPressMetrics) const;
-  void onKeyPressSync(const KeyPressMetrics& keyPressMetrics) const;
-  void onScroll(const TextInputMetrics& textInputMetrics) const;
+  void onScroll(const Metrics& textInputMetrics) const;
 
  private:
   void dispatchTextInputEvent(
       const std::string& name,
-      const TextInputMetrics& textInputMetrics,
-      EventPriority priority = EventPriority::AsynchronousBatched) const;
+      const Metrics& textInputMetrics) const;
 
   void dispatchTextInputContentSizeChangeEvent(
       const std::string& name,
-      const TextInputMetrics& textInputMetrics,
-      EventPriority priority = EventPriority::AsynchronousBatched) const;
+      const Metrics& textInputMetrics) const;
 };
 
 } // namespace facebook::react

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

@@ -18,75 +18,8 @@ TextInputProps::TextInputProps(
     const PropsParserContext& context,
     const TextInputProps& sourceProps,
     const RawProps& rawProps)
-    : ViewProps(context, sourceProps, rawProps),
-      BaseTextProps(context, sourceProps, rawProps),
+    : BaseTextInputProps(context, sourceProps, rawProps),
       traits(convertRawProp(context, rawProps, sourceProps.traits, {})),
-      paragraphAttributes(convertRawProp(
-          context,
-          rawProps,
-          sourceProps.paragraphAttributes,
-          {})),
-      defaultValue(convertRawProp(
-          context,
-          rawProps,
-          "defaultValue",
-          sourceProps.defaultValue,
-          {})),
-      placeholder(convertRawProp(
-          context,
-          rawProps,
-          "placeholder",
-          sourceProps.placeholder,
-          {})),
-      placeholderTextColor(convertRawProp(
-          context,
-          rawProps,
-          "placeholderTextColor",
-          sourceProps.placeholderTextColor,
-          {})),
-      maxLength(convertRawProp(
-          context,
-          rawProps,
-          "maxLength",
-          sourceProps.maxLength,
-          {})),
-      cursorColor(convertRawProp(
-          context,
-          rawProps,
-          "cursorColor",
-          sourceProps.cursorColor,
-          {})),
-      selectionColor(convertRawProp(
-          context,
-          rawProps,
-          "selectionColor",
-          sourceProps.selectionColor,
-          {})),
-      selectionHandleColor(convertRawProp(
-          context,
-          rawProps,
-          "selectionHandleColor",
-          sourceProps.selectionHandleColor,
-          {})),
-      underlineColorAndroid(convertRawProp(
-          context,
-          rawProps,
-          "underlineColorAndroid",
-          sourceProps.underlineColorAndroid,
-          {})),
-      text(convertRawProp(context, rawProps, "text", sourceProps.text, {})),
-      mostRecentEventCount(convertRawProp(
-          context,
-          rawProps,
-          "mostRecentEventCount",
-          sourceProps.mostRecentEventCount,
-          {})),
-      autoFocus(convertRawProp(
-          context,
-          rawProps,
-          "autoFocus",
-          sourceProps.autoFocus,
-          {})),
       selection(convertRawProp(
           context,
           rawProps,
@@ -112,15 +45,6 @@ TextInputProps::TextInputProps(
           sourceProps.onChangeSync,
           {})){};
 
-void TextInputProps::setProp(
-    const PropsParserContext& context,
-    RawPropsPropNameHash hash,
-    const char* propName,
-    const RawValue& 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/platform/ios/react/renderer/components/iostextinput/TextInputProps.h

@@ -11,18 +11,16 @@
 #include <react/renderer/attributedstring/TextAttributes.h>
 #include <react/renderer/components/iostextinput/conversions.h>
 #include <react/renderer/components/iostextinput/primitives.h>
-#include <react/renderer/components/text/BaseTextProps.h>
-#include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/components/textinput/BaseTextInputProps.h>
 #include <react/renderer/core/Props.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
-#include <react/renderer/graphics/Color.h>
 #include <react/renderer/imagemanager/primitives.h>
 #include <vector>
 
 namespace facebook::react {
 
-class TextInputProps final : public ViewProps, public BaseTextProps {
+class TextInputProps final : public BaseTextInputProps {
  public:
   TextInputProps() = default;
   TextInputProps(
@@ -30,43 +28,15 @@ class TextInputProps final : public ViewProps, public BaseTextProps {
       const TextInputProps& sourceProps,
       const RawProps& rawProps);
 
-  void setProp(
-      const PropsParserContext& context,
-      RawPropsPropNameHash hash,
-      const char* propName,
-      const RawValue& value);
-
 #pragma mark - Props
-
   const TextInputTraits traits{};
-  const ParagraphAttributes paragraphAttributes{};
-
-  std::string const defaultValue{};
-
-  std::string const placeholder{};
-  const SharedColor placeholderTextColor{};
-
-  int maxLength{};
-
-  /*
-   * Tint colors
-   */
-  const SharedColor cursorColor{};
-  const SharedColor selectionColor{};
-  const SharedColor selectionHandleColor{};
-  // TODO: Rename to `tintColor` and make universal.
-  const SharedColor underlineColorAndroid{};
 
   /*
    * "Private" (only used by TextInput.js) props
    */
-  std::string const text{};
-  const int mostRecentEventCount{0};
-
-  bool autoFocus{false};
   std::optional<Selection> selection{};
 
-  std::string const inputAccessoryViewID{};
+  const std::string inputAccessoryViewID{};
 
   bool onKeyPressSync{false};
   bool onChangeSync{false};

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

@@ -8,6 +8,7 @@
 #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>
@@ -19,6 +20,24 @@ namespace facebook::react {
 
 extern const char TextInputComponentName[] = "TextInput";
 
+TextInputShadowNode::TextInputShadowNode(
+    const ShadowNode& sourceShadowNode,
+    const ShadowNodeFragment& fragment)
+    : ConcreteViewShadowNode(sourceShadowNode, fragment) {
+  auto& sourceTextInputShadowNode =
+      static_cast<const TextInputShadowNode&>(sourceShadowNode);
+
+  if (ReactNativeFeatureFlags::enableCleanTextInputYogaNode()) {
+    if (!fragment.children && !fragment.props &&
+        sourceTextInputShadowNode.getIsLayoutClean()) {
+      // This ParagraphShadowNode was cloned but did not change
+      // in a way that affects its layout. Let's mark it clean
+      // to stop Yoga from traversing it.
+      cleanLayout();
+    }
+  }
+}
+
 AttributedStringBox TextInputShadowNode::attributedStringBoxToMeasure(
     const LayoutContext& layoutContext) const {
   bool hasMeaningfulState =
@@ -117,8 +136,7 @@ Size TextInputShadowNode::measureContent(
           attributedStringBoxToMeasure(layoutContext),
           getConcreteProps().getEffectiveParagraphAttributes(),
           textLayoutContext,
-          layoutConstraints,
-          nullptr)
+          layoutConstraints)
       .size;
 }
 

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

@@ -32,6 +32,10 @@ class TextInputShadowNode final : public ConcreteViewShadowNode<
  public:
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
 
+  TextInputShadowNode(
+      const ShadowNode& sourceShadowNode,
+      const ShadowNodeFragment& fragment);
+
   static ShadowNodeTraits BaseTraits() {
     auto traits = ConcreteViewShadowNode::BaseTraits();
     traits.set(ShadowNodeTraits::Trait::LeafYogaNode);