diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index ddb1ac1c6ac..005309b0d93 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -3539,6 +3539,10 @@ public class com/facebook/react/uimanager/NativeViewHierarchyManager { public fun updateViewExtraData (ILjava/lang/Object;)V } +public final class com/facebook/react/uimanager/NativeViewHierarchyOptimizer { + public fun ()V +} + public final class com/facebook/react/uimanager/OnLayoutEvent : com/facebook/react/uimanager/events/Event { public static final field Companion Lcom/facebook/react/uimanager/OnLayoutEvent$Companion; public fun getEventName ()Ljava/lang/String; @@ -3839,7 +3843,7 @@ public abstract interface class com/facebook/react/uimanager/ReactShadowNode { public abstract fun calculateLayout (FF)V public abstract fun calculateLayoutOnChildren ()Ljava/lang/Iterable; public abstract fun dirty ()V - public abstract fun dispatchUpdates (FFLcom/facebook/react/uimanager/UIViewOperationQueue;)V + public abstract fun dispatchUpdates (FFLcom/facebook/react/uimanager/UIViewOperationQueue;Lcom/facebook/react/uimanager/NativeViewHierarchyOptimizer;)V public abstract fun dispatchUpdatesWillChangeLayout (FF)Z public abstract fun dispose ()V public abstract fun getChildAt (I)Lcom/facebook/react/uimanager/ReactShadowNode; @@ -3888,7 +3892,7 @@ public abstract interface class com/facebook/react/uimanager/ReactShadowNode { public abstract fun markUpdateSeen ()V public abstract fun markUpdated ()V public abstract fun onAfterUpdateTransaction ()V - public abstract fun onBeforeLayout ()V + public abstract fun onBeforeLayout (Lcom/facebook/react/uimanager/NativeViewHierarchyOptimizer;)V public abstract fun onCollectExtraUpdates (Lcom/facebook/react/uimanager/UIViewOperationQueue;)V public abstract fun removeAllNativeChildren ()V public abstract fun removeAndDisposeAllChildren ()V @@ -3965,7 +3969,7 @@ public class com/facebook/react/uimanager/ReactShadowNodeImpl : com/facebook/rea public fun calculateLayout (FF)V public fun calculateLayoutOnChildren ()Ljava/lang/Iterable; public fun dirty ()V - public fun dispatchUpdates (FFLcom/facebook/react/uimanager/UIViewOperationQueue;)V + public fun dispatchUpdates (FFLcom/facebook/react/uimanager/UIViewOperationQueue;Lcom/facebook/react/uimanager/NativeViewHierarchyOptimizer;)V public fun dispatchUpdatesWillChangeLayout (FF)Z public fun dispose ()V public synthetic fun getChildAt (I)Lcom/facebook/react/uimanager/ReactShadowNode; @@ -4022,7 +4026,7 @@ public class com/facebook/react/uimanager/ReactShadowNodeImpl : com/facebook/rea public final fun markUpdateSeen ()V public fun markUpdated ()V public fun onAfterUpdateTransaction ()V - public fun onBeforeLayout ()V + public fun onBeforeLayout (Lcom/facebook/react/uimanager/NativeViewHierarchyOptimizer;)V public fun onCollectExtraUpdates (Lcom/facebook/react/uimanager/UIViewOperationQueue;)V public final fun removeAllNativeChildren ()V public fun removeAndDisposeAllChildren ()V diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.kt new file mode 100644 index 00000000000..49ad016522e --- /dev/null +++ b/packages/react-native/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.ERROR, +) +public class NativeViewHierarchyOptimizer() {} diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java index c66166bc60f..e145fbce55a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java @@ -111,7 +111,7 @@ public interface ReactShadowNode { * layout. Will be only called for nodes that are marked as updated with {@link #markUpdated()} or * require layouting (marked with {@link #dirty()}). */ - void onBeforeLayout(); + void onBeforeLayout(NativeViewHierarchyOptimizer nativeViewHierarchyOptimizer); void updateProperties(ReactStylesDiffMap props); @@ -129,7 +129,10 @@ public interface ReactShadowNode { /* package */ boolean dispatchUpdatesWillChangeLayout(float absoluteX, float absoluteY); /* package */ void dispatchUpdates( - float absoluteX, float absoluteY, UIViewOperationQueue uiViewOperationQueue); + float absoluteX, + float absoluteY, + UIViewOperationQueue uiViewOperationQueue, + NativeViewHierarchyOptimizer nativeViewHierarchyOptimizer); int getReactTag(); diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java index fe254d5f7e2..766c5e9995b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java @@ -318,7 +318,7 @@ public class ReactShadowNodeImpl implements ReactShadowNode * require layouting (marked with {@link #dirty()}). */ @Override - public void onBeforeLayout() {} + public void onBeforeLayout(NativeViewHierarchyOptimizer nativeViewHierarchyOptimizer) {} @Override public final void updateProperties(ReactStylesDiffMap props) { @@ -367,7 +367,10 @@ public class ReactShadowNodeImpl implements ReactShadowNode @Override public void dispatchUpdates( - float absoluteX, float absoluteY, UIViewOperationQueue uiViewOperationQueue) { + float absoluteX, + float absoluteY, + UIViewOperationQueue uiViewOperationQueue, + @Nullable NativeViewHierarchyOptimizer nativeViewHierarchyOptimizer) { if (mNodeUpdated) { onCollectExtraUpdates(uiViewOperationQueue); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java index bbaa7fc909e..df93789527d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java @@ -849,7 +849,7 @@ public class UIImplementation { for (int i = 0; i < cssNode.getChildCount(); i++) { notifyOnBeforeLayoutRecursive(cssNode.getChildAt(i)); } - cssNode.onBeforeLayout(); + cssNode.onBeforeLayout(null); } protected void calculateRootLayout(ReactShadowNode cssRoot) { @@ -897,7 +897,7 @@ public class UIImplementation { } } - cssNode.dispatchUpdates(absoluteX, absoluteY, mOperationsQueue); + cssNode.dispatchUpdates(absoluteX, absoluteY, mOperationsQueue, null); cssNode.markUpdateSeen(); }