frey-ui 1.1.0 → 1.2.1

package/dist/esm/Popover/index.mjs

@@ -1,9 +1,10 @@
 'use client';
 import { jsx } from 'react/jsx-runtime';
-import { FloatingFocusManager, useFloatingRootContext, useFloating, autoUpdate, useDismiss, useInteractions } from '@floating-ui/react';
 import clsx from 'clsx';
-import React, { useId, useRef, useState } from 'react';
-import { createFloatingMiddleware, toFloatingPlacement } from '../hooks/floatingConfig.mjs';
+import React, { useId } from 'react';
+import { useDismissibleLayer } from '../floating/dismissibleLayer.mjs';
+import { FocusScope } from '../floating/FocusScope.mjs';
+import { useFloatingPosition } from '../floating/useFloatingPosition.mjs';
 import { useControllableValue } from '../hooks/useControllableState.mjs';
 import { mergeRefs } from '../utils/mergeRefs.mjs';
 import Portal from '../utils/Portal.mjs';
@@ -20,73 +21,50 @@ function usePopoverContext() {
 }
 const PopoverRoot = function Popover({ open, defaultOpen = false, onOpenChange, placement = 'bottom', offset = 8, closeOnEscape = true, closeOnOutsideClick = true, children, }) {
     const idPrefix = useId();
-    const triggerRef = useRef(null);
-    const [referenceElement, setReferenceElement] = useState(null);
-    const [floatingElement, setFloatingElement] = useState(null);
     const [currentOpen, handleOpenChange] = useControllableValue(open, defaultOpen, onOpenChange);
-    const handleFloatingOpenChange = React.useCallback((nextOpen, _event, reason) => {
-        handleOpenChange(nextOpen);
-        if (!nextOpen && reason === 'escape-key') {
-            triggerRef.current?.focus();
-        }
-    }, [handleOpenChange]);
-    const floatingRootContext = useFloatingRootContext({
+    const { referenceRef: triggerRef, floatingRef, setReference, setFloating, floatingStyles, } = useFloatingPosition({
         open: currentOpen,
-        onOpenChange: handleFloatingOpenChange,
-        elements: {
-            reference: referenceElement,
-            floating: floatingElement,
-        },
+        side: placement,
+        alignment: 'center',
+        offset,
     });
-    const { refs, floatingStyles, context: floatingContext, } = useFloating({
-        rootContext: floatingRootContext,
-        placement: toFloatingPlacement(placement, 'center'),
-        middleware: createFloatingMiddleware(offset),
-        strategy: 'fixed',
-        transform: false,
-        whileElementsMounted: autoUpdate,
-    });
-    const dismiss = useDismiss(floatingContext, {
-        enabled: currentOpen,
-        escapeKey: closeOnEscape,
-        outsidePress: closeOnOutsideClick,
+    const handleDismiss = React.useCallback((reason) => {
+        handleOpenChange(false);
+        if (reason === 'escape')
+            triggerRef.current?.focus();
+    }, [handleOpenChange, triggerRef]);
+    useDismissibleLayer({
+        open: currentOpen,
+        referenceRef: triggerRef,
+        floatingRef,
+        closeOnEscape,
+        closeOnOutsidePointerDown: closeOnOutsideClick,
+        onDismiss: handleDismiss,
     });
-    const { getReferenceProps, getFloatingProps } = useInteractions([dismiss]);
-    const setReference = React.useCallback((node) => {
-        refs.setReference(node);
-        setReferenceElement(node);
-    }, [refs]);
-    const setFloating = React.useCallback((node) => {
-        refs.setFloating(node);
-        setFloatingElement(node);
-    }, [refs]);
     const contextValue = React.useMemo(() => ({
         open: currentOpen,
         onOpenChange: handleOpenChange,
         idPrefix,
         triggerRef,
+        floatingRef,
         setReference,
         setFloating,
         floatingStyles,
-        floatingContext,
-        getReferenceProps,
-        getFloatingProps,
     }), [
         currentOpen,
         handleOpenChange,
         idPrefix,
+        triggerRef,
+        floatingRef,
         setReference,
         setFloating,
         floatingStyles,
-        floatingContext,
-        getReferenceProps,
-        getFloatingProps,
     ]);
     return (jsx(PopoverContext.Provider, { value: contextValue, children: children }));
 };
 PopoverRoot.displayName = 'Popover';
 const PopoverTrigger = React.forwardRef(function PopoverTrigger({ children, asChild = false, onClick, type, ...triggerProps }, ref) {
-    const { open, onOpenChange, idPrefix, triggerRef, setReference, getReferenceProps, } = usePopoverContext();
+    const { open, onOpenChange, idPrefix, triggerRef, setReference } = usePopoverContext();
     const mergedRef = mergeRefs(ref, triggerRef, setReference);
     const handleClick = (event) => {
         onClick?.(event);
@@ -94,13 +72,13 @@ const PopoverTrigger = React.forwardRef(function PopoverTrigger({ children, asCh
             onOpenChange(!open);
         }
     };
-    const referenceProps = getReferenceProps({
+    const referenceProps = {
         ...triggerProps,
         onClick: handleClick,
         'aria-haspopup': 'dialog',
         'aria-expanded': open,
         'aria-controls': `${idPrefix}-content`,
-    });
+    };
     if (asChild) {
         if (!React.isValidElement(children)) {
             throw new Error('Popover.Trigger with asChild expects a single valid React element child.');
@@ -110,15 +88,14 @@ const PopoverTrigger = React.forwardRef(function PopoverTrigger({ children, asCh
     return (jsx("button", { ref: mergedRef, type: type ?? 'button', ...referenceProps, children: children }));
 });
 PopoverTrigger.displayName = 'Popover.Trigger';
-const PopoverContent = React.forwardRef(function PopoverContent({ className, style, children, ...props }, ref) {
-    const { open, idPrefix, setFloating, floatingStyles, floatingContext, getFloatingProps, } = usePopoverContext();
-    const floatingProps = getFloatingProps(props);
+const PopoverContent = React.forwardRef(function PopoverContent({ className, style, children, initialFocusRef, ...props }, ref) {
+    const { open, idPrefix, triggerRef, floatingRef, setFloating, floatingStyles, } = usePopoverContext();
     if (!open)
         return null;
-    return (jsx(Portal, { children: jsx(FloatingFocusManager, { context: floatingContext, modal: true, returnFocus: true, outsideElementsInert: false, initialFocus: 0, children: jsx("div", { id: `${idPrefix}-content`, ref: mergeRefs(ref, setFloating), className: clsx(styles.popover_content, className), style: {
+    return (jsx(Portal, { children: jsx(FocusScope, { contentRef: floatingRef, triggerRef: triggerRef, initialFocusRef: initialFocusRef, children: jsx("div", { id: `${idPrefix}-content`, ref: mergeRefs(ref, setFloating), className: clsx(styles.popover_content, className), style: {
                     ...floatingStyles,
                     ...style,
-                }, ...floatingProps, children: children }) }) }));
+                }, tabIndex: -1, ...props, children: children }) }) }));
 });
 PopoverContent.displayName = 'Popover.Content';
 const Popover = Object.assign(PopoverRoot, {

package/dist/esm/Popover/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":["../../../src/Popover/index.tsx"],"sourcesContent":[null],"names":["_jsx"],"mappings":"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"}
+{"version":3,"file":"index.mjs","sources":["../../../src/Popover/index.tsx"],"sourcesContent":[null],"names":["_jsx"],"mappings":"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"}

package/dist/esm/Tooltip/index.mjs

@@ -1,9 +1,10 @@
 'use client';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { useFloating, autoUpdate, useHover, useFocus, useDismiss, useInteractions } from '@floating-ui/react';
 import clsx from 'clsx';
 import React from 'react';
-import { createFloatingMiddleware, toFloatingPlacement } from '../hooks/floatingConfig.mjs';
+import { useDismissibleLayer } from '../floating/dismissibleLayer.mjs';
+import { useFloatingPosition } from '../floating/useFloatingPosition.mjs';
+import { useTooltipInteractions } from '../floating/useTooltipInteractions.mjs';
 import { useControllableValue } from '../hooks/useControllableState.mjs';
 import Portal from '../utils/Portal.mjs';
 import { Slot } from '../utils/slot.mjs';
@@ -13,56 +14,50 @@ function Tooltip({ children, asChild = false, content, open, defaultOpen = false
     const generatedId = React.useId();
     const tooltipId = id ?? `${generatedId}-tooltip`;
     const [isOpen, setOpen] = useControllableValue(open, defaultOpen, onOpenChange);
-    const { refs, floatingStyles, context } = useFloating({
+    const { referenceRef, floatingRef, setReference, setFloating, floatingStyles, } = useFloatingPosition({
         open: isOpen,
-        onOpenChange: setOpen,
-        placement: toFloatingPlacement(placement, 'center'),
-        middleware: createFloatingMiddleware(offset),
-        strategy: 'fixed',
-        transform: false,
-        whileElementsMounted: autoUpdate,
+        side: placement,
+        alignment: 'center',
+        offset,
     });
-    const hover = useHover(context, {
-        delay: {
-            open: delay,
-            close: 0,
-        },
-        move: false,
+    const interactionProps = useTooltipInteractions({
+        open: isOpen,
+        delay,
+        reference: referenceRef.current,
+        onOpenChange: setOpen,
     });
-    const focus = useFocus(context);
-    const dismiss = useDismiss(context, {
-        escapeKey: true,
-        outsidePress: false,
+    const handleDismiss = React.useCallback(() => {
+        setOpen(false);
+    }, [setOpen]);
+    useDismissibleLayer({
+        open: isOpen,
+        referenceRef,
+        floatingRef,
+        closeOnEscape: true,
+        closeOnOutsidePointerDown: false,
+        onDismiss: handleDismiss,
     });
-    const { getReferenceProps, getFloatingProps } = useInteractions([
-        hover,
-        focus,
-        dismiss,
-    ]);
-    const referenceProps = getReferenceProps({
+    const referenceProps = {
+        ...interactionProps,
         'aria-describedby': isOpen ? tooltipId : undefined,
-    });
+    };
     let triggerElement;
     if (asChild) {
         if (!React.isValidElement(children)) {
             throw new Error('Tooltip with asChild expects a single valid React element child.');
         }
-        triggerElement = (jsx(Slot, { ref: refs.setReference, ...referenceProps, children: children }));
+        triggerElement = (jsx(Slot, { ref: setReference, ...referenceProps, children: children }));
     }
     else {
-        triggerElement = (jsx("button", { ref: refs.setReference, type: 'button', ...referenceProps, children: children }));
+        triggerElement = (jsx("button", { ref: setReference, type: 'button', ...referenceProps, children: children }));
     }
     if (typeof document === 'undefined') {
         return triggerElement;
     }
-    const floatingProps = getFloatingProps({
-        id: tooltipId,
-        role: 'tooltip',
-    });
-    return (jsxs(Fragment, { children: [triggerElement, isOpen && (jsx(Portal, { children: jsx("div", { ref: refs.setFloating, className: clsx(styles.tooltip, className), style: {
+    return (jsxs(Fragment, { children: [triggerElement, isOpen && (jsx(Portal, { children: jsx("div", { ref: setFloating, className: clsx(styles.tooltip, className), style: {
                         ...floatingStyles,
                         ...style,
-                    }, ...floatingProps, children: content }) }))] }));
+                    }, id: tooltipId, role: 'tooltip', children: content }) }))] }));
 }
 
 export { Tooltip as default };

package/dist/esm/Tooltip/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":["../../../src/Tooltip/index.tsx"],"sourcesContent":[null],"names":["_jsx","_jsxs","_Fragment"],"mappings":"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"}
+{"version":3,"file":"index.mjs","sources":["../../../src/Tooltip/index.tsx"],"sourcesContent":[null],"names":["_jsx","_jsxs","_Fragment"],"mappings":";;;;;;;;;;;;AA2BA,SAAS,OAAO,CAAC,EACf,QAAQ,EACR,OAAO,GAAG,KAAK,EACf,OAAO,EACP,IAAI,EACJ,WAAW,GAAG,KAAK,EACnB,YAAY,EACZ,SAAS,GAAG,KAAK,EACjB,MAAM,GAAG,CAAC,EACV,KAAK,GAAG,GAAG,EACX,EAAE,EACF,SAAS,EACT,KAAK,GACkB,EAAA;AACvB,IAAA,MAAM,WAAW,GAAG,KAAK,CAAC,KAAK,EAAE;AACjC,IAAA,MAAM,SAAS,GAAG,EAAE,IAAI,CAAA,EAAG,WAAW,UAAU;AAChD,IAAA,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,oBAAoB,CAC5C,IAAI,EACJ,WAAW,EACX,YAAY,CACb;AAED,IAAA,MAAM,EACJ,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,WAAW,EACX,cAAc,GACf,GAAG,mBAAmB,CAAC;AACtB,QAAA,IAAI,EAAE,MAAM;AACZ,QAAA,IAAI,EAAE,SAAS;AACf,QAAA,SAAS,EAAE,QAAQ;QACnB,MAAM;AACP,KAAA,CAAC;IAEF,MAAM,gBAAgB,GAAG,sBAAsB,CAAC;AAC9C,QAAA,IAAI,EAAE,MAAM;QACZ,KAAK;QACL,SAAS,EAAE,YAAY,CAAC,OAAO;AAC/B,QAAA,YAAY,EAAE,OAAO;AACtB,KAAA,CAAC;AAEF,IAAA,MAAM,aAAa,GAAG,KAAK,CAAC,WAAW,CAAC,MAAK;QAC3C,OAAO,CAAC,KAAK,CAAC;AAChB,IAAA,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;AAEb,IAAA,mBAAmB,CAAC;AAClB,QAAA,IAAI,EAAE,MAAM;QACZ,YAAY;QACZ,WAAW;AACX,QAAA,aAAa,EAAE,IAAI;AACnB,QAAA,yBAAyB,EAAE,KAAK;AAChC,QAAA,SAAS,EAAE,aAAa;AACzB,KAAA,CAAC;AAEF,IAAA,MAAM,cAAc,GAAsC;AACxD,QAAA,GAAG,gBAAgB;QACnB,kBAAkB,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;KACnD;AAED,IAAA,IAAI,cAAkC;IAEtC,IAAI,OAAO,EAAE;QACX,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE;AACnC,YAAA,MAAM,IAAI,KAAK,CACb,kEAAkE,CACnE;QACH;AAEA,QAAA,cAAc,IACZA,GAAA,CAAC,IAAI,IACH,GAAG,EAAE,YAA8C,EAAA,GAC/C,cAAc,EAAA,QAAA,EAEjB,QAAQ,EAAA,CACJ,CACR;IACH;SAAO;AACL,QAAA,cAAc,IACZA,GAAA,CAAA,QAAA,EAAA,EACE,GAAG,EAAE,YAA4C,EACjD,IAAI,EAAC,QAAQ,KACR,cAAgE,EAAA,QAAA,EAEpE,QAAQ,EAAA,CACF,CACV;IACH;AAEA,IAAA,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE;AACnC,QAAA,OAAO,cAAc;IACvB;IAEA,QACEC,IAAA,CAAAC,QAAA,EAAA,EAAA,QAAA,EAAA,CACG,cAAc,EAEd,MAAM,KACLF,GAAA,CAAC,MAAM,EAAA,EAAA,QAAA,EACLA,GAAA,CAAA,KAAA,EAAA,EACE,GAAG,EAAE,WAAwC,EAC7C,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,EAC1C,KAAK,EAAE;AACL,wBAAA,GAAG,cAAc;AACjB,wBAAA,GAAG,KAAK;AACT,qBAAA,EACD,EAAE,EAAE,SAAS,EACb,IAAI,EAAC,SAAS,EAAA,QAAA,EAEb,OAAO,EAAA,CACJ,EAAA,CACC,CACV,CAAA,EAAA,CACA;AAEP;;;;"}