react-native-tvos 0.82.1-0 → 0.83.0-0

package/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp

@@ -125,6 +125,51 @@ HostPlatformViewProps::HostPlatformViewProps(
                     rawProps,
                     "screenReaderFocusable",
                     sourceProps.screenReaderFocusable,
+                    {})),
+      nextFocusDown(
+          ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
+              ? sourceProps.nextFocusDown
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "nextFocusDown",
+                    sourceProps.nextFocusDown,
+                    {})),
+      nextFocusForward(
+          ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
+              ? sourceProps.nextFocusForward
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "nextFocusForward",
+                    sourceProps.nextFocusForward,
+                    {})),
+      nextFocusLeft(
+          ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
+              ? sourceProps.nextFocusLeft
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "nextFocusLeft",
+                    sourceProps.nextFocusLeft,
+                    {})),
+      nextFocusRight(
+          ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
+              ? sourceProps.nextFocusRight
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "nextFocusRight",
+                    sourceProps.nextFocusRight,
+                    {})),
+      nextFocusUp(
+          ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
+              ? sourceProps.nextFocusUp
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "nextFocusUp",
+                    sourceProps.nextFocusUp,
                     {})) {}
 #define VIEW_EVENT_CASE(eventType)                      \
   case CONSTEXPR_RAW_PROPS_KEY_HASH("on" #eventType): { \
@@ -159,6 +204,11 @@ void HostPlatformViewProps::setProp(
     RAW_SET_PROP_SWITCH_CASE_BASIC(needsOffscreenAlphaCompositing);
     RAW_SET_PROP_SWITCH_CASE_BASIC(renderToHardwareTextureAndroid);
     RAW_SET_PROP_SWITCH_CASE_BASIC(screenReaderFocusable);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(nextFocusDown);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(nextFocusForward);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(nextFocusLeft);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(nextFocusRight);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(nextFocusUp);
   }
 }
 
@@ -339,7 +389,7 @@ static void updateBorderColorPropValue(
     const std::optional<SharedColor>& newColor,
     const std::optional<SharedColor>& oldColor) {
   if (newColor != oldColor) {
-    result[propName] = *newColor.value_or(SharedColor());
+    result[propName] = newColor.has_value() ? *newColor.value() : NULL;
   }
 }
 
@@ -642,26 +692,16 @@ folly::dynamic HostPlatformViewProps::getDiffProps(
     result["filter"] = toDynamic(filter);
   }
 
