Skip to content

Add RN feature flag for ScrollView view recycling #53373

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

Add RN feature flag for ScrollView view recycling #53373

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<<f162c19a6742ecadd171500ccb918f4b>>
* @generated SignedSource<<1e8a84a53072fa0c8665aead80d0199f>>
*/

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

/**
* Enables View Recycling for <ScrollView> via ReactViewGroup/ReactViewManager.
*/
@JvmStatic
public fun enableViewRecyclingForScrollView(): Boolean = accessor.enableViewRecyclingForScrollView()

/**
* Enables View Recycling for <Text> via ReactTextView/ReactTextViewManager.
*/
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<<51bb91fd70ba266c01bf46b3ca237ad5>>
* @generated SignedSource<<d07316109dce5cc1ce7b0dc010962c3c>>
*/

/**
Expand Down Expand Up @@ -58,6 +58,7 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
private var enableResourceTimingAPICache: Boolean? = null
private var enableViewCullingCache: Boolean? = null
private var enableViewRecyclingCache: Boolean? = null
private var enableViewRecyclingForScrollViewCache: Boolean? = null
private var enableViewRecyclingForTextCache: Boolean? = null
private var enableViewRecyclingForViewCache: Boolean? = null
private var enableVirtualViewDebugFeaturesCache: Boolean? = null
Expand Down Expand Up @@ -430,6 +431,15 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
return cached
}

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

override fun enableViewRecyclingForText(): Boolean {
var cached = enableViewRecyclingForTextCache
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<<d4a1d4510264580e2f1436b05f1c2f0e>>
* @generated SignedSource<<6e384a07f0e7bc237f72b49a1268e16b>>
*/

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

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

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

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

@DoNotStrip @JvmStatic public external fun enableViewRecyclingForView(): 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<<4cc61b5f71805589fa91abbdefb5eade>>
* @generated SignedSource<<5494951448e43319e9165388aa5559a2>>
*/

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

override fun enableViewRecycling(): Boolean = false

override fun enableViewRecyclingForScrollView(): Boolean = true

override fun enableViewRecyclingForText(): Boolean = true

override fun enableViewRecyclingForView(): Boolean = true
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<<78c9ee8f53273560de6b75719e317273>>
* @generated SignedSource<<1a19e0569371a038ba8d3849fb26eb5c>>
*/

/**
Expand Down Expand Up @@ -62,6 +62,7 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
private var enableResourceTimingAPICache: Boolean? = null
private var enableViewCullingCache: Boolean? = null
private var enableViewRecyclingCache: Boolean? = null
private var enableViewRecyclingForScrollViewCache: Boolean? = null
private var enableViewRecyclingForTextCache: Boolean? = null
private var enableViewRecyclingForViewCache: Boolean? = null
private var enableVirtualViewDebugFeaturesCache: Boolean? = null
Expand Down Expand Up @@ -472,6 +473,16 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
return cached
}

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

override fun enableViewRecyclingForText(): Boolean {
var cached = enableViewRecyclingForTextCache
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<<3db9f160e7221eb9c7660a3e93da0f40>>
* @generated SignedSource<<5f84a9a17209b9ecb95e13e6567e7c3c>>
*/

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

@DoNotStrip public fun enableViewRecycling(): Boolean

@DoNotStrip public fun enableViewRecyclingForScrollView(): Boolean

@DoNotStrip public fun enableViewRecyclingForText(): Boolean

@DoNotStrip public fun enableViewRecyclingForView(): Boolean
Expand Down
16 changes: 15 additions & 1 deletion ...ative/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp
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<<0dadaee3f6bd74cc13295b8683e8e470>>
* @generated SignedSource<<1eff5bade524e3ad8e827ad4adb37f1a>>
*/

/**
Expand Down Expand Up @@ -267,6 +267,12 @@ class ReactNativeFeatureFlagsJavaProvider
return method(javaProvider_);
}

bool enableViewRecyclingForScrollView() override {
static const auto method =
getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableViewRecyclingForScrollView");
return method(javaProvider_);
}

bool enableViewRecyclingForText() override {
static const auto method =
getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableViewRecyclingForText");
Expand Down Expand Up @@ -635,6 +641,11 @@ bool JReactNativeFeatureFlagsCxxInterop::enableViewRecycling(
return ReactNativeFeatureFlags::enableViewRecycling();
}

bool JReactNativeFeatureFlagsCxxInterop::enableViewRecyclingForScrollView(
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
return ReactNativeFeatureFlags::enableViewRecyclingForScrollView();
}

bool JReactNativeFeatureFlagsCxxInterop::enableViewRecyclingForText(
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
return ReactNativeFeatureFlags::enableViewRecyclingForText();
Expand Down Expand Up @@ -925,6 +936,9 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
makeNativeMethod(
"enableViewRecycling",
JReactNativeFeatureFlagsCxxInterop::enableViewRecycling),
makeNativeMethod(
"enableViewRecyclingForScrollView",
JReactNativeFeatureFlagsCxxInterop::enableViewRecyclingForScrollView),
makeNativeMethod(
"enableViewRecyclingForText",
JReactNativeFeatureFlagsCxxInterop::enableViewRecyclingForText),
Expand Down
5 changes: 4 additions & 1 deletion ...-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h
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<<74ac256afe63253ddb6576285858444c>>
* @generated SignedSource<<05dba4cd49bd4f490e1ea943dd02cae0>>
*/

/**
Expand Down Expand Up @@ -144,6 +144,9 @@ class JReactNativeFeatureFlagsCxxInterop
static bool enableViewRecycling(
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);

static bool enableViewRecyclingForScrollView(
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);

static bool enableViewRecyclingForText(
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);

Expand Down
6 changes: 5 additions & 1 deletion packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp
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<<392fdd6e857b7c8ae99329b927be6ae0>>
* @generated SignedSource<<a7bd9fcbbcb19ee8a939b4c08e0fd508>>
*/

/**
Expand Down Expand Up @@ -178,6 +178,10 @@ bool ReactNativeFeatureFlags::enableViewRecycling() {
return getAccessor().enableViewRecycling();
}

bool ReactNativeFeatureFlags::enableViewRecyclingForScrollView() {
return getAccessor().enableViewRecyclingForScrollView();
}

bool ReactNativeFeatureFlags::enableViewRecyclingForText() {
return getAccessor().enableViewRecyclingForText();
}
Expand Down
7 changes: 6 additions & 1 deletion packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.h
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<<b601a3c92cd80549ca2391ab0a123214>>
* @generated SignedSource<<4831f7b871223d8347db93f9a0b3a1f9>>
*/

/**
Expand Down Expand Up @@ -229,6 +229,11 @@ class ReactNativeFeatureFlags {
*/
RN_EXPORT static bool enableViewRecycling();

/**
* Enables View Recycling for <ScrollView> via ReactViewGroup/ReactViewManager.
*/
RN_EXPORT static bool enableViewRecyclingForScrollView();

/**
* Enables View Recycling for <Text> via ReactTextView/ReactTextViewManager.
*/
Expand Down
Loading
Loading