diff --git a/packages/react-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js index 9e4ab0e59faf5..eade4ea474c77 100644 --- a/packages/react-dom/src/client/ReactDOM.js +++ b/packages/react-dom/src/client/ReactDOM.js @@ -28,7 +28,6 @@ import { flushSync, flushControlled, injectIntoDevTools, - flushPassiveEffects, IsThisRendererActing, act, attemptSynchronousHydration, @@ -156,7 +155,7 @@ function renderSubtreeIntoContainer( } const Internals = { - // Keep in sync with ReactTestUtils.js, and ReactTestUtilsAct.js. + // Keep in sync with ReactTestUtils.js. // This is an array for better minification. Events: [ getInstanceFromNode, @@ -164,11 +163,10 @@ const Internals = { getFiberCurrentPropsFromNode, enqueueStateRestore, restoreStateIfNeeded, - flushPassiveEffects, - // TODO: This is related to `act`, not events. Move to separate key? - IsThisRendererActing, - act, ], + act, + // TODO: Temporary. Only used by our internal version of `act. Will remove. + IsThisRendererActing, }; export { diff --git a/packages/react-dom/src/test-utils/ReactTestUtils.js b/packages/react-dom/src/test-utils/ReactTestUtils.js index 2db21c264866d..69c1a6afcff3a 100644 --- a/packages/react-dom/src/test-utils/ReactTestUtils.js +++ b/packages/react-dom/src/test-utils/ReactTestUtils.js @@ -25,18 +25,17 @@ import { } from 'shared/ReactErrorUtils'; import isArray from 'shared/isArray'; -// Keep in sync with ReactDOM.js, and ReactTestUtilsAct.js: -const EventInternals = - ReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.Events; +// Keep in sync with ReactDOM.js: +const SecretInternals = + ReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED; +const EventInternals = SecretInternals.Events; const getInstanceFromNode = EventInternals[0]; const getNodeFromInstance = EventInternals[1]; const getFiberCurrentPropsFromNode = EventInternals[2]; const enqueueStateRestore = EventInternals[3]; const restoreStateIfNeeded = EventInternals[4]; -// const flushPassiveEffects = EventInternals[5]; -// TODO: This is related to `act`, not events. Move to separate key? -// const IsThisRendererActing = EventInternals[6]; -const act = EventInternals[7]; + +const act = SecretInternals.act; function Event(suffix) {} diff --git a/packages/react-dom/src/test-utils/ReactTestUtilsInternalAct.js b/packages/react-dom/src/test-utils/ReactTestUtilsInternalAct.js index 77fd1779ee56a..3adc786eed5fa 100644 --- a/packages/react-dom/src/test-utils/ReactTestUtilsInternalAct.js +++ b/packages/react-dom/src/test-utils/ReactTestUtilsInternalAct.js @@ -14,16 +14,9 @@ import ReactSharedInternals from 'shared/ReactSharedInternals'; import enqueueTask from 'shared/enqueueTask'; import * as Scheduler from 'scheduler'; -// Keep in sync with ReactDOM.js, and ReactTestUtils.js: -const EventInternals = - ReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.Events; -// const getInstanceFromNode = EventInternals[0]; -// const getNodeFromInstance = EventInternals[1]; -// const getFiberCurrentPropsFromNode = EventInternals[2]; -// const enqueueStateRestore = EventInternals[3]; -// const restoreStateIfNeeded = EventInternals[4]; -// const flushPassiveEffects = EventInternals[5]; -const IsThisRendererActing = EventInternals[6]; +const SecretInternals = + ReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED; +const IsThisRendererActing = SecretInternals.IsThisRendererActing; const batchedUpdates = ReactDOM.unstable_batchedUpdates;