From bc3ea5c957837adc9d2973f0ecda81cb9dbcd8e4 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Wed, 6 Nov 2024 18:04:31 -0800 Subject: [PATCH] Revert migration of ReactHorizontalScrollContainerViewManager to use ViewManagerInterface (#47472) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/47472 using ViewManagerDelegates for ReactHorizontalScrollContainerViewManager which extends ReactClippingViewManager will introduce a bug (not updating props that are managed by ReactClippingViewManager) I'm reverting the migration and we should fix the bug in codegen This diff is a revert of D65428646 changelog: [internal] internal Reviewed By: sammy-SC, Abbondanzo Differential Revision: D65564730 fbshipit-source-id: ff183876321d4d36e51da8f38ff6f381207c7c3a --- .../react-native/ReactAndroid/api/ReactAndroid.api | 4 +--- .../ReactHorizontalScrollContainerViewManager.kt | 11 +---------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index 19d74b8100c..b8776e459e5 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -6772,16 +6772,14 @@ public final class com/facebook/react/views/scroll/OnScrollDispatchHelper { public final fun onScrollChanged (II)Z } -public final class com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager : com/facebook/react/views/view/ReactViewManager, com/facebook/react/viewmanagers/AndroidHorizontalScrollContentViewManagerInterface { +public final class com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager : com/facebook/react/views/view/ReactViewManager { public static final field Companion Lcom/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager$Companion; public static final field REACT_CLASS Ljava/lang/String; public fun ()V public synthetic fun createViewInstance (ILcom/facebook/react/uimanager/ThemedReactContext;Lcom/facebook/react/uimanager/ReactStylesDiffMap;Lcom/facebook/react/uimanager/StateWrapper;)Landroid/view/View; public synthetic fun createViewInstance (Lcom/facebook/react/uimanager/ThemedReactContext;)Landroid/view/View; public fun createViewInstance (Lcom/facebook/react/uimanager/ThemedReactContext;)Lcom/facebook/react/views/view/ReactViewGroup; - public fun getDelegate ()Lcom/facebook/react/uimanager/ViewManagerDelegate; public fun getName ()Ljava/lang/String; - public synthetic fun setRemoveClippedSubviews (Landroid/view/View;Z)V } public final class com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager$Companion { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.kt index a82070f6295..c9d6c01e065 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.kt @@ -11,25 +11,16 @@ import com.facebook.react.module.annotations.ReactModule import com.facebook.react.uimanager.ReactStylesDiffMap import com.facebook.react.uimanager.StateWrapper import com.facebook.react.uimanager.ThemedReactContext -import com.facebook.react.uimanager.ViewManagerDelegate import com.facebook.react.uimanager.common.UIManagerType import com.facebook.react.uimanager.common.ViewUtil -import com.facebook.react.viewmanagers.AndroidHorizontalScrollContentViewManagerDelegate -import com.facebook.react.viewmanagers.AndroidHorizontalScrollContentViewManagerInterface import com.facebook.react.views.view.ReactViewGroup import com.facebook.react.views.view.ReactViewManager /** View manager for {@link ReactHorizontalScrollContainerView} components. */ @ReactModule(name = ReactHorizontalScrollContainerViewManager.REACT_CLASS) -public class ReactHorizontalScrollContainerViewManager : - ReactViewManager(), AndroidHorizontalScrollContentViewManagerInterface { +public class ReactHorizontalScrollContainerViewManager : ReactViewManager() { override public fun getName(): String = REACT_CLASS - private val delegate: ViewManagerDelegate = - AndroidHorizontalScrollContentViewManagerDelegate(this) - - public override fun getDelegate(): ViewManagerDelegate = delegate - protected override fun createViewInstance( reactTag: Int, context: ThemedReactContext,