From 702cd33bd7b53e2b4426982846dea72167ba0933 Mon Sep 17 00:00:00 2001 From: kassens Date: Thu, 20 Apr 2023 17:02:20 +0000 Subject: [PATCH] Remove findInstanceBlockingEvent unused parameters (#26534) This reverts commit 682e67edd4c12e2fbf2f1617815ebcc7c809e511. DiffTrain build for [90fa6be2509f68fa05897324e6adbab57de30c0f](https://github.com/facebook/react/commit/90fa6be2509f68fa05897324e6adbab57de30c0f) --- compiled/facebook-www/REVISION | 2 +- compiled/facebook-www/React-dev.modern.js | 2 +- compiled/facebook-www/ReactART-dev.classic.js | 2 +- compiled/facebook-www/ReactART-prod.modern.js | 4 +- compiled/facebook-www/ReactDOM-dev.classic.js | 31 ++------ compiled/facebook-www/ReactDOM-dev.modern.js | 31 ++------ .../facebook-www/ReactDOM-prod.classic.js | 77 +++++++------------ compiled/facebook-www/ReactDOM-prod.modern.js | 77 +++++++------------ .../ReactDOM-profiling.classic.js | 77 +++++++------------ .../facebook-www/ReactDOM-profiling.modern.js | 77 +++++++------------ .../ReactDOMTesting-dev.classic.js | 31 ++------ .../ReactDOMTesting-dev.modern.js | 31 ++------ .../ReactDOMTesting-prod.classic.js | 77 +++++++------------ .../ReactDOMTesting-prod.modern.js | 77 +++++++------------ .../ReactTestRenderer-dev.modern.js | 2 +- 15 files changed, 194 insertions(+), 404 deletions(-) diff --git a/compiled/facebook-www/REVISION b/compiled/facebook-www/REVISION index 67745d17e6..ce080b6608 100644 --- a/compiled/facebook-www/REVISION +++ b/compiled/facebook-www/REVISION @@ -1 +1 @@ -f506c332bbece40ca884cdb1f81345732ab0d3d3 +90fa6be2509f68fa05897324e6adbab57de30c0f diff --git a/compiled/facebook-www/React-dev.modern.js b/compiled/facebook-www/React-dev.modern.js index 3dcdb450aa..90ec4ab8a1 100644 --- a/compiled/facebook-www/React-dev.modern.js +++ b/compiled/facebook-www/React-dev.modern.js @@ -27,7 +27,7 @@ if ( } "use strict"; -var ReactVersion = "18.3.0-www-modern-a9fc539b"; +var ReactVersion = "18.3.0-www-modern-ab94a8a5"; // ATTENTION // When adding new symbols to this file, diff --git a/compiled/facebook-www/ReactART-dev.classic.js b/compiled/facebook-www/ReactART-dev.classic.js index 24eda69b02..12b9eb8db1 100644 --- a/compiled/facebook-www/ReactART-dev.classic.js +++ b/compiled/facebook-www/ReactART-dev.classic.js @@ -69,7 +69,7 @@ function _assertThisInitialized(self) { return self; } -var ReactVersion = "18.3.0-www-classic-bcdef9ce"; +var ReactVersion = "18.3.0-www-classic-4fdc00d9"; var LegacyRoot = 0; var ConcurrentRoot = 1; diff --git a/compiled/facebook-www/ReactART-prod.modern.js b/compiled/facebook-www/ReactART-prod.modern.js index 4b1871511b..47cb758b59 100644 --- a/compiled/facebook-www/ReactART-prod.modern.js +++ b/compiled/facebook-www/ReactART-prod.modern.js @@ -9737,7 +9737,7 @@ var slice = Array.prototype.slice, return null; }, bundleType: 0, - version: "18.3.0-www-modern-35aa2c7f", + version: "18.3.0-www-modern-52b1a95d", rendererPackageName: "react-art" }; var internals$jscomp$inline_1324 = { @@ -9768,7 +9768,7 @@ var internals$jscomp$inline_1324 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-www-modern-35aa2c7f" + reconcilerVersion: "18.3.0-www-modern-52b1a95d" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_1325 = __REACT_DEVTOOLS_GLOBAL_HOOK__; diff --git a/compiled/facebook-www/ReactDOM-dev.classic.js b/compiled/facebook-www/ReactDOM-dev.classic.js index dbd0a4836f..c78072e494 100644 --- a/compiled/facebook-www/ReactDOM-dev.classic.js +++ b/compiled/facebook-www/ReactDOM-dev.classic.js @@ -33326,7 +33326,7 @@ function createFiberRoot( return root; } -var ReactVersion = "18.3.0-www-classic-0d2c3a86"; +var ReactVersion = "18.3.0-www-classic-e70b8dd2"; function createPortal$1( children, @@ -45353,13 +45353,7 @@ function attemptReplayContinuousQueuedEvent(queuedEvent) { var targetContainers = queuedEvent.targetContainers; while (targetContainers.length > 0) { - var targetContainer = targetContainers[0]; - var nextBlockedOn = findInstanceBlockingEvent( - queuedEvent.domEventName, - queuedEvent.eventSystemFlags, - targetContainer, - queuedEvent.nativeEvent - ); + var nextBlockedOn = findInstanceBlockingEvent(queuedEvent.nativeEvent); if (nextBlockedOn === null) { var nativeEvent = queuedEvent.nativeEvent; @@ -45581,12 +45575,7 @@ function dispatchEvent( return; } - var blockedOn = findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent - ); + var blockedOn = findInstanceBlockingEvent(nativeEvent); if (blockedOn === null) { dispatchEventForPluginEventSystem( @@ -45627,12 +45616,7 @@ function dispatchEvent( attemptSynchronousHydration(fiber); } - var nextBlockedOn = findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent - ); + var nextBlockedOn = findInstanceBlockingEvent(nativeEvent); if (nextBlockedOn === null) { dispatchEventForPluginEventSystem( @@ -45670,12 +45654,7 @@ function dispatchEvent( var return_targetInst = null; // Returns a SuspenseInstance or Container if it's blocked. // The return_targetInst field above is conceptually part of the return value. -function findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent -) { +function findInstanceBlockingEvent(nativeEvent) { // TODO: Warn if _enabled is false. return_targetInst = null; var nativeEventTarget = getEventTarget(nativeEvent); diff --git a/compiled/facebook-www/ReactDOM-dev.modern.js b/compiled/facebook-www/ReactDOM-dev.modern.js index 4c44149a6c..843b3d8a43 100644 --- a/compiled/facebook-www/ReactDOM-dev.modern.js +++ b/compiled/facebook-www/ReactDOM-dev.modern.js @@ -33165,7 +33165,7 @@ function createFiberRoot( return root; } -var ReactVersion = "18.3.0-www-modern-35aa2c7f"; +var ReactVersion = "18.3.0-www-modern-52b1a95d"; function createPortal$1( children, @@ -34180,13 +34180,7 @@ function attemptReplayContinuousQueuedEvent(queuedEvent) { var targetContainers = queuedEvent.targetContainers; while (targetContainers.length > 0) { - var targetContainer = targetContainers[0]; - var nextBlockedOn = findInstanceBlockingEvent( - queuedEvent.domEventName, - queuedEvent.eventSystemFlags, - targetContainer, - queuedEvent.nativeEvent - ); + var nextBlockedOn = findInstanceBlockingEvent(queuedEvent.nativeEvent); if (nextBlockedOn === null) { var nativeEvent = queuedEvent.nativeEvent; @@ -34408,12 +34402,7 @@ function dispatchEvent( return; } - var blockedOn = findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent - ); + var blockedOn = findInstanceBlockingEvent(nativeEvent); if (blockedOn === null) { dispatchEventForPluginEventSystem( @@ -34454,12 +34443,7 @@ function dispatchEvent( attemptSynchronousHydration(fiber); } - var nextBlockedOn = findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent - ); + var nextBlockedOn = findInstanceBlockingEvent(nativeEvent); if (nextBlockedOn === null) { dispatchEventForPluginEventSystem( @@ -34497,12 +34481,7 @@ function dispatchEvent( var return_targetInst = null; // Returns a SuspenseInstance or Container if it's blocked. // The return_targetInst field above is conceptually part of the return value. -function findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent -) { +function findInstanceBlockingEvent(nativeEvent) { // TODO: Warn if _enabled is false. return_targetInst = null; var nativeEventTarget = getEventTarget(nativeEvent); diff --git a/compiled/facebook-www/ReactDOM-prod.classic.js b/compiled/facebook-www/ReactDOM-prod.classic.js index df390c1431..23077495b0 100644 --- a/compiled/facebook-www/ReactDOM-prod.classic.js +++ b/compiled/facebook-www/ReactDOM-prod.classic.js @@ -15751,12 +15751,7 @@ function attemptReplayContinuousQueuedEvent(queuedEvent) { 0 < targetContainers.length; ) { - var nextBlockedOn = findInstanceBlockingEvent( - queuedEvent.domEventName, - queuedEvent.eventSystemFlags, - targetContainers[0], - queuedEvent.nativeEvent - ); + var nextBlockedOn = findInstanceBlockingEvent(queuedEvent.nativeEvent); if (null === nextBlockedOn) { nextBlockedOn = queuedEvent.nativeEvent; var nativeEventClone = new nextBlockedOn.constructor( @@ -15900,12 +15895,7 @@ function dispatchEvent( nativeEvent ) { if (_enabled) { - var blockedOn = findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent - ); + var blockedOn = findInstanceBlockingEvent(nativeEvent); if (null === blockedOn) dispatchEventForPluginEventSystem( domEventName, @@ -15933,12 +15923,7 @@ function dispatchEvent( for (; null !== blockedOn; ) { var fiber = getInstanceFromNode(blockedOn); null !== fiber && attemptSynchronousHydration(fiber); - fiber = findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent - ); + fiber = findInstanceBlockingEvent(nativeEvent); null === fiber && dispatchEventForPluginEventSystem( domEventName, @@ -15962,35 +15947,29 @@ function dispatchEvent( } } var return_targetInst = null; -function findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent -) { +function findInstanceBlockingEvent(nativeEvent) { return_targetInst = null; - domEventName = getEventTarget(nativeEvent); - domEventName = getClosestInstanceFromNode(domEventName); - if (null !== domEventName) - if ( - ((eventSystemFlags = getNearestMountedFiber(domEventName)), - null === eventSystemFlags) - ) - domEventName = null; - else if ( - ((targetContainer = eventSystemFlags.tag), 13 === targetContainer) - ) { - domEventName = getSuspenseInstanceFromFiber(eventSystemFlags); - if (null !== domEventName) return domEventName; - domEventName = null; - } else if (3 === targetContainer) { - if (eventSystemFlags.stateNode.current.memoizedState.isDehydrated) - return 3 === eventSystemFlags.tag - ? eventSystemFlags.stateNode.containerInfo - : null; - domEventName = null; - } else eventSystemFlags !== domEventName && (domEventName = null); - return_targetInst = domEventName; + nativeEvent = getEventTarget(nativeEvent); + nativeEvent = getClosestInstanceFromNode(nativeEvent); + if (null !== nativeEvent) { + var nearestMounted = getNearestMountedFiber(nativeEvent); + if (null === nearestMounted) nativeEvent = null; + else { + var tag = nearestMounted.tag; + if (13 === tag) { + nativeEvent = getSuspenseInstanceFromFiber(nearestMounted); + if (null !== nativeEvent) return nativeEvent; + nativeEvent = null; + } else if (3 === tag) { + if (nearestMounted.stateNode.current.memoizedState.isDehydrated) + return 3 === nearestMounted.tag + ? nearestMounted.stateNode.containerInfo + : null; + nativeEvent = null; + } else nearestMounted !== nativeEvent && (nativeEvent = null); + } + } + return_targetInst = nativeEvent; return null; } function getEventPriority(domEventName) { @@ -16277,7 +16256,7 @@ Internals.Events = [ var devToolsConfig$jscomp$inline_1812 = { findFiberByHostInstance: getClosestInstanceFromNode, bundleType: 0, - version: "18.3.0-www-classic-ea906405", + version: "18.3.0-www-classic-ab47ddec", rendererPackageName: "react-dom" }; var internals$jscomp$inline_2195 = { @@ -16307,7 +16286,7 @@ var internals$jscomp$inline_2195 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-www-classic-ea906405" + reconcilerVersion: "18.3.0-www-classic-ab47ddec" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_2196 = __REACT_DEVTOOLS_GLOBAL_HOOK__; @@ -16547,4 +16526,4 @@ exports.unstable_renderSubtreeIntoContainer = function ( ); }; exports.unstable_runWithPriority = runWithPriority; -exports.version = "18.3.0-www-classic-ea906405"; +exports.version = "18.3.0-www-classic-ab47ddec"; diff --git a/compiled/facebook-www/ReactDOM-prod.modern.js b/compiled/facebook-www/ReactDOM-prod.modern.js index 1b42c43efa..424eea2501 100644 --- a/compiled/facebook-www/ReactDOM-prod.modern.js +++ b/compiled/facebook-www/ReactDOM-prod.modern.js @@ -11991,12 +11991,7 @@ function attemptReplayContinuousQueuedEvent(queuedEvent) { 0 < targetContainers.length; ) { - var nextBlockedOn = findInstanceBlockingEvent( - queuedEvent.domEventName, - queuedEvent.eventSystemFlags, - targetContainers[0], - queuedEvent.nativeEvent - ); + var nextBlockedOn = findInstanceBlockingEvent(queuedEvent.nativeEvent); if (null === nextBlockedOn) { nextBlockedOn = queuedEvent.nativeEvent; var nativeEventClone = new nextBlockedOn.constructor( @@ -12140,12 +12135,7 @@ function dispatchEvent( nativeEvent ) { if (_enabled) { - var blockedOn = findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent - ); + var blockedOn = findInstanceBlockingEvent(nativeEvent); if (null === blockedOn) dispatchEventForPluginEventSystem( domEventName, @@ -12173,12 +12163,7 @@ function dispatchEvent( for (; null !== blockedOn; ) { var fiber = getInstanceFromNode$1(blockedOn); null !== fiber && attemptSynchronousHydration(fiber); - fiber = findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent - ); + fiber = findInstanceBlockingEvent(nativeEvent); null === fiber && dispatchEventForPluginEventSystem( domEventName, @@ -12202,35 +12187,29 @@ function dispatchEvent( } } var return_targetInst = null; -function findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent -) { +function findInstanceBlockingEvent(nativeEvent) { return_targetInst = null; - domEventName = getEventTarget(nativeEvent); - domEventName = getClosestInstanceFromNode(domEventName); - if (null !== domEventName) - if ( - ((eventSystemFlags = getNearestMountedFiber(domEventName)), - null === eventSystemFlags) - ) - domEventName = null; - else if ( - ((targetContainer = eventSystemFlags.tag), 13 === targetContainer) - ) { - domEventName = getSuspenseInstanceFromFiber(eventSystemFlags); - if (null !== domEventName) return domEventName; - domEventName = null; - } else if (3 === targetContainer) { - if (eventSystemFlags.stateNode.current.memoizedState.isDehydrated) - return 3 === eventSystemFlags.tag - ? eventSystemFlags.stateNode.containerInfo - : null; - domEventName = null; - } else eventSystemFlags !== domEventName && (domEventName = null); - return_targetInst = domEventName; + nativeEvent = getEventTarget(nativeEvent); + nativeEvent = getClosestInstanceFromNode(nativeEvent); + if (null !== nativeEvent) { + var nearestMounted = getNearestMountedFiber(nativeEvent); + if (null === nearestMounted) nativeEvent = null; + else { + var tag = nearestMounted.tag; + if (13 === tag) { + nativeEvent = getSuspenseInstanceFromFiber(nearestMounted); + if (null !== nativeEvent) return nativeEvent; + nativeEvent = null; + } else if (3 === tag) { + if (nearestMounted.stateNode.current.memoizedState.isDehydrated) + return 3 === nearestMounted.tag + ? nearestMounted.stateNode.containerInfo + : null; + nativeEvent = null; + } else nearestMounted !== nativeEvent && (nativeEvent = null); + } + } + return_targetInst = nativeEvent; return null; } function getEventPriority(domEventName) { @@ -15804,7 +15783,7 @@ Internals.Events = [ var devToolsConfig$jscomp$inline_1770 = { findFiberByHostInstance: getClosestInstanceFromNode, bundleType: 0, - version: "18.3.0-www-modern-47928511", + version: "18.3.0-www-modern-22680fca", rendererPackageName: "react-dom" }; var internals$jscomp$inline_2158 = { @@ -15835,7 +15814,7 @@ var internals$jscomp$inline_2158 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-www-modern-47928511" + reconcilerVersion: "18.3.0-www-modern-22680fca" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_2159 = __REACT_DEVTOOLS_GLOBAL_HOOK__; @@ -16004,4 +15983,4 @@ exports.unstable_createEventHandle = function (type, options) { return eventHandle; }; exports.unstable_runWithPriority = runWithPriority; -exports.version = "18.3.0-www-modern-47928511"; +exports.version = "18.3.0-www-modern-22680fca"; diff --git a/compiled/facebook-www/ReactDOM-profiling.classic.js b/compiled/facebook-www/ReactDOM-profiling.classic.js index d339542f59..d482180fa0 100644 --- a/compiled/facebook-www/ReactDOM-profiling.classic.js +++ b/compiled/facebook-www/ReactDOM-profiling.classic.js @@ -16526,12 +16526,7 @@ function attemptReplayContinuousQueuedEvent(queuedEvent) { 0 < targetContainers.length; ) { - var nextBlockedOn = findInstanceBlockingEvent( - queuedEvent.domEventName, - queuedEvent.eventSystemFlags, - targetContainers[0], - queuedEvent.nativeEvent - ); + var nextBlockedOn = findInstanceBlockingEvent(queuedEvent.nativeEvent); if (null === nextBlockedOn) { nextBlockedOn = queuedEvent.nativeEvent; var nativeEventClone = new nextBlockedOn.constructor( @@ -16675,12 +16670,7 @@ function dispatchEvent( nativeEvent ) { if (_enabled) { - var blockedOn = findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent - ); + var blockedOn = findInstanceBlockingEvent(nativeEvent); if (null === blockedOn) dispatchEventForPluginEventSystem( domEventName, @@ -16708,12 +16698,7 @@ function dispatchEvent( for (; null !== blockedOn; ) { var fiber = getInstanceFromNode(blockedOn); null !== fiber && attemptSynchronousHydration(fiber); - fiber = findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent - ); + fiber = findInstanceBlockingEvent(nativeEvent); null === fiber && dispatchEventForPluginEventSystem( domEventName, @@ -16737,35 +16722,29 @@ function dispatchEvent( } } var return_targetInst = null; -function findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent -) { +function findInstanceBlockingEvent(nativeEvent) { return_targetInst = null; - domEventName = getEventTarget(nativeEvent); - domEventName = getClosestInstanceFromNode(domEventName); - if (null !== domEventName) - if ( - ((eventSystemFlags = getNearestMountedFiber(domEventName)), - null === eventSystemFlags) - ) - domEventName = null; - else if ( - ((targetContainer = eventSystemFlags.tag), 13 === targetContainer) - ) { - domEventName = getSuspenseInstanceFromFiber(eventSystemFlags); - if (null !== domEventName) return domEventName; - domEventName = null; - } else if (3 === targetContainer) { - if (eventSystemFlags.stateNode.current.memoizedState.isDehydrated) - return 3 === eventSystemFlags.tag - ? eventSystemFlags.stateNode.containerInfo - : null; - domEventName = null; - } else eventSystemFlags !== domEventName && (domEventName = null); - return_targetInst = domEventName; + nativeEvent = getEventTarget(nativeEvent); + nativeEvent = getClosestInstanceFromNode(nativeEvent); + if (null !== nativeEvent) { + var nearestMounted = getNearestMountedFiber(nativeEvent); + if (null === nearestMounted) nativeEvent = null; + else { + var tag = nearestMounted.tag; + if (13 === tag) { + nativeEvent = getSuspenseInstanceFromFiber(nearestMounted); + if (null !== nativeEvent) return nativeEvent; + nativeEvent = null; + } else if (3 === tag) { + if (nearestMounted.stateNode.current.memoizedState.isDehydrated) + return 3 === nearestMounted.tag + ? nearestMounted.stateNode.containerInfo + : null; + nativeEvent = null; + } else nearestMounted !== nativeEvent && (nativeEvent = null); + } + } + return_targetInst = nativeEvent; return null; } function getEventPriority(domEventName) { @@ -17052,7 +17031,7 @@ Internals.Events = [ var devToolsConfig$jscomp$inline_1891 = { findFiberByHostInstance: getClosestInstanceFromNode, bundleType: 0, - version: "18.3.0-www-classic-99499b5c", + version: "18.3.0-www-classic-4f35a26c", rendererPackageName: "react-dom" }; (function (internals) { @@ -17096,7 +17075,7 @@ var devToolsConfig$jscomp$inline_1891 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-www-classic-99499b5c" + reconcilerVersion: "18.3.0-www-classic-4f35a26c" }); assign(Internals, { ReactBrowserEventEmitter: { @@ -17323,7 +17302,7 @@ exports.unstable_renderSubtreeIntoContainer = function ( ); }; exports.unstable_runWithPriority = runWithPriority; -exports.version = "18.3.0-www-classic-99499b5c"; +exports.version = "18.3.0-www-classic-4f35a26c"; /* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */ if ( diff --git a/compiled/facebook-www/ReactDOM-profiling.modern.js b/compiled/facebook-www/ReactDOM-profiling.modern.js index fc81d61137..fda59c4ba8 100644 --- a/compiled/facebook-www/ReactDOM-profiling.modern.js +++ b/compiled/facebook-www/ReactDOM-profiling.modern.js @@ -12760,12 +12760,7 @@ function attemptReplayContinuousQueuedEvent(queuedEvent) { 0 < targetContainers.length; ) { - var nextBlockedOn = findInstanceBlockingEvent( - queuedEvent.domEventName, - queuedEvent.eventSystemFlags, - targetContainers[0], - queuedEvent.nativeEvent - ); + var nextBlockedOn = findInstanceBlockingEvent(queuedEvent.nativeEvent); if (null === nextBlockedOn) { nextBlockedOn = queuedEvent.nativeEvent; var nativeEventClone = new nextBlockedOn.constructor( @@ -12909,12 +12904,7 @@ function dispatchEvent( nativeEvent ) { if (_enabled) { - var blockedOn = findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent - ); + var blockedOn = findInstanceBlockingEvent(nativeEvent); if (null === blockedOn) dispatchEventForPluginEventSystem( domEventName, @@ -12942,12 +12932,7 @@ function dispatchEvent( for (; null !== blockedOn; ) { var fiber = getInstanceFromNode$1(blockedOn); null !== fiber && attemptSynchronousHydration(fiber); - fiber = findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent - ); + fiber = findInstanceBlockingEvent(nativeEvent); null === fiber && dispatchEventForPluginEventSystem( domEventName, @@ -12971,35 +12956,29 @@ function dispatchEvent( } } var return_targetInst = null; -function findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent -) { +function findInstanceBlockingEvent(nativeEvent) { return_targetInst = null; - domEventName = getEventTarget(nativeEvent); - domEventName = getClosestInstanceFromNode(domEventName); - if (null !== domEventName) - if ( - ((eventSystemFlags = getNearestMountedFiber(domEventName)), - null === eventSystemFlags) - ) - domEventName = null; - else if ( - ((targetContainer = eventSystemFlags.tag), 13 === targetContainer) - ) { - domEventName = getSuspenseInstanceFromFiber(eventSystemFlags); - if (null !== domEventName) return domEventName; - domEventName = null; - } else if (3 === targetContainer) { - if (eventSystemFlags.stateNode.current.memoizedState.isDehydrated) - return 3 === eventSystemFlags.tag - ? eventSystemFlags.stateNode.containerInfo - : null; - domEventName = null; - } else eventSystemFlags !== domEventName && (domEventName = null); - return_targetInst = domEventName; + nativeEvent = getEventTarget(nativeEvent); + nativeEvent = getClosestInstanceFromNode(nativeEvent); + if (null !== nativeEvent) { + var nearestMounted = getNearestMountedFiber(nativeEvent); + if (null === nearestMounted) nativeEvent = null; + else { + var tag = nearestMounted.tag; + if (13 === tag) { + nativeEvent = getSuspenseInstanceFromFiber(nearestMounted); + if (null !== nativeEvent) return nativeEvent; + nativeEvent = null; + } else if (3 === tag) { + if (nearestMounted.stateNode.current.memoizedState.isDehydrated) + return 3 === nearestMounted.tag + ? nearestMounted.stateNode.containerInfo + : null; + nativeEvent = null; + } else nearestMounted !== nativeEvent && (nativeEvent = null); + } + } + return_targetInst = nativeEvent; return null; } function getEventPriority(domEventName) { @@ -16573,7 +16552,7 @@ Internals.Events = [ var devToolsConfig$jscomp$inline_1849 = { findFiberByHostInstance: getClosestInstanceFromNode, bundleType: 0, - version: "18.3.0-www-modern-93ac8006", + version: "18.3.0-www-modern-e957d901", rendererPackageName: "react-dom" }; (function (internals) { @@ -16618,7 +16597,7 @@ var devToolsConfig$jscomp$inline_1849 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-www-modern-93ac8006" + reconcilerVersion: "18.3.0-www-modern-e957d901" }); exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = Internals; exports.createPortal = function (children, container) { @@ -16774,7 +16753,7 @@ exports.unstable_createEventHandle = function (type, options) { return eventHandle; }; exports.unstable_runWithPriority = runWithPriority; -exports.version = "18.3.0-www-modern-93ac8006"; +exports.version = "18.3.0-www-modern-e957d901"; /* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */ if ( diff --git a/compiled/facebook-www/ReactDOMTesting-dev.classic.js b/compiled/facebook-www/ReactDOMTesting-dev.classic.js index f5e967a6c7..09facf7d08 100644 --- a/compiled/facebook-www/ReactDOMTesting-dev.classic.js +++ b/compiled/facebook-www/ReactDOMTesting-dev.classic.js @@ -37465,7 +37465,7 @@ function createFiberRoot( return root; } -var ReactVersion = "18.3.0-www-classic-4528dcae"; +var ReactVersion = "18.3.0-www-classic-c8268d37"; function createPortal$1( children, @@ -47064,13 +47064,7 @@ function attemptReplayContinuousQueuedEvent(queuedEvent) { var targetContainers = queuedEvent.targetContainers; while (targetContainers.length > 0) { - var targetContainer = targetContainers[0]; - var nextBlockedOn = findInstanceBlockingEvent( - queuedEvent.domEventName, - queuedEvent.eventSystemFlags, - targetContainer, - queuedEvent.nativeEvent - ); + var nextBlockedOn = findInstanceBlockingEvent(queuedEvent.nativeEvent); if (nextBlockedOn === null) { var nativeEvent = queuedEvent.nativeEvent; @@ -47292,12 +47286,7 @@ function dispatchEvent( return; } - var blockedOn = findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent - ); + var blockedOn = findInstanceBlockingEvent(nativeEvent); if (blockedOn === null) { dispatchEventForPluginEventSystem( @@ -47338,12 +47327,7 @@ function dispatchEvent( attemptSynchronousHydration(fiber); } - var nextBlockedOn = findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent - ); + var nextBlockedOn = findInstanceBlockingEvent(nativeEvent); if (nextBlockedOn === null) { dispatchEventForPluginEventSystem( @@ -47381,12 +47365,7 @@ function dispatchEvent( var return_targetInst = null; // Returns a SuspenseInstance or Container if it's blocked. // The return_targetInst field above is conceptually part of the return value. -function findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent -) { +function findInstanceBlockingEvent(nativeEvent) { // TODO: Warn if _enabled is false. return_targetInst = null; var nativeEventTarget = getEventTarget(nativeEvent); diff --git a/compiled/facebook-www/ReactDOMTesting-dev.modern.js b/compiled/facebook-www/ReactDOMTesting-dev.modern.js index 8ec15541db..99d40ee44d 100644 --- a/compiled/facebook-www/ReactDOMTesting-dev.modern.js +++ b/compiled/facebook-www/ReactDOMTesting-dev.modern.js @@ -33784,7 +33784,7 @@ function createFiberRoot( return root; } -var ReactVersion = "18.3.0-www-modern-e9cdb837"; +var ReactVersion = "18.3.0-www-modern-2f8092f3"; function createPortal$1( children, @@ -34799,13 +34799,7 @@ function attemptReplayContinuousQueuedEvent(queuedEvent) { var targetContainers = queuedEvent.targetContainers; while (targetContainers.length > 0) { - var targetContainer = targetContainers[0]; - var nextBlockedOn = findInstanceBlockingEvent( - queuedEvent.domEventName, - queuedEvent.eventSystemFlags, - targetContainer, - queuedEvent.nativeEvent - ); + var nextBlockedOn = findInstanceBlockingEvent(queuedEvent.nativeEvent); if (nextBlockedOn === null) { var nativeEvent = queuedEvent.nativeEvent; @@ -35027,12 +35021,7 @@ function dispatchEvent( return; } - var blockedOn = findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent - ); + var blockedOn = findInstanceBlockingEvent(nativeEvent); if (blockedOn === null) { dispatchEventForPluginEventSystem( @@ -35073,12 +35062,7 @@ function dispatchEvent( attemptSynchronousHydration(fiber); } - var nextBlockedOn = findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent - ); + var nextBlockedOn = findInstanceBlockingEvent(nativeEvent); if (nextBlockedOn === null) { dispatchEventForPluginEventSystem( @@ -35116,12 +35100,7 @@ function dispatchEvent( var return_targetInst = null; // Returns a SuspenseInstance or Container if it's blocked. // The return_targetInst field above is conceptually part of the return value. -function findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent -) { +function findInstanceBlockingEvent(nativeEvent) { // TODO: Warn if _enabled is false. return_targetInst = null; var nativeEventTarget = getEventTarget(nativeEvent); diff --git a/compiled/facebook-www/ReactDOMTesting-prod.classic.js b/compiled/facebook-www/ReactDOMTesting-prod.classic.js index 137e31a278..9a71543db4 100644 --- a/compiled/facebook-www/ReactDOMTesting-prod.classic.js +++ b/compiled/facebook-www/ReactDOMTesting-prod.classic.js @@ -14965,7 +14965,7 @@ Internals.Events = [ var devToolsConfig$jscomp$inline_1769 = { findFiberByHostInstance: getClosestInstanceFromNode, bundleType: 0, - version: "18.3.0-www-classic-bcdef9ce", + version: "18.3.0-www-classic-4fdc00d9", rendererPackageName: "react-dom" }; var internals$jscomp$inline_2225 = { @@ -14995,7 +14995,7 @@ var internals$jscomp$inline_2225 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-www-classic-bcdef9ce" + reconcilerVersion: "18.3.0-www-classic-4fdc00d9" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_2226 = __REACT_DEVTOOLS_GLOBAL_HOOK__; @@ -16317,12 +16317,7 @@ function attemptReplayContinuousQueuedEvent(queuedEvent) { 0 < targetContainers.length; ) { - var nextBlockedOn = findInstanceBlockingEvent( - queuedEvent.domEventName, - queuedEvent.eventSystemFlags, - targetContainers[0], - queuedEvent.nativeEvent - ); + var nextBlockedOn = findInstanceBlockingEvent(queuedEvent.nativeEvent); if (null === nextBlockedOn) { nextBlockedOn = queuedEvent.nativeEvent; var nativeEventClone = new nextBlockedOn.constructor( @@ -16466,12 +16461,7 @@ function dispatchEvent( nativeEvent ) { if (_enabled) { - var blockedOn = findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent - ); + var blockedOn = findInstanceBlockingEvent(nativeEvent); if (null === blockedOn) dispatchEventForPluginEventSystem( domEventName, @@ -16499,12 +16489,7 @@ function dispatchEvent( for (; null !== blockedOn; ) { var fiber = getInstanceFromNode(blockedOn); null !== fiber && attemptSynchronousHydration(fiber); - fiber = findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent - ); + fiber = findInstanceBlockingEvent(nativeEvent); null === fiber && dispatchEventForPluginEventSystem( domEventName, @@ -16528,35 +16513,29 @@ function dispatchEvent( } } var return_targetInst = null; -function findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent -) { +function findInstanceBlockingEvent(nativeEvent) { return_targetInst = null; - domEventName = getEventTarget(nativeEvent); - domEventName = getClosestInstanceFromNode(domEventName); - if (null !== domEventName) - if ( - ((eventSystemFlags = getNearestMountedFiber(domEventName)), - null === eventSystemFlags) - ) - domEventName = null; - else if ( - ((targetContainer = eventSystemFlags.tag), 13 === targetContainer) - ) { - domEventName = getSuspenseInstanceFromFiber(eventSystemFlags); - if (null !== domEventName) return domEventName; - domEventName = null; - } else if (3 === targetContainer) { - if (eventSystemFlags.stateNode.current.memoizedState.isDehydrated) - return 3 === eventSystemFlags.tag - ? eventSystemFlags.stateNode.containerInfo - : null; - domEventName = null; - } else eventSystemFlags !== domEventName && (domEventName = null); - return_targetInst = domEventName; + nativeEvent = getEventTarget(nativeEvent); + nativeEvent = getClosestInstanceFromNode(nativeEvent); + if (null !== nativeEvent) { + var nearestMounted = getNearestMountedFiber(nativeEvent); + if (null === nearestMounted) nativeEvent = null; + else { + var tag = nearestMounted.tag; + if (13 === tag) { + nativeEvent = getSuspenseInstanceFromFiber(nearestMounted); + if (null !== nativeEvent) return nativeEvent; + nativeEvent = null; + } else if (3 === tag) { + if (nearestMounted.stateNode.current.memoizedState.isDehydrated) + return 3 === nearestMounted.tag + ? nearestMounted.stateNode.containerInfo + : null; + nativeEvent = null; + } else nearestMounted !== nativeEvent && (nativeEvent = null); + } + } + return_targetInst = nativeEvent; return null; } function getEventPriority(domEventName) { @@ -17027,4 +17006,4 @@ exports.unstable_renderSubtreeIntoContainer = function ( ); }; exports.unstable_runWithPriority = runWithPriority; -exports.version = "18.3.0-www-classic-bcdef9ce"; +exports.version = "18.3.0-www-classic-4fdc00d9"; diff --git a/compiled/facebook-www/ReactDOMTesting-prod.modern.js b/compiled/facebook-www/ReactDOMTesting-prod.modern.js index eb84c250c9..8043583310 100644 --- a/compiled/facebook-www/ReactDOMTesting-prod.modern.js +++ b/compiled/facebook-www/ReactDOMTesting-prod.modern.js @@ -12318,12 +12318,7 @@ function attemptReplayContinuousQueuedEvent(queuedEvent) { 0 < targetContainers.length; ) { - var nextBlockedOn = findInstanceBlockingEvent( - queuedEvent.domEventName, - queuedEvent.eventSystemFlags, - targetContainers[0], - queuedEvent.nativeEvent - ); + var nextBlockedOn = findInstanceBlockingEvent(queuedEvent.nativeEvent); if (null === nextBlockedOn) { nextBlockedOn = queuedEvent.nativeEvent; var nativeEventClone = new nextBlockedOn.constructor( @@ -12467,12 +12462,7 @@ function dispatchEvent( nativeEvent ) { if (_enabled) { - var blockedOn = findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent - ); + var blockedOn = findInstanceBlockingEvent(nativeEvent); if (null === blockedOn) dispatchEventForPluginEventSystem( domEventName, @@ -12500,12 +12490,7 @@ function dispatchEvent( for (; null !== blockedOn; ) { var fiber = getInstanceFromNode$1(blockedOn); null !== fiber && attemptSynchronousHydration(fiber); - fiber = findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent - ); + fiber = findInstanceBlockingEvent(nativeEvent); null === fiber && dispatchEventForPluginEventSystem( domEventName, @@ -12529,35 +12514,29 @@ function dispatchEvent( } } var return_targetInst = null; -function findInstanceBlockingEvent( - domEventName, - eventSystemFlags, - targetContainer, - nativeEvent -) { +function findInstanceBlockingEvent(nativeEvent) { return_targetInst = null; - domEventName = getEventTarget(nativeEvent); - domEventName = getClosestInstanceFromNode(domEventName); - if (null !== domEventName) - if ( - ((eventSystemFlags = getNearestMountedFiber(domEventName)), - null === eventSystemFlags) - ) - domEventName = null; - else if ( - ((targetContainer = eventSystemFlags.tag), 13 === targetContainer) - ) { - domEventName = getSuspenseInstanceFromFiber(eventSystemFlags); - if (null !== domEventName) return domEventName; - domEventName = null; - } else if (3 === targetContainer) { - if (eventSystemFlags.stateNode.current.memoizedState.isDehydrated) - return 3 === eventSystemFlags.tag - ? eventSystemFlags.stateNode.containerInfo - : null; - domEventName = null; - } else eventSystemFlags !== domEventName && (domEventName = null); - return_targetInst = domEventName; + nativeEvent = getEventTarget(nativeEvent); + nativeEvent = getClosestInstanceFromNode(nativeEvent); + if (null !== nativeEvent) { + var nearestMounted = getNearestMountedFiber(nativeEvent); + if (null === nearestMounted) nativeEvent = null; + else { + var tag = nearestMounted.tag; + if (13 === tag) { + nativeEvent = getSuspenseInstanceFromFiber(nearestMounted); + if (null !== nativeEvent) return nativeEvent; + nativeEvent = null; + } else if (3 === tag) { + if (nearestMounted.stateNode.current.memoizedState.isDehydrated) + return 3 === nearestMounted.tag + ? nearestMounted.stateNode.containerInfo + : null; + nativeEvent = null; + } else nearestMounted !== nativeEvent && (nativeEvent = null); + } + } + return_targetInst = nativeEvent; return null; } function getEventPriority(domEventName) { @@ -16188,7 +16167,7 @@ Internals.Events = [ var devToolsConfig$jscomp$inline_1799 = { findFiberByHostInstance: getClosestInstanceFromNode, bundleType: 0, - version: "18.3.0-www-modern-a9fc539b", + version: "18.3.0-www-modern-ab94a8a5", rendererPackageName: "react-dom" }; var internals$jscomp$inline_2192 = { @@ -16219,7 +16198,7 @@ var internals$jscomp$inline_2192 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-www-modern-a9fc539b" + reconcilerVersion: "18.3.0-www-modern-ab94a8a5" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_2193 = __REACT_DEVTOOLS_GLOBAL_HOOK__; @@ -16539,4 +16518,4 @@ exports.unstable_createEventHandle = function (type, options) { return eventHandle; }; exports.unstable_runWithPriority = runWithPriority; -exports.version = "18.3.0-www-modern-a9fc539b"; +exports.version = "18.3.0-www-modern-ab94a8a5"; diff --git a/compiled/facebook-www/ReactTestRenderer-dev.modern.js b/compiled/facebook-www/ReactTestRenderer-dev.modern.js index 3d6b943199..ba2c176908 100644 --- a/compiled/facebook-www/ReactTestRenderer-dev.modern.js +++ b/compiled/facebook-www/ReactTestRenderer-dev.modern.js @@ -24521,7 +24521,7 @@ function createFiberRoot( return root; } -var ReactVersion = "18.3.0-www-modern-a9fc539b"; +var ReactVersion = "18.3.0-www-modern-ab94a8a5"; // Might add PROFILE later.