@depup/react-native 0.84.1-depup.3 → 0.85.0-depup.0

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt

@@ -14,7 +14,6 @@ import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.Rect
-import android.graphics.drawable.Drawable
 import android.os.Build
 import android.os.Bundle
 import android.text.Editable
@@ -86,7 +85,6 @@ import com.facebook.react.views.text.internal.span.ReactSpan
 import com.facebook.react.views.text.internal.span.ReactStrikethroughSpan
 import com.facebook.react.views.text.internal.span.ReactTextPaintHolderSpan
 import com.facebook.react.views.text.internal.span.ReactUnderlineSpan
-import com.facebook.react.views.text.internal.span.TextInlineImageSpan
 import java.util.concurrent.CopyOnWriteArrayList
 import kotlin.math.max
 import kotlin.math.min
@@ -119,7 +117,6 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
   private var listeners: CopyOnWriteArrayList<TextWatcher>?
 
   public var stagedInputType: Int
-  protected var containsImages: Boolean = false
   public var submitBehavior: String? = null
   public var dragAndDropFilter: List<String>? = null
 
@@ -639,13 +636,13 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
 
   public fun incrementAndGetEventCounter(): Int = ++nativeEventCount
 
-  public fun maybeSetTextFromJS(reactTextUpdate: ReactTextUpdate) {
+  internal fun maybeSetTextFromJS(reactTextUpdate: ReactTextUpdate) {
     isSettingTextFromJS = true
     maybeSetText(reactTextUpdate)
     isSettingTextFromJS = false
   }
 
-  public fun maybeSetTextFromState(reactTextUpdate: ReactTextUpdate) {
+  internal fun maybeSetTextFromState(reactTextUpdate: ReactTextUpdate) {
     isSettingTextFromState = true
     maybeSetText(reactTextUpdate)
     isSettingTextFromState = false
@@ -679,9 +676,6 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
     manageSpans(spannableStringBuilder)
     stripStyleEquivalentSpans(spannableStringBuilder)
 
-    @Suppress("DEPRECATION")
-    containsImages = reactTextUpdate.containsImages()
-
     // When we update text, we trigger onChangeText code that will
     // try to update state if the wrapper is available. Temporarily disable
     // to prevent an (asynchronous) infinite loop.
@@ -921,54 +915,6 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
         }
   }
 
-  override fun verifyDrawable(drawable: Drawable): Boolean {
-    if (containsImages) {
-      val text: Spanned? = text
-      val spans = checkNotNull(text).getSpans(0, text.length, TextInlineImageSpan::class.java)
-      for (span in spans) {
-        if (span.drawable === drawable) {
-          return true
-        }
-      }
-    }
-    return super.verifyDrawable(drawable)
-  }
-
-  override fun invalidateDrawable(drawable: Drawable) {
-    if (containsImages) {
-      val text: Spanned? = text
-      val spans = checkNotNull(text).getSpans(0, text.length, TextInlineImageSpan::class.java)
-      for (span in spans) {
-        if (span.drawable === drawable) {
-          invalidate()
-        }
-      }
-    }
-    super.invalidateDrawable(drawable)
-  }
-
-  public override fun onDetachedFromWindow() {
-    super.onDetachedFromWindow()
-    if (containsImages) {
-      val text: Spanned? = text
-      val spans = checkNotNull(text).getSpans(0, text.length, TextInlineImageSpan::class.java)
-      for (span in spans) {
-        span.onDetachedFromWindow()
-      }
-    }
-  }
-
-  override fun onStartTemporaryDetach() {
-    super.onStartTemporaryDetach()
-    if (containsImages) {
-      val text: Spanned? = text
-      val spans = checkNotNull(text).getSpans(0, text.length, TextInlineImageSpan::class.java)
-      for (span in spans) {
-        span.onStartTemporaryDetach()
-      }
-    }
-  }
-
   public override fun onConfigurationChanged(newConfig: Configuration) {
     super.onConfigurationChanged(newConfig)
 
@@ -994,14 +940,6 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
     // Restore the selection since `setTextIsSelectable` changed it.
     maybeSetSelection(selectionStart, selectionEnd)
 
-    if (containsImages) {
-      val text: Spanned? = text
-      val spans = checkNotNull(text).getSpans(0, text.length, TextInlineImageSpan::class.java)
-      for (span in spans) {
-        span.onAttachedToWindow()
-      }
-    }
-
     if (autoFocus && !didAttachToWindow) {
       requestFocusProgrammatically()
     }
@@ -1009,17 +947,6 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
     didAttachToWindow = true
   }
 
-  override fun onFinishTemporaryDetach() {
-    super.onFinishTemporaryDetach()
-    if (containsImages) {
-      val text: Spanned? = text
-      val spans = checkNotNull(text).getSpans(0, text.length, TextInlineImageSpan::class.java)
-      for (span in spans) {
-        span.onFinishTemporaryDetach()
-      }
-    }
-  }
-
   override fun setBackgroundColor(color: Int) {
     setBackgroundColor(this, color)
   }

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.kt

@@ -17,6 +17,8 @@ internal class ReactTextChangedEvent(
     viewId: Int,
     private val text: String,
     private val eventCount: Int,
+    private val selectionStart: Int,
+    private val selectionEnd: Int,
 ) : Event<ReactTextChangedEvent>(surfaceId, viewId) {
   override fun getEventName(): String = EVENT_NAME
 
@@ -25,6 +27,12 @@ internal class ReactTextChangedEvent(
       putString("text", text)
       putInt("eventCount", eventCount)
       putInt("target", viewTag)
+      val selectionData =
+          Arguments.createMap().apply {
+            putInt("start", selectionStart)
+            putInt("end", selectionEnd)
+          }
+      putMap("selection", selectionData)
     }
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextContentSizeWatcher.kt

@@ -20,7 +20,7 @@ internal class ReactTextContentSizeWatcher(private val editText: ReactEditText)
 
   init {
     val reactContext = UIManagerHelper.getReactContext(editText)
-    eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, editText.id)
+    eventDispatcher = UIManagerHelper.getEventDispatcher(reactContext)
     surfaceId = UIManagerHelper.getSurfaceId(reactContext)
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.kt

@@ -66,14 +66,12 @@ import com.facebook.react.views.scroll.ScrollEventType.Companion.getJSEventName
 import com.facebook.react.views.text.DefaultStyleValuesUtil.getDefaultTextColor
 import com.facebook.react.views.text.DefaultStyleValuesUtil.getDefaultTextColorHighlight
 import com.facebook.react.views.text.DefaultStyleValuesUtil.getDefaultTextColorHint
-import com.facebook.react.views.text.ReactBaseTextShadowNode
 import com.facebook.react.views.text.ReactTextUpdate
 import com.facebook.react.views.text.ReactTextUpdate.Companion.buildReactTextUpdateFromState
 import com.facebook.react.views.text.ReactTextViewManagerCallback
 import com.facebook.react.views.text.ReactTypefaceUtils.parseFontVariant
 import com.facebook.react.views.text.TextAttributeProps
 import com.facebook.react.views.text.TextLayoutManager
-import com.facebook.react.views.text.internal.span.TextInlineImageSpan.Companion.possiblyUpdateInlineImageSpans
 import java.util.LinkedList
 
 /** Manages instances of TextInput. */
@@ -101,14 +99,13 @@ public open class ReactTextInputManager public constructor() :
     return editText
   }
 
-  override fun createShadowNodeInstance(): ReactBaseTextShadowNode = ReactTextInputShadowNode()
+  override fun createShadowNodeInstance(): LayoutShadowNode = LayoutShadowNode()
 
   public fun createShadowNodeInstance(
       reactTextViewManagerCallback: ReactTextViewManagerCallback?
-  ): ReactBaseTextShadowNode = ReactTextInputShadowNode(reactTextViewManagerCallback)
+  ): LayoutShadowNode = LayoutShadowNode()
 
