Skip to content

Remove setViewZIndex and associated state from BaseViewManager #56717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
javache wants to merge 1 commit into from
Closed

Remove setViewZIndex and associated state from BaseViewManager #56717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 1 addition & 25 deletions packages/react-native/ReactAndroid/api/ReactAndroid.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4090,11 +4090,6 @@ public final class com/facebook/react/uimanager/ReactStylesDiffMap {
public fun toString ()Ljava/lang/String;
}

public abstract interface class com/facebook/react/uimanager/ReactZIndexedViewGroup {
public abstract fun getZIndexMappedChildIndex (I)I
public abstract fun updateDrawingOrder ()V
}

public abstract interface class com/facebook/react/uimanager/RootView {
public abstract fun handleException (Ljava/lang/Throwable;)V
public abstract fun onChildEndedNativeGesture (Landroid/view/View;Landroid/view/MotionEvent;)V
Expand Down Expand Up @@ -4400,17 +4395,7 @@ public final class com/facebook/react/uimanager/ViewDefaults {
public static final field NUMBER_OF_LINES I
}

public final class com/facebook/react/uimanager/ViewGroupDrawingOrderHelper {
public fun <init> (Landroid/view/ViewGroup;)V
public final fun getChildDrawingOrder (II)I
public final fun handleAddView (Landroid/view/View;)V
public final fun handleRemoveView (Landroid/view/View;)V
public final fun shouldEnableCustomDrawingOrder ()Z
public final fun update ()V
}

public abstract class com/facebook/react/uimanager/ViewGroupManager : com/facebook/react/uimanager/BaseViewManager, com/facebook/react/uimanager/IViewGroupManager {
public static final field Companion Lcom/facebook/react/uimanager/ViewGroupManager$Companion;
public fun <init> ()V
public fun <init> (Lcom/facebook/react/bridge/ReactApplicationContext;)V
public synthetic fun <init> (Lcom/facebook/react/bridge/ReactApplicationContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
Expand All @@ -4424,21 +4409,14 @@ public abstract class com/facebook/react/uimanager/ViewGroupManager : com/facebo
public synthetic fun getChildCount (Landroid/view/View;)I
public fun getChildCount (Landroid/view/ViewGroup;)I
public fun getShadowNodeClass ()Ljava/lang/Class;
public static final fun getViewZIndex (Landroid/view/View;)Ljava/lang/Integer;
public fun needsCustomLayoutForChildren ()Z
public fun removeView (Landroid/view/ViewGroup;Landroid/view/View;)V
public synthetic fun removeViewAt (Landroid/view/View;I)V
public fun removeViewAt (Landroid/view/ViewGroup;I)V
public static final fun setViewZIndex (Landroid/view/View;I)V
public synthetic fun updateExtraData (Landroid/view/View;Ljava/lang/Object;)V
public fun updateExtraData (Landroid/view/ViewGroup;Ljava/lang/Object;)V
}

public final class com/facebook/react/uimanager/ViewGroupManager$Companion {
public final fun getViewZIndex (Landroid/view/View;)Ljava/lang/Integer;
public final fun setViewZIndex (Landroid/view/View;I)V
}

public abstract class com/facebook/react/uimanager/ViewManager : com/facebook/react/bridge/BaseJavaModule {
public fun <init> ()V
public fun <init> (Lcom/facebook/react/bridge/ReactApplicationContext;)V
Expand Down Expand Up @@ -6445,7 +6423,7 @@ public final class com/facebook/react/views/view/ReactDrawableHelper {
public static final fun createDrawableFromJSDescription (Landroid/content/Context;Lcom/facebook/react/bridge/ReadableMap;)Landroid/graphics/drawable/Drawable;
}

public class com/facebook/react/views/view/ReactViewGroup : android/view/ViewGroup, com/facebook/react/touch/ReactHitSlopView, com/facebook/react/touch/ReactInterceptingViewGroup, com/facebook/react/uimanager/ReactClippingViewGroup, com/facebook/react/uimanager/ReactOverflowViewWithInset, com/facebook/react/uimanager/ReactPointerEventsView, com/facebook/react/uimanager/ReactZIndexedViewGroup {
public class com/facebook/react/views/view/ReactViewGroup : android/view/ViewGroup, com/facebook/react/touch/ReactHitSlopView, com/facebook/react/touch/ReactInterceptingViewGroup, com/facebook/react/uimanager/ReactClippingViewGroup, com/facebook/react/uimanager/ReactOverflowViewWithInset, com/facebook/react/uimanager/ReactPointerEventsView {
public fun <init> (Landroid/content/Context;)V
public fun addChildrenForAccessibility (Ljava/util/ArrayList;)V
public final fun cleanUpAxOrderListener ()V
Expand All @@ -6465,7 +6443,6 @@ public class com/facebook/react/views/view/ReactViewGroup : android/view/ViewGro
public fun getOverflowInset ()Landroid/graphics/Rect;
public fun getPointerEvents ()Lcom/facebook/react/uimanager/PointerEvents;
public fun getRemoveClippedSubviews ()Z
public fun getZIndexMappedChildIndex (I)I
public fun hasOverlappingRendering ()Z
protected fun onAttachedToWindow ()V
public fun onHoverEvent (Landroid/view/MotionEvent;)Z
Expand Down Expand Up @@ -6498,7 +6475,6 @@ public class com/facebook/react/views/view/ReactViewGroup : android/view/ViewGro
public final fun setTranslucentBackgroundDrawable (Landroid/graphics/drawable/Drawable;)V
public fun updateClippingRect ()V
public fun updateClippingRect (Ljava/util/Set;)V
public fun updateDrawingOrder ()V
}

public class com/facebook/react/views/view/ReactViewManager : com/facebook/react/views/view/ReactClippingViewManager {
Expand Down
8 changes: 1 addition & 7 deletions ...react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import android.view.View;
import android.view.View.OnFocusChangeListener;
import android.view.ViewGroup;
import android.view.ViewParent;
import android.view.accessibility.AccessibilityEvent;
import androidx.annotation.ColorInt;
import androidx.annotation.NonNull;
Expand Down Expand Up @@ -285,12 +284,7 @@ public void setShadowColor(@NonNull T view, int shadowColor) {

@ReactProp(name = ViewProps.Z_INDEX)
public void setZIndex(@NonNull T view, float zIndex) {
int integerZIndex = Math.round(zIndex);
ViewGroupManager.setViewZIndex(view, integerZIndex);
ViewParent parent = view.getParent();
if (parent instanceof ReactZIndexedViewGroup) {
((ReactZIndexedViewGroup) parent).updateDrawingOrder();
}
// No-op: Z-order is managed at the C++ layer in Fabric
}

@ReactProp(name = ViewProps.RENDER_TO_HARDWARE_TEXTURE)
Expand Down
35 changes: 0 additions & 35 deletions ...-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactZIndexedViewGroup.kt
View file
Open in desktop

This file was deleted.

113 changes: 0 additions & 113 deletions ...ve/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.kt
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions .../react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import android.view.View
import android.view.ViewGroup
import com.facebook.react.bridge.ReactApplicationContext
import com.facebook.react.bridge.UiThreadUtil
import java.util.WeakHashMap

@Suppress("DEPRECATION")
public abstract class ViewGroupManager<T : ViewGroup>
Expand Down Expand Up @@ -76,13 +75,4 @@ constructor(reactContext: ReactApplicationContext? = null) :
* that case, onLayout for this View type must *not* call layout on its children.
*/
public override fun needsCustomLayoutForChildren(): Boolean = false

public companion object {
private val zIndexHash: WeakHashMap<View, Int> = WeakHashMap()

@JvmStatic
public fun setViewZIndex(view: View, zIndex: Int): Unit = zIndexHash.set(view, zIndex)

@JvmStatic public fun getViewZIndex(view: View?): Int? = zIndexHash[view]
}
}
16 changes: 0 additions & 16 deletions ...s/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ import com.facebook.react.uimanager.ReactClippingViewGroup
import com.facebook.react.uimanager.ReactClippingViewGroupHelper.calculateClippingRect
import com.facebook.react.uimanager.ReactOverflowViewWithInset
import com.facebook.react.uimanager.ReactPointerEventsView
import com.facebook.react.uimanager.ReactZIndexedViewGroup
import com.facebook.react.uimanager.style.BorderRadiusProp
import com.facebook.react.uimanager.style.BorderStyle
import com.facebook.react.uimanager.style.LogicalEdge
Expand All @@ -81,7 +80,6 @@ public open class ReactViewGroup public constructor(context: Context?) :
ReactClippingViewGroup,
ReactPointerEventsView,
ReactHitSlopView,
ReactZIndexedViewGroup,
ReactOverflowViewWithInset {

public override val overflowInset: Rect = Rect()
Expand Down Expand Up @@ -622,20 +620,6 @@ public open class ReactViewGroup public constructor(context: Context?) :
}
}

/**
* 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() {
// No-op: Z-order is managed at the C++ layer
}

override fun dispatchSetPressed(pressed: Boolean) {
// Prevents the ViewGroup from dispatching the pressed state
// to it's children.
Expand Down
Loading