@milktop/react-ui 0.3.25 → 0.3.26

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.
@@ -55,6 +55,7 @@ import { Portal } from '@ark-ui/react/portal';
55
55
  import '../icons.js';
56
56
  import { cx, on, partOf, partsOf, withParts } from '../utils.js';
57
57
  import { useMessages } from '../format/LocaleProvider.js';
58
+ import { InLayer } from '../layer.js';
58
59
  import '../theme.css';
59
60
  import './dialog.css';
60
61
  function Header({ heading = null, description = null, children, ...rest }) {
@@ -74,7 +75,7 @@ function DialogShortcut({ open, defaultOpen, onOpenChange, onExitComplete, headi
74
75
  const content = composed ? nodes.filter((node) => !triggers.includes(node)) : children;
75
76
  // Left out when not given: Zag reads undefined as a value.
76
77
  const state = { ...(open !== undefined && { open }), ...(defaultOpen !== undefined && { defaultOpen }) };
77
- return (_jsxs(Ark.Root, { ...state, ...on('onOpenChange', onOpenChange, (details) => details.open), ...(onExitComplete && { onExitComplete }), role: alert ? 'alertdialog' : 'dialog', closeOnInteractOutside: !alert, lazyMount: true, unmountOnExit: true, children: [trigger && _jsx(Ark.Trigger, { asChild: true, children: trigger }), composed && triggers, _jsxs(Portal, { children: [_jsx(Ark.Backdrop, { ...part('backdrop') }), _jsx(Ark.Positioner, { ...part('positioner'), children: _jsxs(Ark.Content, { ...rest, ...part('content'), className: cx(className, classes?.content), "data-size": size, children: [closable && _jsx(Ark.CloseTrigger, { ...part('close-trigger'), "aria-label": t.common.close, children: _jsx("iconify-icon", { icon: "lucide:x" }) }), (heading || description) && (_jsxs("div", { ...part('header'), children: [heading && _jsx(Ark.Title, { ...part('title'), children: heading }), description && _jsx(Ark.Description, { ...part('description'), children: description })] })), composed ? content : children != null && _jsx("div", { ...part('body'), children: children }), footer && _jsx("div", { ...part('footer'), children: footer })] }) })] })] }));
78
+ return (_jsxs(Ark.Root, { ...state, ...on('onOpenChange', onOpenChange, (details) => details.open), ...(onExitComplete && { onExitComplete }), role: alert ? 'alertdialog' : 'dialog', closeOnInteractOutside: !alert, lazyMount: true, unmountOnExit: true, children: [trigger && _jsx(Ark.Trigger, { asChild: true, children: trigger }), composed && triggers, _jsx(InLayer.Provider, { value: true, children: _jsxs(Portal, { children: [_jsx(Ark.Backdrop, { ...part('backdrop') }), _jsx(Ark.Positioner, { ...part('positioner'), children: _jsxs(Ark.Content, { ...rest, ...part('content'), className: cx(className, classes?.content), "data-size": size, children: [closable && _jsx(Ark.CloseTrigger, { ...part('close-trigger'), "aria-label": t.common.close, children: _jsx("iconify-icon", { icon: "lucide:x" }) }), (heading || description) && (_jsxs("div", { ...part('header'), children: [heading && _jsx(Ark.Title, { ...part('title'), children: heading }), description && _jsx(Ark.Description, { ...part('description'), children: description })] })), composed ? content : children != null && _jsx("div", { ...part('body'), children: children }), footer && _jsx("div", { ...part('footer'), children: footer })] }) })] }) })] }));
78
79
  }
79
80
  export const Dialog = withParts(DialogShortcut, {
80
81
  Root: Ark.Root,
@@ -0,0 +1 @@
1
+ export declare const InLayer: import("react").Context<boolean>;
package/dist/layer.js ADDED
@@ -0,0 +1,4 @@
1
+ import { createContext } from 'react';
2
+ // True inside a Dialog or Sheet (z-index 100). A Popover there opens on top of it: its portal lands
3
+ // before the dialog's in the page (children mount first), so an equal z-index would leave it behind.
4
+ export const InLayer = createContext(false);
@@ -1,4 +1,4 @@
1
- import type { ReactElement, ReactNode } from 'react';
1
+ import { type ReactElement, type ReactNode } from 'react';
2
2
  import { Popover as Ark, type PopoverOpenChangeDetails } from '@ark-ui/react/popover';
3
3
  import '../icons.js';
4
4
  import { type Classes } from '../utils.js';
@@ -26,16 +26,19 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
26
26
  * </Popover.Root>
27
27
  */
28
28
  import { Portal } from '@ark-ui/react/portal';
29
+ import { useContext } from 'react';
29
30
  import { Popover as Ark } from '@ark-ui/react/popover';
30
31
  import '../icons.js';
31
32
  import { cx, on, partOf, partsOf, withParts } from '../utils.js';
32
33
  import { useMessages } from '../format/LocaleProvider.js';
34
+ import { InLayer } from '../layer.js';
33
35
  import '../theme.css';
34
36
  import './popover.css';
35
37
  function PopoverShortcut({ trigger = null, heading = null, description = null, closable = false, arrow = false, modal = false, open, defaultOpen, onOpenChange, placement = 'bottom', className, classes, children, ...rest }) {
36
38
  const t = useMessages();
37
39
  const part = partsOf('popover', classes);
38
- return (_jsxs(Ark.Root, { modal: modal, positioning: { placement, strategy: 'fixed' }, ...(open !== undefined && { open }), ...(defaultOpen !== undefined && { defaultOpen }), ...on('onOpenChange', onOpenChange, (details) => details.open), children: [trigger && _jsx(Ark.Trigger, { asChild: true, children: trigger }), _jsx(Portal, { children: _jsx(Ark.Positioner, { ...part('positioner'), children: _jsxs(Ark.Content, { ...rest, ...part('content'), className: cx(className, classes?.content), children: [arrow && _jsx(Ark.Arrow, { ...part('arrow'), children: _jsx(Ark.ArrowTip, { ...part('arrow-tip') }) }), (heading || description) && (_jsxs("div", { ...part('header'), children: [heading && _jsx(Ark.Title, { ...part('title'), children: heading }), description && _jsx(Ark.Description, { ...part('description'), children: description })] })), children, closable && _jsx(Ark.CloseTrigger, { ...part('close-trigger'), "aria-label": t.common.close, children: _jsx("iconify-icon", { icon: "lucide:x" }) })] }) }) })] }));
40
+ const layered = useContext(InLayer) ? { 'data-layered': '' } : {};
41
+ return (_jsxs(Ark.Root, { modal: modal, positioning: { placement, strategy: 'fixed' }, ...(open !== undefined && { open }), ...(defaultOpen !== undefined && { defaultOpen }), ...on('onOpenChange', onOpenChange, (details) => details.open), children: [trigger && _jsx(Ark.Trigger, { asChild: true, children: trigger }), _jsx(Portal, { children: _jsx(Ark.Positioner, { ...part('positioner'), ...layered, children: _jsxs(Ark.Content, { ...rest, ...part('content'), ...layered, className: cx(className, classes?.content), children: [arrow && _jsx(Ark.Arrow, { ...part('arrow'), children: _jsx(Ark.ArrowTip, { ...part('arrow-tip') }) }), (heading || description) && (_jsxs("div", { ...part('header'), children: [heading && _jsx(Ark.Title, { ...part('title'), children: heading }), description && _jsx(Ark.Description, { ...part('description'), children: description })] })), children, closable && _jsx(Ark.CloseTrigger, { ...part('close-trigger'), "aria-label": t.common.close, children: _jsx("iconify-icon", { icon: "lucide:x" }) })] }) }) })] }));
39
42
  }
40
43
  export const Popover = withParts(PopoverShortcut, {
41
44
  Root: Ark.Root,
@@ -2,6 +2,9 @@
2
2
  /* The positioner carries the z-index itself. Zag sets it inline as
3
3
  var(--z-index) but doesn't always fill in the variable, so set both. */
4
4
  [data-scope=popover][data-part=positioner] { z-index: 50; --z-index: 50; }
5
+ /* Opened from a dialog or sheet (100): above it, below tooltips (110). Zag copies the content's
6
+ z-index inline when it opens, so the content carries it too. */
7
+ [data-scope=popover]:is([data-part=positioner], [data-part=content])[data-layered] { z-index: 105; --z-index: 105; }
5
8
  [data-scope=popover][data-part=content] { z-index: 50; position: relative; width: 18rem; max-width: calc(100vw - 32px);
6
9
  padding: 1rem; box-sizing: border-box; outline: none; font-weight: 400;
7
10
  background: var(--ui-surface); color: var(--ui-text); font-family: var(--ui-font); font-size: 14px;
@@ -30,6 +30,7 @@ import { Portal } from '@ark-ui/react/portal';
30
30
  import '../icons.js';
31
31
  import { cx, on, partOf, partsOf, withParts } from '../utils.js';
32
32
  import { useMessages } from '../format/LocaleProvider.js';
33
+ import { InLayer } from '../layer.js';
33
34
  import '../theme.css';
34
35
  import './sheet.css';
35
36
  // Ark's dialog stamps data-scope="dialog"; ours wins, so Dialog's CSS stays off.
@@ -53,7 +54,7 @@ function SheetShortcut({ open, defaultOpen, onOpenChange, side = 'right', size =
53
54
  const composed = nodes.some((node) => isValidElement(node) && layout.includes(node.type));
54
55
  const triggers = nodes.filter((node) => isValidElement(node) && node.type === Ark.Trigger);
55
56
  const content = composed ? nodes.filter((node) => !triggers.includes(node)) : children;
56
- return (_jsxs(Ark.Root, { ...(open !== undefined && { open }), ...(defaultOpen !== undefined && { defaultOpen }), ...on('onOpenChange', onOpenChange, (details) => details.open), role: alert ? 'alertdialog' : 'dialog', modal: modal, trapFocus: modal, preventScroll: modal, closeOnInteractOutside: modal && !alert, lazyMount: true, unmountOnExit: true, children: [trigger && _jsx(Ark.Trigger, { asChild: true, children: trigger }), composed && triggers, _jsxs(Portal, { children: [modal && _jsx(Ark.Backdrop, { ...part('backdrop') }), _jsx(Ark.Positioner, { ...part('positioner'), "data-side": side, children: _jsxs(Ark.Content, { ...rest, ...part('content'), className: cx(className, classes?.content), "data-side": side, "data-size": size, children: [closable && _jsx(Ark.CloseTrigger, { ...part('close-trigger'), "aria-label": t.common.close, children: _jsx("iconify-icon", { icon: "lucide:x" }) }), composed ? content : _jsxs(_Fragment, { children: [(heading || description) && (_jsxs("div", { ...part('header'), children: [heading && _jsx(Ark.Title, { ...part('title'), children: heading }), description && _jsx(Ark.Description, { ...part('description'), children: description })] })), _jsx("div", { ...part('body'), children: children }), footer && _jsx("div", { ...part('footer'), children: footer })] })] }) })] })] }));
57
+ return (_jsxs(Ark.Root, { ...(open !== undefined && { open }), ...(defaultOpen !== undefined && { defaultOpen }), ...on('onOpenChange', onOpenChange, (details) => details.open), role: alert ? 'alertdialog' : 'dialog', modal: modal, trapFocus: modal, preventScroll: modal, closeOnInteractOutside: modal && !alert, lazyMount: true, unmountOnExit: true, children: [trigger && _jsx(Ark.Trigger, { asChild: true, children: trigger }), composed && triggers, _jsx(InLayer.Provider, { value: true, children: _jsxs(Portal, { children: [modal && _jsx(Ark.Backdrop, { ...part('backdrop') }), _jsx(Ark.Positioner, { ...part('positioner'), "data-side": side, children: _jsxs(Ark.Content, { ...rest, ...part('content'), className: cx(className, classes?.content), "data-side": side, "data-size": size, children: [closable && _jsx(Ark.CloseTrigger, { ...part('close-trigger'), "aria-label": t.common.close, children: _jsx("iconify-icon", { icon: "lucide:x" }) }), composed ? content : _jsxs(_Fragment, { children: [(heading || description) && (_jsxs("div", { ...part('header'), children: [heading && _jsx(Ark.Title, { ...part('title'), children: heading }), description && _jsx(Ark.Description, { ...part('description'), children: description })] })), _jsx("div", { ...part('body'), children: children }), footer && _jsx("div", { ...part('footer'), children: footer })] })] }) })] }) })] }));
57
58
  }
58
59
  export const Sheet = withParts(SheetShortcut, {
59
60
  Header, Body, Footer,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@milktop/react-ui",
3
- "version": "0.3.25",
3
+ "version": "0.3.26",
4
4
  "description": "React components on Ark UI (Zag state machines), with imba-ui's API and design",
5
5
  "license": "MIT",
6
6
  "author": "André Goldstein",