-  override fun getShadowNodeClass(): Class<out LayoutShadowNode> =
-      ReactTextInputShadowNode::class.java
+  override fun getShadowNodeClass(): Class<out LayoutShadowNode> = LayoutShadowNode::class.java
 
   override fun getExportedCustomBubblingEventTypeConstants(): Map<String, Any> {
     val baseEventTypeConstants = super.getExportedCustomBubblingEventTypeConstants()
@@ -195,11 +192,6 @@ public open class ReactTextInputManager public constructor() :
     return ReactTextUpdate(
         sb,
         mostRecentEventCount,
-        false,
-        0f,
-        0f,
-        0f,
-        0f,
         Gravity.NO_GRAVITY,
         0,
         0,
@@ -208,31 +200,6 @@ public open class ReactTextInputManager public constructor() :
 
   override fun updateExtraData(view: ReactEditText, extraData: Any) {
     if (extraData is ReactTextUpdate) {
-      // TODO T58784068: delete this block of code, these are always unset in Fabric
-      val paddingLeft = extraData.paddingLeft.toInt()
-      val paddingTop = extraData.paddingTop.toInt()
-      val paddingRight = extraData.paddingRight.toInt()
-      val paddingBottom = extraData.paddingBottom.toInt()
-      if (
-          paddingLeft != UNSET ||
-              paddingTop != UNSET ||
-              paddingRight != UNSET ||
-              paddingBottom != UNSET
-      ) {
-        view.setPadding(
-            if (paddingLeft != UNSET) paddingLeft else view.paddingLeft,
-            if (paddingTop != UNSET) paddingTop else view.paddingTop,
-            if (paddingRight != UNSET) paddingRight else view.paddingRight,
-            if (paddingBottom != UNSET) paddingBottom else view.paddingBottom,
-        )
-      }
-
-      @Suppress("DEPRECATION")
-      if (extraData.containsImages()) {
-        val spannable = extraData.text
-        possiblyUpdateInlineImageSpans(spannable, view)
-      }
-
       // Ensure that selection is handled correctly on text update
       val isCurrentSelectionEmpty = view.selectionStart == view.selectionEnd
       var selectionStart = UNSET
@@ -357,7 +324,7 @@ public open class ReactTextInputManager public constructor() :
   }
 
   // Sets the letter spacing as an absolute point size.
-  // This extra handling, on top of what ReactBaseTextShadowNode already does, is required for the
+  // This extra handling is required for the
   // correct display of spacing in placeholder (hint) text.
   @ReactProp(name = ViewProps.LETTER_SPACING, defaultFloat = 0f)
   public fun setLetterSpacing(view: ReactEditText, letterSpacing: Float) {
@@ -1184,6 +1151,6 @@ public open class ReactTextInputManager public constructor() :
     private fun getEventDispatcher(
         reactContext: ReactContext,
         editText: ReactEditText,
-    ): EventDispatcher? = UIManagerHelper.getEventDispatcherForReactTag(reactContext, editText.id)
+    ): EventDispatcher? = UIManagerHelper.getEventDispatcher(reactContext)
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputTextWatcher.kt

@@ -19,8 +19,7 @@ internal class ReactTextInputTextWatcher(
     reactContext: ReactContext,
     private val editText: ReactEditText,
 ) : TextWatcher {
-  private val eventDispatcher: EventDispatcher? =
-      UIManagerHelper.getEventDispatcherForReactTag(reactContext, editText.id)
+  private val eventDispatcher: EventDispatcher? = UIManagerHelper.getEventDispatcher(reactContext)
   private val surfaceId = UIManagerHelper.getSurfaceId(reactContext)
   private var previousText: String? = null
 
@@ -63,6 +62,8 @@ internal class ReactTextInputTextWatcher(
             editText.id,
             s.toString(),
             editText.incrementAndGetEventCounter(),
+            editText.selectionStart,
+            editText.selectionEnd,
         )
     )
   }

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextScrollWatcher.kt

@@ -20,7 +20,7 @@ internal class ReactTextScrollWatcher(private val editText: ReactEditText) : Scr
 
   init {
     val reactContext = UIManagerHelper.getReactContext(editText)
-    eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, editText.id)
+    eventDispatcher = UIManagerHelper.getEventDispatcher(reactContext)
     surfaceId = UIManagerHelper.getSurfaceId(reactContext)
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextSelectionWatcher.kt

@@ -20,7 +20,7 @@ internal class ReactTextSelectionWatcher(private val editText: ReactEditText) :
 
   init {
     val reactContext = UIManagerHelper.getReactContext(editText)
-    eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, editText.id)
+    eventDispatcher = UIManagerHelper.getEventDispatcher(reactContext)
     surfaceId = UIManagerHelper.getSurfaceId(reactContext)
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ImportantForInteractionHelper.kt

@@ -0,0 +1,55 @@
+/*
+ * 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.views.view
+
+import android.view.View
+import com.facebook.react.R
+import com.facebook.react.uimanager.PointerEvents
+
+/**
+ * Helper class for managing the important_for_interaction view tag. This tag determines how a view
+ * participates in interaction handling.
+ */
+internal object ImportantForInteractionHelper {
+  /** The view is important for interaction. */
+  const val IMPORTANT_FOR_INTERACTION_YES: Int = 0x1
+
+  /** The view is not important for interaction. */
+  const val IMPORTANT_FOR_INTERACTION_NO: Int = 0x2
+
+  /** Descendants of this view should be excluded from interaction handling. */
+  const val IMPORTANT_FOR_INTERACTION_EXCLUDE_DESCENDANTS: Int = 0x4
+
+  /** CSS pointer-events: auto heuristics. */
+  const val IMPORTANT_FOR_INTERACTION_AUTO_CSSPOINTEREVENTSAUTO: Int = 0x8
+
+  /**
+   * Sets the important_for_interaction tag on a view based on the given [PointerEvents] value.
+   *
+   * Note: The pointer events value alone does not determine if a view is important for interaction.
+   * A view with pointerEvents=auto or pointerEvents=box-only can be important for interaction if
+   * none of its ancestors is blocking pointer events with pointerEvents=none or box-none.
+   *
+   * @param view The view to set the tag on
+   * @param pointerEvents The pointer events value to convert and set
+   */
+  @JvmStatic
+  fun setImportantForInteraction(view: View, pointerEvents: PointerEvents) {
+    val value =
+        when (pointerEvents) {
+          PointerEvents.AUTO -> IMPORTANT_FOR_INTERACTION_AUTO_CSSPOINTEREVENTSAUTO
+          PointerEvents.NONE ->
+              IMPORTANT_FOR_INTERACTION_NO or IMPORTANT_FOR_INTERACTION_EXCLUDE_DESCENDANTS
+          PointerEvents.BOX_ONLY ->
+              IMPORTANT_FOR_INTERACTION_AUTO_CSSPOINTEREVENTSAUTO or
+                  IMPORTANT_FOR_INTERACTION_EXCLUDE_DESCENDANTS
+          PointerEvents.BOX_NONE -> IMPORTANT_FOR_INTERACTION_NO
+        }
+    view.setTag(R.id.important_for_interaction, value)
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.kt

@@ -58,7 +58,6 @@ import com.facebook.react.uimanager.ReactClippingViewGroupHelper.calculateClippi
 import com.facebook.react.uimanager.ReactOverflowViewWithInset
 import com.facebook.react.uimanager.ReactPointerEventsView
 import com.facebook.react.uimanager.ReactZIndexedViewGroup
-import com.facebook.react.uimanager.ViewGroupDrawingOrderHelper
 import com.facebook.react.uimanager.common.UIManagerType
 import com.facebook.react.uimanager.common.ViewUtil.getUIManagerType
 import com.facebook.react.uimanager.style.BorderRadiusProp
@@ -167,6 +166,9 @@ public open class ReactViewGroup public constructor(context: Context?) :
    */
   private fun initView() {
     clipChildren = false
+    if (ReactNativeFeatureFlags.syncAndroidClipToPaddingWithOverflow()) {
+      clipToPadding = false
+    }
 
     _removeClippedSubviews = false
     inSubviewClippingLoop = false
@@ -176,10 +178,10 @@ public open class ReactViewGroup public constructor(context: Context?) :
     hitSlopRect = null
     _overflow = Overflow.VISIBLE
     pointerEvents = PointerEvents.AUTO
+    ImportantForInteractionHelper.setImportantForInteraction(this, pointerEvents)
     childrenLayoutChangeListener = null
     onInterceptTouchEventListener = null
     needsOffscreenAlphaCompositing = false
-    _drawingOrderHelper = null
     backfaceOpacity = 1f
     backfaceVisible = true
     childrenRemovedWhileTransitioning = null
@@ -219,15 +221,6 @@ public open class ReactViewGroup public constructor(context: Context?) :
     focusOnAttach = false
   }
 
-  private var _drawingOrderHelper: ViewGroupDrawingOrderHelper? = null
-  private val drawingOrderHelper: ViewGroupDrawingOrderHelper
-    get() {
-      if (_drawingOrderHelper == null) {
-        _drawingOrderHelper = ViewGroupDrawingOrderHelper(this)
-      }
-      return requireNotNull(_drawingOrderHelper)
-    }
-
   override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
     assertExplicitMeasureSpec(widthMeasureSpec, heightMeasureSpec)
 
@@ -598,36 +591,15 @@ public open class ReactViewGroup public constructor(context: Context?) :
     }
   }
 
-  private fun customDrawOrderDisabled(): Boolean {
-    if (id == NO_ID) {
-      return false
-    }
-
-    // Custom draw order is disabled for Fabric.
-    return getUIManagerType(id) == UIManagerType.FABRIC
-  }
-
   override fun onViewAdded(child: View) {
     assertOnUiThread()
     checkViewClippingTag(child, false)
-    if (!customDrawOrderDisabled()) {
-      drawingOrderHelper.handleAddView(child)
-      isChildrenDrawingOrderEnabled = drawingOrderHelper.shouldEnableCustomDrawingOrder()
-    } else {
-      isChildrenDrawingOrderEnabled = false
-    }
     super.onViewAdded(child)
   }
 
   override fun onViewRemoved(child: View) {
     assertOnUiThread()
     checkViewClippingTag(child, true)
-    if (!customDrawOrderDisabled()) {
-      drawingOrderHelper.handleRemoveView(child)
-      isChildrenDrawingOrderEnabled = drawingOrderHelper.shouldEnableCustomDrawingOrder()
-    } else {
-      isChildrenDrawingOrderEnabled = false
-    }
 
     // The parent might not be null in case the child is transitioning.
     if (child.parent != null) {
@@ -654,35 +626,18 @@ public open class ReactViewGroup public constructor(context: Context?) :
     }
   }
 
-  override fun getChildDrawingOrder(childCount: Int, index: Int): Int {
-    assertOnUiThread()
-
-    return if (!customDrawOrderDisabled()) {
-      drawingOrderHelper.getChildDrawingOrder(childCount, index)
-    } else {
-      index
-    }
-  }
-
-  override fun getZIndexMappedChildIndex(index: Int): Int {
-    assertOnUiThread()
-
-    if (!customDrawOrderDisabled() && drawingOrderHelper.shouldEnableCustomDrawingOrder()) {
-      return drawingOrderHelper.getChildDrawingOrder(childCount, index)
-    }
-
-    // Fabric behavior
-    return index
-  }
+  /**
+   * No-op implementation for backward compatibility. Z-order is now managed at the C++ layer in
+   * Fabric.
+   */
+  override fun getZIndexMappedChildIndex(index: Int): Int = index
 
+  /**
+   * No-op implementation for backward compatibility. Z-order is now managed at the C++ layer in
+   * Fabric.
+   */
   override fun updateDrawingOrder() {
-    if (customDrawOrderDisabled()) {
-      return
-    }
-
-    drawingOrderHelper.update()
-    isChildrenDrawingOrderEnabled = drawingOrderHelper.shouldEnableCustomDrawingOrder()
-    invalidate()
+    // No-op: Z-order is managed at the C++ layer
   }
 
   override fun dispatchSetPressed(pressed: Boolean) {
@@ -867,6 +822,9 @@ public open class ReactViewGroup public constructor(context: Context?) :
           } else {
             Overflow.fromString(overflow)
           }
+      if (ReactNativeFeatureFlags.syncAndroidClipToPaddingWithOverflow()) {
+        clipToPadding = _overflow != Overflow.VISIBLE
+      }
       invalidate()
     }
 

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.kt

@@ -321,6 +321,7 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
   @ReactProp(name = ViewProps.POINTER_EVENTS)
   public open fun setPointerEvents(view: ReactViewGroup, pointerEventsStr: String?) {
     view.pointerEvents = PointerEvents.parsePointerEvents(pointerEventsStr)
+    ImportantForInteractionHelper.setImportantForInteraction(view, view.pointerEvents)
   }
 
   @ReactProp(name = "nativeBackgroundAndroid")
@@ -388,8 +389,7 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
   @ReactProp(name = ViewProps.COLLAPSABLE)
   @Suppress("UNUSED_PARAMETER")
   public open fun setCollapsable(view: ReactViewGroup, collapsable: Boolean) {
-    // no-op: it's here only so that "collapsable" property is exported to JS. The value is actually
-    // handled in NativeViewHierarchyOptimizer
+    // no-op: it's here only so that "collapsable" property is exported to JS.
   }
 
   @ReactProp(name = ViewProps.COLLAPSABLE_CHILDREN)
@@ -402,8 +402,7 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
   public open fun setFocusable(view: ReactViewGroup, focusable: Boolean) {
     if (focusable) {
       view.setOnClickListener {
-        val eventDispatcher =
-            UIManagerHelper.getEventDispatcherForReactTag((view.context as ReactContext), view.id)
+        val eventDispatcher = UIManagerHelper.getEventDispatcher(view.context as ReactContext)
         eventDispatcher?.dispatchEvent(
             ViewGroupClickEvent(UIManagerHelper.getSurfaceId(view.context), view.id)
         )