diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java index 408b5bd4927..3ce7adf0517 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java @@ -28,7 +28,6 @@ import com.facebook.react.bridge.WritableArray; import com.facebook.react.bridge.WritableMap; import com.facebook.react.common.annotations.VisibleForTesting; import com.facebook.react.common.build.ReactBuildConfig; -import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags; import com.facebook.react.module.annotations.ReactModule; import com.facebook.react.modules.core.ReactChoreographer; import com.facebook.react.uimanager.GuardedFrameCallback; @@ -256,10 +255,7 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec return; } - if (!ReactNativeFeatureFlags.lazyAnimationCallbacks() - || nodesManager.hasActiveAnimations()) { - enqueueFrameCallback(); - } + enqueueFrameCallback(); } catch (Exception ex) { throw new RuntimeException(ex); } @@ -1176,9 +1172,6 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec opsAndArgs.getInt(i++), opsAndArgs.getInt(i++)); break; case OP_CODE_START_ANIMATING_NODE: - if (ReactNativeFeatureFlags.lazyAnimationCallbacks()) { - enqueueFrameCallback(); - } animatedNodesManager.startAnimatingNode( // NULLSAFE_FIXME[Parameter Not Nullable] opsAndArgs.getInt(i++), opsAndArgs.getInt(i++), opsAndArgs.getMap(i++), null); diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt index f4f4b7a8b83..15951d3326a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt @@ -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<<8522ebea8b35daaca25b4d1ee4e93dd9>> + * @generated SignedSource<<661dc1be35759bceb19c3521ed97c106>> */ /** @@ -216,12 +216,6 @@ public object ReactNativeFeatureFlags { @JvmStatic public fun fuseboxNetworkInspectionEnabled(): Boolean = accessor.fuseboxNetworkInspectionEnabled() - /** - * Only enqueue Choreographer calls if there is an ongoing animation, instead of enqueueing every frame. - */ - @JvmStatic - public fun lazyAnimationCallbacks(): Boolean = accessor.lazyAnimationCallbacks() - /** * When enabled, mutex _turboModuleManagerDelegateMutex in RCTTurboModuleManager will not be used */ diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt index ebec84ceb91..73f12b5ad55 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt @@ -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<<86fe1d1217f974eb9cbe2fc6b556b6f3>> + * @generated SignedSource<> */ /** @@ -51,7 +51,6 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces private var fixMountingCoordinatorReportedPendingTransactionsOnAndroidCache: Boolean? = null private var fuseboxEnabledReleaseCache: Boolean? = null private var fuseboxNetworkInspectionEnabledCache: Boolean? = null - private var lazyAnimationCallbacksCache: Boolean? = null private var removeTurboModuleManagerDelegateMutexCache: Boolean? = null private var throwExceptionInsteadOfDeadlockOnTurboModuleSetupDuringSyncRenderIOSCache: Boolean? = null private var traceTurboModulePromiseRejectionsOnAndroidCache: Boolean? = null @@ -343,15 +342,6 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces return cached } - override fun lazyAnimationCallbacks(): Boolean { - var cached = lazyAnimationCallbacksCache - if (cached == null) { - cached = ReactNativeFeatureFlagsCxxInterop.lazyAnimationCallbacks() - lazyAnimationCallbacksCache = cached - } - return cached - } - override fun removeTurboModuleManagerDelegateMutex(): Boolean { var cached = removeTurboModuleManagerDelegateMutexCache if (cached == null) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt index 5607cab41a6..23da510afd9 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt @@ -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<> + * @generated SignedSource<<522c2ef58105dc16f104e047b92cad88>> */ /** @@ -90,8 +90,6 @@ public object ReactNativeFeatureFlagsCxxInterop { @DoNotStrip @JvmStatic public external fun fuseboxNetworkInspectionEnabled(): Boolean - @DoNotStrip @JvmStatic public external fun lazyAnimationCallbacks(): Boolean - @DoNotStrip @JvmStatic public external fun removeTurboModuleManagerDelegateMutex(): Boolean @DoNotStrip @JvmStatic public external fun throwExceptionInsteadOfDeadlockOnTurboModuleSetupDuringSyncRenderIOS(): Boolean diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt index ce0e00a74f5..098da3bd3b9 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt @@ -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<> + * @generated SignedSource<<8383768fde5c98d3a0ecd3bc69ab3332>> */ /** @@ -85,8 +85,6 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi override fun fuseboxNetworkInspectionEnabled(): Boolean = false - override fun lazyAnimationCallbacks(): Boolean = false - override fun removeTurboModuleManagerDelegateMutex(): Boolean = false override fun throwExceptionInsteadOfDeadlockOnTurboModuleSetupDuringSyncRenderIOS(): Boolean = false diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt index 6552ac9f737..ba6cb00196f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt @@ -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<<5fc2a365b51c5e14f99ec1d3b162f4e3>> + * @generated SignedSource<> */ /** @@ -55,7 +55,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc private var fixMountingCoordinatorReportedPendingTransactionsOnAndroidCache: Boolean? = null private var fuseboxEnabledReleaseCache: Boolean? = null private var fuseboxNetworkInspectionEnabledCache: Boolean? = null - private var lazyAnimationCallbacksCache: Boolean? = null private var removeTurboModuleManagerDelegateMutexCache: Boolean? = null private var throwExceptionInsteadOfDeadlockOnTurboModuleSetupDuringSyncRenderIOSCache: Boolean? = null private var traceTurboModulePromiseRejectionsOnAndroidCache: Boolean? = null @@ -378,16 +377,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc return cached } - override fun lazyAnimationCallbacks(): Boolean { - var cached = lazyAnimationCallbacksCache - if (cached == null) { - cached = currentProvider.lazyAnimationCallbacks() - accessedFeatureFlags.add("lazyAnimationCallbacks") - lazyAnimationCallbacksCache = cached - } - return cached - } - override fun removeTurboModuleManagerDelegateMutex(): Boolean { var cached = removeTurboModuleManagerDelegateMutexCache if (cached == null) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt index 24795a5698b..b8bb5f9595e 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt @@ -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<<1db9978c9096c9775fd7cd7d37637c8c>> + * @generated SignedSource<<0b3ff27c6f870a5d357fc840156d843c>> */ /** @@ -85,8 +85,6 @@ public interface ReactNativeFeatureFlagsProvider { @DoNotStrip public fun fuseboxNetworkInspectionEnabled(): Boolean - @DoNotStrip public fun lazyAnimationCallbacks(): Boolean - @DoNotStrip public fun removeTurboModuleManagerDelegateMutex(): Boolean @DoNotStrip public fun throwExceptionInsteadOfDeadlockOnTurboModuleSetupDuringSyncRenderIOS(): Boolean diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp index f254b5827cd..731a032db12 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp @@ -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<> + * @generated SignedSource<<758258d179734897366670bec314def2>> */ /** @@ -225,12 +225,6 @@ class ReactNativeFeatureFlagsJavaProvider return method(javaProvider_); } - bool lazyAnimationCallbacks() override { - static const auto method = - getReactNativeFeatureFlagsProviderJavaClass()->getMethod("lazyAnimationCallbacks"); - return method(javaProvider_); - } - bool removeTurboModuleManagerDelegateMutex() override { static const auto method = getReactNativeFeatureFlagsProviderJavaClass()->getMethod("removeTurboModuleManagerDelegateMutex"); @@ -456,11 +450,6 @@ bool JReactNativeFeatureFlagsCxxInterop::fuseboxNetworkInspectionEnabled( return ReactNativeFeatureFlags::fuseboxNetworkInspectionEnabled(); } -bool JReactNativeFeatureFlagsCxxInterop::lazyAnimationCallbacks( - facebook::jni::alias_ref /*unused*/) { - return ReactNativeFeatureFlags::lazyAnimationCallbacks(); -} - bool JReactNativeFeatureFlagsCxxInterop::removeTurboModuleManagerDelegateMutex( facebook::jni::alias_ref /*unused*/) { return ReactNativeFeatureFlags::removeTurboModuleManagerDelegateMutex(); @@ -640,9 +629,6 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() { makeNativeMethod( "fuseboxNetworkInspectionEnabled", JReactNativeFeatureFlagsCxxInterop::fuseboxNetworkInspectionEnabled), - makeNativeMethod( - "lazyAnimationCallbacks", - JReactNativeFeatureFlagsCxxInterop::lazyAnimationCallbacks), makeNativeMethod( "removeTurboModuleManagerDelegateMutex", JReactNativeFeatureFlagsCxxInterop::removeTurboModuleManagerDelegateMutex), diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h b/packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h index 381b3596d9c..dd0df5b3dc4 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h @@ -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<> + * @generated SignedSource<> */ /** @@ -123,9 +123,6 @@ class JReactNativeFeatureFlagsCxxInterop static bool fuseboxNetworkInspectionEnabled( facebook::jni::alias_ref); - static bool lazyAnimationCallbacks( - facebook::jni::alias_ref); - static bool removeTurboModuleManagerDelegateMutex( facebook::jni::alias_ref); diff --git a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp index c375c6fb0aa..8da0824492e 100644 --- a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp +++ b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp @@ -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<<07e6cf68cec4f7c7d61de4958b11ff4f>> + * @generated SignedSource<<8ebf334ae9a7fd165e8d8a48448fe5d7>> */ /** @@ -150,10 +150,6 @@ bool ReactNativeFeatureFlags::fuseboxNetworkInspectionEnabled() { return getAccessor().fuseboxNetworkInspectionEnabled(); } -bool ReactNativeFeatureFlags::lazyAnimationCallbacks() { - return getAccessor().lazyAnimationCallbacks(); -} - bool ReactNativeFeatureFlags::removeTurboModuleManagerDelegateMutex() { return getAccessor().removeTurboModuleManagerDelegateMutex(); } diff --git a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.h b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.h index 5c32ca5588c..4135fab6a4b 100644 --- a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.h +++ b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.h @@ -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<<25a17c52439f8f8cd607d91f28fadb07>> + * @generated SignedSource<<83452819d876ba79d0ce3b45adfe70ce>> */ /** @@ -194,11 +194,6 @@ class ReactNativeFeatureFlags { */ RN_EXPORT static bool fuseboxNetworkInspectionEnabled(); - /** - * Only enqueue Choreographer calls if there is an ongoing animation, instead of enqueueing every frame. - */ - RN_EXPORT static bool lazyAnimationCallbacks(); - /** * When enabled, mutex _turboModuleManagerDelegateMutex in RCTTurboModuleManager will not be used */ diff --git a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsAccessor.cpp b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsAccessor.cpp index d335d93a816..174d06016b9 100644 --- a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsAccessor.cpp +++ b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsAccessor.cpp @@ -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<<40daa9d9fc429b26ec6c178a6d9f6c5d>> + * @generated SignedSource<<554383ea858e6243bf37960317e1ebf8>> */ /** @@ -587,24 +587,6 @@ bool ReactNativeFeatureFlagsAccessor::fuseboxNetworkInspectionEnabled() { return flagValue.value(); } -bool ReactNativeFeatureFlagsAccessor::lazyAnimationCallbacks() { - auto flagValue = lazyAnimationCallbacks_.load(); - - if (!flagValue.has_value()) { - // This block is not exclusive but it is not necessary. - // If multiple threads try to initialize the feature flag, we would only - // be accessing the provider multiple times but the end state of this - // instance and the returned flag value would be the same. - - markFlagAsAccessed(31, "lazyAnimationCallbacks"); - - flagValue = currentProvider_->lazyAnimationCallbacks(); - lazyAnimationCallbacks_ = flagValue; - } - - return flagValue.value(); -} - bool ReactNativeFeatureFlagsAccessor::removeTurboModuleManagerDelegateMutex() { auto flagValue = removeTurboModuleManagerDelegateMutex_.load(); @@ -614,7 +596,7 @@ bool ReactNativeFeatureFlagsAccessor::removeTurboModuleManagerDelegateMutex() { // be accessing the provider multiple times but the end state of this // instance and the returned flag value would be the same. - markFlagAsAccessed(32, "removeTurboModuleManagerDelegateMutex"); + markFlagAsAccessed(31, "removeTurboModuleManagerDelegateMutex"); flagValue = currentProvider_->removeTurboModuleManagerDelegateMutex(); removeTurboModuleManagerDelegateMutex_ = flagValue; @@ -632,7 +614,7 @@ bool ReactNativeFeatureFlagsAccessor::throwExceptionInsteadOfDeadlockOnTurboModu // be accessing the provider multiple times but the end state of this // instance and the returned flag value would be the same. - markFlagAsAccessed(33, "throwExceptionInsteadOfDeadlockOnTurboModuleSetupDuringSyncRenderIOS"); + markFlagAsAccessed(32, "throwExceptionInsteadOfDeadlockOnTurboModuleSetupDuringSyncRenderIOS"); flagValue = currentProvider_->throwExceptionInsteadOfDeadlockOnTurboModuleSetupDuringSyncRenderIOS(); throwExceptionInsteadOfDeadlockOnTurboModuleSetupDuringSyncRenderIOS_ = flagValue; @@ -650,7 +632,7 @@ bool ReactNativeFeatureFlagsAccessor::traceTurboModulePromiseRejectionsOnAndroid // be accessing the provider multiple times but the end state of this // instance and the returned flag value would be the same. - markFlagAsAccessed(34, "traceTurboModulePromiseRejectionsOnAndroid"); + markFlagAsAccessed(33, "traceTurboModulePromiseRejectionsOnAndroid"); flagValue = currentProvider_->traceTurboModulePromiseRejectionsOnAndroid(); traceTurboModulePromiseRejectionsOnAndroid_ = flagValue; @@ -668,7 +650,7 @@ bool ReactNativeFeatureFlagsAccessor::useAlwaysAvailableJSErrorHandling() { // be accessing the provider multiple times but the end state of this // instance and the returned flag value would be the same. - markFlagAsAccessed(35, "useAlwaysAvailableJSErrorHandling"); + markFlagAsAccessed(34, "useAlwaysAvailableJSErrorHandling"); flagValue = currentProvider_->useAlwaysAvailableJSErrorHandling(); useAlwaysAvailableJSErrorHandling_ = flagValue; @@ -686,7 +668,7 @@ bool ReactNativeFeatureFlagsAccessor::useEditTextStockAndroidFocusBehavior() { // be accessing the provider multiple times but the end state of this // instance and the returned flag value would be the same. - markFlagAsAccessed(36, "useEditTextStockAndroidFocusBehavior"); + markFlagAsAccessed(35, "useEditTextStockAndroidFocusBehavior"); flagValue = currentProvider_->useEditTextStockAndroidFocusBehavior(); useEditTextStockAndroidFocusBehavior_ = flagValue; @@ -704,7 +686,7 @@ bool ReactNativeFeatureFlagsAccessor::useFabricInterop() { // be accessing the provider multiple times but the end state of this // instance and the returned flag value would be the same. - markFlagAsAccessed(37, "useFabricInterop"); + markFlagAsAccessed(36, "useFabricInterop"); flagValue = currentProvider_->useFabricInterop(); useFabricInterop_ = flagValue; @@ -722,7 +704,7 @@ bool ReactNativeFeatureFlagsAccessor::useNativeViewConfigsInBridgelessMode() { // be accessing the provider multiple times but the end state of this // instance and the returned flag value would be the same. - markFlagAsAccessed(38, "useNativeViewConfigsInBridgelessMode"); + markFlagAsAccessed(37, "useNativeViewConfigsInBridgelessMode"); flagValue = currentProvider_->useNativeViewConfigsInBridgelessMode(); useNativeViewConfigsInBridgelessMode_ = flagValue; @@ -740,7 +722,7 @@ bool ReactNativeFeatureFlagsAccessor::useOptimizedEventBatchingOnAndroid() { // be accessing the provider multiple times but the end state of this // instance and the returned flag value would be the same. - markFlagAsAccessed(39, "useOptimizedEventBatchingOnAndroid"); + markFlagAsAccessed(38, "useOptimizedEventBatchingOnAndroid"); flagValue = currentProvider_->useOptimizedEventBatchingOnAndroid(); useOptimizedEventBatchingOnAndroid_ = flagValue; @@ -758,7 +740,7 @@ bool ReactNativeFeatureFlagsAccessor::useRawPropsJsiValue() { // be accessing the provider multiple times but the end state of this // instance and the returned flag value would be the same. - markFlagAsAccessed(40, "useRawPropsJsiValue"); + markFlagAsAccessed(39, "useRawPropsJsiValue"); flagValue = currentProvider_->useRawPropsJsiValue(); useRawPropsJsiValue_ = flagValue; @@ -776,7 +758,7 @@ bool ReactNativeFeatureFlagsAccessor::useTurboModuleInterop() { // be accessing the provider multiple times but the end state of this // instance and the returned flag value would be the same. - markFlagAsAccessed(41, "useTurboModuleInterop"); + markFlagAsAccessed(40, "useTurboModuleInterop"); flagValue = currentProvider_->useTurboModuleInterop(); useTurboModuleInterop_ = flagValue; @@ -794,7 +776,7 @@ bool ReactNativeFeatureFlagsAccessor::useTurboModules() { // be accessing the provider multiple times but the end state of this // instance and the returned flag value would be the same. - markFlagAsAccessed(42, "useTurboModules"); + markFlagAsAccessed(41, "useTurboModules"); flagValue = currentProvider_->useTurboModules(); useTurboModules_ = flagValue; diff --git a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsAccessor.h b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsAccessor.h index cd53f268d2b..7fce36a98a0 100644 --- a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsAccessor.h +++ b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsAccessor.h @@ -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<<54364d504177fce95cc2cbbc2b55cb65>> + * @generated SignedSource<<9beffcac72be3722c64130acbe0aadd3>> */ /** @@ -63,7 +63,6 @@ class ReactNativeFeatureFlagsAccessor { bool fixMountingCoordinatorReportedPendingTransactionsOnAndroid(); bool fuseboxEnabledRelease(); bool fuseboxNetworkInspectionEnabled(); - bool lazyAnimationCallbacks(); bool removeTurboModuleManagerDelegateMutex(); bool throwExceptionInsteadOfDeadlockOnTurboModuleSetupDuringSyncRenderIOS(); bool traceTurboModulePromiseRejectionsOnAndroid(); @@ -86,7 +85,7 @@ class ReactNativeFeatureFlagsAccessor { std::unique_ptr currentProvider_; bool wasOverridden_; - std::array, 43> accessedFeatureFlags_; + std::array, 42> accessedFeatureFlags_; std::atomic> commonTestFlag_; std::atomic> animatedShouldSignalBatch_; @@ -119,7 +118,6 @@ class ReactNativeFeatureFlagsAccessor { std::atomic> fixMountingCoordinatorReportedPendingTransactionsOnAndroid_; std::atomic> fuseboxEnabledRelease_; std::atomic> fuseboxNetworkInspectionEnabled_; - std::atomic> lazyAnimationCallbacks_; std::atomic> removeTurboModuleManagerDelegateMutex_; std::atomic> throwExceptionInsteadOfDeadlockOnTurboModuleSetupDuringSyncRenderIOS_; std::atomic> traceTurboModulePromiseRejectionsOnAndroid_; diff --git a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDefaults.h b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDefaults.h index 8bcbc0dd95b..79367cf8faa 100644 --- a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDefaults.h +++ b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDefaults.h @@ -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<> + * @generated SignedSource<<799b8ba7a7c666ee5985777c26ce99a3>> */ /** @@ -151,10 +151,6 @@ class ReactNativeFeatureFlagsDefaults : public ReactNativeFeatureFlagsProvider { return false; } - bool lazyAnimationCallbacks() override { - return false; - } - bool removeTurboModuleManagerDelegateMutex() override { return false; } diff --git a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDynamicProvider.h b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDynamicProvider.h index e3c119f7dad..27cbbede143 100644 --- a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDynamicProvider.h +++ b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDynamicProvider.h @@ -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<<28915a06a3c24b532384b481cc91d863>> + * @generated SignedSource<<1d0d1004706ba33b0896b671feca74a0>> */ /** @@ -324,15 +324,6 @@ class ReactNativeFeatureFlagsDynamicProvider : public ReactNativeFeatureFlagsDef return ReactNativeFeatureFlagsDefaults::fuseboxNetworkInspectionEnabled(); } - bool lazyAnimationCallbacks() override { - auto value = values_["lazyAnimationCallbacks"]; - if (!value.isNull()) { - return value.getBool(); - } - - return ReactNativeFeatureFlagsDefaults::lazyAnimationCallbacks(); - } - bool removeTurboModuleManagerDelegateMutex() override { auto value = values_["removeTurboModuleManagerDelegateMutex"]; if (!value.isNull()) { diff --git a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsOverridesOSSCanary.h b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsOverridesOSSCanary.h index 55ad9008b61..3dbcd2356cc 100644 --- a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsOverridesOSSCanary.h +++ b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsOverridesOSSCanary.h @@ -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<<53c858fa9ec8c4e3b9849f7513fdb441>> + * @generated SignedSource<> */ /** @@ -100,8 +100,6 @@ class ReactNativeFeatureFlagsOverridesOSSCanary : public ReactNativeFeatureFlags - - diff --git a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsOverridesOSSExperimental.h b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsOverridesOSSExperimental.h index 6925f5f629f..0d63daa28ba 100644 --- a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsOverridesOSSExperimental.h +++ b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsOverridesOSSExperimental.h @@ -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<> + * @generated SignedSource<> */ /** @@ -107,8 +107,6 @@ class ReactNativeFeatureFlagsOverridesOSSExperimental : public ReactNativeFeatur - - diff --git a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsProvider.h b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsProvider.h index e05009ab0ef..9f9befe1411 100644 --- a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsProvider.h +++ b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsProvider.h @@ -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<<3d6eb54a5f64b0d5c72dae44e669052e>> + * @generated SignedSource<> */ /** @@ -56,7 +56,6 @@ class ReactNativeFeatureFlagsProvider { virtual bool fixMountingCoordinatorReportedPendingTransactionsOnAndroid() = 0; virtual bool fuseboxEnabledRelease() = 0; virtual bool fuseboxNetworkInspectionEnabled() = 0; - virtual bool lazyAnimationCallbacks() = 0; virtual bool removeTurboModuleManagerDelegateMutex() = 0; virtual bool throwExceptionInsteadOfDeadlockOnTurboModuleSetupDuringSyncRenderIOS() = 0; virtual bool traceTurboModulePromiseRejectionsOnAndroid() = 0; diff --git a/packages/react-native/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.cpp b/packages/react-native/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.cpp index 061eb797c46..e841753bcf2 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.cpp +++ b/packages/react-native/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.cpp @@ -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<> + * @generated SignedSource<<30a4515935eedcbec28b00e2f5ed8baa>> */ /** @@ -199,11 +199,6 @@ bool NativeReactNativeFeatureFlags::fuseboxNetworkInspectionEnabled( return ReactNativeFeatureFlags::fuseboxNetworkInspectionEnabled(); } -bool NativeReactNativeFeatureFlags::lazyAnimationCallbacks( - jsi::Runtime& /*runtime*/) { - return ReactNativeFeatureFlags::lazyAnimationCallbacks(); -} - bool NativeReactNativeFeatureFlags::removeTurboModuleManagerDelegateMutex( jsi::Runtime& /*runtime*/) { return ReactNativeFeatureFlags::removeTurboModuleManagerDelegateMutex(); diff --git a/packages/react-native/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.h b/packages/react-native/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.h index 619b45d88fb..55540b2d5b1 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.h +++ b/packages/react-native/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.h @@ -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<> + * @generated SignedSource<> */ /** @@ -99,8 +99,6 @@ class NativeReactNativeFeatureFlags bool fuseboxNetworkInspectionEnabled(jsi::Runtime& runtime); - bool lazyAnimationCallbacks(jsi::Runtime& runtime); - bool removeTurboModuleManagerDelegateMutex(jsi::Runtime& runtime); bool throwExceptionInsteadOfDeadlockOnTurboModuleSetupDuringSyncRenderIOS(jsi::Runtime& runtime); diff --git a/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js b/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js index 728c3a6eabb..b3f371321fc 100644 --- a/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js +++ b/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js @@ -374,17 +374,6 @@ const definitions: FeatureFlagDefinitions = { }, ossReleaseStage: 'none', }, - lazyAnimationCallbacks: { - defaultValue: false, - metadata: { - dateAdded: '2024-05-01', - description: - 'Only enqueue Choreographer calls if there is an ongoing animation, instead of enqueueing every frame.', - expectedReleaseValue: true, - purpose: 'experimentation', - }, - ossReleaseStage: 'none', - }, removeTurboModuleManagerDelegateMutex: { defaultValue: false, metadata: { diff --git a/packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js b/packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js index 192fbd28d8b..a7e11dc886c 100644 --- a/packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js +++ b/packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js @@ -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<> + * @generated SignedSource<> * @flow strict */ @@ -78,7 +78,6 @@ export type ReactNativeFeatureFlags = $ReadOnly<{ fixMountingCoordinatorReportedPendingTransactionsOnAndroid: Getter, fuseboxEnabledRelease: Getter, fuseboxNetworkInspectionEnabled: Getter, - lazyAnimationCallbacks: Getter, removeTurboModuleManagerDelegateMutex: Getter, throwExceptionInsteadOfDeadlockOnTurboModuleSetupDuringSyncRenderIOS: Getter, traceTurboModulePromiseRejectionsOnAndroid: Getter, @@ -285,10 +284,6 @@ export const fuseboxEnabledRelease: Getter = createNativeFlagGetter('fu * Enable network inspection support in the React Native DevTools CDP backend. Requires `enableBridgelessArchitecture`. This flag is global and should not be changed across React Host lifetimes. */ export const fuseboxNetworkInspectionEnabled: Getter = createNativeFlagGetter('fuseboxNetworkInspectionEnabled', false); -/** - * Only enqueue Choreographer calls if there is an ongoing animation, instead of enqueueing every frame. - */ -export const lazyAnimationCallbacks: Getter = createNativeFlagGetter('lazyAnimationCallbacks', false); /** * When enabled, mutex _turboModuleManagerDelegateMutex in RCTTurboModuleManager will not be used */ diff --git a/packages/react-native/src/private/featureflags/specs/NativeReactNativeFeatureFlags.js b/packages/react-native/src/private/featureflags/specs/NativeReactNativeFeatureFlags.js index a571a2d2450..70a7a551d93 100644 --- a/packages/react-native/src/private/featureflags/specs/NativeReactNativeFeatureFlags.js +++ b/packages/react-native/src/private/featureflags/specs/NativeReactNativeFeatureFlags.js @@ -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<> + * @generated SignedSource<> * @flow strict */ @@ -55,7 +55,6 @@ export interface Spec extends TurboModule { +fixMountingCoordinatorReportedPendingTransactionsOnAndroid?: () => boolean; +fuseboxEnabledRelease?: () => boolean; +fuseboxNetworkInspectionEnabled?: () => boolean; - +lazyAnimationCallbacks?: () => boolean; +removeTurboModuleManagerDelegateMutex?: () => boolean; +throwExceptionInsteadOfDeadlockOnTurboModuleSetupDuringSyncRenderIOS?: () => boolean; +traceTurboModulePromiseRejectionsOnAndroid?: () => boolean;