react-native-tvos 0.84.1-0 → 0.85.0-0

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.kt

@@ -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.
+ */
+
+package com.facebook.react.uimanager
+
+import com.facebook.react.common.annotations.internal.LegacyArchitecture
+import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel
+
+@LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR)
+@Deprecated(
+    message = "This class is part of Legacy Architecture and will be removed in a future release",
+    level = DeprecationLevel.WARNING,
+)
+public class NativeViewHierarchyOptimizer() {}

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java

@@ -42,8 +42,7 @@ import com.facebook.yoga.YogaWrap;
  *
  * <p>This class allows for the native view hierarchy to not be an exact copy of the hierarchy
  * received from JS by keeping track of both JS children (e.g. {@link #getChildCount()} and
- * separately native children (e.g. {@link #getNativeChildCount()}). See {@link
- * NativeViewHierarchyOptimizer} for more information.
+ * separately native children (e.g. {@link #getNativeChildCount()}).
  */
 @LegacyArchitecture
 @Deprecated(
@@ -227,13 +226,12 @@ public interface ReactShadowNode<T extends ReactShadowNode> {
    * in this subtree (which means that the given child will be a sibling of theirs in the final
    * native hierarchy since they'll get attached to the same native parent).
    *
-   * <p>Basically, a view might have children that have been optimized away by {@link
-   * NativeViewHierarchyOptimizer}. Since those children will then add their native children to this
-   * view, we now have ranges of native children that correspond to single unoptimized children. The
-   * purpose of this method is to return the index within the native children that corresponds to
-   * the **start** of the native children that belong to the given child. Also, note that all of the
-   * children of a view might be optimized away, so this could return the same value for multiple
-   * different children.
+   * <p>Basically, a view might have children that have been optimized away. Since those children
+   * will then add their native children to this view, we now have ranges of native children that
+   * correspond to single unoptimized children. The purpose of this method is to return the index
+   * within the native children that corresponds to the **start** of the native children that belong
+   * to the given child. Also, note that all of the children of a view might be optimized away, so
+   * this could return the same value for multiple different children.
    *
    * <p>Example. Native children are represented by (N) where N is the no-opt child they came from.
    * If no children are optimized away it'd look like this: (0) (1) (2) (3) ... (n)

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java

@@ -55,8 +55,7 @@ import java.util.Arrays;
  *
  * <p>This class allows for the native view hierarchy to not be an exact copy of the hierarchy
  * received from JS by keeping track of both JS children (e.g. {@link #getChildCount()} and
- * separately native children (e.g. {@link #getNativeChildCount()}). See {@link
- * NativeViewHierarchyOptimizer} for more information.
+ * separately native children (e.g. {@link #getNativeChildCount()}).
  */
 @ReactPropertyHolder
 @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR)
@@ -389,32 +388,10 @@ public class ReactShadowNodeImpl implements ReactShadowNode<ReactShadowNodeImpl>
       int newScreenWidth = newAbsoluteRight - newAbsoluteLeft;
       int newScreenHeight = newAbsoluteBottom - newAbsoluteTop;
 
-      boolean layoutHasChanged =
-          newScreenX != mScreenX
-              || newScreenY != mScreenY
-              || newScreenWidth != mScreenWidth
-              || newScreenHeight != mScreenHeight;
-
       mScreenX = newScreenX;
       mScreenY = newScreenY;
       mScreenWidth = newScreenWidth;
       mScreenHeight = newScreenHeight;
-
-      if (layoutHasChanged) {
-        // TODO: T26400974 ReactShadowNode should not depend on nativeViewHierarchyOptimizer
-        if (nativeViewHierarchyOptimizer != null) {
-          nativeViewHierarchyOptimizer.handleUpdateLayout(this);
-        } else {
-          uiViewOperationQueue.enqueueUpdateLayout(
-              getParent().getReactTag(),
-              getReactTag(),
-              getScreenX(),
-              getScreenY(),
-              getScreenWidth(),
-              getScreenHeight(),
-              getLayoutDirection());
-        }
-      }
     }
   }
 
@@ -623,13 +600,12 @@ public class ReactShadowNodeImpl implements ReactShadowNode<ReactShadowNodeImpl>
    * in this subtree (which means that the given child will be a sibling of theirs in the final
    * native hierarchy since they'll get attached to the same native parent).
    *
-   * <p>Basically, a view might have children that have been optimized away by {@link
-   * NativeViewHierarchyOptimizer}. Since those children will then add their native children to this
-   * view, we now have ranges of native children that correspond to single unoptimized children. The
-   * purpose of this method is to return the index within the native children that corresponds to
-   * the **start** of the native children that belong to the given child. Also, note that all of the
-   * children of a view might be optimized away, so this could return the same value for multiple
-   * different children.
+   * <p>Basically, a view might have children that have been optimized away. Since those children
+   * will then add their native children to this view, we now have ranges of native children that
+   * correspond to single unoptimized children. The purpose of this method is to return the index
+   * within the native children that corresponds to the **start** of the native children that belong
+   * to the given child. Also, note that all of the children of a view might be optimized away, so
+   * this could return the same value for multiple different children.
    *
    * <p>Example. Native children are represented by (N) where N is the no-opt child they came from.
    * If no children are optimized away it'd look like this: (0) (1) (2) (3) ... (n)

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactZIndexedViewGroup.kt

@@ -7,7 +7,17 @@
 
 package com.facebook.react.uimanager
 
-/** ViewGroup that supports z-index. */
+import com.facebook.react.common.annotations.internal.LegacyArchitecture
+
+/**
+ * ViewGroup that supports z-index.
+ *
+ * This interface is part of the legacy architecture. CustomDrawOrder is no longer used when Fabric
+ * is enabled, which is now everywhere. Z-order is managed at the C++ layer, and no re-ordering is
+ * needed in the Android View layer. This interface is kept for backward compatibility but should
+ * not be used in new code.
+ */
+@LegacyArchitecture
 public interface ReactZIndexedViewGroup {
   /**
    * Determine the index of a child view at [index] considering z-index.

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.kt

@@ -19,6 +19,7 @@ import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContext
+import com.facebook.react.bridge.ScrollEndedListeners
 import com.facebook.react.bridge.UIManager
 import com.facebook.react.common.annotations.internal.LegacyArchitecture
 import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder
@@ -154,4 +155,7 @@ public class ThemedReactContext(
   override fun registerSegment(segmentId: Int, path: String?, callback: Callback?) {
     reactApplicationContext.registerSegment(segmentId, path, callback)
   }
+
+  override fun getScrollEndedListeners(): ScrollEndedListeners =
+      reactApplicationContext.scrollEndedListeners
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.kt

@@ -214,11 +214,8 @@ public object TouchTargetHelper {
       }
 
       val childrenCount = viewGroup.childCount
-      // Consider z-index when determining the touch target.
-      val zIndexedViewGroup = viewGroup as? ReactZIndexedViewGroup
       for (i in childrenCount - 1 downTo 0) {
-        val childIndex = zIndexedViewGroup?.getZIndexMappedChildIndex(i) ?: i
-        val child = viewGroup.getChildAt(childIndex)
+        val child = viewGroup.getChildAt(i)
         val childPoint = tempPoint
         getChildPoint(eventCoords[0], eventCoords[1], viewGroup, child, childPoint)
         // The childPoint value will contain the view coordinates relative to the child.