@@ -258,3 +258,155 @@ index ef202bd782287091b2a7d0d179fe5d43c4ff73a3..34d5f2b811eb9412c071f3340c575d14
258258 const defaultProps = {
259259 id: idProp,
260260 role: 'radiogroup',
261+ diff --git a/floating-ui-react/hooks/useHoverReferenceInteraction.d.mts b/floating-ui-react/hooks/useHoverReferenceInteraction.d.mts
262+ index 9f3ac4b14b6bd2caeef52ce284e1d22d1ba007fe..f12bffd0ef926ade984240b9a1e2c4b1cc13babc 100644
263+ --- a/floating-ui-react/hooks/useHoverReferenceInteraction.d.mts
264+ +++ b/floating-ui-react/hooks/useHoverReferenceInteraction.d.mts
265+ @@ -25,7 +25,7 @@ export interface UseHoverReferenceInteractionProps {
266+ * Called before each hover-driven open attempt (immediate, delayed, and rest-ms
267+ * paths). Return `false` to veto; any other return value permits the open.
268+ */
269+ - shouldOpen?: (() => boolean) | undefined;
270+ + shouldOpen?: ((event: MouseEvent) => boolean) | undefined;
271+ /**
272+ * Regression workaround (#5152): also cancels a pending hover-open from the
273+ * trigger's `mouseout`, backing up a `mouseleave` that Chrome can drop during
274+ diff --git a/floating-ui-react/hooks/useHoverReferenceInteraction.d.ts b/floating-ui-react/hooks/useHoverReferenceInteraction.d.ts
275+ index 7551ed4a6cc55fe7c2c9973670c8dcaff650ba2f..c9a80f623b357233e5eeeadcf0762697175f84d9 100644
276+ --- a/floating-ui-react/hooks/useHoverReferenceInteraction.d.ts
277+ +++ b/floating-ui-react/hooks/useHoverReferenceInteraction.d.ts
278+ @@ -25,7 +25,7 @@ export interface UseHoverReferenceInteractionProps {
279+ * Called before each hover-driven open attempt (immediate, delayed, and rest-ms
280+ * paths). Return `false` to veto; any other return value permits the open.
281+ */
282+ - shouldOpen?: (() => boolean) | undefined;
283+ + shouldOpen?: ((event: MouseEvent) => boolean) | undefined;
284+ /**
285+ * Regression workaround (#5152): also cancels a pending hover-open from the
286+ * trigger's `mouseout`, backing up a `mouseleave` that Chrome can drop during
287+ diff --git a/floating-ui-react/hooks/useHoverReferenceInteraction.js b/floating-ui-react/hooks/useHoverReferenceInteraction.js
288+ index 9c5f5bae91441c732a0def38caf2ca655c7d7aae..1be80667032ff899e5cb11db652bf9063077900f 100644
289+ --- a/floating-ui-react/hooks/useHoverReferenceInteraction.js
290+ +++ b/floating-ui-react/hooks/useHoverReferenceInteraction.js
291+ @@ -62,8 +62,8 @@ function useHoverReferenceInteraction(context, props = {}) {
292+ const isClickLikeOpenEvent = (0, _useStableCallback.useStableCallback)(() => {
293+ return (0, _useHoverShared.isClickLikeOpenEvent)(dataRef.current.openEvent?.type, instance.interactedInside);
294+ });
295+ - const checkShouldOpen = (0, _useStableCallback.useStableCallback)(() => {
296+ - return shouldOpenRef.current?.() !== false;
297+ + const checkShouldOpen = (0, _useStableCallback.useStableCallback)(event => {
298+ + return shouldOpenRef.current?.(event) !== false;
299+ });
300+ const isOverInactiveTrigger = (0, _useStableCallback.useStableCallback)((currentDomReference, currentTarget, target) => {
301+ const allTriggers = store.context.triggerElements;
302+ @@ -184,7 +184,7 @@ function useHoverReferenceInteraction(context, props = {}) {
303+ // Open immediately when moving between triggers while open, or during
304+ // a hover-driven close transition (including same-trigger re-entry).
305+ if (shouldOpenImmediately) {
306+ - if (checkShouldOpen()) {
307+ + if (checkShouldOpen(event)) {
308+ store.setOpen(true, (0, _createBaseUIEventDetails.createChangeEventDetails)(_reasons.REASONS.triggerHover, event, triggerNode));
309+ }
310+ return;
311+ @@ -194,12 +194,12 @@ function useHoverReferenceInteraction(context, props = {}) {
312+ }
313+ if (openDelay) {
314+ instance.openChangeTimeout.start(openDelay, () => {
315+ - if (shouldOpen && checkShouldOpen()) {
316+ + if (shouldOpen && checkShouldOpen(event)) {
317+ store.setOpen(true, (0, _createBaseUIEventDetails.createChangeEventDetails)(_reasons.REASONS.triggerHover, event, triggerNode));
318+ }
319+ });
320+ } else if (shouldOpen) {
321+ - if (checkShouldOpen()) {
322+ + if (checkShouldOpen(event)) {
323+ store.setOpen(true, (0, _createBaseUIEventDetails.createChangeEventDetails)(_reasons.REASONS.triggerHover, event, triggerNode));
324+ }
325+ }
326+ @@ -312,7 +312,7 @@ function useHoverReferenceInteraction(context, props = {}) {
327+ return;
328+ }
329+ const latestOpen = store.select('open');
330+ - if (!instance.blockMouseMove && (!latestOpen || isOverInactive) && checkShouldOpen()) {
331+ + if (!instance.blockMouseMove && (!latestOpen || isOverInactive) && checkShouldOpen(nativeEvent)) {
332+ store.setOpen(true, (0, _createBaseUIEventDetails.createChangeEventDetails)(_reasons.REASONS.triggerHover, nativeEvent, trigger));
333+ }
334+ }
335+ diff --git a/floating-ui-react/hooks/useHoverReferenceInteraction.mjs b/floating-ui-react/hooks/useHoverReferenceInteraction.mjs
336+ index 01ec377e5046cf1645dbd2203e8c6dc99a89ea18..659a8dc07135f8a82e03b654d514c4f2a010cb4c 100644
337+ --- a/floating-ui-react/hooks/useHoverReferenceInteraction.mjs
338+ +++ b/floating-ui-react/hooks/useHoverReferenceInteraction.mjs
339+ @@ -56,8 +56,8 @@ export function useHoverReferenceInteraction(context, props = {}) {
340+ const isClickLikeOpenEvent = useStableCallback(() => {
341+ return isClickLikeOpenEventShared(dataRef.current.openEvent?.type, instance.interactedInside);
342+ });
343+ - const checkShouldOpen = useStableCallback(() => {
344+ - return shouldOpenRef.current?.() !== false;
345+ + const checkShouldOpen = useStableCallback(event => {
346+ + return shouldOpenRef.current?.(event) !== false;
347+ });
348+ const isOverInactiveTrigger = useStableCallback((currentDomReference, currentTarget, target) => {
349+ const allTriggers = store.context.triggerElements;
350+ @@ -178,7 +178,7 @@ export function useHoverReferenceInteraction(context, props = {}) {
351+ // Open immediately when moving between triggers while open, or during
352+ // a hover-driven close transition (including same-trigger re-entry).
353+ if (shouldOpenImmediately) {
354+ - if (checkShouldOpen()) {
355+ + if (checkShouldOpen(event)) {
356+ store.setOpen(true, createChangeEventDetails(REASONS.triggerHover, event, triggerNode));
357+ }
358+ return;
359+ @@ -188,12 +188,12 @@ export function useHoverReferenceInteraction(context, props = {}) {
360+ }
361+ if (openDelay) {
362+ instance.openChangeTimeout.start(openDelay, () => {
363+ - if (shouldOpen && checkShouldOpen()) {
364+ + if (shouldOpen && checkShouldOpen(event)) {
365+ store.setOpen(true, createChangeEventDetails(REASONS.triggerHover, event, triggerNode));
366+ }
367+ });
368+ } else if (shouldOpen) {
369+ - if (checkShouldOpen()) {
370+ + if (checkShouldOpen(event)) {
371+ store.setOpen(true, createChangeEventDetails(REASONS.triggerHover, event, triggerNode));
372+ }
373+ }
374+ @@ -306,7 +306,7 @@ export function useHoverReferenceInteraction(context, props = {}) {
375+ return;
376+ }
377+ const latestOpen = store.select('open');
378+ - if (!instance.blockMouseMove && (!latestOpen || isOverInactive) && checkShouldOpen()) {
379+ + if (!instance.blockMouseMove && (!latestOpen || isOverInactive) && checkShouldOpen(nativeEvent)) {
380+ store.setOpen(true, createChangeEventDetails(REASONS.triggerHover, nativeEvent, trigger));
381+ }
382+ }
383+ diff --git a/menu/submenu-trigger/MenuSubmenuTrigger.js b/menu/submenu-trigger/MenuSubmenuTrigger.js
384+ index 76610266064c56e99741296140b0db02d8b7ab04..66f90d4389411580f5aef91a8198686ee814011b 100644
385+ --- a/menu/submenu-trigger/MenuSubmenuTrigger.js
386+ +++ b/menu/submenu-trigger/MenuSubmenuTrigger.js
387+ @@ -146,7 +146,9 @@ const MenuSubmenuTrigger = exports.MenuSubmenuTrigger = /*#__PURE__*/React.forwa
388+ open: delay,
389+ close: closeDelay
390+ },
391+ - shouldOpen: delay > 0 ? () => parentMenuStore.select('allowMouseEnter') : undefined,
392+ + // A newly opened parent can appear beneath a stationary pointer.
393+ + // Zero delay still requires pointer movement before activating its submenu.
394+ + shouldOpen: event => parentMenuStore.select('allowMouseEnter') || delay === 0 && event.type === 'mousemove',
395+ triggerElementRef,
396+ externalTree: floatingTreeRoot,
397+ isClosing: () => store.select('transitionStatus') === 'ending',
398+ diff --git a/menu/submenu-trigger/MenuSubmenuTrigger.mjs b/menu/submenu-trigger/MenuSubmenuTrigger.mjs
399+ index 243ee5ac67bbb0297a3ede21f3963372c43c0150..341beb1f7a2093e68d1bd65fae62c7712a657d11 100644
400+ --- a/menu/submenu-trigger/MenuSubmenuTrigger.mjs
401+ +++ b/menu/submenu-trigger/MenuSubmenuTrigger.mjs
402+ @@ -139,7 +139,9 @@ export const MenuSubmenuTrigger = /*#__PURE__*/React.forwardRef(function MenuSub
403+ open: delay,
404+ close: closeDelay
405+ },
406+ - shouldOpen: delay > 0 ? () => parentMenuStore.select('allowMouseEnter') : undefined,
407+ + // A newly opened parent can appear beneath a stationary pointer.
408+ + // Zero delay still requires pointer movement before activating its submenu.
409+ + shouldOpen: event => parentMenuStore.select('allowMouseEnter') || delay === 0 && event.type === 'mousemove',
410+ triggerElementRef,
411+ externalTree: floatingTreeRoot,
412+ isClosing: () => store.select('transitionStatus') === 'ending',
0 commit comments