react-native-tvos 0.83.1-0 → 0.84.0-0rc0

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

@@ -0,0 +1,156 @@
+/*
+ * 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.events
+
+import android.view.KeyEvent as AndroidKeyEvent
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+
+internal abstract class KeyEvent(
+    surfaceId: Int,
+    viewTag: Int,
+    keyEvent: AndroidKeyEvent,
+) : Event<KeyEvent>(surfaceId, viewTag) {
+
+  // Extract all needed data from keyEvent immediately to avoid storing the AndroidKeyEvent itself
+  private val keyCode: Int = keyEvent.keyCode
+  private val unicodeChar: Int = keyEvent.unicodeChar
+  private val isAltPressed: Boolean = keyEvent.isAltPressed
+  private val isCtrlPressed: Boolean = keyEvent.isCtrlPressed
+  private val isMetaPressed: Boolean = keyEvent.isMetaPressed
+  private val isShiftPressed: Boolean = keyEvent.isShiftPressed
+
+  override fun canCoalesce(): Boolean = false
+
+  override fun getEventCategory(): Int = EventCategoryDef.DISCRETE
+
+  override fun getEventData(): WritableMap {
+    val eventData = Arguments.createMap()
+
+    eventData.putInt("target", viewTag)
+
+    // W3C KeyboardEvent properties
+    eventData.putString("key", getKeyString())
+    eventData.putString("code", getCodeString())
+
+    // Modifier keys
+    eventData.putBoolean("altKey", isAltPressed)
+    eventData.putBoolean("ctrlKey", isCtrlPressed)
+    eventData.putBoolean("metaKey", isMetaPressed)
+    eventData.putBoolean("shiftKey", isShiftPressed)
+
+    // Additional properties
+    eventData.putDouble("timestamp", timestampMs.toDouble())
+
+    return eventData
+  }
+
+  private fun getKeyString(): String {
+    return when {
+      unicodeChar != 0 && !Character.isISOControl(unicodeChar) -> unicodeChar.toChar().toString()
+      else -> KEY_NAME_MAP[keyCode] ?: UNIDENTIFIED
+    }
+  }
+
+  private fun getCodeString(): String {
+    return CODE_MAP[keyCode] ?: UNIDENTIFIED
+  }
+
+  internal companion object {
+    private const val UNIDENTIFIED = "Unidentified"
+
+    private val CODE_MAP: Map<Int, String> by
+        lazy(LazyThreadSafetyMode.PUBLICATION) {
+          mapOf(
+              // Letter keys
+              AndroidKeyEvent.KEYCODE_A to "KeyA",
+              AndroidKeyEvent.KEYCODE_B to "KeyB",
+              AndroidKeyEvent.KEYCODE_C to "KeyC",
+              AndroidKeyEvent.KEYCODE_D to "KeyD",
+              AndroidKeyEvent.KEYCODE_E to "KeyE",
+              AndroidKeyEvent.KEYCODE_F to "KeyF",
+              AndroidKeyEvent.KEYCODE_G to "KeyG",
+              AndroidKeyEvent.KEYCODE_H to "KeyH",
+              AndroidKeyEvent.KEYCODE_I to "KeyI",
+              AndroidKeyEvent.KEYCODE_J to "KeyJ",
+              AndroidKeyEvent.KEYCODE_K to "KeyK",
+              AndroidKeyEvent.KEYCODE_L to "KeyL",
+              AndroidKeyEvent.KEYCODE_M to "KeyM",
+              AndroidKeyEvent.KEYCODE_N to "KeyN",
+              AndroidKeyEvent.KEYCODE_O to "KeyO",
+              AndroidKeyEvent.KEYCODE_P to "KeyP",
+              AndroidKeyEvent.KEYCODE_Q to "KeyQ",
+              AndroidKeyEvent.KEYCODE_R to "KeyR",
+              AndroidKeyEvent.KEYCODE_S to "KeyS",
+              AndroidKeyEvent.KEYCODE_T to "KeyT",
+              AndroidKeyEvent.KEYCODE_U to "KeyU",
+              AndroidKeyEvent.KEYCODE_V to "KeyV",
+              AndroidKeyEvent.KEYCODE_W to "KeyW",
+              AndroidKeyEvent.KEYCODE_X to "KeyX",
+              AndroidKeyEvent.KEYCODE_Y to "KeyY",
+              AndroidKeyEvent.KEYCODE_Z to "KeyZ",
+              // Digit keys
+              AndroidKeyEvent.KEYCODE_0 to "Digit0",
+              AndroidKeyEvent.KEYCODE_1 to "Digit1",
+              AndroidKeyEvent.KEYCODE_2 to "Digit2",
+              AndroidKeyEvent.KEYCODE_3 to "Digit3",
+              AndroidKeyEvent.KEYCODE_4 to "Digit4",
+              AndroidKeyEvent.KEYCODE_5 to "Digit5",
+              AndroidKeyEvent.KEYCODE_6 to "Digit6",
+              AndroidKeyEvent.KEYCODE_7 to "Digit7",
+              AndroidKeyEvent.KEYCODE_8 to "Digit8",
+              AndroidKeyEvent.KEYCODE_9 to "Digit9",
+              // Special keys
+              AndroidKeyEvent.KEYCODE_ENTER to "Enter",
+              AndroidKeyEvent.KEYCODE_SPACE to "Space",
+              AndroidKeyEvent.KEYCODE_TAB to "Tab",
+              AndroidKeyEvent.KEYCODE_DEL to "Backspace",
+              AndroidKeyEvent.KEYCODE_ESCAPE to "Escape",
+              // Modifier keys
+              AndroidKeyEvent.KEYCODE_SHIFT_LEFT to "ShiftLeft",
+              AndroidKeyEvent.KEYCODE_SHIFT_RIGHT to "ShiftRight",
+              AndroidKeyEvent.KEYCODE_CTRL_LEFT to "ControlLeft",
+              AndroidKeyEvent.KEYCODE_CTRL_RIGHT to "ControlRight",
+              AndroidKeyEvent.KEYCODE_ALT_LEFT to "AltLeft",
+              AndroidKeyEvent.KEYCODE_ALT_RIGHT to "AltRight",
+              AndroidKeyEvent.KEYCODE_META_LEFT to "MetaLeft",
+              AndroidKeyEvent.KEYCODE_META_RIGHT to "MetaRight",
+              // Arrow keys
+              AndroidKeyEvent.KEYCODE_DPAD_UP to "ArrowUp",
+              AndroidKeyEvent.KEYCODE_DPAD_DOWN to "ArrowDown",
+              AndroidKeyEvent.KEYCODE_DPAD_LEFT to "ArrowLeft",
+              AndroidKeyEvent.KEYCODE_DPAD_RIGHT to "ArrowRight",
+              AndroidKeyEvent.KEYCODE_DPAD_CENTER to "Enter",
+          )
+        }
+
+    private val KEY_NAME_MAP: Map<Int, String> by
+        lazy(LazyThreadSafetyMode.PUBLICATION) {
+          mapOf(
+              AndroidKeyEvent.KEYCODE_ENTER to "Enter",
+              AndroidKeyEvent.KEYCODE_DPAD_CENTER to "Enter",
+              AndroidKeyEvent.KEYCODE_SPACE to " ",
+              AndroidKeyEvent.KEYCODE_TAB to "Tab",
+              AndroidKeyEvent.KEYCODE_DEL to "Backspace",
+              AndroidKeyEvent.KEYCODE_ESCAPE to "Escape",
+              AndroidKeyEvent.KEYCODE_SHIFT_LEFT to "Shift",
+              AndroidKeyEvent.KEYCODE_SHIFT_RIGHT to "Shift",
+              AndroidKeyEvent.KEYCODE_CTRL_LEFT to "Control",
+              AndroidKeyEvent.KEYCODE_CTRL_RIGHT to "Control",
+              AndroidKeyEvent.KEYCODE_ALT_LEFT to "Alt",
+              AndroidKeyEvent.KEYCODE_ALT_RIGHT to "Alt",
+              AndroidKeyEvent.KEYCODE_META_LEFT to "Meta",
+              AndroidKeyEvent.KEYCODE_META_RIGHT to "Meta",
+              AndroidKeyEvent.KEYCODE_DPAD_UP to "ArrowUp",
+              AndroidKeyEvent.KEYCODE_DPAD_DOWN to "ArrowDown",
+              AndroidKeyEvent.KEYCODE_DPAD_LEFT to "ArrowLeft",
+              AndroidKeyEvent.KEYCODE_DPAD_RIGHT to "ArrowRight",
+          )
+        }
+  }
+}

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

@@ -0,0 +1,24 @@
+/*
+ * 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.events
+
+import android.view.KeyEvent as AndroidKeyEvent
+
+/** An event representing a key release (keyup). Corresponds to W3C KeyboardEvent specification. */
+internal class KeyUpEvent(
+    surfaceId: Int,
+    viewTag: Int,
+    keyEvent: AndroidKeyEvent,
+) : KeyEvent(surfaceId, viewTag, keyEvent) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  companion object {
+    private const val EVENT_NAME: String = "topKeyUp"
+  }
+}

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

