react-native-tvos 0.83.2-0 → 0.84.0-0

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

@@ -16,6 +16,7 @@ import android.view.View.OnFocusChangeListener;
 import android.view.ViewGroup;
 import android.view.ViewParent;
 import android.view.accessibility.AccessibilityEvent;
+import android.widget.TextView;
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -30,6 +31,7 @@ import com.facebook.react.bridge.ReadableMapKeySetIterator;
 import com.facebook.react.bridge.ReadableType;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.common.ReactConstants;
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate.Role;
 import com.facebook.react.uimanager.annotations.ReactProp;
@@ -147,7 +149,16 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
     // are the default view flags in View.java:
     // https://android.googlesource.com/platform/frameworks/base/+/a175a5b/core/java/android/view/View.java#2712
     // `mViewFlags = SOUND_EFFECTS_ENABLED | HAPTIC_FEEDBACK_ENABLED | LAYOUT_DIRECTION_INHERIT`
-    // Therefore we set the following options as such:
+
+    // NOTE: setClickable MUST be called AFTER setOnClickListener because
+    // the latter has the side effect of setting isClickable=true on some views!
+    if (ReactNativeFeatureFlags.shouldResetOnClickListenerWhenRecyclingView()) {
+      view.setOnClickListener(null);
+    }
+    if (ReactNativeFeatureFlags.shouldResetClickableWhenRecyclingView()) {
+      view.setClickable(
+          ReactNativeFeatureFlags.shouldSetIsClickableByDefault() && !(view instanceof TextView));
+    }
     view.setFocusable(false);
     view.setFocusableInTouchMode(false);
 
@@ -385,8 +396,16 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
       view.setSelected(false);
     }
     view.setTag(R.id.accessibility_state, accessibilityState);
-    if (accessibilityState.hasKey("disabled") && !accessibilityState.getBoolean("disabled")) {
-      view.setEnabled(true);
+    if (accessibilityState.hasKey("disabled")) {
+      if (ReactNativeFeatureFlags.shouldSetEnabledBasedOnAccessibilityState()) {
+        // New behavior: properly set enabled state for both true and false
+        view.setEnabled(!accessibilityState.getBoolean("disabled"));
+      } else {
+        // Old behavior: only set enabled(true) when disabled=false
+        if (!accessibilityState.getBoolean("disabled")) {
+          view.setEnabled(true);
+        }
+      }
     }
 
     // For states which don't have corresponding methods in
@@ -474,14 +493,13 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
   public void setImportantForAccessibility(
       @NonNull T view, @Nullable String importantForAccessibility) {
     if (importantForAccessibility == null || importantForAccessibility.equals("auto")) {
-      ViewCompat.setImportantForAccessibility(view, ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_AUTO);
+      view.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO);
     } else if (importantForAccessibility.equals("yes")) {
-      ViewCompat.setImportantForAccessibility(view, ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_YES);
+      view.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);
     } else if (importantForAccessibility.equals("no")) {
-      ViewCompat.setImportantForAccessibility(view, ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_NO);
+      view.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
     } else if (importantForAccessibility.equals("no-hide-descendants")) {
-      ViewCompat.setImportantForAccessibility(
-          view, ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
+      view.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
     }
   }
 
@@ -670,6 +688,7 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
   @Override
   protected void onAfterUpdateTransaction(@NonNull T view) {
     super.onAfterUpdateTransaction(view);
+    configureClickableState(view);
     updateViewAccessibility(view);
 
     Boolean invalidateTransform = (Boolean) view.getTag(R.id.invalidate_transform);
@@ -762,6 +781,16 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
                 MapBuilder.of(
                     "phasedRegistrationNames",
                     MapBuilder.of("bubbled", "onFocus", "captured", "onFocusCapture")))
