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 13d40caab75..76b1a17682b 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<<74896623764d3d01d2925fdcf30948f1>> + * @generated SignedSource<> */ /** @@ -109,7 +109,7 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi override fun enableResizeObserverByDefault(): Boolean = false - override fun enableRuntimeSchedulerQueueClearingOnError(): Boolean = false + override fun enableRuntimeSchedulerQueueClearingOnError(): Boolean = true override fun enableSchedulerDelegateInvalidation(): Boolean = false diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsOverrides_RNOSS_Experimental_Android.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsOverrides_RNOSS_Experimental_Android.kt index 14a604ced14..cf4e094b051 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsOverrides_RNOSS_Experimental_Android.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsOverrides_RNOSS_Experimental_Android.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<<7103d9c2fa3e2f152ce60b5dff12c0e4>> + * @generated SignedSource<<29904c9a4e11c71f7657c49f3f45a32f>> */ /** @@ -25,8 +25,6 @@ public open class ReactNativeFeatureFlagsOverrides_RNOSS_Experimental_Android : override fun enableFlexboxAutoMinSizeInStrictMode(): Boolean = true - override fun enableRuntimeSchedulerQueueClearingOnError(): Boolean = true - override fun enableSchedulerDelegateInvalidation(): Boolean = true override fun preventShadowTreeCommitExhaustion(): Boolean = true diff --git a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDefaults.h b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDefaults.h index 0d1c741f920..99743dc3436 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<<0dcc09eb60ab85de9bc72410e93c2a1c>> + * @generated SignedSource<<374da5049c71e475cb3e5c2bfed87c9c>> */ /** @@ -200,7 +200,7 @@ class ReactNativeFeatureFlagsDefaults : public ReactNativeFeatureFlagsProvider { } bool enableRuntimeSchedulerQueueClearingOnError() override { - return false; + return true; } bool enableSchedulerDelegateInvalidation() override { diff --git a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsOverridesOSSExperimental.h b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsOverridesOSSExperimental.h index 20ffb27c3e7..428424b850a 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<<7341b28bb77aeeec670051149faeae04>> + * @generated SignedSource<<764568389a1ae8675638104ab3d96d4d>> */ /** @@ -31,10 +31,6 @@ class ReactNativeFeatureFlagsOverridesOSSExperimental : public ReactNativeFeatur return true; } - bool enableRuntimeSchedulerQueueClearingOnError() override { - return true; - } - bool enableSchedulerDelegateInvalidation() override { return true; } diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Modern.cpp b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Modern.cpp index dd5af091c16..ac93cc30035 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Modern.cpp +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Modern.cpp @@ -370,16 +370,19 @@ void RuntimeScheduler_Modern::updateRendering( // internally; this call site stays a single invocation per tick. if (resizeObserverDelegate_ != nullptr) { // This delivers the observations to JS synchronously, so it is outside the - // error boundary of `executeTask`. Handle errors the same way here, so a - // throwing observer callback can't abort the remaining steps below. + // error boundary of `executeTask`. Report the error without going through + // `handleTaskError`: we are already inside the "update the rendering" step, + // so clearing the queues here would drop the pending rendering updates this + // step is about to drain, and a throwing observer callback would abort the + // remaining steps below. try { resizeObserverDelegate_->runResizeObservations(runtime); } catch (jsi::JSError& error) { - handleTaskError(runtime, error); + onTaskError_(runtime, error); } catch (std::exception& ex) { jsi::JSError error( runtime, std::string("Non-JS exception: ") + ex.what()); - handleTaskError(runtime, error); + onTaskError_(runtime, error); } } diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/tests/RuntimeSchedulerTest.cpp b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/tests/RuntimeSchedulerTest.cpp index 8f458876f2a..e00d0156c46 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/tests/RuntimeSchedulerTest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/tests/RuntimeSchedulerTest.cpp @@ -1826,6 +1826,8 @@ TEST_P(RuntimeSchedulerTest, errorInResizeObservationsDoesNotStopUpdate) { return; } + setUpFeatureFlags(/*enableRuntimeSchedulerQueueClearingOnError=*/true); + StubResizeObserverDelegate resizeObserverDelegate; resizeObserverDelegate.onRunResizeObservations = [](jsi::Runtime& runtime) { throw jsi::JSError(runtime, "Test error"); @@ -1848,6 +1850,9 @@ TEST_P(RuntimeSchedulerTest, errorInResizeObservationsDoesNotStopUpdate) { // Delivering observations to JS synchronously happens outside the error // boundary of the task, so the step handles the error itself and carries on. + // In particular the error must not be routed through `handleTaskError`: + // that clears the pending rendering updates this same step is about to + // drain, and `didRunRenderingUpdate` below would be false. EXPECT_EQ(stubErrorUtils_->getReportFatalCallCount(), 1); EXPECT_EQ(resizeObserverDelegate.callCount, 1); EXPECT_EQ(intersectionObserverDelegate.callCount, 1); diff --git a/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js b/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js index 421b5fe0360..3822355f9cf 100644 --- a/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js +++ b/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js @@ -506,7 +506,7 @@ const definitions: FeatureFlagDefinitions = { ossReleaseStage: 'none', }, enableRuntimeSchedulerQueueClearingOnError: { - defaultValue: false, + defaultValue: true, metadata: { dateAdded: '2026-05-19', description: @@ -514,7 +514,7 @@ const definitions: FeatureFlagDefinitions = { expectedReleaseValue: true, purpose: 'experimentation', }, - ossReleaseStage: 'experimental', + ossReleaseStage: 'none', }, enableSchedulerDelegateInvalidation: { defaultValue: false, diff --git a/packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js b/packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js index 0c0a8e54e61..ae013ee25df 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<<2adcae106ae1e758061a91ee20f902fd>> * @flow strict * @noformat */ @@ -387,7 +387,7 @@ export const enableResizeObserverByDefault: Getter = createNativeFlagGe /** * When enabled, RuntimeScheduler_Modern clears pending tasks and rendering updates before handling an error. */ -export const enableRuntimeSchedulerQueueClearingOnError: Getter = createNativeFlagGetter('enableRuntimeSchedulerQueueClearingOnError', false); +export const enableRuntimeSchedulerQueueClearingOnError: Getter = createNativeFlagGetter('enableRuntimeSchedulerQueueClearingOnError', true); /** * Gates a defensive guard around Scheduler::uiManagerDidDispatchCommand and uiManagerDidFinishTransaction that prevents queued rendering-update lambdas from dereferencing the SchedulerDelegate after it has been destroyed (use-after-free). */