@base-ui/react 1.4.1 → 1.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +125 -8
- package/README.md +1 -1
- package/accordion/item/AccordionItem.d.ts +4 -0
- package/accordion/item/AccordionItem.js +5 -4
- package/accordion/panel/AccordionPanel.js +29 -51
- package/accordion/root/AccordionRoot.js +5 -6
- package/accordion/trigger/AccordionTrigger.js +3 -4
- package/alert-dialog/handle.d.ts +14 -1
- package/alert-dialog/handle.js +22 -5
- package/alert-dialog/index.d.ts +1 -1
- package/alert-dialog/index.parts.d.ts +2 -3
- package/alert-dialog/index.parts.js +4 -5
- package/alert-dialog/root/AlertDialogRoot.d.ts +7 -7
- package/alert-dialog/root/AlertDialogRoot.js +2 -56
- package/alert-dialog/trigger/AlertDialogTrigger.d.ts +25 -0
- package/alert-dialog/trigger/AlertDialogTrigger.js +15 -0
- package/alert-dialog/trigger/AlertDialogTriggerDataAttributes.d.ts +10 -0
- package/alert-dialog/trigger/AlertDialogTriggerDataAttributes.js +18 -0
- package/autocomplete/root/AutocompleteRoot.js +9 -10
- package/avatar/image/AvatarImage.js +4 -4
- package/checkbox/indicator/CheckboxIndicator.js +2 -2
- package/checkbox/root/CheckboxRoot.js +49 -11
- package/checkbox-group/CheckboxGroup.js +1 -5
- package/collapsible/panel/CollapsiblePanel.js +29 -51
- package/collapsible/panel/useCollapsiblePanel.d.ts +9 -23
- package/collapsible/panel/useCollapsiblePanel.js +308 -268
- package/collapsible/root/CollapsibleRoot.d.ts +1 -1
- package/collapsible/root/CollapsibleRootContext.d.ts +0 -2
- package/collapsible/root/useCollapsibleRoot.d.ts +0 -27
- package/collapsible/root/useCollapsibleRoot.js +2 -64
- package/collapsible/trigger/CollapsibleTrigger.js +5 -6
- package/combobox/arrow/ComboboxArrow.js +1 -1
- package/combobox/backdrop/ComboboxBackdrop.js +1 -1
- package/combobox/chip/ComboboxChip.js +7 -2
- package/combobox/clear/ComboboxClear.d.ts +4 -0
- package/combobox/clear/ComboboxClear.js +1 -0
- package/combobox/clear/ComboboxClearDataAttributes.d.ts +4 -0
- package/combobox/clear/ComboboxClearDataAttributes.js +4 -0
- package/combobox/icon/ComboboxIcon.js +1 -1
- package/combobox/input/ComboboxInput.js +15 -6
- package/combobox/item/ComboboxItem.js +8 -14
- package/combobox/item-indicator/ComboboxItemIndicator.js +1 -2
- package/combobox/root/AriaCombobox.js +61 -28
- package/combobox/store.d.ts +4 -8
- package/combobox/store.js +2 -1
- package/combobox/utils/ComboboxInternalDismissButton.js +2 -3
- package/csp-provider/CSPProvider.js +1 -1
- package/dialog/close/DialogClose.js +6 -6
- package/dialog/popup/DialogPopup.js +9 -4
- package/dialog/root/DialogRoot.d.ts +1 -2
- package/dialog/root/DialogRoot.js +3 -73
- package/dialog/root/DialogRootContext.d.ts +1 -0
- package/dialog/root/DialogRootContext.js +3 -1
- package/dialog/root/useDialogRoot.d.ts +12 -4
- package/dialog/root/useDialogRoot.js +27 -25
- package/dialog/root/useRenderDialogRoot.d.ts +4 -0
- package/dialog/root/useRenderDialogRoot.js +96 -0
- package/dialog/store/DialogHandle.d.ts +1 -1
- package/dialog/store/DialogHandle.js +2 -2
- package/dialog/store/DialogStore.d.ts +88 -1
- package/dialog/store/DialogStore.js +12 -17
- package/dialog/trigger/DialogTrigger.d.ts +1 -1
- package/dialog/trigger/DialogTrigger.js +11 -4
- package/dialog/viewport/DialogViewport.js +4 -3
- package/drawer/popup/DrawerPopup.js +13 -9
- package/drawer/root/DrawerRoot.js +11 -11
- package/drawer/root/DrawerRootContext.d.ts +1 -1
- package/drawer/swipe-area/DrawerSwipeArea.js +6 -5
- package/drawer/viewport/DrawerViewport.js +13 -14
- package/esm/accordion/item/AccordionItem.d.ts +4 -0
- package/esm/accordion/item/AccordionItem.js +5 -4
- package/esm/accordion/panel/AccordionPanel.js +29 -51
- package/esm/accordion/root/AccordionRoot.js +5 -6
- package/esm/accordion/trigger/AccordionTrigger.js +4 -5
- package/esm/alert-dialog/handle.d.ts +14 -1
- package/esm/alert-dialog/handle.js +20 -5
- package/esm/alert-dialog/index.d.ts +1 -1
- package/esm/alert-dialog/index.parts.d.ts +2 -3
- package/esm/alert-dialog/index.parts.js +2 -3
- package/esm/alert-dialog/root/AlertDialogRoot.d.ts +7 -7
- package/esm/alert-dialog/root/AlertDialogRoot.js +2 -55
- package/esm/alert-dialog/trigger/AlertDialogTrigger.d.ts +25 -0
- package/esm/alert-dialog/trigger/AlertDialogTrigger.js +10 -0
- package/esm/alert-dialog/trigger/AlertDialogTriggerDataAttributes.d.ts +10 -0
- package/esm/alert-dialog/trigger/AlertDialogTriggerDataAttributes.js +12 -0
- package/esm/autocomplete/root/AutocompleteRoot.js +9 -10
- package/esm/avatar/image/AvatarImage.js +4 -4
- package/esm/checkbox/indicator/CheckboxIndicator.js +2 -2
- package/esm/checkbox/root/CheckboxRoot.js +49 -11
- package/esm/checkbox-group/CheckboxGroup.js +1 -5
- package/esm/collapsible/panel/CollapsiblePanel.js +29 -51
- package/esm/collapsible/panel/useCollapsiblePanel.d.ts +9 -23
- package/esm/collapsible/panel/useCollapsiblePanel.js +309 -269
- package/esm/collapsible/root/CollapsibleRoot.d.ts +1 -1
- package/esm/collapsible/root/CollapsibleRootContext.d.ts +0 -2
- package/esm/collapsible/root/useCollapsibleRoot.d.ts +0 -27
- package/esm/collapsible/root/useCollapsibleRoot.js +2 -64
- package/esm/collapsible/trigger/CollapsibleTrigger.js +5 -6
- package/esm/combobox/arrow/ComboboxArrow.js +1 -1
- package/esm/combobox/backdrop/ComboboxBackdrop.js +1 -1
- package/esm/combobox/chip/ComboboxChip.js +7 -2
- package/esm/combobox/clear/ComboboxClear.d.ts +4 -0
- package/esm/combobox/clear/ComboboxClear.js +1 -0
- package/esm/combobox/clear/ComboboxClearDataAttributes.d.ts +4 -0
- package/esm/combobox/clear/ComboboxClearDataAttributes.js +4 -0
- package/esm/combobox/icon/ComboboxIcon.js +1 -1
- package/esm/combobox/input/ComboboxInput.js +16 -7
- package/esm/combobox/item/ComboboxItem.js +8 -14
- package/esm/combobox/item-indicator/ComboboxItemIndicator.js +1 -2
- package/esm/combobox/root/AriaCombobox.js +62 -29
- package/esm/combobox/store.d.ts +4 -8
- package/esm/combobox/store.js +2 -1
- package/esm/combobox/utils/ComboboxInternalDismissButton.js +2 -3
- package/esm/csp-provider/CSPProvider.js +1 -1
- package/esm/dialog/close/DialogClose.js +6 -6
- package/esm/dialog/popup/DialogPopup.js +9 -4
- package/esm/dialog/root/DialogRoot.d.ts +1 -2
- package/esm/dialog/root/DialogRoot.js +4 -72
- package/esm/dialog/root/DialogRootContext.d.ts +1 -0
- package/esm/dialog/root/DialogRootContext.js +2 -0
- package/esm/dialog/root/useDialogRoot.d.ts +12 -4
- package/esm/dialog/root/useDialogRoot.js +28 -27
- package/esm/dialog/root/useRenderDialogRoot.d.ts +4 -0
- package/esm/dialog/root/useRenderDialogRoot.js +90 -0
- package/esm/dialog/store/DialogHandle.d.ts +1 -1
- package/esm/dialog/store/DialogHandle.js +2 -2
- package/esm/dialog/store/DialogStore.d.ts +88 -1
- package/esm/dialog/store/DialogStore.js +13 -18
- package/esm/dialog/trigger/DialogTrigger.d.ts +1 -1
- package/esm/dialog/trigger/DialogTrigger.js +12 -5
- package/esm/dialog/viewport/DialogViewport.js +4 -3
- package/esm/drawer/popup/DrawerPopup.js +14 -9
- package/esm/drawer/root/DrawerRoot.js +11 -11
- package/esm/drawer/root/DrawerRootContext.d.ts +1 -1
- package/esm/drawer/swipe-area/DrawerSwipeArea.js +6 -5
- package/esm/drawer/viewport/DrawerViewport.js +13 -14
- package/esm/field/control/FieldControl.js +2 -6
- package/esm/field/item/FieldItem.js +1 -4
- package/esm/field/root/FieldRoot.js +11 -3
- package/esm/field/root/useFieldValidation.d.ts +1 -0
- package/esm/field/root/useFieldValidation.js +23 -20
- package/esm/field/utils/getCombinedFieldValidityData.d.ts +1 -1
- package/esm/field/validity/FieldValidity.d.ts +1 -1
- package/esm/floating-ui-react/components/FloatingDelayGroup.js +3 -3
- package/esm/floating-ui-react/components/FloatingFocusManager.d.ts +1 -1
- package/esm/floating-ui-react/components/FloatingFocusManager.js +20 -8
- package/esm/floating-ui-react/components/FloatingPortal.js +3 -3
- package/esm/floating-ui-react/hooks/useClick.js +83 -74
- package/esm/floating-ui-react/hooks/useClientPoint.js +29 -20
- package/esm/floating-ui-react/hooks/useDismiss.d.ts +1 -1
- package/esm/floating-ui-react/hooks/useDismiss.js +82 -93
- package/esm/floating-ui-react/hooks/useFloating.js +37 -32
- package/esm/floating-ui-react/hooks/useFloatingRootContext.d.ts +1 -1
- package/esm/floating-ui-react/hooks/useFloatingRootContext.js +2 -2
- package/esm/floating-ui-react/hooks/useFocus.js +84 -81
- package/esm/floating-ui-react/hooks/useHover.js +72 -76
- package/esm/floating-ui-react/hooks/useHoverFloatingInteraction.js +49 -44
- package/esm/floating-ui-react/hooks/useHoverInteractionSharedState.js +1 -1
- package/esm/floating-ui-react/hooks/useHoverReferenceInteraction.d.ts +7 -2
- package/esm/floating-ui-react/hooks/useHoverReferenceInteraction.js +44 -39
- package/esm/floating-ui-react/hooks/useHoverShared.d.ts +2 -1
- package/esm/floating-ui-react/hooks/useHoverShared.js +4 -0
- package/esm/floating-ui-react/hooks/useListNavigation.d.ts +1 -3
- package/esm/floating-ui-react/hooks/useListNavigation.js +83 -74
- package/esm/floating-ui-react/hooks/useSyncedFloatingRootContext.d.ts +9 -6
- package/esm/floating-ui-react/hooks/useSyncedFloatingRootContext.js +25 -20
- package/esm/floating-ui-react/hooks/useTypeahead.d.ts +2 -2
- package/esm/floating-ui-react/hooks/useTypeahead.js +33 -52
- package/esm/floating-ui-react/index.d.ts +0 -2
- package/esm/floating-ui-react/index.js +0 -2
- package/esm/floating-ui-react/types.d.ts +2 -7
- package/esm/floating-ui-react/utils/composite.js +2 -0
- package/esm/floating-ui-react/utils/enqueueFocus.d.ts +1 -1
- package/esm/floating-ui-react/utils/enqueueFocus.js +10 -7
- package/esm/floating-ui-react/utils/getEmptyRootContext.js +1 -1
- package/esm/form/Form.js +2 -2
- package/esm/index.js +1 -1
- package/esm/internals/composite/composite.d.ts +0 -1
- package/esm/internals/composite/composite.js +1 -2
- package/esm/internals/composite/root/useCompositeRoot.js +2 -2
- package/esm/internals/createBaseUIEventDetails.d.ts +2 -0
- package/esm/internals/csp-context/index.d.ts +2 -0
- package/esm/internals/csp-context/index.js +1 -0
- package/esm/internals/field-register-control/index.d.ts +0 -1
- package/esm/internals/field-register-control/useFieldControlRegistration.d.ts +2 -1
- package/esm/internals/field-register-control/useFieldControlRegistration.js +11 -14
- package/esm/internals/field-register-control/useRegisterFieldControl.d.ts +1 -4
- package/esm/internals/field-register-control/useRegisterFieldControl.js +6 -11
- package/esm/internals/field-root-context/FieldRootContext.d.ts +1 -0
- package/esm/internals/field-root-context/FieldRootContext.js +3 -2
- package/esm/internals/form-context/FormContext.d.ts +5 -1
- package/esm/internals/reason-parts.d.ts +2 -0
- package/esm/internals/reason-parts.js +2 -0
- package/esm/internals/types.d.ts +1 -0
- package/esm/internals/use-button/useButton.js +4 -4
- package/esm/internals/usePressAndHold.js +2 -2
- package/esm/internals/useRenderElement.js +2 -0
- package/esm/menu/arrow/MenuArrow.js +1 -1
- package/esm/menu/backdrop/MenuBackdrop.js +1 -1
- package/esm/menu/checkbox-item/MenuCheckboxItem.js +5 -7
- package/esm/menu/group/MenuGroup.js +1 -4
- package/esm/menu/group/MenuGroupContext.d.ts +1 -3
- package/esm/menu/group/MenuGroupContext.js +1 -1
- package/esm/menu/group-label/MenuGroupLabel.js +4 -6
- package/esm/menu/link-item/MenuLinkItem.js +2 -2
- package/esm/menu/popup/MenuPopup.js +5 -5
- package/esm/menu/radio-group/MenuRadioGroup.js +11 -5
- package/esm/menu/radio-item/MenuRadioItem.js +5 -7
- package/esm/menu/root/MenuRoot.js +63 -68
- package/esm/menu/store/MenuHandle.js +1 -1
- package/esm/menu/store/MenuStore.d.ts +87 -0
- package/esm/menu/submenu-trigger/MenuSubmenuTrigger.js +8 -5
- package/esm/menu/trigger/MenuTrigger.js +13 -10
- package/esm/menu/viewport/MenuViewport.d.ts +2 -2
- package/esm/menu/viewport/MenuViewport.js +2 -2
- package/esm/navigation-menu/arrow/NavigationMenuArrow.js +1 -1
- package/esm/navigation-menu/backdrop/NavigationMenuBackdrop.js +1 -1
- package/esm/navigation-menu/content/NavigationMenuContent.js +8 -5
- package/esm/navigation-menu/icon/NavigationMenuIcon.js +1 -1
- package/esm/navigation-menu/item/NavigationMenuItem.js +2 -2
- package/esm/navigation-menu/list/NavigationMenuList.js +1 -1
- package/esm/navigation-menu/popup/NavigationMenuPopup.js +2 -2
- package/esm/navigation-menu/root/NavigationMenuRoot.js +1 -3
- package/esm/navigation-menu/trigger/NavigationMenuTrigger.js +24 -17
- package/esm/navigation-menu/utils/isOutsideMenuEvent.d.ts +0 -1
- package/esm/navigation-menu/utils/isOutsideMenuEvent.js +1 -5
- package/esm/navigation-menu/viewport/NavigationMenuViewport.js +2 -3
- package/esm/number-field/input/NumberFieldInput.js +3 -5
- package/esm/number-field/root/NumberFieldRoot.js +5 -2
- package/esm/number-field/scrub-area/NumberFieldScrubArea.js +7 -3
- package/esm/otp-field/input/OTPFieldInput.js +43 -29
- package/esm/otp-field/root/OTPFieldRoot.d.ts +17 -8
- package/esm/otp-field/root/OTPFieldRoot.js +33 -33
- package/esm/otp-field/root/OTPFieldRootContext.d.ts +1 -1
- package/esm/otp-field/utils/otp.d.ts +5 -4
- package/esm/otp-field/utils/otp.js +23 -12
- package/esm/popover/arrow/PopoverArrow.js +1 -1
- package/esm/popover/backdrop/PopoverBackdrop.js +1 -1
- package/esm/popover/close/PopoverClose.js +2 -2
- package/esm/popover/description/PopoverDescription.js +1 -7
- package/esm/popover/popup/PopoverPopup.d.ts +1 -1
- package/esm/popover/popup/PopoverPopup.js +16 -10
- package/esm/popover/popup/PopoverPopupDataAttributes.d.ts +1 -1
- package/esm/popover/popup/PopoverPopupDataAttributes.js +1 -1
- package/esm/popover/positioner/PopoverPositioner.js +5 -5
- package/esm/popover/root/PopoverRoot.d.ts +1 -1
- package/esm/popover/root/PopoverRoot.js +42 -47
- package/esm/popover/store/PopoverHandle.js +1 -1
- package/esm/popover/store/PopoverStore.d.ts +91 -4
- package/esm/popover/store/PopoverStore.js +17 -18
- package/esm/popover/title/PopoverTitle.js +1 -7
- package/esm/popover/trigger/PopoverTrigger.js +24 -17
- package/esm/popover/viewport/PopoverViewport.d.ts +3 -3
- package/esm/popover/viewport/PopoverViewport.js +2 -2
- package/esm/popover/viewport/PopoverViewportDataAttributes.d.ts +1 -1
- package/esm/popover/viewport/PopoverViewportDataAttributes.js +1 -1
- package/esm/preview-card/positioner/PreviewCardPositioner.js +11 -1
- package/esm/preview-card/root/PreviewCardRoot.d.ts +1 -1
- package/esm/preview-card/root/PreviewCardRoot.js +32 -22
- package/esm/preview-card/store/PreviewCardHandle.js +1 -1
- package/esm/preview-card/store/PreviewCardStore.d.ts +90 -2
- package/esm/preview-card/store/PreviewCardStore.js +19 -31
- package/esm/preview-card/trigger/PreviewCardTrigger.js +6 -3
- package/esm/preview-card/viewport/PreviewCardViewport.d.ts +2 -2
- package/esm/preview-card/viewport/PreviewCardViewport.js +2 -2
- package/esm/preview-card/viewport/PreviewCardViewportDataAttributes.d.ts +2 -2
- package/esm/preview-card/viewport/PreviewCardViewportDataAttributes.js +2 -2
- package/esm/progress/indicator/ProgressIndicator.js +6 -11
- package/esm/progress/root/ProgressRoot.d.ts +1 -1
- package/esm/radio/root/RadioRoot.js +7 -3
- package/esm/radio-group/RadioGroup.js +4 -11
- package/esm/radio-group/RadioGroupContext.d.ts +0 -1
- package/esm/scroll-area/content/ScrollAreaContent.js +4 -4
- package/esm/scroll-area/root/ScrollAreaRoot.js +1 -1
- package/esm/scroll-area/scrollbar/ScrollAreaScrollbar.js +16 -20
- package/esm/scroll-area/viewport/ScrollAreaViewport.js +6 -10
- package/esm/select/arrow/SelectArrow.js +1 -1
- package/esm/select/backdrop/SelectBackdrop.js +1 -1
- package/esm/select/group/SelectGroup.js +1 -1
- package/esm/select/group-label/SelectGroupLabel.js +2 -2
- package/esm/select/icon/SelectIcon.js +1 -1
- package/esm/select/item/SelectItem.js +46 -32
- package/esm/select/item/SelectItemContext.d.ts +1 -1
- package/esm/select/item-indicator/SelectItemIndicator.js +1 -2
- package/esm/select/item-text/SelectItemText.js +9 -6
- package/esm/select/list/SelectList.js +1 -1
- package/esm/select/popup/SelectPopup.js +8 -3
- package/esm/select/positioner/SelectPositioner.js +3 -0
- package/esm/select/root/SelectRoot.js +46 -40
- package/esm/select/root/SelectRootContext.d.ts +4 -5
- package/esm/select/store.d.ts +3 -0
- package/esm/select/store.js +1 -0
- package/esm/select/trigger/SelectTrigger.d.ts +5 -0
- package/esm/select/trigger/SelectTrigger.js +19 -33
- package/esm/select/trigger/SelectTriggerDataAttributes.d.ts +5 -0
- package/esm/select/trigger/SelectTriggerDataAttributes.js +5 -0
- package/esm/slider/control/SliderControl.js +10 -12
- package/esm/slider/root/SliderRoot.js +1 -4
- package/esm/slider/thumb/SliderThumb.js +32 -30
- package/esm/slider/value/SliderValue.js +7 -15
- package/esm/switch/root/SwitchRoot.js +10 -10
- package/esm/switch/thumb/SwitchThumb.js +1 -9
- package/esm/tabs/indicator/TabsIndicator.js +14 -19
- package/esm/tabs/list/TabsList.js +4 -10
- package/esm/tabs/list/TabsListContext.d.ts +2 -1
- package/esm/tabs/panel/TabsPanel.js +1 -1
- package/esm/tabs/root/TabsRoot.d.ts +16 -1
- package/esm/tabs/root/TabsRoot.js +73 -25
- package/esm/tabs/root/TabsRootContext.d.ts +0 -2
- package/esm/toast/provider/ToastProvider.js +1 -1
- package/esm/toast/root/ToastRoot.d.ts +1 -1
- package/esm/toast/root/ToastRoot.js +108 -131
- package/esm/toast/root/ToastRootDataAttributes.d.ts +1 -1
- package/esm/toast/root/ToastRootDataAttributes.js +1 -1
- package/esm/toast/store.d.ts +9 -1
- package/esm/toast/store.js +19 -13
- package/esm/toast/useToastManager.d.ts +1 -1
- package/esm/toast/viewport/ToastViewport.js +1 -1
- package/esm/toggle/Toggle.js +5 -9
- package/esm/toggle-group/ToggleGroup.d.ts +2 -2
- package/esm/toggle-group/ToggleGroup.js +6 -13
- package/esm/toolbar/link/ToolbarLink.d.ts +1 -1
- package/esm/toolbar/link/ToolbarLink.js +1 -2
- package/esm/tooltip/arrow/TooltipArrow.js +3 -3
- package/esm/tooltip/popup/TooltipPopup.js +5 -4
- package/esm/tooltip/root/TooltipRoot.js +35 -26
- package/esm/tooltip/store/TooltipHandle.js +1 -1
- package/esm/tooltip/store/TooltipStore.d.ts +90 -2
- package/esm/tooltip/store/TooltipStore.js +18 -31
- package/esm/tooltip/trigger/TooltipTrigger.js +151 -20
- package/esm/tooltip/viewport/TooltipViewport.d.ts +2 -2
- package/esm/tooltip/viewport/TooltipViewport.js +2 -2
- package/esm/tooltip/viewport/TooltipViewportDataAttributes.d.ts +1 -1
- package/esm/tooltip/viewport/TooltipViewportDataAttributes.js +1 -1
- package/esm/unstable-use-media-query/index.js +1 -1
- package/esm/utils/popups/index.d.ts +1 -0
- package/esm/utils/popups/index.js +1 -0
- package/esm/utils/popups/inlineRect.d.ts +15 -0
- package/esm/utils/popups/inlineRect.js +191 -0
- package/esm/utils/popups/popupStoreUtils.d.ts +28 -10
- package/esm/utils/popups/popupStoreUtils.js +105 -20
- package/esm/utils/popups/popupTriggerMap.js +2 -0
- package/esm/utils/popups/store.d.ts +15 -2
- package/esm/utils/popups/store.js +38 -2
- package/esm/utils/popups/useTriggerFocusGuards.js +4 -5
- package/esm/utils/useAnchorPositioning.d.ts +5 -0
- package/esm/utils/useAnchorPositioning.js +12 -9
- package/esm/utils/useOpenInteractionType.d.ts +4 -0
- package/esm/utils/useOpenInteractionType.js +23 -18
- package/field/control/FieldControl.js +2 -6
- package/field/item/FieldItem.js +1 -4
- package/field/root/FieldRoot.js +11 -3
- package/field/root/useFieldValidation.d.ts +1 -0
- package/field/root/useFieldValidation.js +23 -20
- package/field/utils/getCombinedFieldValidityData.d.ts +1 -1
- package/field/validity/FieldValidity.d.ts +1 -1
- package/floating-ui-react/components/FloatingDelayGroup.js +3 -3
- package/floating-ui-react/components/FloatingFocusManager.d.ts +1 -1
- package/floating-ui-react/components/FloatingFocusManager.js +20 -8
- package/floating-ui-react/components/FloatingPortal.js +3 -3
- package/floating-ui-react/hooks/useClick.js +82 -73
- package/floating-ui-react/hooks/useClientPoint.js +29 -20
- package/floating-ui-react/hooks/useDismiss.d.ts +1 -1
- package/floating-ui-react/hooks/useDismiss.js +82 -92
- package/floating-ui-react/hooks/useFloating.js +36 -32
- package/floating-ui-react/hooks/useFloatingRootContext.d.ts +1 -1
- package/floating-ui-react/hooks/useFloatingRootContext.js +2 -2
- package/floating-ui-react/hooks/useFocus.js +84 -81
- package/floating-ui-react/hooks/useHover.js +74 -78
- package/floating-ui-react/hooks/useHoverFloatingInteraction.js +48 -43
- package/floating-ui-react/hooks/useHoverInteractionSharedState.js +1 -1
- package/floating-ui-react/hooks/useHoverReferenceInteraction.d.ts +7 -2
- package/floating-ui-react/hooks/useHoverReferenceInteraction.js +43 -38
- package/floating-ui-react/hooks/useHoverShared.d.ts +2 -1
- package/floating-ui-react/hooks/useHoverShared.js +11 -0
- package/floating-ui-react/hooks/useListNavigation.d.ts +1 -3
- package/floating-ui-react/hooks/useListNavigation.js +83 -74
- package/floating-ui-react/hooks/useSyncedFloatingRootContext.d.ts +9 -6
- package/floating-ui-react/hooks/useSyncedFloatingRootContext.js +26 -20
- package/floating-ui-react/hooks/useTypeahead.d.ts +2 -2
- package/floating-ui-react/hooks/useTypeahead.js +33 -52
- package/floating-ui-react/index.d.ts +0 -2
- package/floating-ui-react/index.js +0 -14
- package/floating-ui-react/types.d.ts +2 -7
- package/floating-ui-react/utils/composite.js +2 -0
- package/floating-ui-react/utils/enqueueFocus.d.ts +1 -1
- package/floating-ui-react/utils/enqueueFocus.js +10 -7
- package/floating-ui-react/utils/getEmptyRootContext.js +1 -1
- package/form/Form.js +2 -2
- package/index.js +1 -1
- package/internals/composite/composite.d.ts +0 -1
- package/internals/composite/composite.js +2 -3
- package/internals/composite/root/useCompositeRoot.js +1 -1
- package/internals/createBaseUIEventDetails.d.ts +2 -0
- package/internals/csp-context/index.d.ts +2 -0
- package/internals/csp-context/index.js +18 -0
- package/internals/field-register-control/index.d.ts +0 -1
- package/internals/field-register-control/useFieldControlRegistration.d.ts +2 -1
- package/internals/field-register-control/useFieldControlRegistration.js +11 -14
- package/internals/field-register-control/useRegisterFieldControl.d.ts +1 -4
- package/internals/field-register-control/useRegisterFieldControl.js +6 -11
- package/internals/field-root-context/FieldRootContext.d.ts +1 -0
- package/internals/field-root-context/FieldRootContext.js +4 -3
- package/internals/form-context/FormContext.d.ts +5 -1
- package/internals/reason-parts.d.ts +2 -0
- package/internals/reason-parts.js +3 -1
- package/internals/types.d.ts +1 -0
- package/internals/use-button/useButton.js +4 -4
- package/internals/usePressAndHold.js +2 -2
- package/internals/useRenderElement.js +2 -0
- package/menu/arrow/MenuArrow.js +1 -1
- package/menu/backdrop/MenuBackdrop.js +1 -1
- package/menu/checkbox-item/MenuCheckboxItem.js +5 -7
- package/menu/group/MenuGroup.js +1 -4
- package/menu/group/MenuGroupContext.d.ts +1 -3
- package/menu/group/MenuGroupContext.js +1 -1
- package/menu/group-label/MenuGroupLabel.js +4 -6
- package/menu/link-item/MenuLinkItem.js +2 -2
- package/menu/popup/MenuPopup.js +5 -5
- package/menu/radio-group/MenuRadioGroup.js +11 -5
- package/menu/radio-item/MenuRadioItem.js +5 -7
- package/menu/root/MenuRoot.js +60 -65
- package/menu/store/MenuHandle.js +1 -1
- package/menu/store/MenuStore.d.ts +87 -0
- package/menu/submenu-trigger/MenuSubmenuTrigger.js +7 -4
- package/menu/trigger/MenuTrigger.js +12 -9
- package/menu/viewport/MenuViewport.d.ts +2 -2
- package/menu/viewport/MenuViewport.js +2 -2
- package/navigation-menu/arrow/NavigationMenuArrow.js +1 -1
- package/navigation-menu/backdrop/NavigationMenuBackdrop.js +1 -1
- package/navigation-menu/content/NavigationMenuContent.js +8 -5
- package/navigation-menu/icon/NavigationMenuIcon.js +1 -1
- package/navigation-menu/item/NavigationMenuItem.js +2 -2
- package/navigation-menu/list/NavigationMenuList.js +1 -1
- package/navigation-menu/popup/NavigationMenuPopup.js +2 -2
- package/navigation-menu/root/NavigationMenuRoot.js +1 -3
- package/navigation-menu/trigger/NavigationMenuTrigger.js +23 -16
- package/navigation-menu/utils/isOutsideMenuEvent.d.ts +0 -1
- package/navigation-menu/utils/isOutsideMenuEvent.js +1 -5
- package/navigation-menu/viewport/NavigationMenuViewport.js +2 -3
- package/number-field/input/NumberFieldInput.js +3 -5
- package/number-field/root/NumberFieldRoot.js +5 -2
- package/number-field/scrub-area/NumberFieldScrubArea.js +7 -3
- package/otp-field/input/OTPFieldInput.js +42 -28
- package/otp-field/root/OTPFieldRoot.d.ts +17 -8
- package/otp-field/root/OTPFieldRoot.js +32 -32
- package/otp-field/root/OTPFieldRootContext.d.ts +1 -1
- package/otp-field/utils/otp.d.ts +5 -4
- package/otp-field/utils/otp.js +24 -12
- package/package.json +331 -317
- package/popover/arrow/PopoverArrow.js +1 -1
- package/popover/backdrop/PopoverBackdrop.js +1 -1
- package/popover/close/PopoverClose.js +2 -2
- package/popover/description/PopoverDescription.js +1 -7
- package/popover/popup/PopoverPopup.d.ts +1 -1
- package/popover/popup/PopoverPopup.js +16 -10
- package/popover/popup/PopoverPopupDataAttributes.d.ts +1 -1
- package/popover/popup/PopoverPopupDataAttributes.js +1 -1
- package/popover/positioner/PopoverPositioner.js +5 -5
- package/popover/root/PopoverRoot.d.ts +1 -1
- package/popover/root/PopoverRoot.js +39 -44
- package/popover/store/PopoverHandle.js +1 -1
- package/popover/store/PopoverStore.d.ts +91 -4
- package/popover/store/PopoverStore.js +16 -19
- package/popover/title/PopoverTitle.js +1 -7
- package/popover/trigger/PopoverTrigger.js +23 -16
- package/popover/viewport/PopoverViewport.d.ts +3 -3
- package/popover/viewport/PopoverViewport.js +2 -2
- package/popover/viewport/PopoverViewportDataAttributes.d.ts +1 -1
- package/popover/viewport/PopoverViewportDataAttributes.js +1 -1
- package/preview-card/positioner/PreviewCardPositioner.js +11 -1
- package/preview-card/root/PreviewCardRoot.d.ts +1 -1
- package/preview-card/root/PreviewCardRoot.js +30 -20
- package/preview-card/store/PreviewCardHandle.js +1 -1
- package/preview-card/store/PreviewCardStore.d.ts +90 -2
- package/preview-card/store/PreviewCardStore.js +18 -30
- package/preview-card/trigger/PreviewCardTrigger.js +5 -2
- package/preview-card/viewport/PreviewCardViewport.d.ts +2 -2
- package/preview-card/viewport/PreviewCardViewport.js +2 -2
- package/preview-card/viewport/PreviewCardViewportDataAttributes.d.ts +2 -2
- package/preview-card/viewport/PreviewCardViewportDataAttributes.js +2 -2
- package/progress/indicator/ProgressIndicator.js +6 -11
- package/progress/root/ProgressRoot.d.ts +1 -1
- package/radio/root/RadioRoot.js +7 -3
- package/radio-group/RadioGroup.js +4 -11
- package/radio-group/RadioGroupContext.d.ts +0 -1
- package/scroll-area/content/ScrollAreaContent.js +4 -4
- package/scroll-area/root/ScrollAreaRoot.js +1 -1
- package/scroll-area/scrollbar/ScrollAreaScrollbar.js +16 -20
- package/scroll-area/viewport/ScrollAreaViewport.js +6 -10
- package/select/arrow/SelectArrow.js +1 -1
- package/select/backdrop/SelectBackdrop.js +1 -1
- package/select/group/SelectGroup.js +1 -1
- package/select/group-label/SelectGroupLabel.js +2 -2
- package/select/icon/SelectIcon.js +1 -1
- package/select/item/SelectItem.js +46 -32
- package/select/item/SelectItemContext.d.ts +1 -1
- package/select/item-indicator/SelectItemIndicator.js +1 -2
- package/select/item-text/SelectItemText.js +9 -6
- package/select/list/SelectList.js +1 -1
- package/select/popup/SelectPopup.js +8 -3
- package/select/positioner/SelectPositioner.js +3 -0
- package/select/root/SelectRoot.js +45 -39
- package/select/root/SelectRootContext.d.ts +4 -5
- package/select/store.d.ts +3 -0
- package/select/store.js +1 -0
- package/select/trigger/SelectTrigger.d.ts +5 -0
- package/select/trigger/SelectTrigger.js +19 -33
- package/select/trigger/SelectTriggerDataAttributes.d.ts +5 -0
- package/select/trigger/SelectTriggerDataAttributes.js +5 -0
- package/slider/control/SliderControl.js +9 -11
- package/slider/root/SliderRoot.js +1 -4
- package/slider/thumb/SliderThumb.js +32 -30
- package/slider/value/SliderValue.js +7 -15
- package/switch/root/SwitchRoot.js +10 -10
- package/switch/thumb/SwitchThumb.js +1 -9
- package/tabs/indicator/TabsIndicator.js +14 -19
- package/tabs/list/TabsList.js +4 -10
- package/tabs/list/TabsListContext.d.ts +2 -1
- package/tabs/panel/TabsPanel.js +1 -1
- package/tabs/root/TabsRoot.d.ts +16 -1
- package/tabs/root/TabsRoot.js +71 -24
- package/tabs/root/TabsRootContext.d.ts +0 -2
- package/toast/provider/ToastProvider.js +1 -1
- package/toast/root/ToastRoot.d.ts +1 -1
- package/toast/root/ToastRoot.js +110 -133
- package/toast/root/ToastRootDataAttributes.d.ts +1 -1
- package/toast/root/ToastRootDataAttributes.js +1 -1
- package/toast/store.d.ts +9 -1
- package/toast/store.js +18 -12
- package/toast/useToastManager.d.ts +1 -1
- package/toast/viewport/ToastViewport.js +1 -1
- package/toggle/Toggle.js +5 -9
- package/toggle-group/ToggleGroup.d.ts +2 -2
- package/toggle-group/ToggleGroup.js +6 -13
- package/toolbar/link/ToolbarLink.d.ts +1 -1
- package/toolbar/link/ToolbarLink.js +1 -2
- package/tooltip/arrow/TooltipArrow.js +3 -3
- package/tooltip/popup/TooltipPopup.js +5 -4
- package/tooltip/root/TooltipRoot.js +32 -23
- package/tooltip/store/TooltipHandle.js +1 -1
- package/tooltip/store/TooltipStore.d.ts +90 -2
- package/tooltip/store/TooltipStore.js +17 -30
- package/tooltip/trigger/TooltipTrigger.js +152 -20
- package/tooltip/viewport/TooltipViewport.d.ts +2 -2
- package/tooltip/viewport/TooltipViewport.js +2 -2
- package/tooltip/viewport/TooltipViewportDataAttributes.d.ts +1 -1
- package/tooltip/viewport/TooltipViewportDataAttributes.js +1 -1
- package/unstable-use-media-query/index.js +1 -1
- package/utils/popups/index.d.ts +1 -0
- package/utils/popups/index.js +11 -0
- package/utils/popups/inlineRect.d.ts +15 -0
- package/utils/popups/inlineRect.js +198 -0
- package/utils/popups/popupStoreUtils.d.ts +28 -10
- package/utils/popups/popupStoreUtils.js +110 -20
- package/utils/popups/popupTriggerMap.js +2 -0
- package/utils/popups/store.d.ts +15 -2
- package/utils/popups/store.js +39 -2
- package/utils/popups/useTriggerFocusGuards.js +4 -5
- package/utils/useAnchorPositioning.d.ts +5 -0
- package/utils/useAnchorPositioning.js +12 -9
- package/utils/useOpenInteractionType.d.ts +4 -0
- package/utils/useOpenInteractionType.js +24 -17
- package/checkbox-group/index.parts.d.ts +0 -1
- package/checkbox-group/index.parts.js +0 -12
- package/esm/checkbox-group/index.parts.d.ts +0 -1
- package/esm/checkbox-group/index.parts.js +0 -1
- package/esm/floating-ui-react/hooks/useInteractions.d.ts +0 -20
- package/esm/floating-ui-react/hooks/useInteractions.js +0 -88
- package/esm/floating-ui-react/hooks/useRole.d.ts +0 -17
- package/esm/floating-ui-react/hooks/useRole.js +0 -113
- package/floating-ui-react/hooks/useInteractions.d.ts +0 -20
- package/floating-ui-react/hooks/useInteractions.js +0 -95
- package/floating-ui-react/hooks/useRole.d.ts +0 -17
- package/floating-ui-react/hooks/useRole.js +0 -120
- /package/{csp-provider → esm/internals/csp-context}/CSPContext.d.ts +0 -0
- /package/esm/{csp-provider → internals/csp-context}/CSPContext.js +0 -0
- /package/{esm/csp-provider → internals/csp-context}/CSPContext.d.ts +0 -0
- /package/{csp-provider → internals/csp-context}/CSPContext.js +0 -0
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
'use client';
|
|
2
2
|
|
|
3
3
|
import * as React from 'react';
|
|
4
|
-
import { getWindow } from '@floating-ui/utils/dom';
|
|
5
4
|
import { addEventListener } from '@base-ui/utils/addEventListener';
|
|
6
5
|
import { useStableCallback } from '@base-ui/utils/useStableCallback';
|
|
6
|
+
import { getWindow } from '@floating-ui/utils/dom';
|
|
7
7
|
import { contains, getTarget } from "../utils/element.js";
|
|
8
8
|
import { isMouseLikePointerType } from "../utils/event.js";
|
|
9
9
|
function createVirtualElement(domElement, data) {
|
|
@@ -68,19 +68,22 @@ function isMouseBasedEvent(event) {
|
|
|
68
68
|
* @see https://floating-ui.com/docs/useClientPoint
|
|
69
69
|
*/
|
|
70
70
|
export function useClientPoint(context, props = {}) {
|
|
71
|
+
const {
|
|
72
|
+
enabled = true,
|
|
73
|
+
axis = 'both'
|
|
74
|
+
} = props;
|
|
71
75
|
const store = 'rootStore' in context ? context.rootStore : context;
|
|
72
76
|
const open = store.useState('open');
|
|
73
77
|
const floating = store.useState('floatingElement');
|
|
74
78
|
const domReference = store.useState('domReferenceElement');
|
|
75
79
|
const dataRef = store.context.dataRef;
|
|
76
|
-
const {
|
|
77
|
-
enabled = true,
|
|
78
|
-
axis = 'both'
|
|
79
|
-
} = props;
|
|
80
80
|
const initialRef = React.useRef(false);
|
|
81
81
|
const cleanupListenerRef = React.useRef(null);
|
|
82
82
|
const [pointerType, setPointerType] = React.useState();
|
|
83
83
|
const [reactive, setReactive] = React.useState([]);
|
|
84
|
+
const resetReference = useStableCallback(reference => {
|
|
85
|
+
store.set('positionReference', reference);
|
|
86
|
+
});
|
|
84
87
|
const setReference = useStableCallback((newX, newY, referenceElement) => {
|
|
85
88
|
if (initialRef.current) {
|
|
86
89
|
return;
|
|
@@ -107,6 +110,7 @@ export function useClientPoint(context, props = {}) {
|
|
|
107
110
|
// If there's no cleanup, there's no listener, but we want to ensure
|
|
108
111
|
// we add the listener if the cursor landed on the floating element and
|
|
109
112
|
// then back on the reference (i.e. it's interactive).
|
|
113
|
+
setReference(event.clientX, event.clientY, event.currentTarget);
|
|
110
114
|
setReactive([]);
|
|
111
115
|
}
|
|
112
116
|
});
|
|
@@ -116,34 +120,39 @@ export function useClientPoint(context, props = {}) {
|
|
|
116
120
|
// devices, this is undesirable because the floating element will move to
|
|
117
121
|
// the dismissal touch point.
|
|
118
122
|
const openCheck = isMouseLikePointerType(pointerType) ? floating : open;
|
|
119
|
-
|
|
120
|
-
if (!
|
|
123
|
+
React.useEffect(() => {
|
|
124
|
+
if (!enabled) {
|
|
125
|
+
resetReference(domReference);
|
|
126
|
+
return undefined;
|
|
127
|
+
}
|
|
128
|
+
if (!openCheck) {
|
|
121
129
|
return undefined;
|
|
122
130
|
}
|
|
131
|
+
function cleanupListener() {
|
|
132
|
+
cleanupListenerRef.current?.();
|
|
133
|
+
cleanupListenerRef.current = null;
|
|
134
|
+
}
|
|
123
135
|
const win = getWindow(floating);
|
|
124
136
|
function handleMouseMove(event) {
|
|
125
137
|
const target = getTarget(event);
|
|
126
138
|
if (!contains(floating, target)) {
|
|
127
139
|
setReference(event.clientX, event.clientY);
|
|
128
140
|
} else {
|
|
129
|
-
|
|
130
|
-
cleanupListenerRef.current = null;
|
|
141
|
+
cleanupListener();
|
|
131
142
|
}
|
|
132
143
|
}
|
|
133
144
|
if (!dataRef.current.openEvent || isMouseBasedEvent(dataRef.current.openEvent)) {
|
|
134
|
-
const cleanup = () => {
|
|
135
|
-
cleanupListenerRef.current?.();
|
|
136
|
-
cleanupListenerRef.current = null;
|
|
137
|
-
};
|
|
138
145
|
cleanupListenerRef.current = addEventListener(win, 'mousemove', handleMouseMove);
|
|
139
|
-
|
|
146
|
+
} else {
|
|
147
|
+
resetReference(domReference);
|
|
140
148
|
}
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
149
|
+
return cleanupListener;
|
|
150
|
+
}, [openCheck, enabled, floating, dataRef, domReference, store, setReference, resetReference, reactive]);
|
|
151
|
+
|
|
152
|
+
// Clear virtual cursor references when the hook unmounts. Enabled flips are handled above.
|
|
153
|
+
React.useEffect(() => () => {
|
|
154
|
+
store.set('positionReference', null);
|
|
155
|
+
}, [store]);
|
|
147
156
|
React.useEffect(() => {
|
|
148
157
|
if (enabled && !floating) {
|
|
149
158
|
initialRef.current = false;
|
|
@@ -71,7 +71,7 @@ export interface UseDismissProps {
|
|
|
71
71
|
outsidePress?: boolean | undefined;
|
|
72
72
|
} | undefined;
|
|
73
73
|
/**
|
|
74
|
-
* External
|
|
74
|
+
* External FloatingTree to use when the one provided by context can't be used.
|
|
75
75
|
*/
|
|
76
76
|
externalTree?: FloatingTreeStore | undefined;
|
|
77
77
|
}
|
|
@@ -1,22 +1,20 @@
|
|
|
1
1
|
'use client';
|
|
2
2
|
|
|
3
|
+
/* eslint-disable no-underscore-dangle */
|
|
3
4
|
import * as React from 'react';
|
|
4
|
-
import { getComputedStyle, getParentNode, isElement, isHTMLElement, isLastTraversableNode, isShadowRoot, isWebKit } from '@floating-ui/utils/dom';
|
|
5
5
|
import { addEventListener } from '@base-ui/utils/addEventListener';
|
|
6
6
|
import { mergeCleanups } from '@base-ui/utils/mergeCleanups';
|
|
7
|
-
import { Timeout, useTimeout } from '@base-ui/utils/useTimeout';
|
|
8
|
-
import { useStableCallback } from '@base-ui/utils/useStableCallback';
|
|
9
7
|
import { ownerDocument } from '@base-ui/utils/owner';
|
|
10
|
-
import {
|
|
11
|
-
import {
|
|
12
|
-
import {
|
|
13
|
-
|
|
14
|
-
/* eslint-disable no-underscore-dangle */
|
|
15
|
-
|
|
8
|
+
import { useStableCallback } from '@base-ui/utils/useStableCallback';
|
|
9
|
+
import { Timeout, useTimeout } from '@base-ui/utils/useTimeout';
|
|
10
|
+
import { getComputedStyle, getParentNode, isElement, isHTMLElement, isLastTraversableNode, isShadowRoot, isWebKit } from '@floating-ui/utils/dom';
|
|
16
11
|
import { useFloatingTree } from "../components/FloatingTree.js";
|
|
17
12
|
import { createChangeEventDetails } from "../../internals/createBaseUIEventDetails.js";
|
|
18
13
|
import { REASONS } from "../../internals/reasons.js";
|
|
19
14
|
import { createAttribute } from "../utils/createAttribute.js";
|
|
15
|
+
import { contains, getTarget, isEventTargetWithin, isRootElement } from "../utils/element.js";
|
|
16
|
+
import { isReactEvent } from "../utils/event.js";
|
|
17
|
+
import { getNodeChildren } from "../utils/nodes.js";
|
|
20
18
|
const bubbleHandlerKeys = {
|
|
21
19
|
intentional: 'onClick',
|
|
22
20
|
sloppy: 'onPointerDown'
|
|
@@ -36,12 +34,6 @@ export function normalizeProp(normalizable) {
|
|
|
36
34
|
* @see https://floating-ui.com/docs/useDismiss
|
|
37
35
|
*/
|
|
38
36
|
export function useDismiss(context, props = {}) {
|
|
39
|
-
const store = 'rootStore' in context ? context.rootStore : context;
|
|
40
|
-
const open = store.useState('open');
|
|
41
|
-
const floatingElement = store.useState('floatingElement');
|
|
42
|
-
const {
|
|
43
|
-
dataRef
|
|
44
|
-
} = store.context;
|
|
45
37
|
const {
|
|
46
38
|
enabled = true,
|
|
47
39
|
escapeKey = true,
|
|
@@ -52,19 +44,27 @@ export function useDismiss(context, props = {}) {
|
|
|
52
44
|
bubbles,
|
|
53
45
|
externalTree
|
|
54
46
|
} = props;
|
|
47
|
+
const store = 'rootStore' in context ? context.rootStore : context;
|
|
48
|
+
const open = store.useState('open');
|
|
49
|
+
const floatingElement = store.useState('floatingElement');
|
|
50
|
+
const {
|
|
51
|
+
dataRef
|
|
52
|
+
} = store.context;
|
|
55
53
|
const tree = useFloatingTree(externalTree);
|
|
56
54
|
const outsidePressFn = useStableCallback(typeof outsidePressProp === 'function' ? outsidePressProp : () => false);
|
|
57
55
|
const outsidePress = typeof outsidePressProp === 'function' ? outsidePressFn : outsidePressProp;
|
|
58
56
|
const outsidePressEnabled = outsidePress !== false;
|
|
59
57
|
const getOutsidePressEventProp = useStableCallback(() => outsidePressEvent);
|
|
60
|
-
const pressStartedInsideRef = React.useRef(false);
|
|
61
|
-
const pressStartPreventedRef = React.useRef(false);
|
|
62
|
-
// Ignore only the very next outside click after dragging from inside to outside.
|
|
63
|
-
const suppressNextOutsideClickRef = React.useRef(false);
|
|
64
58
|
const {
|
|
65
59
|
escapeKey: escapeKeyBubbles,
|
|
66
60
|
outsidePress: outsidePressBubbles
|
|
67
61
|
} = normalizeProp(bubbles);
|
|
62
|
+
const pressStartedInsideRef = React.useRef(false);
|
|
63
|
+
const pressStartPreventedRef = React.useRef(false);
|
|
64
|
+
// Ignore only the very next outside click after dragging from inside to outside.
|
|
65
|
+
const suppressNextOutsideClickRef = React.useRef(false);
|
|
66
|
+
const isComposingRef = React.useRef(false);
|
|
67
|
+
const currentPointerTypeRef = React.useRef('');
|
|
68
68
|
const touchStateRef = React.useRef(null);
|
|
69
69
|
const cancelDismissOnEndTimeout = useTimeout();
|
|
70
70
|
const clearInsideReactTreeTimeout = useTimeout();
|
|
@@ -72,9 +72,20 @@ export function useDismiss(context, props = {}) {
|
|
|
72
72
|
clearInsideReactTreeTimeout.clear();
|
|
73
73
|
dataRef.current.insideReactTree = false;
|
|
74
74
|
});
|
|
75
|
-
const
|
|
76
|
-
|
|
77
|
-
|
|
75
|
+
const hasBlockingChild = useStableCallback(bubbleKey => {
|
|
76
|
+
const nodeId = dataRef.current.floatingContext?.nodeId;
|
|
77
|
+
const children = tree ? getNodeChildren(tree.nodesRef.current, nodeId) : [];
|
|
78
|
+
return children.some(child => child.context?.open && !child.context.dataRef.current[bubbleKey]);
|
|
79
|
+
});
|
|
80
|
+
const isEventWithinOwnElements = useStableCallback(event => {
|
|
81
|
+
return isEventTargetWithin(event, store.select('floatingElement')) || isEventTargetWithin(event, store.select('domReferenceElement'));
|
|
82
|
+
});
|
|
83
|
+
const closeOnReferencePress = useStableCallback(event => {
|
|
84
|
+
if (!referencePress()) {
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
87
|
+
store.setOpen(false, createChangeEventDetails(REASONS.triggerPress, event.nativeEvent));
|
|
88
|
+
});
|
|
78
89
|
const closeOnEscapeKeyDown = useStableCallback(event => {
|
|
79
90
|
if (!open || !enabled || !escapeKey || event.key !== 'Escape') {
|
|
80
91
|
return;
|
|
@@ -85,24 +96,15 @@ export function useDismiss(context, props = {}) {
|
|
|
85
96
|
if (isComposingRef.current) {
|
|
86
97
|
return;
|
|
87
98
|
}
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
if (!escapeKeyBubbles) {
|
|
91
|
-
if (children.length > 0) {
|
|
92
|
-
let shouldDismiss = true;
|
|
93
|
-
children.forEach(child => {
|
|
94
|
-
if (child.context?.open && !child.context.dataRef.current.__escapeKeyBubbles) {
|
|
95
|
-
shouldDismiss = false;
|
|
96
|
-
}
|
|
97
|
-
});
|
|
98
|
-
if (!shouldDismiss) {
|
|
99
|
-
return;
|
|
100
|
-
}
|
|
101
|
-
}
|
|
99
|
+
if (!escapeKeyBubbles && hasBlockingChild('__escapeKeyBubbles')) {
|
|
100
|
+
return;
|
|
102
101
|
}
|
|
103
102
|
const native = isReactEvent(event) ? event.nativeEvent : event;
|
|
104
103
|
const eventDetails = createChangeEventDetails(REASONS.escapeKey, native);
|
|
105
104
|
store.setOpen(false, eventDetails);
|
|
105
|
+
if (!eventDetails.isCanceled) {
|
|
106
|
+
event.preventDefault();
|
|
107
|
+
}
|
|
106
108
|
if (!escapeKeyBubbles && !eventDetails.isPropagationAllowed) {
|
|
107
109
|
event.stopPropagation();
|
|
108
110
|
}
|
|
@@ -111,6 +113,33 @@ export function useDismiss(context, props = {}) {
|
|
|
111
113
|
dataRef.current.insideReactTree = true;
|
|
112
114
|
clearInsideReactTreeTimeout.start(0, clearInsideReactTree);
|
|
113
115
|
});
|
|
116
|
+
const markPressStartedInsideReactTree = useStableCallback(event => {
|
|
117
|
+
if (!open || !enabled || event.button !== 0) {
|
|
118
|
+
return;
|
|
119
|
+
}
|
|
120
|
+
const target = getTarget(event.nativeEvent);
|
|
121
|
+
|
|
122
|
+
// Only treat presses that start within the floating DOM subtree as inside.
|
|
123
|
+
// This avoids suppressing parent dismissal when interacting with nested portals.
|
|
124
|
+
if (!contains(store.select('floatingElement'), target)) {
|
|
125
|
+
return;
|
|
126
|
+
}
|
|
127
|
+
if (!pressStartedInsideRef.current) {
|
|
128
|
+
pressStartedInsideRef.current = true;
|
|
129
|
+
pressStartPreventedRef.current = false;
|
|
130
|
+
}
|
|
131
|
+
});
|
|
132
|
+
const markInsidePressStartPrevented = useStableCallback(event => {
|
|
133
|
+
if (!open || !enabled) {
|
|
134
|
+
return;
|
|
135
|
+
}
|
|
136
|
+
if (!(event.defaultPrevented || event.nativeEvent.defaultPrevented)) {
|
|
137
|
+
return;
|
|
138
|
+
}
|
|
139
|
+
if (pressStartedInsideRef.current) {
|
|
140
|
+
pressStartPreventedRef.current = true;
|
|
141
|
+
}
|
|
142
|
+
});
|
|
114
143
|
React.useEffect(() => {
|
|
115
144
|
if (!open || !enabled) {
|
|
116
145
|
return undefined;
|
|
@@ -163,10 +192,16 @@ export function useDismiss(context, props = {}) {
|
|
|
163
192
|
function isEventWithinFloatingTree(event) {
|
|
164
193
|
const nodeId = dataRef.current.floatingContext?.nodeId;
|
|
165
194
|
const targetIsInsideChildren = tree && getNodeChildren(tree.nodesRef.current, nodeId).some(node => isEventTargetWithin(event, node.context?.elements.floating));
|
|
166
|
-
return
|
|
195
|
+
return isEventWithinOwnElements(event) || targetIsInsideChildren;
|
|
167
196
|
}
|
|
168
197
|
function closeOnPressOutside(event) {
|
|
169
198
|
if (shouldIgnoreEvent(event)) {
|
|
199
|
+
// A new press began outside the floating element and its trigger. Clear any
|
|
200
|
+
// leftover drag-out suppression so this press's eventual click can dismiss.
|
|
201
|
+
if (event.type !== 'click' && !isEventWithinOwnElements(event)) {
|
|
202
|
+
preventedPressSuppressionTimeout.clear();
|
|
203
|
+
suppressNextOutsideClickRef.current = false;
|
|
204
|
+
}
|
|
170
205
|
clearInsideReactTree();
|
|
171
206
|
return;
|
|
172
207
|
}
|
|
@@ -242,30 +277,20 @@ export function useDismiss(context, props = {}) {
|
|
|
242
277
|
if (typeof outsidePress === 'function' && !outsidePress(event)) {
|
|
243
278
|
return;
|
|
244
279
|
}
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
if (children.length > 0) {
|
|
248
|
-
let shouldDismiss = true;
|
|
249
|
-
children.forEach(child => {
|
|
250
|
-
if (child.context?.open && !child.context.dataRef.current.__outsidePressBubbles) {
|
|
251
|
-
shouldDismiss = false;
|
|
252
|
-
}
|
|
253
|
-
});
|
|
254
|
-
if (!shouldDismiss) {
|
|
255
|
-
return;
|
|
256
|
-
}
|
|
280
|
+
if (hasBlockingChild('__outsidePressBubbles')) {
|
|
281
|
+
return;
|
|
257
282
|
}
|
|
258
283
|
store.setOpen(false, createChangeEventDetails(REASONS.outsidePress, event));
|
|
259
284
|
clearInsideReactTree();
|
|
260
285
|
}
|
|
261
286
|
function handlePointerDown(event) {
|
|
262
|
-
if (getOutsidePressEvent() !== 'sloppy' || event.pointerType === 'touch' || !store.select('open') || !enabled ||
|
|
287
|
+
if (getOutsidePressEvent() !== 'sloppy' || event.pointerType === 'touch' || !store.select('open') || !enabled || isEventWithinOwnElements(event)) {
|
|
263
288
|
return;
|
|
264
289
|
}
|
|
265
290
|
closeOnPressOutside(event);
|
|
266
291
|
}
|
|
267
292
|
function handleTouchStart(event) {
|
|
268
|
-
if (getOutsidePressEvent() !== 'sloppy' || !store.select('open') || !enabled ||
|
|
293
|
+
if (getOutsidePressEvent() !== 'sloppy' || !store.select('open') || !enabled || isEventWithinOwnElements(event)) {
|
|
269
294
|
return;
|
|
270
295
|
}
|
|
271
296
|
const touch = event.touches[0];
|
|
@@ -352,7 +377,7 @@ export function useDismiss(context, props = {}) {
|
|
|
352
377
|
clearInsideReactTree();
|
|
353
378
|
}
|
|
354
379
|
function handleTouchMove(event) {
|
|
355
|
-
if (getOutsidePressEvent() !== 'sloppy' || !touchStateRef.current ||
|
|
380
|
+
if (getOutsidePressEvent() !== 'sloppy' || !touchStateRef.current || isEventWithinOwnElements(event)) {
|
|
356
381
|
return;
|
|
357
382
|
}
|
|
358
383
|
const touch = event.touches[0];
|
|
@@ -375,7 +400,7 @@ export function useDismiss(context, props = {}) {
|
|
|
375
400
|
addTargetEventListenerOnce(event, handleTouchMove);
|
|
376
401
|
}
|
|
377
402
|
function handleTouchEnd(event) {
|
|
378
|
-
if (getOutsidePressEvent() !== 'sloppy' || !touchStateRef.current ||
|
|
403
|
+
if (getOutsidePressEvent() !== 'sloppy' || !touchStateRef.current || isEventWithinOwnElements(event)) {
|
|
379
404
|
return;
|
|
380
405
|
}
|
|
381
406
|
if (touchStateRef.current.dismissOnTouchEnd) {
|
|
@@ -396,51 +421,15 @@ export function useDismiss(context, props = {}) {
|
|
|
396
421
|
resetPressStartState();
|
|
397
422
|
suppressNextOutsideClickRef.current = false;
|
|
398
423
|
};
|
|
399
|
-
}, [dataRef, floatingElement, escapeKey, outsidePressEnabled, outsidePress, open, enabled, escapeKeyBubbles, outsidePressBubbles, closeOnEscapeKeyDown, clearInsideReactTree, getOutsidePressEventProp, tree, store, cancelDismissOnEndTimeout]);
|
|
424
|
+
}, [dataRef, floatingElement, escapeKey, outsidePressEnabled, outsidePress, open, enabled, escapeKeyBubbles, outsidePressBubbles, closeOnEscapeKeyDown, clearInsideReactTree, getOutsidePressEventProp, hasBlockingChild, isEventWithinOwnElements, tree, store, cancelDismissOnEndTimeout]);
|
|
400
425
|
React.useEffect(clearInsideReactTree, [outsidePress, clearInsideReactTree]);
|
|
401
426
|
const reference = React.useMemo(() => ({
|
|
402
427
|
onKeyDown: closeOnEscapeKeyDown,
|
|
403
|
-
[bubbleHandlerKeys[referencePressEvent]]:
|
|
404
|
-
if (!isReferencePressEnabled()) {
|
|
405
|
-
return;
|
|
406
|
-
}
|
|
407
|
-
store.setOpen(false, createChangeEventDetails(REASONS.triggerPress, event.nativeEvent));
|
|
408
|
-
},
|
|
428
|
+
[bubbleHandlerKeys[referencePressEvent]]: closeOnReferencePress,
|
|
409
429
|
...(referencePressEvent !== 'intentional' && {
|
|
410
|
-
onClick
|
|
411
|
-
if (!isReferencePressEnabled()) {
|
|
412
|
-
return;
|
|
413
|
-
}
|
|
414
|
-
store.setOpen(false, createChangeEventDetails(REASONS.triggerPress, event.nativeEvent));
|
|
415
|
-
}
|
|
430
|
+
onClick: closeOnReferencePress
|
|
416
431
|
})
|
|
417
|
-
}), [closeOnEscapeKeyDown,
|
|
418
|
-
const markPressStartedInsideReactTree = useStableCallback(event => {
|
|
419
|
-
if (!open || !enabled || event.button !== 0) {
|
|
420
|
-
return;
|
|
421
|
-
}
|
|
422
|
-
const target = getTarget(event.nativeEvent);
|
|
423
|
-
// Only treat presses that start within the floating DOM subtree as inside.
|
|
424
|
-
// This avoids suppressing parent dismissal when interacting with nested portals.
|
|
425
|
-
if (!contains(store.select('floatingElement'), target)) {
|
|
426
|
-
return;
|
|
427
|
-
}
|
|
428
|
-
if (!pressStartedInsideRef.current) {
|
|
429
|
-
pressStartedInsideRef.current = true;
|
|
430
|
-
pressStartPreventedRef.current = false;
|
|
431
|
-
}
|
|
432
|
-
});
|
|
433
|
-
const markInsidePressStartPrevented = useStableCallback(event => {
|
|
434
|
-
if (!open || !enabled) {
|
|
435
|
-
return;
|
|
436
|
-
}
|
|
437
|
-
if (!(event.defaultPrevented || event.nativeEvent.defaultPrevented)) {
|
|
438
|
-
return;
|
|
439
|
-
}
|
|
440
|
-
if (pressStartedInsideRef.current) {
|
|
441
|
-
pressStartPreventedRef.current = true;
|
|
442
|
-
}
|
|
443
|
-
});
|
|
432
|
+
}), [closeOnEscapeKeyDown, closeOnReferencePress, referencePressEvent]);
|
|
444
433
|
const floating = React.useMemo(() => ({
|
|
445
434
|
onKeyDown: closeOnEscapeKeyDown,
|
|
446
435
|
// `onMouseDown` may be blocked if `event.preventDefault()` is called in
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
'use client';
|
|
2
2
|
|
|
3
3
|
import * as React from 'react';
|
|
4
|
+
import { useIsoLayoutEffect } from '@base-ui/utils/useIsoLayoutEffect';
|
|
4
5
|
import { useFloating as usePosition } from '@floating-ui/react-dom';
|
|
5
6
|
import { isElement } from '@floating-ui/utils/dom';
|
|
6
|
-
import { useIsoLayoutEffect } from '@base-ui/utils/useIsoLayoutEffect';
|
|
7
7
|
import { useFloatingTree } from "../components/FloatingTree.js";
|
|
8
8
|
import { useFloatingRootContext } from "./useFloatingRootContext.js";
|
|
9
|
+
|
|
9
10
|
/**
|
|
10
11
|
* Provides data to position a floating element and context to add interactions.
|
|
11
12
|
* @see https://floating-ui.com/docs/useFloating
|
|
@@ -15,30 +16,37 @@ export function useFloating(options = {}) {
|
|
|
15
16
|
nodeId,
|
|
16
17
|
externalTree
|
|
17
18
|
} = options;
|
|
18
|
-
const
|
|
19
|
-
const
|
|
20
|
-
const
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
19
|
+
const internalStore = useFloatingRootContext(options);
|
|
20
|
+
const store = options.rootContext || internalStore;
|
|
21
|
+
const referenceElement = store.useState('referenceElement');
|
|
22
|
+
const floatingElement = store.useState('floatingElement');
|
|
23
|
+
const domReferenceElement = store.useState('domReferenceElement');
|
|
24
|
+
const open = store.useState('open');
|
|
25
|
+
const floatingId = store.useState('floatingId');
|
|
25
26
|
const [positionReference, setPositionReferenceRaw] = React.useState(null);
|
|
27
|
+
const [localDomReference, setLocalDomReference] = React.useState(undefined);
|
|
28
|
+
const [localFloatingElement, setLocalFloatingElement] = React.useState(undefined);
|
|
26
29
|
const domReferenceRef = React.useRef(null);
|
|
27
30
|
const tree = useFloatingTree(externalTree);
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
}, [
|
|
31
|
+
const storeElements = React.useMemo(() => ({
|
|
32
|
+
reference: referenceElement,
|
|
33
|
+
floating: floatingElement,
|
|
34
|
+
domReference: domReferenceElement
|
|
35
|
+
}), [referenceElement, floatingElement, domReferenceElement]);
|
|
33
36
|
const position = usePosition({
|
|
34
37
|
...options,
|
|
35
38
|
elements: {
|
|
36
|
-
...
|
|
39
|
+
...storeElements,
|
|
37
40
|
...(positionReference && {
|
|
38
41
|
reference: positionReference
|
|
39
42
|
})
|
|
40
43
|
}
|
|
41
44
|
});
|
|
45
|
+
const localDomReferenceElement = isElement(localDomReference) ? localDomReference : null;
|
|
46
|
+
const syncedFloatingElement = localFloatingElement === undefined ? store.state.floatingElement : localFloatingElement;
|
|
47
|
+
store.useSyncedValue('referenceElement', localDomReference ?? null);
|
|
48
|
+
store.useSyncedValue('domReferenceElement', localDomReference === undefined ? domReferenceElement : localDomReferenceElement);
|
|
49
|
+
store.useSyncedValue('floatingElement', syncedFloatingElement);
|
|
42
50
|
const setPositionReference = React.useCallback(node => {
|
|
43
51
|
const computedPositionReference = isElement(node) ? {
|
|
44
52
|
getBoundingClientRect: () => node.getBoundingClientRect(),
|
|
@@ -50,12 +58,6 @@ export function useFloating(options = {}) {
|
|
|
50
58
|
setPositionReferenceRaw(computedPositionReference);
|
|
51
59
|
position.refs.setReference(computedPositionReference);
|
|
52
60
|
}, [position.refs]);
|
|
53
|
-
const [localDomReference, setLocalDomReference] = React.useState(undefined);
|
|
54
|
-
const [localFloatingElement, setLocalFloatingElement] = React.useState(null);
|
|
55
|
-
rootContext.useSyncedValue('referenceElement', localDomReference ?? null);
|
|
56
|
-
const localDomReferenceElement = isElement(localDomReference) ? localDomReference : null;
|
|
57
|
-
rootContext.useSyncedValue('domReferenceElement', localDomReference === undefined ? rootContextElements.domReference : localDomReferenceElement);
|
|
58
|
-
rootContext.useSyncedValue('floatingElement', localFloatingElement);
|
|
59
61
|
const setReference = React.useCallback(node => {
|
|
60
62
|
if (isElement(node) || node === null) {
|
|
61
63
|
domReferenceRef.current = node;
|
|
@@ -85,24 +87,27 @@ export function useFloating(options = {}) {
|
|
|
85
87
|
}), [position.refs, setReference, setFloating, setPositionReference]);
|
|
86
88
|
const elements = React.useMemo(() => ({
|
|
87
89
|
...position.elements,
|
|
88
|
-
domReference:
|
|
89
|
-
}), [position.elements,
|
|
90
|
-
const open = rootContext.useState('open');
|
|
91
|
-
const floatingId = rootContext.useState('floatingId');
|
|
90
|
+
domReference: domReferenceElement
|
|
91
|
+
}), [position.elements, domReferenceElement]);
|
|
92
92
|
const context = React.useMemo(() => ({
|
|
93
93
|
...position,
|
|
94
|
-
dataRef:
|
|
94
|
+
dataRef: store.context.dataRef,
|
|
95
95
|
open,
|
|
96
|
-
onOpenChange:
|
|
97
|
-
events:
|
|
96
|
+
onOpenChange: store.setOpen,
|
|
97
|
+
events: store.context.events,
|
|
98
98
|
floatingId,
|
|
99
99
|
refs,
|
|
100
100
|
elements,
|
|
101
101
|
nodeId,
|
|
102
|
-
rootStore:
|
|
103
|
-
}), [position, refs, elements, nodeId,
|
|
102
|
+
rootStore: store
|
|
103
|
+
}), [position, refs, elements, nodeId, store, open, floatingId]);
|
|
104
|
+
useIsoLayoutEffect(() => {
|
|
105
|
+
if (domReferenceElement) {
|
|
106
|
+
domReferenceRef.current = domReferenceElement;
|
|
107
|
+
}
|
|
108
|
+
}, [domReferenceElement]);
|
|
104
109
|
useIsoLayoutEffect(() => {
|
|
105
|
-
|
|
110
|
+
store.context.dataRef.current.floatingContext = context;
|
|
106
111
|
const node = tree?.nodesRef.current.find(n => n.id === nodeId);
|
|
107
112
|
if (node) {
|
|
108
113
|
node.context = context;
|
|
@@ -113,6 +118,6 @@ export function useFloating(options = {}) {
|
|
|
113
118
|
context,
|
|
114
119
|
refs,
|
|
115
120
|
elements,
|
|
116
|
-
rootStore:
|
|
117
|
-
}), [position, refs, elements, context,
|
|
121
|
+
rootStore: store
|
|
122
|
+
}), [position, refs, elements, context, store]);
|
|
118
123
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { ReferenceType } from "../types.js";
|
|
2
1
|
import type { BaseUIChangeEventDetails } from "../../internals/createBaseUIEventDetails.js";
|
|
3
2
|
import { FloatingRootStore } from "../components/FloatingRootStore.js";
|
|
3
|
+
import type { ReferenceType } from "../types.js";
|
|
4
4
|
export interface UseFloatingRootContextOptions {
|
|
5
5
|
open?: boolean | undefined;
|
|
6
6
|
onOpenChange?(open: boolean, eventDetails: BaseUIChangeEventDetails<string>): void;
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
|
|
3
3
|
import { isElement } from '@floating-ui/utils/dom';
|
|
4
4
|
import { useId } from '@base-ui/utils/useId';
|
|
5
|
-
import { useRefWithInit } from '@base-ui/utils/useRefWithInit';
|
|
6
5
|
import { useIsoLayoutEffect } from '@base-ui/utils/useIsoLayoutEffect';
|
|
6
|
+
import { useRefWithInit } from '@base-ui/utils/useRefWithInit';
|
|
7
|
+
import { PopupTriggerMap } from "../../utils/popups/index.js";
|
|
7
8
|
import { useFloatingParentNodeId } from "../components/FloatingTree.js";
|
|
8
9
|
import { FloatingRootStore } from "../components/FloatingRootStore.js";
|
|
9
|
-
import { PopupTriggerMap } from "../../utils/popups/index.js";
|
|
10
10
|
export function useFloatingRootContext(options) {
|
|
11
11
|
const {
|
|
12
12
|
open = false,
|