@@ -29,7 +29,8 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
   private lateinit var _eventName: String
   private var coalescingKey = UNSET_COALESCING_KEY
   private var pointersEventData: List<WritableMap>? = null
-  private lateinit var eventState: PointerEventState
+  private var eventState: PointerEventState? = null
+  private var activeHitPathViewIds: List<Int>? = null
 
   private fun init(
       eventName: String,
@@ -37,12 +38,14 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
       eventState: PointerEventState,
       motionEventToCopy: MotionEvent,
       coalescingKey: Short,
+      activeHitPathViewIds: List<Int>?,
   ) {
     super.init(eventState.getSurfaceId(), targetTag, motionEventToCopy.eventTime)
     this._eventName = eventName
     this.motionEvent = MotionEvent.obtain(motionEventToCopy)
     this.coalescingKey = coalescingKey
     this.eventState = eventState
+    this.activeHitPathViewIds = activeHitPathViewIds
   }
 
   override fun getEventName(): String = _eventName
@@ -84,7 +87,7 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
             return@EventAnimationDriverMatchSpec false
           }
           if (isBubblingEvent(eventName)) {
-            for (viewTarget in eventState.hitPathForActivePointer) {
+            for (viewTarget in checkNotNull(eventState).hitPathForActivePointer) {
               if (viewTarget.getViewId() == viewTag) {
                 return@EventAnimationDriverMatchSpec true
               }
@@ -97,10 +100,10 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
       }
 
   override fun onDispose() {
+    eventState = null
     pointersEventData = null
-    val motionEvent = motionEvent
-    this.motionEvent = null
     motionEvent?.recycle()
+    motionEvent = null
 
     // Either `this` is in the event pool, or motionEvent
     // is null. It is in theory not possible for a PointerEvent to
@@ -137,6 +140,7 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
     val pointerEvent = Arguments.createMap()
     val motionEvent = checkNotNull(motionEvent)
     val pointerId = motionEvent.getPointerId(index)
+    val eventState = checkNotNull(eventState)
 
     // https://www.w3.org/TR/pointerevents/#pointerevent-interface
     pointerEvent.putDouble("pointerId", pointerId.toDouble())
@@ -212,6 +216,13 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
     pointerEvent.putDouble("pressure", pressure)
     pointerEvent.putDouble("tangentialPressure", 0.0)
 
+    if (activeHitPathViewIds != null) {
+      pointerEvent.putArray(
+          "hitPathForEventListener",
+          Arguments.makeNativeArray(activeHitPathViewIds),
+      )
+    }
+
     addModifierKeyData(pointerEvent, motionEvent.metaState)
 
     return pointerEvent
@@ -295,6 +306,9 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
 
     val hitPathForActivePointer: List<ViewTarget>
       get() = checkNotNull(hitPathByPointerId[activePointerId])
+
+    val hitPathViewIdsForActivePointer: List<Int>
+      get() = checkNotNull(hitPathByPointerId[activePointerId]).map { it.getViewId() }
   }
 
   companion object {
@@ -309,6 +323,15 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
         targetTag: Int,
         eventState: PointerEventState,
         motionEventToCopy: MotionEvent?,
+    ): PointerEvent = obtain(eventName, targetTag, eventState, motionEventToCopy, null)
+
+    @JvmStatic
+    fun obtain(
+        eventName: String,
+        targetTag: Int,
+        eventState: PointerEventState,
+        motionEventToCopy: MotionEvent?,
+        activeHitPathViewIds: List<Int>?,
     ): PointerEvent {
       var event = EVENTS_POOL.acquire()
       if (event == null) {
@@ -320,6 +343,7 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
           eventState,
           Assertions.assertNotNull(motionEventToCopy),
           0.toShort(),
+          activeHitPathViewIds,
       )
       return event
     }
@@ -342,6 +366,7 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
           eventState,
           Assertions.assertNotNull(motionEventToCopy),
           coalescingKey,
+          null,
       )
       return event
     }

