@janbox/storefront-ui 4.0.12 → 4.0.13

package/dist/lib/dialog/dialog/dialog.js

@@ -1,11 +1,9 @@
-import { jsx, jsxs } from "react/jsx-runtime";
+import { jsx } from "react/jsx-runtime";
 import { getDialogProps, getDialogSizeInNumber } from "./helpers.js";
-import { FLOATING_Z_INDEX } from "../../../theme/index.js";
+import { breakpoint } from "../../../theme/screens.js";
+import { getColorVar } from "../../../theme/palette.js";
 import { Floating } from "../../floating/floating/floating.js";
 import { FloatingContent } from "../../floating/floating-content/floating-content.js";
-import { Primitive } from "../../primitive/primitive.js";
-import { getColorVar } from "../../../theme/palette.js";
-import { mediaQuery } from "../../../theme/screens.js";
 const Dialog = (_props) => {
   const { size, sm, md, lg, children, ...props } = getDialogProps(_props);
   return /* @__PURE__ */ jsx(
@@ -15,71 +13,41 @@ const Dialog = (_props) => {
         enabled: true
       },
       ...props,
-      children: /* @__PURE__ */ jsxs(
+      children: /* @__PURE__ */ jsx(
         FloatingContent,
         {
-          floatingOverlayProps: {
-            disabled: false,
-            css: {
-              display: "grid",
-              placeItems: "center",
-              padding: "1rem",
-              [mediaQuery("sm")]: { padding: "1.25rem" },
-              [mediaQuery("md")]: { padding: "1.5rem" }
-            },
+          overlay: {
             lockScroll: true,
             style: {
-              zIndex: FLOATING_Z_INDEX
+              display: "grid",
+              placeItems: "center",
+              backgroundColor: "rgba(0, 0, 0, 0.4)",
+              backdropFilter: "blur(2px)"
             }
           },
           sx: {
-            maxHeight: "100%",
-            maxWidth: "100%",
+            width: getDialogSizeInNumber(size),
+            backgroundColor: getColorVar("surface.default"),
+            maxWidth: `calc(100% - ${breakpoint.xs.padding * 2}px)`,
             overflow: "hidden",
             display: "flex",
-            flexDirection: "column"
+            flexDirection: "column",
+            borderRadius: 8,
+            paddingBlock: 8,
+            sm: {
+              width: getDialogSizeInNumber(sm == null ? void 0 : sm.size),
+              maxWidth: `calc(100% - ${breakpoint.sm.padding * 2}px)`
+            },
+            md: {
+              width: getDialogSizeInNumber(md == null ? void 0 : md.size),
+              maxWidth: `calc(100% - ${breakpoint.md.padding * 2}px)`
+            },
+            lg: {
+              width: getDialogSizeInNumber(lg == null ? void 0 : lg.size),
+              maxWidth: `calc(100% - ${breakpoint.lg.padding * 2}px)`
+            }
           },
-          children: [
-            /* @__PURE__ */ jsx(
-              Primitive,
-              {
-                sx: {
-                  backdropFilter: "blur(2px)",
-                  position: "fixed",
-                  inset: 0,
-                  backgroundColor: "rgba(0, 0, 0, 0.4)",
-                  pointerEvents: "none"
-                }
-              }
-            ),
-            /* @__PURE__ */ jsx(
-              Primitive,
-              {
-                sx: {
-                  width: getDialogSizeInNumber(size),
-                  backgroundColor: getColorVar("surface.default"),
-                  maxWidth: "100%",
-                  overflow: "hidden",
-                  display: "flex",
-                  flexDirection: "column",
-                  borderRadius: "0.5rem",
-                  paddingTop: "0.5rem",
-                  paddingBottom: "0.5rem",
-                  position: "relative",
-                  sm: {
-                    width: getDialogSizeInNumber(sm == null ? void 0 : sm.size)
-                  },
-                  md: {
-                    width: getDialogSizeInNumber(md == null ? void 0 : md.size)
-                  },
-                  lg: {
-                    width: getDialogSizeInNumber(lg == null ? void 0 : lg.size)
-                  }
-                },
-                children
-              }
-            )
-          ]
+          children
         }
       )
     }

package/dist/lib/drawer/drawer/drawer.js

@@ -1,7 +1,6 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useMemo } from "react";
 import { motion } from "motion/react";
-import { FLOATING_Z_INDEX } from "../../../theme/index.js";
 import { Floating } from "../../floating/floating/floating.js";
 import { FloatingContent } from "../../floating/floating-content/floating-content.js";
 import { Primitive } from "../../primitive/primitive.js";
@@ -39,12 +38,8 @@ const Drawer = ({ children, placement = "left", ...props }) => {
       children: /* @__PURE__ */ jsxs(
         FloatingContent,
         {
-          floatingOverlayProps: {
-            disabled: false,
-            lockScroll: true,
-            style: {
-              zIndex: FLOATING_Z_INDEX
-            }
+          overlay: {
+            lockScroll: true
           },
           sx: {
             maxHeight: "100%",

package/dist/lib/floating/floating/floating.js

@@ -30,6 +30,7 @@ const FloatingCore = ({
   offsetOptions = 4,
   sizeOptions,
   autoUpdateOptions,
+  strategy,
   ref
 }) => {
   const floating = useFloating({
@@ -72,7 +73,8 @@ const FloatingCore = ({
     whileElementsMounted: (...args) => {
       return autoUpdate(...args, autoUpdateOptions);
     },
-    elements
+    elements,
+    strategy
   });
   useImperativeHandle(ref, () => floating, [floating]);
   const { context } = floating;

package/dist/lib/floating/floating/types.d.ts

@@ -1,5 +1,5 @@
 import { PropsWithChildren } from 'react';
-import { AutoUpdateOptions, OffsetOptions, Placement, SizeOptions, UseClickProps, UseDismissProps, UseFloatingOptions, UseFloatingReturn, UseFocusProps, UseHoverProps } from '@floating-ui/react';
+import { AutoUpdateOptions, OffsetOptions, Placement, SizeOptions, Strategy, UseClickProps, UseDismissProps, UseFloatingOptions, UseFloatingReturn, UseFocusProps, UseHoverProps } from '@floating-ui/react';
 export type FloatingProps = PropsWithChildren<{
     placement?: Placement;
     onOpenChange?: UseFloatingOptions['onOpenChange'];
@@ -13,5 +13,6 @@ export type FloatingProps = PropsWithChildren<{
     sizeOptions?: SizeOptions;
     autoUpdateOptions?: AutoUpdateOptions;
     ref?: React.Ref<FloatingRef>;
+    strategy?: Strategy;
 }>;
 export type FloatingRef = UseFloatingReturn;

package/dist/lib/floating/floating-content/floating-content.d.ts

@@ -1,2 +1,2 @@
 import { FloatingContentProps } from './types';
-export declare const FloatingContent: ({ style, floatingPortalProps, floatingFocusManagerProps, floatingOverlayProps, sx, ref, ...props }: FloatingContentProps) => import("react/jsx-runtime").JSX.Element;
+export declare const FloatingContent: ({ preserveTabOrder, focus, overlay, sx, ref, ...props }: FloatingContentProps) => import("react/jsx-runtime").JSX.Element;

package/dist/lib/floating/floating-content/floating-content.js

@@ -1,55 +1,46 @@
 import { jsx } from "react/jsx-runtime";
-import { useMergeRefs, FloatingPortal, FloatingOverlay, FloatingFocusManager } from "@floating-ui/react";
-import { AnimatePresence, motion } from "motion/react";
+import { useMergeRefs, FloatingFocusManager, FloatingPortal, FloatingOverlay } from "@floating-ui/react";
+import { motion, AnimatePresence } from "motion/react";
 import { useFloatingContext } from "../floating/helpers.js";
 import { FLOATING_Z_INDEX } from "../../../theme/index.js";
 import { useIsHydrated } from "../../../hooks/use-is-hydrated/index.js";
 import { usePortalContainer } from "../../../theme/provider.js";
 import { Stylesheet } from "../../stylesheet/stylesheet.js";
-const FloatingContent = ({
-  style,
-  floatingPortalProps,
-  floatingFocusManagerProps,
-  floatingOverlayProps,
-  sx,
-  ref,
-  ...props
-}) => {
+const FloatingContent = ({ preserveTabOrder, focus, overlay, sx, ref, ...props }) => {
   const { getFloatingProps, context } = useFloatingContext();
   const mergedRefs = useMergeRefs([context.refs.setFloating, ref]);
   const isHydrated = useIsHydrated();
   const portalRoot = usePortalContainer();
-  const { root = portalRoot, ...portalProps } = floatingPortalProps ?? {};
-  const resolvedRoot = root || void 0;
-  return /* @__PURE__ */ jsx(AnimatePresence, { children: context.open && isHydrated && /* @__PURE__ */ jsx(FloatingPortal, { root: resolvedRoot, ...portalProps, children: /* @__PURE__ */ jsx(
-    FloatingOverlay,
+  const mainContent = /* @__PURE__ */ jsx(FloatingFocusManager, { initialFocus: -1, context, ...focus, children: /* @__PURE__ */ jsx(Stylesheet, { children: ({ cx, css }) => /* @__PURE__ */ jsx(
+    motion.div,
     {
-      ...floatingOverlayProps,
+      initial: { opacity: 0 },
+      animate: { opacity: 1 },
+      exit: { opacity: 0 },
+      ...getFloatingProps({
+        ...props,
+        className: cx(css(sx), props.className)
+      }),
       style: {
-        display: (floatingOverlayProps == null ? void 0 : floatingOverlayProps.disabled) ?? true ? "contents" : void 0,
-        ...floatingOverlayProps == null ? void 0 : floatingOverlayProps.style
+        ...context.elements.reference ? context.floatingStyles : {},
+        ...props.style,
+        zIndex: FLOATING_Z_INDEX
       },
-      children: /* @__PURE__ */ jsx(FloatingFocusManager, { disabled: true, context, ...floatingFocusManagerProps, children: /* @__PURE__ */ jsx(Stylesheet, { children: ({ cx, css }) => /* @__PURE__ */ jsx(
-        motion.div,
-        {
-          initial: { opacity: 0 },
-          animate: { opacity: 1 },
-          exit: { opacity: 0 },
-          style: {
-            ...context.elements.reference ? context.floatingStyles : {},
-            ...style,
-            zIndex: FLOATING_Z_INDEX
-          },
-          ...getFloatingProps({
-            ...props,
-            className: cx(css(sx), props.className)
-          }),
-          ref: mergedRefs,
-          children: props.children
-        }
-      ) }) })
+      ref: mergedRefs,
+      children: props.children
     }
   ) }) });
+  return /* @__PURE__ */ jsx(AnimatePresence, { children: context.open && isHydrated && /* @__PURE__ */ jsx(FloatingPortal, { root: portalRoot ?? void 0, preserveTabOrder, children: overlay ? /* @__PURE__ */ jsx(
+    FloatingOverlay,
+    {
+      ...overlay,
+      style: {
+        zIndex: FLOATING_Z_INDEX,
+        ...overlay.style
+      },
+      children: mainContent
+    }
+  ) : mainContent }) });
 };
 export {
   FloatingContent

package/dist/lib/floating/floating-content/types.d.ts

@@ -1,12 +1,8 @@
 import { ComponentProps, HTMLProps } from 'react';
-import { Interpolation } from '@emotion/react';
-import { FloatingFocusManager, FloatingOverlay, FloatingPortal } from '@floating-ui/react';
-import { PropsWithSx, ShallowMerge } from '../../../types';
+import { FloatingFocusManager, FloatingOverlay, FloatingPortal, FloatingPortalProps } from '@floating-ui/react';
+import { PropsWithSx } from '../../../types';
 export type FloatingContentProps = PropsWithSx<HTMLProps<HTMLDivElement> & {
     floatingPortalProps?: Partial<ComponentProps<typeof FloatingPortal>>;
-    floatingOverlayProps?: Partial<ShallowMerge<ComponentProps<typeof FloatingOverlay>, {
-        disabled: boolean;
-        css?: Interpolation;
-    }>>;
-    floatingFocusManagerProps?: Partial<ComponentProps<typeof FloatingFocusManager>>;
-}>;
+    focus?: Partial<ComponentProps<typeof FloatingFocusManager>>;
+    overlay?: Partial<ComponentProps<typeof FloatingOverlay>>;
+} & Pick<FloatingPortalProps, 'preserveTabOrder'>>;

package/dist/lib/lightbox/lightbox.js

@@ -269,16 +269,11 @@ const Lightbox = ({ slides, defaultActiveIndex, ...props }) => {
       children: /* @__PURE__ */ jsx(
         FloatingContent,
         {
-          floatingOverlayProps: {
-            disabled: false,
+          overlay: {
             lockScroll: true,
             style: {
               zIndex: FLOATING_Z_INDEX,
-              backdropFilter: "blur(4px)"
-            },
-            css: {
-              position: "fixed",
-              inset: 0,
+              backdropFilter: "blur(4px)",
               backgroundColor: "rgba(0, 0, 0, 0.9)",
               color: "white"
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@janbox/storefront-ui",
-  "version": "4.0.12",
+  "version": "4.0.13",
   "description": "Storefront UI component library for Janbox",
   "author": "Janbox",
   "keywords": [