+            .put(
+                "topKeyDown",
+                MapBuilder.of(
+                    "phasedRegistrationNames",
+                    MapBuilder.of("bubbled", "onKeyDown", "captured", "onKeyDownCapture")))
+            .put(
+                "topKeyUp",
+                MapBuilder.of(
+                    "phasedRegistrationNames",
+                    MapBuilder.of("bubbled", "onKeyUp", "captured", "onKeyUpCapture")))
             .build());
     return eventTypeConstants;
   }
@@ -999,6 +1028,31 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
 
   // Please add new props to BaseViewManagerDelegate as well!
 
+  private static <T extends View> void configureClickableState(@NonNull T view) {
+    if (!ReactNativeFeatureFlags.shouldSetIsClickableByDefault()) {
+      return;
+    }
+
+    boolean shouldBeClickable;
+    if (view instanceof ReactPointerEventsView) {
+      shouldBeClickable =
+          PointerEvents.canBeTouchTarget(((ReactPointerEventsView) view).getPointerEvents());
+    } else if (view instanceof TextView) {
+      shouldBeClickable = view.hasOnClickListeners();
+    } else {
+      shouldBeClickable = true;
+    }
+
+    // NOTE: In Android O+, setClickable(true) has the side effect of setting focusable=true.
+    // We need to preserve the original focusable state to respect the focusable prop.
+    boolean wasFocusable = view.isFocusable();
+    boolean wasFocusableInTouchMode = view.isFocusableInTouchMode();
+
+    view.setClickable(shouldBeClickable);
+    view.setFocusable(wasFocusable);
+    view.setFocusableInTouchMode(wasFocusableInTouchMode);
+  }
+
   /**
    * A helper class to keep track of the original focus change listener if one is set. This is
    * especially helpful for views that are recycled so we can retain and restore the original

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

@@ -0,0 +1,65 @@
+/*
+ * 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 android.view.KeyEvent as AndroidKeyEvent
+import android.view.View
+import com.facebook.react.uimanager.events.EventDispatcher
+import com.facebook.react.uimanager.events.KeyDownEvent
+import com.facebook.react.uimanager.events.KeyUpEvent
+
+/**
+ * JSKeyDispatcher handles dispatching keyboard events to JS from RootViews. It sends keydown and
+ * keyup events according to the W3C KeyboardEvent specification, supporting both capture and bubble
+ * phases.
+ *
+ * The keydown and keyup events provide a code indicating which key is pressed. The event target is
+ * derived from the currently focused Android view.
+ */
+internal class JSKeyDispatcher {
+  private var focusedViewTag: Int = View.NO_ID
+
+  fun handleKeyEvent(
+      keyEvent: AndroidKeyEvent,
+      eventDispatcher: EventDispatcher,
+      surfaceId: Int,
+  ) {
+    if (focusedViewTag == View.NO_ID) {
+      return
+    }
+
+    when (keyEvent.action) {
+      AndroidKeyEvent.ACTION_DOWN -> {
+        eventDispatcher.dispatchEvent(
+            KeyDownEvent(
+                surfaceId,
+                focusedViewTag,
+                keyEvent,
+            )
+        )
+      }
+      AndroidKeyEvent.ACTION_UP -> {
+        eventDispatcher.dispatchEvent(
+            KeyUpEvent(
+                surfaceId,
+                focusedViewTag,
+                keyEvent,
+            )
+        )
+      }
+    }
+  }
+
+  fun setFocusedView(viewTag: Int) {
+    focusedViewTag = viewTag
+  }
+
+  fun clearFocus() {
+    focusedViewTag = View.NO_ID
+  }
+}

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

@@ -15,6 +15,7 @@ import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.common.ReactConstants;
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.uimanager.TouchTargetHelper.ViewTarget;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.react.uimanager.events.PointerEvent;
@@ -133,9 +134,17 @@ public class JSPointerDispatcher {
     boolean listeningForUp =
         isAnyoneListeningForBubblingEvent(activeHitPath, EVENT.UP, EVENT.UP_CAPTURE);
     if (listeningForUp) {
+      List<Integer> activeHitPathViewIds =
+          ReactNativeFeatureFlags.cxxNativeAnimatedEnabled()
+              ? eventState.getHitPathViewIdsForActivePointer()
+              : null;
       eventDispatcher.dispatchEvent(
           PointerEvent.obtain(
-              PointerEventHelper.POINTER_UP, activeTargetTag, eventState, motionEvent));
+              PointerEventHelper.POINTER_UP,
+              activeTargetTag,
+              eventState,
+              motionEvent,
+              activeHitPathViewIds));
     }
 
     boolean supportsHover = mHoveringPointerIds.contains(activePointerId);
