{label}<\/div>;\n+}\n+\n+export default function ErrorBoundaries() {\n+ return (\n+ \n+

Nested error boundaries demo<\/h1>\n+ \n+ \n+ \n+ \n+ <\/ErrorBoundary>\n+ <\/ErrorBoundary>\n+ \n+ \n+ <\/ErrorBoundary>\n+ <\/Fragment>\n+ );\n+}\ndiff --git a\/packages\/react-devtools-shell\/src\/app\/index.js b\/packages\/react-devtools-shell\/src\/app\/index.js\nindex 5764130075..d00ffde4a5 100644\n--- a\/packages\/react-devtools-shell\/src\/app\/index.js\n+++ b\/packages\/react-devtools-shell\/src\/app\/index.js\n@@ -17,6 +17,7 @@ import InspectableElements from '.\/InspectableElements';\n import ReactNativeWeb from '.\/ReactNativeWeb';\n import ToDoList from '.\/ToDoList';\n import Toggle from '.\/Toggle';\n+import ErrorBoundaries from '.\/ErrorBoundaries';\n import SuspenseTree from '.\/SuspenseTree';\n import {ignoreErrors, ignoreWarnings} from '.\/console';\n \n@@ -54,6 +55,7 @@ function mountTestApp() {\n mountHelper(InlineWarnings);\n mountHelper(ReactNativeWeb);\n mountHelper(Toggle);\n+ mountHelper(ErrorBoundaries);\n mountHelper(SuspenseTree);\n mountHelper(DeeplyNestedComponents);\n mountHelper(Iframe);\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.new.js b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.new.js\nindex 6f1f7953b2..30fdc51656 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.new.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.new.js\n@@ -70,6 +70,7 @@ import {\n ChildDeletion,\n ForceUpdateForLegacySuspense,\n StaticMask,\n+ ShouldCapture,\n } from '.\/ReactFiberFlags';\n import ReactSharedInternals from 'shared\/ReactSharedInternals';\n import {\n@@ -111,6 +112,7 @@ import {\n processUpdateQueue,\n cloneUpdateQueue,\n initializeUpdateQueue,\n+ enqueueCapturedUpdate,\n } from '.\/ReactUpdateQueue.new';\n import {\n NoLane,\n@@ -125,6 +127,7 @@ import {\n removeLanes,\n mergeLanes,\n getBumpedLaneForHydration,\n+ pickArbitraryLane,\n } from '.\/ReactFiberLane.new';\n import {\n ConcurrentMode,\n@@ -141,7 +144,7 @@ import {\n isPrimaryRenderer,\n } from '.\/ReactFiberHostConfig';\n import type {SuspenseInstance} from '.\/ReactFiberHostConfig';\n-import {shouldSuspend} from '.\/ReactFiberReconciler';\n+import {shouldError, shouldSuspend} from '.\/ReactFiberReconciler';\n import {pushHostContext, pushHostContainer} from '.\/ReactFiberHostContext.new';\n import {\n suspenseStackCursor,\n@@ -219,6 +222,8 @@ import {\n restoreSpawnedCachePool,\n getOffscreenDeferredCachePool,\n } from '.\/ReactFiberCacheComponent.new';\n+import {createCapturedValue} from '.\/ReactCapturedValue';\n+import {createClassErrorUpdate} from '.\/ReactFiberThrow.new';\n import is from 'shared\/objectIs';\n \n import {disableLogs, reenableLogs} from 'shared\/ConsolePatchingDev';\n@@ -947,6 +952,38 @@ function updateClassComponent(\n renderLanes: Lanes,\n ) {\n if (DEV) {\n+ \/\/ This is used by DevTools to force a boundary to error.\n+ switch (shouldError(workInProgress)) {\n+ case false: {\n+ const instance = workInProgress.stateNode;\n+ const ctor = workInProgress.type;\n+ \/\/ TODO This way of resetting the error boundary state is a hack.\n+ \/\/ Is there a better way to do this?\n+ const tempInstance = new ctor(\n+ workInProgress.memoizedProps,\n+ instance.context,\n+ );\n+ const state = tempInstance.state;\n+ instance.updater.enqueueSetState(instance, state, null);\n+ break;\n+ }\n+ case true: {\n+ workInProgress.flags |= DidCapture;\n+ workInProgress.flags |= ShouldCapture;\n+ const error = new Error('Simulated error coming from DevTools');\n+ const lane = pickArbitraryLane(renderLanes);\n+ workInProgress.lanes = mergeLanes(workInProgress.lanes, lane);\n+ \/\/ Schedule the error boundary to re-render using updated state\n+ const update = createClassErrorUpdate(\n+ workInProgress,\n+ createCapturedValue(error, workInProgress),\n+ lane,\n+ );\n+ enqueueCapturedUpdate(workInProgress, update);\n+ break;\n+ }\n+ }\n+\n if (workInProgress.type !== workInProgress.elementType) {\n \/\/ Lazy component props can't be validated in createElement\n \/\/ because they're only guaranteed to be resolved here.\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.old.js b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.old.js\nindex 8bac08c0ff..090fa0b195 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.old.js\n@@ -70,6 +70,7 @@ import {\n ChildDeletion,\n ForceUpdateForLegacySuspense,\n StaticMask,\n+ ShouldCapture,\n } from '.\/ReactFiberFlags';\n import ReactSharedInternals from 'shared\/ReactSharedInternals';\n import {\n@@ -111,6 +112,7 @@ import {\n processUpdateQueue,\n cloneUpdateQueue,\n initializeUpdateQueue,\n+ enqueueCapturedUpdate,\n } from '.\/ReactUpdateQueue.old';\n import {\n NoLane,\n@@ -125,6 +127,7 @@ import {\n removeLanes,\n mergeLanes,\n getBumpedLaneForHydration,\n+ pickArbitraryLane,\n } from '.\/ReactFiberLane.old';\n import {\n ConcurrentMode,\n@@ -141,7 +144,7 @@ import {\n isPrimaryRenderer,\n } from '.\/ReactFiberHostConfig';\n import type {SuspenseInstance} from '.\/ReactFiberHostConfig';\n-import {shouldSuspend} from '.\/ReactFiberReconciler';\n+import {shouldError, shouldSuspend} from '.\/ReactFiberReconciler';\n import {pushHostContext, pushHostContainer} from '.\/ReactFiberHostContext.old';\n import {\n suspenseStackCursor,\n@@ -219,6 +222,8 @@ import {\n restoreSpawnedCachePool,\n getOffscreenDeferredCachePool,\n } from '.\/ReactFiberCacheComponent.old';\n+import {createCapturedValue} from '.\/ReactCapturedValue';\n+import {createClassErrorUpdate} from '.\/ReactFiberThrow.old';\n import is from 'shared\/objectIs';\n \n import {disableLogs, reenableLogs} from 'shared\/ConsolePatchingDev';\n@@ -947,6 +952,38 @@ function updateClassComponent(\n renderLanes: Lanes,\n ) {\n if (DEV) {\n+ \/\/ This is used by DevTools to force a boundary to error.\n+ switch (shouldError(workInProgress)) {\n+ case false: {\n+ const instance = workInProgress.stateNode;\n+ const ctor = workInProgress.type;\n+ \/\/ TODO This way of resetting the error boundary state is a hack.\n+ \/\/ Is there a better way to do this?\n+ const tempInstance = new ctor(\n+ workInProgress.memoizedProps,\n+ instance.context,\n+ );\n+ const state = tempInstance.state;\n+ instance.updater.enqueueSetState(instance, state, null);\n+ break;\n+ }\n+ case true: {\n+ workInProgress.flags |= DidCapture;\n+ workInProgress.flags |= ShouldCapture;\n+ const error = new Error('Simulated error coming from DevTools');\n+ const lane = pickArbitraryLane(renderLanes);\n+ workInProgress.lanes = mergeLanes(workInProgress.lanes, lane);\n+ \/\/ Schedule the error boundary to re-render using updated state\n+ const update = createClassErrorUpdate(\n+ workInProgress,\n+ createCapturedValue(error, workInProgress),\n+ lane,\n+ );\n+ enqueueCapturedUpdate(workInProgress, update);\n+ break;\n+ }\n+ }\n+\n if (workInProgress.type !== workInProgress.elementType) {\n \/\/ Lazy component props can't be validated in createElement\n \/\/ because they're only guaranteed to be resolved here.\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberReconciler.js b\/packages\/react-reconciler\/src\/ReactFiberReconciler.js\nindex e789b58b61..ff68770f09 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberReconciler.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberReconciler.js\n@@ -35,6 +35,7 @@ import {\n findHostInstance as findHostInstance_old,\n findHostInstanceWithWarning as findHostInstanceWithWarning_old,\n findHostInstanceWithNoPortals as findHostInstanceWithNoPortals_old,\n+ shouldError as shouldError_old,\n shouldSuspend as shouldSuspend_old,\n injectIntoDevTools as injectIntoDevTools_old,\n act as act_old,\n@@ -75,6 +76,7 @@ import {\n findHostInstance as findHostInstance_new,\n findHostInstanceWithWarning as findHostInstanceWithWarning_new,\n findHostInstanceWithNoPortals as findHostInstanceWithNoPortals_new,\n+ shouldError as shouldError_new,\n shouldSuspend as shouldSuspend_new,\n injectIntoDevTools as injectIntoDevTools_new,\n act as act_new,\n@@ -155,6 +157,9 @@ export const findHostInstanceWithWarning = enableNewReconciler\n export const findHostInstanceWithNoPortals = enableNewReconciler\n ? findHostInstanceWithNoPortals_new\n : findHostInstanceWithNoPortals_old;\n+export const shouldError = enableNewReconciler\n+ ? shouldError_new\n+ : shouldError_old;\n export const shouldSuspend = enableNewReconciler\n ? shouldSuspend_new\n : shouldSuspend_old;\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberReconciler.new.js b\/packages\/react-reconciler\/src\/ReactFiberReconciler.new.js\nindex c1e9778160..c53fabbb8e 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberReconciler.new.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberReconciler.new.js\n@@ -463,6 +463,12 @@ export function findHostInstanceWithNoPortals(\n return hostFiber.stateNode;\n }\n \n+let shouldErrorImpl = fiber => null;\n+\n+export function shouldError(fiber: Fiber): ?boolean {\n+ return shouldErrorImpl(fiber);\n+}\n+\n let shouldSuspendImpl = fiber => false;\n \n export function shouldSuspend(fiber: Fiber): boolean {\n@@ -476,6 +482,7 @@ let overrideProps = null;\n let overridePropsDeletePath = null;\n let overridePropsRenamePath = null;\n let scheduleUpdate = null;\n+let setErrorHandler = null;\n let setSuspenseHandler = null;\n \n if (DEV) {\n@@ -690,6 +697,10 @@ if (DEV) {\n scheduleUpdateOnFiber(fiber, SyncLane, NoTimestamp);\n };\n \n+ setErrorHandler = (newShouldErrorImpl: Fiber => ?boolean) => {\n+ shouldErrorImpl = newShouldErrorImpl;\n+ };\n+\n setSuspenseHandler = (newShouldSuspendImpl: Fiber => boolean) => {\n shouldSuspendImpl = newShouldSuspendImpl;\n };\n@@ -728,6 +739,7 @@ export function injectIntoDevTools(devToolsConfig: DevToolsConfig): boolean {\n overrideProps,\n overridePropsDeletePath,\n overridePropsRenamePath,\n+ setErrorHandler,\n setSuspenseHandler,\n scheduleUpdate,\n currentDispatcherRef: ReactCurrentDispatcher,\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberReconciler.old.js b\/packages\/react-reconciler\/src\/ReactFiberReconciler.old.js\nindex 47ced00130..73d412bfcd 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberReconciler.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberReconciler.old.js\n@@ -463,6 +463,12 @@ export function findHostInstanceWithNoPortals(\n return hostFiber.stateNode;\n }\n \n+let shouldErrorImpl = fiber => null;\n+\n+export function shouldError(fiber: Fiber): ?boolean {\n+ return shouldErrorImpl(fiber);\n+}\n+\n let shouldSuspendImpl = fiber => false;\n \n export function shouldSuspend(fiber: Fiber): boolean {\n@@ -476,6 +482,7 @@ let overrideProps = null;\n let overridePropsDeletePath = null;\n let overridePropsRenamePath = null;\n let scheduleUpdate = null;\n+let setErrorHandler = null;\n let setSuspenseHandler = null;\n \n if (DEV) {\n@@ -690,6 +697,10 @@ if (DEV) {\n scheduleUpdateOnFiber(fiber, SyncLane, NoTimestamp);\n };\n \n+ setErrorHandler = (newShouldErrorImpl: Fiber => ?boolean) => {\n+ shouldErrorImpl = newShouldErrorImpl;\n+ };\n+\n setSuspenseHandler = (newShouldSuspendImpl: Fiber => boolean) => {\n shouldSuspendImpl = newShouldSuspendImpl;\n };\n@@ -728,6 +739,7 @@ export function injectIntoDevTools(devToolsConfig: DevToolsConfig): boolean {\n overrideProps,\n overridePropsDeletePath,\n overridePropsRenamePath,\n+ setErrorHandler,\n setSuspenseHandler,\n scheduleUpdate,\n currentDispatcherRef: ReactCurrentDispatcher,\n"}

dillon1000/react

Files changed