package/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.kt

@@ -372,15 +372,18 @@ public class ReactImageView(
   public override fun hasOverlappingRendering(): Boolean = false
 
   public override fun onDraw(canvas: Canvas) {
-    BackgroundStyleApplicator.clipToPaddingBox(this, canvas)
-    try {
-      super.onDraw(canvas)
-    } catch (e: RuntimeException) {
-      // Only provide updates if downloadListener is set (shouldNotify is true)
-      if (downloadListener != null) {
-        val eventDispatcher =
-            UIManagerHelper.getEventDispatcherForReactTag(context as ReactContext, id)
-        eventDispatcher?.dispatchEvent(createErrorEvent(UIManagerHelper.getSurfaceId(this), id, e))
+    BackgroundStyleApplicator.clipToPaddingBoxWithAntiAliasing(this, canvas) {
+      try {
+        super.onDraw(canvas)
+      } catch (e: RuntimeException) {
+        // Only provide updates if downloadListener is set (shouldNotify is true)
+        if (downloadListener != null) {
+          val eventDispatcher =
+              UIManagerHelper.getEventDispatcherForReactTag(context as ReactContext, id)
+          eventDispatcher?.dispatchEvent(
+              createErrorEvent(UIManagerHelper.getSurfaceId(this), id, e)
+          )
+        }
       }
     }
   }

package/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt

@@ -646,7 +646,7 @@ public class ReactModalHostView(context: ThemedReactContext) :
 
     override fun onInterceptHoverEvent(event: MotionEvent): Boolean {
       eventDispatcher?.let { jSPointerDispatcher?.handleMotionEvent(event, it, true) }
-      return super.onHoverEvent(event)
+      return super.onInterceptHoverEvent(event)
     }
 
     override fun onHoverEvent(event: MotionEvent): Boolean {

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java

@@ -28,6 +28,7 @@ import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.HorizontalScrollView;
 import android.widget.OverScroller;
@@ -134,6 +135,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
   private @Nullable MaintainVisibleScrollPositionHelper mMaintainVisibleContentPositionHelper;
   private int mFadingEdgeLengthStart = 0;
   private int mFadingEdgeLengthEnd = 0;
+  private boolean mEmittedOverScrollSinceScrollBegin = false;
 
   public ReactHorizontalScrollView(Context context) {
     this(context, null);
@@ -298,6 +300,10 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
 
   @Override
   public void setRemoveClippedSubviews(boolean removeClippedSubviews) {
+    if (ReactNativeFeatureFlags.disableSubviewClippingAndroid()) {
+      return;
+    }
+
     if (removeClippedSubviews && mClippingRect == null) {
       mClippingRect = new Rect();
     }
@@ -733,6 +739,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
     }
     ReactScrollViewHelper.emitScrollBeginDragEvent(this);
     mDragging = true;
+    mEmittedOverScrollSinceScrollBegin = false;
     enableFpsListener();
     getFlingAnimator().cancel();
   }
@@ -748,6 +755,20 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
     return handled;
   }
 
+  private boolean isDescendantOf(View parent, View view) {
+    if (view == null || parent == null) {
+      return false;
+    }
+    ViewParent p = view.getParent();
+    while (p != null && p.getParent() != null) {
+      if (p == parent) {
+        return true;
+      }
+      p = p.getParent();
+    }
+    return false;
+  }
+
   @Override
   public boolean arrowScroll(int direction) {
     boolean handled = false;
@@ -759,7 +780,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
         View currentFocused = findFocus();
         View nextFocused = FocusFinder.getInstance().findNextFocus(this, currentFocused, direction);
         View rootChild = getContentView();
-        if (rootChild != null && nextFocused != null && nextFocused.getParent() == rootChild) {
+        if (isDescendantOf(rootChild, nextFocused)) {
           if (!isScrolledInView(nextFocused) && !isMostlyScrolledInView(nextFocused)) {
             smoothScrollToNextPage(direction);
           }
@@ -842,8 +863,13 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
                 @Override
                 public void run() {
                   mPostTouchRunnable = null;
-                  // Trigger snap alignment now that scrolling has stopped
-                  handlePostTouchScrolling(0, 0);
+                  // +1/-1 velocity if scrolling right or left. This is to ensure that the
+                  // next/previous page is picked rather than sliding backwards to the current page
+                  int velocityX = (int) Math.signum(hScroll);
+                  if (mDisableIntervalMomentum) {
+                    velocityX = 0;
+                  }
+                  flingAndSnap(velocityX);
                 }
               };
           postOnAnimationDelayed(mPostTouchRunnable, ReactScrollViewHelper.MOMENTUM_DELAY);
@@ -1060,6 +1086,13 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
       // END FB SCROLLVIEW CHANGE
     }
 
+    if (ReactNativeFeatureFlags.shouldTriggerResponderTransferOnScrollAndroid()
+        && clampedX
+        && mEmittedOverScrollSinceScrollBegin == false) {
+      ReactScrollViewHelper.emitScrollEvent(this, 0f, 0f);
+      mEmittedOverScrollSinceScrollBegin = true;
+    }
+
     super.onOverScrolled(scrollX, scrollY, clampedX, clampedY);
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java

@@ -132,6 +132,7 @@ public class ReactScrollView extends ScrollView
   private @Nullable MaintainVisibleScrollPositionHelper mMaintainVisibleContentPositionHelper;
   private int mFadingEdgeLengthStart;
   private int mFadingEdgeLengthEnd;
+  private boolean mEmittedOverScrollSinceScrollBegin;
 
   public ReactScrollView(Context context) {
     this(context, null);
@@ -194,6 +195,7 @@ public class ReactScrollView extends ScrollView
     mMaintainVisibleContentPositionHelper = null;
     mFadingEdgeLengthStart = 0;
     mFadingEdgeLengthEnd = 0;
+    mEmittedOverScrollSinceScrollBegin = false;
   }
 
   /* package */ void recycleView() {
@@ -629,6 +631,7 @@ public class ReactScrollView extends ScrollView
     }
     ReactScrollViewHelper.emitScrollBeginDragEvent(this);
     mDragging = true;
+    mEmittedOverScrollSinceScrollBegin = false;
     enableFpsListener();
     getFlingAnimator().cancel();
   }
@@ -696,8 +699,13 @@ public class ReactScrollView extends ScrollView
                 @Override
                 public void run() {
                   mPostTouchRunnable = null;
-                  // Trigger snap alignment now that scrolling has stopped
-                  handlePostTouchScrolling(0, 0);
+                  // +1/-1 velocity if scrolling down or up. This is to ensure that the
+                  // next/previous page is picked rather than sliding backwards to the current page
+                  int velocityY = (int) -Math.signum(vScroll);
+                  if (mDisableIntervalMomentum) {
+                    velocityY = 0;
+                  }
+                  flingAndSnap(velocityY);
                 }
               };
           postOnAnimationDelayed(mPostTouchRunnable, ReactScrollViewHelper.MOMENTUM_DELAY);
@@ -722,6 +730,10 @@ public class ReactScrollView extends ScrollView
 
   @Override
   public void setRemoveClippedSubviews(boolean removeClippedSubviews) {
+    if (ReactNativeFeatureFlags.disableSubviewClippingAndroid()) {
+      return;
+    }
+
     if (removeClippedSubviews && mClippingRect == null) {
       mClippingRect = new Rect();
     }
@@ -776,8 +788,6 @@ public class ReactScrollView extends ScrollView
     if (mPagingEnabled) {
       flingAndSnap(correctedVelocityY);
     } else if (mScroller != null) {
-      // FB SCROLLVIEW CHANGE
-
       // We provide our own version of fling that uses a different call to the standard OverScroller
       // which takes into account the possibility of adding new content while the ScrollView is
       // animating. Because we give essentially no max Y for the fling, the fling will continue as
@@ -802,8 +812,6 @@ public class ReactScrollView extends ScrollView
           );
 
       ViewCompat.postInvalidateOnAnimation(this);
-
-      // END FB SCROLLVIEW CHANGE
     } else {
       super.fling(correctedVelocityY);
     }
@@ -1262,11 +1270,8 @@ public class ReactScrollView extends ScrollView
   @Override
   protected void onOverScrolled(int scrollX, int scrollY, boolean clampedX, boolean clampedY) {
     if (mScroller != null && mContentView != null) {
-      // FB SCROLLVIEW CHANGE
-
       // This is part two of the reimplementation of fling to fix the bounce-back bug. See #fling()
-      // for
-      // more information.
+      // for more information.
 
       if (!mScroller.isFinished() && mScroller.getCurrY() != mScroller.getFinalY()) {
         int scrollRange = getMaxScrollY();
@@ -1275,8 +1280,13 @@ public class ReactScrollView extends ScrollView
           scrollY = scrollRange;
         }
       }
+    }
 
-      // END FB SCROLLVIEW CHANGE
+    if (ReactNativeFeatureFlags.shouldTriggerResponderTransferOnScrollAndroid()
+        && clampedY
+        && mEmittedOverScrollSinceScrollBegin == false) {
+      ReactScrollViewHelper.emitScrollEvent(this, 0f, 0f);
+      mEmittedOverScrollSinceScrollBegin = true;
     }
 
     super.onOverScrolled(scrollX, scrollY, clampedX, clampedY);

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/VirtualViewContainerStateExperimental.kt

@@ -49,6 +49,13 @@ internal class VirtualViewContainerStateExperimental(scrollView: ViewGroup) :
     }
   }
 