+  if (backgroundImage != oldProps->backgroundImage) {
+    result["experimental_backgroundImage"] = toDynamic(backgroundImage);
+  }
+
   if (mixBlendMode != oldProps->mixBlendMode) {
     result["mixBlendMode"] = toString(mixBlendMode);
   }
 
   if (pointerEvents != oldProps->pointerEvents) {
-    std::string value;
-    switch (pointerEvents) {
-      case PointerEventsMode::BoxOnly:
-        result["pointerEvents"] = "box-only";
-        break;
-      case PointerEventsMode::BoxNone:
-        result["pointerEvents"] = "box-none";
-        break;
-      case PointerEventsMode::None:
-        result["pointerEvents"] = "none";
-        break;
-      default:
-        result["pointerEvents"] = "auto";
-        break;
-    }
+    result["pointerEvents"] = toString(pointerEvents);
   }
 
   if (hitSlop != oldProps->hitSlop) {
@@ -946,17 +986,7 @@ folly::dynamic HostPlatformViewProps::getDiffProps(
   }
 
   if (accessibilityLiveRegion != oldProps->accessibilityLiveRegion) {
-    switch (accessibilityLiveRegion) {
-      case AccessibilityLiveRegion::Assertive:
-        result["accessibilityLiveRegion"] = "assertive";
-        break;
-      case AccessibilityLiveRegion::Polite:
-        result["accessibilityLiveRegion"] = "polite";
-        break;
-      case AccessibilityLiveRegion::None:
-        result["accessibilityLiveRegion"] = "none";
-        break;
-    }
+    result["accessibilityLiveRegion"] = toString(accessibilityLiveRegion);
   }
 
   if (accessibilityHint != oldProps->accessibilityHint) {
@@ -1032,19 +1062,46 @@ folly::dynamic HostPlatformViewProps::getDiffProps(
   }
 
   if (importantForAccessibility != oldProps->importantForAccessibility) {
-    switch (importantForAccessibility) {
-      case ImportantForAccessibility::Auto:
-        result["importantForAccessibility"] = "auto";
-        break;
-      case ImportantForAccessibility::Yes:
-        result["importantForAccessibility"] = "yes";
-        break;
-      case ImportantForAccessibility::No:
-        result["importantForAccessibility"] = "no";
-        break;
-      case ImportantForAccessibility::NoHideDescendants:
-        result["importantForAccessibility"] = "noHideDescendants";
-        break;
+    result["importantForAccessibility"] = toString(importantForAccessibility);
+  }
+
+  if (nextFocusDown != oldProps->nextFocusDown) {
+    if (nextFocusDown.has_value()) {
+      result["nextFocusDown"] = nextFocusDown.value();
+    } else {
+      result["nextFocusDown"] = folly::dynamic(nullptr);
+    }
+  }
+
+  if (nextFocusForward != oldProps->nextFocusForward) {
+    if (nextFocusForward.has_value()) {
+      result["nextFocusForward"] = nextFocusForward.value();
+    } else {
+      result["nextFocusForward"] = folly::dynamic(nullptr);
+    }
+  }
+
+  if (nextFocusLeft != oldProps->nextFocusLeft) {
+    if (nextFocusLeft.has_value()) {
+      result["nextFocusLeft"] = nextFocusLeft.value();
+    } else {
+      result["nextFocusLeft"] = folly::dynamic(nullptr);
+    }
+  }
+
+  if (nextFocusRight != oldProps->nextFocusRight) {
+    if (nextFocusRight.has_value()) {
+      result["nextFocusRight"] = nextFocusRight.value();
+    } else {
+      result["nextFocusRight"] = folly::dynamic(nullptr);
+    }
+  }
+
+  if (nextFocusUp != oldProps->nextFocusUp) {
+    if (nextFocusUp.has_value()) {
+      result["nextFocusUp"] = nextFocusUp.value();
+    } else {
+      result["nextFocusUp"] = folly::dynamic(nullptr);
     }
   }
 

package/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.h

@@ -24,17 +24,13 @@ class HostPlatformViewProps : public BaseViewProps {
  public:
   HostPlatformViewProps() = default;
   HostPlatformViewProps(
-      const PropsParserContext& context,
-      const HostPlatformViewProps& sourceProps,
-      const RawProps& rawProps,
-      const std::function<bool(const std::string&)>& filterObjectKeys =
-          nullptr);
-
-  void setProp(
-      const PropsParserContext& context,
-      RawPropsPropNameHash hash,
-      const char* propName,
-      const RawValue& value);
+      const PropsParserContext &context,
+      const HostPlatformViewProps &sourceProps,
+      const RawProps &rawProps,
+      const std::function<bool(const std::string &)> &filterObjectKeys = nullptr);
+
+  void
+  setProp(const PropsParserContext &context, RawPropsPropNameHash hash, const char *propName, const RawValue &value);
 
 #pragma mark - Props
 
@@ -56,6 +52,12 @@ class HostPlatformViewProps : public BaseViewProps {
   bool renderToHardwareTextureAndroid{false};
   bool screenReaderFocusable{false};
 
+  std::optional<int> nextFocusDown{};
+  std::optional<int> nextFocusForward{};
+  std::optional<int> nextFocusLeft{};
+  std::optional<int> nextFocusRight{};
+  std::optional<int> nextFocusUp{};
+
 #pragma mark - Convenience Methods
 
   bool getProbablyMoreHorizontalThanVertical_DEPRECATED() const;
@@ -66,7 +68,7 @@ class HostPlatformViewProps : public BaseViewProps {
 
 #ifdef RN_SERIALIZABLE_STATE
   ComponentName getDiffPropsImplementationTarget() const override;
-  folly::dynamic getDiffProps(const Props* prevProps) const override;
+  folly::dynamic getDiffProps(const Props *prevProps) const override;
 #endif
 };
 

package/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewTraitsInitializer.h

@@ -12,20 +12,20 @@
 
 namespace facebook::react::HostPlatformViewTraitsInitializer {
 
-inline bool formsStackingContext(const ViewProps& viewProps) {
+inline bool formsStackingContext(const ViewProps &viewProps)
+{
   return viewProps.elevation != 0;
 }
 
-inline bool formsView(const ViewProps& viewProps) {
-  return viewProps.nativeBackground.has_value() ||
-      viewProps.nativeForeground.has_value() || viewProps.focusable ||
-      viewProps.hasTVPreferredFocus ||
-      viewProps.needsOffscreenAlphaCompositing ||
-      viewProps.renderToHardwareTextureAndroid ||
-      viewProps.screenReaderFocusable;
+inline bool formsView(const ViewProps &viewProps)
+{
+  return viewProps.nativeBackground.has_value() || viewProps.nativeForeground.has_value() || viewProps.focusable ||
+      viewProps.hasTVPreferredFocus || viewProps.needsOffscreenAlphaCompositing ||
+      viewProps.renderToHardwareTextureAndroid || viewProps.screenReaderFocusable;
 }
 
-inline bool isKeyboardFocusable(const ViewProps& viewProps) {
+inline bool isKeyboardFocusable(const ViewProps &viewProps)
+{
   return (viewProps.focusable || viewProps.hasTVPreferredFocus);
 }
 

package/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/NativeDrawable.h

@@ -26,7 +26,8 @@ struct NativeDrawable {
     std::optional<Float> rippleRadius{};
     bool borderless{false};
 
-    bool operator==(const Ripple& rhs) const {
+    bool operator==(const Ripple &rhs) const
+    {
       return std::tie(this->color, this->borderless, this->rippleRadius) ==
           std::tie(rhs.color, rhs.borderless, rhs.rippleRadius);
     }
@@ -36,7 +37,8 @@ struct NativeDrawable {
   Ripple ripple;
   Kind kind;
 
-  bool operator==(const NativeDrawable& rhs) const {
+  bool operator==(const NativeDrawable &rhs) const
+  {
     if (this->kind != rhs.kind) {
       return false;
     }
@@ -49,29 +51,26 @@ struct NativeDrawable {
     }
   }
 
-  bool operator!=(const NativeDrawable& rhs) const {
+  bool operator!=(const NativeDrawable &rhs) const
+  {
     return !(*this == rhs);
   }
 
   ~NativeDrawable() = default;
 };
 
-static inline void fromRawValue(
-    const PropsParserContext& /*context*/,
-    const RawValue& rawValue,
-    NativeDrawable& result) {
+static inline void
+fromRawValue(const PropsParserContext & /*context*/, const RawValue &rawValue, NativeDrawable &result)
+{
   auto map = (std::unordered_map<std::string, RawValue>)rawValue;
 
   auto typeIterator = map.find("type");
-  react_native_expect(
-      typeIterator != map.end() && typeIterator->second.hasType<std::string>());
+  react_native_expect(typeIterator != map.end() && typeIterator->second.hasType<std::string>());
   std::string type = (std::string)typeIterator->second;
 
   if (type == "ThemeAttrAndroid") {
     auto attrIterator = map.find("attribute");
-    react_native_expect(
-        attrIterator != map.end() &&
-        attrIterator->second.hasType<std::string>());
+    react_native_expect(attrIterator != map.end() && attrIterator->second.hasType<std::string>());
 
     result = NativeDrawable{
         (std::string)attrIterator->second,
@@ -86,15 +85,10 @@ static inline void fromRawValue(
     result = NativeDrawable{
         std::string{},
         NativeDrawable::Ripple{
-            color != map.end() && color->second.hasType<int32_t>()
-                ? (int32_t)color->second
-                : std::optional<int32_t>{},
-            rippleRadius != map.end() && rippleRadius->second.hasType<Float>()
-                ? (Float)rippleRadius->second
-                : std::optional<Float>{},
-            borderless != map.end() && borderless->second.hasType<bool>()
-                ? (bool)borderless->second
-                : false,
+            color != map.end() && color->second.hasType<int32_t>() ? (int32_t)color->second : std::optional<int32_t>{},
+            rippleRadius != map.end() && rippleRadius->second.hasType<Float>() ? (Float)rippleRadius->second
+                                                                               : std::optional<Float>{},
+            borderless != map.end() && borderless->second.hasType<bool>() ? (bool)borderless->second : false,
         },
         NativeDrawable::Kind::Ripple,
     };

package/ReactCommon/react/renderer/components/view/platform/cxx/react/renderer/components/view/HostPlatformViewTraitsInitializer.h

@@ -12,15 +12,18 @@
 
 namespace facebook::react::HostPlatformViewTraitsInitializer {
 
-inline bool formsStackingContext(const ViewProps& props) {
+inline bool formsStackingContext(const ViewProps &props)
+{
   return false;
 }
 
-inline bool formsView(const ViewProps& props) {
+inline bool formsView(const ViewProps &props)
+{
   return false;
 }
 
-inline bool isKeyboardFocusable(const ViewProps& /*props*/) {
+inline bool isKeyboardFocusable(const ViewProps & /*props*/)
+{
   return false;
 }
 

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

@@ -69,20 +69,24 @@ struct ViewEvents {
     PointerUpCapture = 37,
   };
 
-  constexpr bool operator[](const Offset offset) const {
+  constexpr bool operator[](const Offset offset) const
+  {
     return bits[static_cast<std::size_t>(offset)];
   }
 
-  std::bitset<64>::reference operator[](const Offset offset) {
+  std::bitset<64>::reference operator[](const Offset offset)
+  {
     return bits[static_cast<std::size_t>(offset)];
   }
 };
 
-inline static bool operator==(const ViewEvents& lhs, const ViewEvents& rhs) {
+inline static bool operator==(const ViewEvents &lhs, const ViewEvents &rhs)
+{
   return lhs.bits == rhs.bits;
 }
 
-inline static bool operator!=(const ViewEvents& lhs, const ViewEvents& rhs) {
+inline static bool operator!=(const ViewEvents &lhs, const ViewEvents &rhs)
+{
   return lhs.bits != rhs.bits;
 }
 
@@ -98,7 +102,7 @@ struct CornerRadii {
   float vertical{0.0f};
   float horizontal{0.0f};
 
-  bool operator==(const CornerRadii& other) const = default;
+  bool operator==(const CornerRadii &other) const = default;
 };
 
 enum class Cursor : uint8_t {
@@ -160,29 +164,27 @@ struct CascadedRectangleEdges {
   OptionalT blockStart{};
   OptionalT blockEnd{};
 
-  Counterpart resolve(bool isRTL, T defaults) const {
+  Counterpart resolve(bool isRTL, T defaults) const
+  {
     const auto leadingEdge = isRTL ? end : start;
     const auto trailingEdge = isRTL ? start : end;
-    const auto horizontalOrAllOrDefault =
-        horizontal.value_or(all.value_or(defaults));
-    const auto verticalOrAllOrDefault =
-        vertical.value_or(all.value_or(defaults));
+    const auto horizontalOrAllOrDefault = horizontal.value_or(all.value_or(defaults));
+    const auto verticalOrAllOrDefault = vertical.value_or(all.value_or(defaults));
 
     return {
         /* .left = */
         left.value_or(leadingEdge.value_or(horizontalOrAllOrDefault)),
         /* .top = */
-        blockStart.value_or(
-            block.value_or(top.value_or(verticalOrAllOrDefault))),
+        blockStart.value_or(block.value_or(top.value_or(verticalOrAllOrDefault))),
         /* .right = */
         right.value_or(trailingEdge.value_or(horizontalOrAllOrDefault)),
         /* .bottom = */
-        blockEnd.value_or(
-            block.value_or(bottom.value_or(verticalOrAllOrDefault))),
+        blockEnd.value_or(block.value_or(bottom.value_or(verticalOrAllOrDefault))),
     };
   }
 
-  bool operator==(const CascadedRectangleEdges<T>& rhs) const {
+  bool operator==(const CascadedRectangleEdges<T> &rhs) const
+  {
     return std::tie(
                this->left,
                this->top,
@@ -211,7 +213,8 @@ struct CascadedRectangleEdges {
                rhs.blockEnd);
   }
 
-  bool operator!=(const CascadedRectangleEdges<T>& rhs) const {
+  bool operator!=(const CascadedRectangleEdges<T> &rhs) const
+  {
     return !(*this == rhs);
   }
 };
@@ -235,7 +238,8 @@ struct CascadedRectangleCorners {
   OptionalT startEnd{};
   OptionalT startStart{};
 
-  Counterpart resolve(bool isRTL, T defaults) const {
+  Counterpart resolve(bool isRTL, T defaults) const
+  {
     const auto logicalTopStart = topStart ? topStart : startStart;
     const auto logicalTopEnd = topEnd ? topEnd : startEnd;
     const auto logicalBottomStart = bottomStart ? bottomStart : endStart;
@@ -247,8 +251,7 @@ struct CascadedRectangleCorners {
     const auto bottomTrailing = isRTL ? logicalBottomStart : logicalBottomEnd;
 
     return {
-        /* .topLeft = */ topLeft.value_or(
-            topLeading.value_or(all.value_or(defaults))),
+        /* .topLeft = */ topLeft.value_or(topLeading.value_or(all.value_or(defaults))),
         /* .topRight = */
         topRight.value_or(topTrailing.value_or(all.value_or(defaults))),
         /* .bottomLeft = */
@@ -258,7 +261,8 @@ struct CascadedRectangleCorners {
     };
   }
 
-  bool operator==(const CascadedRectangleCorners<T>& rhs) const {
+  bool operator==(const CascadedRectangleCorners<T> &rhs) const
+  {
     return std::tie(
                this->topLeft,
                this->topRight,
@@ -289,7 +293,8 @@ struct CascadedRectangleCorners {
                rhs.startStart);
   }
 
-  bool operator!=(const CascadedRectangleCorners<T>& rhs) const {
+  bool operator!=(const CascadedRectangleCorners<T> &rhs) const
+  {
     return !(*this == rhs);
   }
 };
@@ -313,22 +318,15 @@ struct BorderMetrics {
   BorderCurves borderCurves{};
   BorderStyles borderStyles{};
 
-  bool operator==(const BorderMetrics& rhs) const {
+  bool operator==(const BorderMetrics &rhs) const
+  {
     return std::tie(
-               this->borderColors,
-               this->borderWidths,
-               this->borderRadii,
-               this->borderCurves,
-               this->borderStyles) ==
-        std::tie(
-               rhs.borderColors,
-               rhs.borderWidths,
-               rhs.borderRadii,
-               rhs.borderCurves,
-               rhs.borderStyles);
+               this->borderColors, this->borderWidths, this->borderRadii, this->borderCurves, this->borderStyles) ==
+        std::tie(rhs.borderColors, rhs.borderWidths, rhs.borderRadii, rhs.borderCurves, rhs.borderStyles);
   }
 
-  bool operator!=(const BorderMetrics& rhs) const {
+  bool operator!=(const BorderMetrics &rhs) const
+  {
     return !(*this == rhs);
   }
 };