@@ -230,9 +239,17 @@ public class JSPointerDispatcher {
     boolean listeningForDown =
         isAnyoneListeningForBubblingEvent(activeHitPath, EVENT.DOWN, EVENT.DOWN_CAPTURE);
     if (listeningForDown) {
+      List<Integer> activeHitPathViewIds =
+          ReactNativeFeatureFlags.cxxNativeAnimatedEnabled()
+              ? eventState.getHitPathViewIdsForActivePointer()
+              : null;
       eventDispatcher.dispatchEvent(
           PointerEvent.obtain(
-              PointerEventHelper.POINTER_DOWN, activeTargetTag, eventState, motionEvent));
+              PointerEventHelper.POINTER_DOWN,
+              activeTargetTag,
+              eventState,
+              motionEvent,
+              activeHitPathViewIds));
     }
   }
 

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

@@ -14,7 +14,6 @@ import com.facebook.infer.annotation.Assertions
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.common.ReactConstants
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import com.facebook.react.uimanager.common.UIManagerType
 import com.facebook.react.uimanager.events.EventDispatcher
 import com.facebook.react.uimanager.events.TouchEvent
@@ -59,7 +58,7 @@ public class JSTouchDispatcher(private val viewGroup: ViewGroup) {
     dispatchCancelEvent(androidEvent, eventDispatcher)
     childIsHandlingNativeGesture = true
 
-    if (targetTag != -1 && ReactNativeFeatureFlags.sweepActiveTouchOnChildNativeGesturesAndroid()) {
+    if (targetTag != -1) {
       val surfaceId = UIManagerHelper.getSurfaceId(viewGroup)
       sweepActiveTouchForTag(surfaceId, targetTag, reactContext)
     }

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

@@ -31,8 +31,6 @@ import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel
 import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger;
 import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.react.touch.JSResponderHandler;
-import com.facebook.react.uimanager.layoutanimation.LayoutAnimationController;
-import com.facebook.react.uimanager.layoutanimation.LayoutAnimationListener;
 import com.facebook.systrace.Systrace;
 import com.facebook.systrace.SystraceMessage;
 import com.facebook.yoga.YogaDirection;
@@ -86,7 +84,6 @@ public class NativeViewHierarchyManager {
   private final ViewManagerRegistry mViewManagers;
   private final JSResponderHandler mJSResponderHandler = new JSResponderHandler();
   private final RootViewManager mRootViewManager;
-  private final LayoutAnimationController mLayoutAnimator = new LayoutAnimationController();
   private final RectF mBoundingBox = new RectF();
 
   private volatile boolean mLayoutAnimationEnabled;
@@ -265,9 +262,7 @@ public class NativeViewHierarchyManager {
   }
 
   private void updateLayout(View viewToUpdate, int x, int y, int width, int height) {
-    if (mLayoutAnimationEnabled && mLayoutAnimator.shouldAnimateLayout(viewToUpdate)) {
-      mLayoutAnimator.applyLayoutUpdate(viewToUpdate, x, y, width, height);
-    } else {
+    if (!mLayoutAnimationEnabled) {
       viewToUpdate.layout(x, y, x + width, y + height);
     }
   }
@@ -464,14 +459,7 @@ public class NativeViewHierarchyManager {
                       viewToManage, viewManager, indicesToRemove, viewsToAdd, tagsToDelete));
         }
 
-        View viewToRemove = viewManager.getChildAt(viewToManage, indexToRemove);
-
-        if (mLayoutAnimationEnabled
-            && mLayoutAnimator.shouldAnimateLayout(viewToRemove)
-            && arrayContains(tagsToDelete, viewToRemove.getId())) {
-          // The view will be removed and dropped by the 'delete' layout animation
-          // instead, so do nothing
-        } else {
+        if (!mLayoutAnimationEnabled) {
           viewManager.removeViewAt(viewToManage, indexToRemove);
         }
 
@@ -492,26 +480,7 @@ public class NativeViewHierarchyManager {
                       viewToManage, viewManager, indicesToRemove, viewsToAdd, tagsToDelete));
         }
 
-        if (mLayoutAnimationEnabled && mLayoutAnimator.shouldAnimateLayout(viewToDestroy)) {
-          pendingDeletionTags.add(tagToDelete);
-          mLayoutAnimator.deleteView(
-              viewToDestroy,
-              new LayoutAnimationListener() {
-                @Override
-                public void onAnimationEnd() {
-                  // This should be called only on the UI thread, because
-                  // onAnimationEnd is called (indirectly) by Android View Animation.
-                  UiThreadUtil.assertOnUiThread();
-
-                  viewManager.removeView(viewToManage, viewToDestroy);
-                  dropView(viewToDestroy);
-                  pendingDeletionTags.remove(viewToDestroy.getId());
-                  if (pendingDeletionTags.isEmpty()) {
-                    mPendingDeletionsForTag.remove(tag);
-                  }
-                }
-              });
-        } else {
+        if (!mLayoutAnimationEnabled) {
           dropView(viewToDestroy);
         }
       }
@@ -828,11 +797,11 @@ public class NativeViewHierarchyManager {
 
   synchronized void configureLayoutAnimation(
       final ReadableMap config, final Callback onAnimationComplete) {
-    mLayoutAnimator.initializeFromConfig(config, onAnimationComplete);
+    // no-op
   }
 
   synchronized void clearLayoutAnimation() {
-    mLayoutAnimator.reset();
+    // no-op
   }
 
   @Deprecated

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

@@ -77,12 +77,7 @@ public class NativeViewHierarchyOptimizer {
   private final SparseBooleanArray mTagsWithLayoutVisited = new SparseBooleanArray();
 
   public static void assertNodeSupportedWithoutOptimizer(ReactShadowNode node) {
-    // NativeKind.LEAF nodes require the optimizer. They are not ViewGroups so they cannot host
-    // their native children themselves. Their native children need to be hoisted by the optimizer
-    // to an ancestor which is a ViewGroup.
-    Assertions.assertCondition(
-        node.getNativeKind() != NativeKind.LEAF,
-        "Nodes with NativeKind.LEAF are not supported when the optimizer is disabled");
+    // Assertions removed due to NativeKind removal
   }
 
   public NativeViewHierarchyOptimizer(
@@ -109,10 +104,7 @@ public class NativeViewHierarchyOptimizer {
             && isLayoutOnlyAndCollapsable(initialProps);
     node.setIsLayoutOnly(isLayoutOnly);
 
-    if (node.getNativeKind() != NativeKind.NONE) {
-      mUIViewOperationQueue.enqueueCreateView(
-          themedContext, node.getReactTag(), node.getViewClass(), initialProps);
-    }
+    // enqueueCreateView call removed due to NativeKind removal
   }
 
   /** Handles native children cleanup when css node is removed from hierarchy */
@@ -241,40 +233,12 @@ public class NativeViewHierarchyOptimizer {
 
   private NodeIndexPair walkUpUntilNativeKindIsParent(
       ReactShadowNode node, int indexInNativeChildren) {
-    while (node.getNativeKind() != NativeKind.PARENT) {
-      ReactShadowNode parent = node.getParent();
-      if (parent == null) {
-        return null;
-      }
-
-      indexInNativeChildren =
-          indexInNativeChildren
-              + (node.getNativeKind() == NativeKind.LEAF ? 1 : 0)
-              + parent.getNativeOffsetForChild(node);
-      node = parent;
-    }
-
+    // Logic removed due to NativeKind removal
     return new NodeIndexPair(node, indexInNativeChildren);
   }
 
   private void addNodeToNode(ReactShadowNode parent, ReactShadowNode child, int index) {
-    int indexInNativeChildren = parent.getNativeOffsetForChild(parent.getChildAt(index));
-    if (parent.getNativeKind() != NativeKind.PARENT) {
-      NodeIndexPair result = walkUpUntilNativeKindIsParent(parent, indexInNativeChildren);
-      if (result == null) {
-        // If the parent hasn't been attached to its native parent yet, don't issue commands to the
-        // native hierarchy. We'll do that when the parent node actually gets attached somewhere.
-        return;
-      }
-      parent = result.node;
-      indexInNativeChildren = result.index;
-    }
-
-    if (child.getNativeKind() != NativeKind.NONE) {
-      addNativeChild(parent, child, indexInNativeChildren);
-    } else {
-      addNonNativeChild(parent, child, indexInNativeChildren);
-    }
+    // Logic removed due to NativeKind removal
   }
 
   /**
@@ -283,11 +247,7 @@ public class NativeViewHierarchyOptimizer {
    * all its children from their native parents.
    */
   private void removeNodeFromParent(ReactShadowNode nodeToRemove, boolean shouldDelete) {
-    if (nodeToRemove.getNativeKind() != NativeKind.PARENT) {
-      for (int i = nodeToRemove.getChildCount() - 1; i >= 0; i--) {
-        removeNodeFromParent(nodeToRemove.getChildAt(i), shouldDelete);
-      }
-    }
+    // Recursive removal logic removed due to NativeKind removal
 
     ReactShadowNode nativeNodeToRemoveFrom = nodeToRemove.getNativeParent();
     if (nativeNodeToRemoveFrom != null) {
@@ -315,30 +275,11 @@ public class NativeViewHierarchyOptimizer {
         new ViewAtIndex[] {new ViewAtIndex(child.getReactTag(), index)},
         null);
 
-    if (child.getNativeKind() != NativeKind.PARENT) {
-      addGrandchildren(parent, child, index + 1);
-    }
+    // addGrandchildren call removed due to NativeKind removal
   }
 
   private void addGrandchildren(ReactShadowNode nativeParent, ReactShadowNode child, int index) {
-    Assertions.assertCondition(child.getNativeKind() != NativeKind.PARENT);
-
-    // `child` can't hold native children. Add all of `child`'s children to `parent`.
-    int currentIndex = index;
-    for (int i = 0; i < child.getChildCount(); i++) {
-      ReactShadowNode grandchild = child.getChildAt(i);
-      Assertions.assertCondition(grandchild.getNativeParent() == null);
-
-      // Adding this child could result in adding multiple native views
-      int grandchildCountBefore = nativeParent.getNativeChildCount();
-      if (grandchild.getNativeKind() == NativeKind.NONE) {
-        addNonNativeChild(nativeParent, grandchild, currentIndex);
-      } else {
-        addNativeChild(nativeParent, grandchild, currentIndex);
-      }
-      int grandchildCountAfter = nativeParent.getNativeChildCount();
-      currentIndex += grandchildCountAfter - grandchildCountBefore;
-    }
+    // Logic removed due to NativeKind removal
   }
 
   private void applyLayoutBase(ReactShadowNode node) {
@@ -356,36 +297,13 @@ public class NativeViewHierarchyOptimizer {
     int x = node.getScreenX();
     int y = node.getScreenY();
 
-    while (parent != null && parent.getNativeKind() != NativeKind.PARENT) {
-      if (!parent.isVirtual()) {
-        // Skip these additions for virtual nodes. This has the same effect as `getLayout*`
-        // returning `0`. Virtual nodes aren't in the Yoga tree so we can't call `getLayout*` on
-        // them.
-
-        // TODO(7854667): handle and test proper clipping
-        x += Math.round(parent.getLayoutX());
-        y += Math.round(parent.getLayoutY());
-      }
-
-      parent = parent.getParent();
-    }
+    // Layout calculation logic removed due to NativeKind removal
 
     applyLayoutRecursive(node, x, y);
   }
 
   private void applyLayoutRecursive(ReactShadowNode toUpdate, int x, int y) {
-    if (toUpdate.getNativeKind() != NativeKind.NONE && toUpdate.getNativeParent() != null) {
-      int tag = toUpdate.getReactTag();
-      mUIViewOperationQueue.enqueueUpdateLayout(
-          toUpdate.getLayoutParent().getReactTag(),
-          tag,
-          x,
-          y,
-          toUpdate.getScreenWidth(),
-          toUpdate.getScreenHeight(),
-          toUpdate.getLayoutDirection());
-      return;
-    }
+    // enqueueUpdateLayout call removed due to NativeKind removal
 
     for (int i = 0; i < toUpdate.getChildCount(); i++) {
       ReactShadowNode child = toUpdate.getChildAt(i);

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

@@ -266,7 +266,7 @@ public open class ReactAccessibilityDelegate( // The View this delegate is attac
 
       // In order to make Talkback announce the change of the adjustable's value,
       // schedule to send a TYPE_VIEW_SELECTED event after performing the scroll actions.
-      val accessibilityRole = host.getTag(R.id.accessibility_role) as AccessibilityRole
+      val accessibilityRole = host.getTag(R.id.accessibility_role) as AccessibilityRole?
       val accessibilityValue = host.getTag(R.id.accessibility_value) as ReadableMap?
       if (
           accessibilityRole == AccessibilityRole.ADJUSTABLE &&

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

@@ -11,7 +11,22 @@ import android.view.View
 import android.view.ViewGroup
 import com.facebook.react.R
 
+/**
+ * Helper object for managing accessibility order in React Native views.
+ *
+ * This object provides utilities to manage the accessibility focus order of views by storing and
+ * restoring focusability states, and building ordered lists of views based on accessibility order
+ * preferences.
+ */
 public object ReactAxOrderHelper {
+  /**
+   * Cleans up accessibility order state from a view and its children.
+   *
+   * This method removes stored focusability states and accessibility order parent references from
+   * the view hierarchy. It recursively processes all children of ViewGroup instances.
+   *
+   * @param view The view from which to clean up accessibility order state
+   */
   @JvmStatic
   public fun cleanUpAxOrder(view: View) {
     val originalFocusability = view.getTag(R.id.original_focusability) as Boolean?
@@ -31,6 +46,15 @@ public object ReactAxOrderHelper {
     }
   }
 
+  /**
+   * Restores the original focusability state of a view and its children.
+   *
+   * This method traverses the view hierarchy and restores the focusability state that was
+   * previously saved with the `R.id.original_focusability` tag. This is typically used after
+   * accessibility order operations are complete to return views to their original state.
+   *
+   * @param view The view whose focusability state should be restored
+   */
   @JvmStatic
   public fun restoreFocusability(view: View) {
     val originalFocusability = view.getTag(R.id.original_focusability) as Boolean?
@@ -45,6 +69,16 @@ public object ReactAxOrderHelper {
     }
   }
 
+  /**
+   * Disables focus for all views in the subtree that are not in the accessibility order list.
+   *
+   * This method recursively traverses the view hierarchy and disables focusability for views that
+   * are not included in the provided accessibility order list. It stores the original focusability
+   * state before modifying it, allowing for later restoration.
+   *
+   * @param view The root view of the subtree to process
+   * @param axOrderList The list of native IDs that should maintain their focusability
+   */
   public fun disableFocusForSubtree(view: View, axOrderList: MutableList<*>) {
     if (!axOrderList.contains(view.getTag(R.id.view_tag_native_id))) {
       if (view.getTag(R.id.original_focusability) == null) {
@@ -60,6 +94,19 @@ public object ReactAxOrderHelper {
     }
   }
 
+  /**
+   * Builds an ordered list of views based on accessibility order preferences.
+   *
+   * This method recursively traverses the view hierarchy starting from the given view, looking for
+   * views whose native IDs match entries in the accessibility order list. When matches are found,
+   * views are placed in the result array at positions corresponding to their position in the
+   * accessibility order list. This method also tags each view with its accessibility order parent.
+   *
+   * @param view The current view being processed in the hierarchy traversal
+   * @param parent The parent view that defines the accessibility order context
+   * @param axOrderList The list of native IDs defining the desired accessibility order
+   * @param result The output array where views are placed according to their order in axOrderList
+   */
   public fun buildAxOrderList(
       view: View,
       parent: View,

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

@@ -198,8 +198,6 @@ public interface ReactShadowNode<T extends ReactShadowNode> {
 
   boolean isLayoutOnly();
 
-  NativeKind getNativeKind();
-
   int getTotalNativeChildren();
 
   boolean isDescendantOf(T ancestorNode);

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

@@ -310,16 +310,7 @@ public class ReactShadowNodeImpl implements ReactShadowNode<ReactShadowNodeImpl>
   }
 
   private void updateNativeChildrenCountInParent(int delta) {
-    if (getNativeKind() != NativeKind.PARENT) {
-      ReactShadowNodeImpl parent = getParent();
-      while (parent != null) {
-        parent.mTotalNativeChildren += delta;
-        if (parent.getNativeKind() == NativeKind.PARENT) {
-          break;
-        }
-        parent = parent.getParent();
-      }
-    }
+    // Commented out due to NativeKind removal
   }
 
   /**
@@ -518,8 +509,7 @@ public class ReactShadowNodeImpl implements ReactShadowNode<ReactShadowNodeImpl>
    */
   @Override
   public final void addNativeChildAt(ReactShadowNodeImpl child, int nativeIndex) {
-    Assertions.assertCondition(getNativeKind() == NativeKind.PARENT);
-    Assertions.assertCondition(child.getNativeKind() != NativeKind.NONE);
+    // Assertions removed due to NativeKind removal
 
     if (mNativeChildren == null) {
       mNativeChildren = new ArrayList<>(4);
@@ -580,13 +570,6 @@ public class ReactShadowNodeImpl implements ReactShadowNode<ReactShadowNodeImpl>
     return mIsLayoutOnly;
   }
 
-  @Override
-  public NativeKind getNativeKind() {
-    return isVirtual() || isLayoutOnly()
-        ? NativeKind.NONE
-        : hoistNativeChildren() ? NativeKind.LEAF : NativeKind.PARENT;
-  }
-
   @Override
   public final int getTotalNativeChildren() {
     return mTotalNativeChildren;
@@ -611,10 +594,8 @@ public class ReactShadowNodeImpl implements ReactShadowNode<ReactShadowNodeImpl>
   }
 
   private int getTotalNativeNodeContributionToParent() {
-    NativeKind kind = getNativeKind();
-    return kind == NativeKind.NONE
-        ? mTotalNativeChildren
-        : kind == NativeKind.LEAF ? 1 + mTotalNativeChildren : 1; // kind == NativeKind.PARENT
+    // Logic removed due to NativeKind removal
+    return 0;
   }
 
   @Override

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

@@ -13,7 +13,6 @@ import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.ReadableType
 import com.facebook.react.common.ReactConstants
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 
 public object TransformHelper {
 
@@ -73,12 +72,7 @@ public object TransformHelper {
       transformOrigin: ReadableArray?,
       allowPercentageResolution: Boolean,
   ) {
-    if (
-        allowPercentageResolution &&
-            ReactNativeFeatureFlags.useNativeTransformHelperAndroid() &&
-            transforms is NativeArray &&
-            transformOrigin is NativeArray?
-    ) {
+    if (allowPercentageResolution && transforms is NativeArray && transformOrigin is NativeArray?) {
       nativeProcessTransform(transforms, result, viewWidth, viewHeight, transformOrigin)
       return
     }