+  override fun remove(virtualView: VirtualView) {
+    super.remove(virtualView)
+    HPV.remove(virtualView.virtualViewID)
+    P.remove(virtualView.virtualViewID)
+    V.remove(virtualView.virtualViewID)
+  }
+
   /**
    * Perform mode update check on a single VirtualView. Does not check other VirtualViews in the
    * collection. Use carefully

package/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewAccessibilityDelegate.kt

@@ -219,6 +219,7 @@ internal class ReactTextViewAccessibilityDelegate(
     node.contentDescription = accessibleTextSpan.description
     node.addAction(AccessibilityNodeInfoCompat.ACTION_CLICK)
     node.setBoundsInParent(bounds)
+    node.setClickable(true)
     node.roleDescription = hostView.resources.getString(R.string.link_description)
     node.className = AccessibilityRole.getValue(AccessibilityRole.BUTTON)
   }
@@ -290,22 +291,26 @@ internal class ReactTextViewAccessibilityDelegate(
     init {
       val accessibleLinks = mutableListOf<AccessibleLink>()
       val spans = text.getSpans(0, text.length, ClickableSpan::class.java)
-      spans.sortBy { text.getSpanStart(it) }
-      for (i in spans.indices) {
-        val span = spans[i]
-        val start = text.getSpanStart(span)
-        val end = text.getSpanEnd(span)
-        // zero length spans, and out of range spans should not be included.
-        if (start == end || start < 0 || end < 0 || start > text.length || end > text.length) {
-          continue
-        }
 
-        val link = AccessibleLink()
-        link.description = text.subSequence(start, end).toString()
-        link.start = start
-        link.end = end
-        link.id = i
-        accessibleLinks.add(link)
+      // Do not generate virtual views if whole text is a single link
+      if (!isWholeTextSingleLink(text, spans)) {
+        spans.sortBy { text.getSpanStart(it) }
+        for (i in spans.indices) {
+          val span = spans[i]
+          val start = text.getSpanStart(span)
+          val end = text.getSpanEnd(span)
+          // zero length spans, and out of range spans should not be included.
+          if (start == end || start < 0 || end < 0 || start > text.length || end > text.length) {
+            continue
+          }
+
+          val link = AccessibleLink()
+          link.description = text.subSequence(start, end).toString()
+          link.start = start
+          link.end = end
+          link.id = i
+          accessibleLinks.add(link)
+        }
       }
       links = accessibleLinks
     }
@@ -342,3 +347,14 @@ internal class ReactTextViewAccessibilityDelegate(
     }
   }
 }
+
+private fun isWholeTextSingleLink(text: Spanned, spans: Array<ClickableSpan>): Boolean {
+  if (spans.size != 1) {
+    return false
+  }
+
+  val span = spans[0]
+  val start = text.getSpanStart(span)
+  val end = text.getSpanEnd(span)
+  return start == 0 && end == text.length
+}