Skip to content

Generate nested scroll view #55239

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
Abbondanzo wants to merge 1 commit into from
Closed

Generate nested scroll view #55239

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
8 changes: 7 additions & 1 deletion ...Android/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<27dfa9832869aa05987fa7cb9740f7ba>>
* @generated SignedSource<<1d13409e4db7a5a48e5d2caf59a5fbcf>>
*/

/**
Expand Down Expand Up @@ -456,6 +456,12 @@ public object ReactNativeFeatureFlags {
@JvmStatic
public fun useNativeViewConfigsInBridgelessMode(): Boolean = accessor.useNativeViewConfigsInBridgelessMode()

/**
* When enabled, ReactScrollView will extend NestedScrollView instead of ScrollView on Android for improved nested scrolling support.
*/
@JvmStatic
public fun useNestedScrollViewAndroid(): Boolean = accessor.useNestedScrollViewAndroid()

/**
* Use shared animation backend in C++ Animated
*/
Expand Down
12 changes: 11 additions & 1 deletion .../main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<6fb19235ba5049e07952cfa1b564e9e2>>
* @generated SignedSource<<58a693fe003a9a19311fc0134d071154>>
*/

/**
Expand Down Expand Up @@ -91,6 +91,7 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
private var useAlwaysAvailableJSErrorHandlingCache: Boolean? = null
private var useFabricInteropCache: Boolean? = null
private var useNativeViewConfigsInBridgelessModeCache: Boolean? = null
private var useNestedScrollViewAndroidCache: Boolean? = null
private var useSharedAnimatedBackendCache: Boolean? = null
private var useTraitHiddenOnAndroidCache: Boolean? = null
private var useTurboModuleInteropCache: Boolean? = null
Expand Down Expand Up @@ -737,6 +738,15 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
return cached
}

override fun useNestedScrollViewAndroid(): Boolean {
var cached = useNestedScrollViewAndroidCache
if (cached == null) {
cached = ReactNativeFeatureFlagsCxxInterop.useNestedScrollViewAndroid()
useNestedScrollViewAndroidCache = cached
}
return cached
}

override fun useSharedAnimatedBackend(): Boolean {
var cached = useSharedAnimatedBackendCache
if (cached == null) {
Expand Down
4 changes: 3 additions & 1 deletion ...c/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<6410500cbf5a05b1f34efd12d1e83bdf>>
* @generated SignedSource<<698641fe5c1a9f4933321d5b155467d1>>
*/

/**
Expand Down Expand Up @@ -170,6 +170,8 @@ public object ReactNativeFeatureFlagsCxxInterop {

@DoNotStrip @JvmStatic public external fun useNativeViewConfigsInBridgelessMode(): Boolean

@DoNotStrip @JvmStatic public external fun useNestedScrollViewAndroid(): Boolean

@DoNotStrip @JvmStatic public external fun useSharedAnimatedBackend(): Boolean

@DoNotStrip @JvmStatic public external fun useTraitHiddenOnAndroid(): Boolean
Expand Down
4 changes: 3 additions & 1 deletion ...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<6c664176cf41ffb9f2bf820f15ed7463>>
* @generated SignedSource<<6ab1616102fb0807ad936f4333cb44c8>>
*/

/**
Expand Down Expand Up @@ -165,6 +165,8 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi

override fun useNativeViewConfigsInBridgelessMode(): Boolean = false

override fun useNestedScrollViewAndroid(): Boolean = false

override fun useSharedAnimatedBackend(): Boolean = false

override fun useTraitHiddenOnAndroid(): Boolean = false
Expand Down
13 changes: 12 additions & 1 deletion ...ain/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<1403b30f4dc3d18f39303d91d6824bda>>
* @generated SignedSource<<f83c3d5107d900273c09061d6822f83d>>
*/

/**
Expand Down Expand Up @@ -95,6 +95,7 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
private var useAlwaysAvailableJSErrorHandlingCache: Boolean? = null
private var useFabricInteropCache: Boolean? = null
private var useNativeViewConfigsInBridgelessModeCache: Boolean? = null
private var useNestedScrollViewAndroidCache: Boolean? = null
private var useSharedAnimatedBackendCache: Boolean? = null
private var useTraitHiddenOnAndroidCache: Boolean? = null
private var useTurboModuleInteropCache: Boolean? = null
Expand Down Expand Up @@ -812,6 +813,16 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
return cached
}

override fun useNestedScrollViewAndroid(): Boolean {
var cached = useNestedScrollViewAndroidCache
if (cached == null) {
cached = currentProvider.useNestedScrollViewAndroid()
accessedFeatureFlags.add("useNestedScrollViewAndroid")
useNestedScrollViewAndroidCache = cached
}
return cached
}

override fun useSharedAnimatedBackend(): Boolean {
var cached = useSharedAnimatedBackendCache
if (cached == null) {
Expand Down
4 changes: 3 additions & 1 deletion ...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<ad478388cb9a64690c71fe8fa06c1c79>>
* @generated SignedSource<<c2e44ee4f139a99b8179f750b416ed2f>>
*/

/**
Expand Down Expand Up @@ -165,6 +165,8 @@ public interface ReactNativeFeatureFlagsProvider {

@DoNotStrip public fun useNativeViewConfigsInBridgelessMode(): Boolean

@DoNotStrip public fun useNestedScrollViewAndroid(): Boolean

@DoNotStrip public fun useSharedAnimatedBackend(): Boolean

@DoNotStrip public fun useTraitHiddenOnAndroid(): Boolean
Expand Down
10 changes: 8 additions & 2 deletions ...ages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ import com.facebook.react.views.progressbar.ReactProgressBarViewManager
import com.facebook.react.views.safeareaview.ReactSafeAreaViewManager
import com.facebook.react.views.scroll.ReactHorizontalScrollContainerViewManager
import com.facebook.react.views.scroll.ReactHorizontalScrollViewManager
import com.facebook.react.views.scroll.ReactNestedScrollViewManager
import com.facebook.react.views.scroll.ReactScrollViewManager
import com.facebook.react.views.swiperefresh.SwipeRefreshLayoutManager
import com.facebook.react.views.switchview.ReactSwitchManager
Expand Down Expand Up @@ -139,7 +140,8 @@ constructor(private val config: MainPackageConfig? = null) :
ReactHorizontalScrollViewManager(),
ReactHorizontalScrollContainerViewManager(),
ReactProgressBarViewManager(),
ReactScrollViewManager(),
if (ReactNativeFeatureFlags.useNestedScrollViewAndroid()) ReactNestedScrollViewManager()
else ReactScrollViewManager(),
ReactSwitchManager(),
ReactSafeAreaViewManager(),
SwipeRefreshLayoutManager(),
Expand Down Expand Up @@ -173,7 +175,11 @@ constructor(private val config: MainPackageConfig? = null) :
ReactSafeAreaViewManager.REACT_CLASS to
ModuleSpec.viewManagerSpec { ReactSafeAreaViewManager() },
ReactScrollViewManager.REACT_CLASS to
ModuleSpec.viewManagerSpec { ReactScrollViewManager() },
ModuleSpec.viewManagerSpec {
if (ReactNativeFeatureFlags.useNestedScrollViewAndroid())
ReactNestedScrollViewManager()
else ReactScrollViewManager()
},
ReactSwitchManager.REACT_CLASS to ModuleSpec.viewManagerSpec { ReactSwitchManager() },
SwipeRefreshLayoutManager.REACT_CLASS to
ModuleSpec.viewManagerSpec { SwipeRefreshLayoutManager() },
Expand Down
Loading
Loading