@glasshome/ui 1.42.0 → 1.44.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.
Files changed (153) hide show
  1. package/SPEC.md +8 -5
  2. package/dist/index.js +2 -2
  3. package/dist/lib/anchor-placement.d.ts +4 -0
  4. package/dist/lib/balance-rows.d.ts +10 -4
  5. package/dist/lib/behavior/anchored.d.ts +16 -3
  6. package/dist/lib/behavior/button-root.d.ts +7 -0
  7. package/dist/lib/behavior/collection.d.ts +8 -0
  8. package/dist/lib/behavior/dismiss.d.ts +6 -4
  9. package/dist/lib/behavior/focus-scope.d.ts +9 -1
  10. package/dist/lib/behavior/hide-outside.d.ts +1 -1
  11. package/dist/lib/behavior/layer-stack.d.ts +3 -2
  12. package/dist/lib/behavior/menu.d.ts +62 -0
  13. package/dist/lib/behavior/modal-root.d.ts +2 -0
  14. package/dist/lib/behavior/range.d.ts +44 -0
  15. package/dist/lib/color/color.d.ts +41 -0
  16. package/dist/lib/color/index.d.ts +2 -0
  17. package/dist/lib/color/intl.d.ts +40 -0
  18. package/dist/lib/dock-slot-classes.d.ts +2 -0
  19. package/dist/lib/hold.d.ts +1 -1
  20. package/dist/lib/locale.d.ts +3 -0
  21. package/dist/lib/menu-classes.d.ts +2 -0
  22. package/dist/lib/motion-classes.d.ts +2 -1
  23. package/dist/lib/overlay-classes.d.ts +1 -0
  24. package/dist/lib/scroll-track.d.ts +3 -2
  25. package/dist/lib/section-tokens.d.ts +1 -1
  26. package/dist/lib/segment-classes.d.ts +2 -0
  27. package/dist/lib/shadow-layer.d.ts +0 -45
  28. package/dist/lib/toggle-set.d.ts +44 -0
  29. package/dist/lib/visually-hidden.d.ts +3 -0
  30. package/dist/solid/accordion.d.ts +35 -11
  31. package/dist/solid/avatar.d.ts +8 -4
  32. package/dist/solid/bottom-sheet/bottom-sheet.d.ts +1 -1
  33. package/dist/solid/button.d.ts +5 -4
  34. package/dist/solid/charts.d.ts +1 -1
  35. package/dist/solid/checkbox.d.ts +14 -4
  36. package/dist/solid/collapsible.d.ts +33 -5
  37. package/dist/solid/color-disc.d.ts +1 -1
  38. package/dist/solid/color-slider.d.ts +1 -1
  39. package/dist/solid/color-wheel.d.ts +1 -1
  40. package/dist/solid/context-menu.d.ts +58 -24
  41. package/dist/solid/data-table.d.ts +4 -2
  42. package/dist/solid/dialog-parts.d.ts +8 -8
  43. package/dist/solid/dropdown-menu.d.ts +55 -24
  44. package/dist/solid/empty.d.ts +1 -1
  45. package/dist/solid/form.d.ts +5 -6
  46. package/dist/solid/hover-card.d.ts +65 -9
  47. package/dist/solid/index.d.ts +1 -1
  48. package/dist/solid/index.js +7752 -13493
  49. package/dist/solid/input-group.d.ts +6 -6
  50. package/dist/solid/item.d.ts +1 -1
  51. package/dist/solid/menu-parts.d.ts +175 -24
  52. package/dist/solid/option-card.d.ts +1 -4
  53. package/dist/solid/picker-row.d.ts +2 -0
  54. package/dist/solid/popover.d.ts +77 -12
  55. package/dist/solid/progress.d.ts +11 -3
  56. package/dist/solid/radio-group.d.ts +31 -6
  57. package/dist/solid/responsive-dialog.d.ts +1 -1
  58. package/dist/solid/scroll-area.d.ts +1 -1
  59. package/dist/solid/section-card.d.ts +2 -3
  60. package/dist/solid/select.d.ts +107 -10
  61. package/dist/solid/selection.d.ts +10 -1
  62. package/dist/solid/sheet.d.ts +1 -1
  63. package/dist/solid/sliding-indicator.d.ts +1 -1
  64. package/dist/solid/sonner.d.ts +1 -1
  65. package/dist/solid/toggle.d.ts +11 -3
  66. package/dist/solid/tooltip.d.ts +22 -22
  67. package/dist/tokens/index.js +54 -51
  68. package/dist/{utils-CxAii-e9.js → utils-BbIeGt7o.js} +376 -314
  69. package/package.json +3 -6
  70. package/src/lib/anchor-placement.ts +10 -3
  71. package/src/lib/balance-rows.ts +115 -40
  72. package/src/lib/behavior/anchored.ts +41 -9
  73. package/src/lib/behavior/button-root.tsx +103 -0
  74. package/src/lib/behavior/collection.ts +56 -28
  75. package/src/lib/behavior/dismiss.ts +61 -21
  76. package/src/lib/behavior/focus-scope.ts +75 -9
  77. package/src/lib/behavior/hide-outside.ts +2 -2
  78. package/src/lib/behavior/layer-stack.ts +33 -8
  79. package/src/lib/behavior/menu.ts +462 -0
  80. package/src/lib/behavior/modal-root.tsx +24 -18
  81. package/src/lib/behavior/polymorphic.tsx +1 -1
  82. package/src/lib/behavior/presence.ts +1 -1
  83. package/src/lib/behavior/range.ts +212 -0
  84. package/src/lib/clipboard.ts +2 -3
  85. package/src/lib/color/color.ts +746 -0
  86. package/src/lib/color/index.ts +2 -0
  87. package/src/lib/color/intl.ts +60 -0
  88. package/src/lib/dock-slot-classes.ts +3 -0
  89. package/src/lib/hold.ts +1 -1
  90. package/src/lib/locale.ts +62 -0
  91. package/src/lib/menu-classes.ts +3 -0
  92. package/src/lib/motion-classes.ts +8 -9
  93. package/src/lib/overlay-classes.ts +1 -3
  94. package/src/lib/scroll-track.ts +11 -6
  95. package/src/lib/section-tokens.ts +1 -1
  96. package/src/lib/segment-classes.ts +3 -0
  97. package/src/lib/shadow-layer.ts +0 -118
  98. package/src/lib/toggle-set.ts +133 -0
  99. package/src/lib/visually-hidden.ts +15 -0
  100. package/src/solid/accordion.tsx +294 -20
  101. package/src/solid/area-picker.tsx +4 -4
  102. package/src/solid/avatar.tsx +98 -24
  103. package/src/solid/bottom-sheet/arbitration.ts +4 -11
  104. package/src/solid/bottom-sheet/bottom-sheet.tsx +4 -5
  105. package/src/solid/bottom-sheet/drag-controller.ts +7 -20
  106. package/src/solid/button.tsx +12 -6
  107. package/src/solid/charts.tsx +1 -1
  108. package/src/solid/checkbox.tsx +167 -44
  109. package/src/solid/collapsible.tsx +260 -12
  110. package/src/solid/color-disc.tsx +11 -12
  111. package/src/solid/color-slider.tsx +114 -47
  112. package/src/solid/color-wheel.tsx +137 -39
  113. package/src/solid/context-menu.tsx +285 -94
  114. package/src/solid/data-table.tsx +48 -22
  115. package/src/solid/dialog-parts.tsx +39 -17
  116. package/src/solid/dock.tsx +44 -43
  117. package/src/solid/dropdown-menu.tsx +252 -115
  118. package/src/solid/empty.tsx +1 -1
  119. package/src/solid/entity-selector.tsx +3 -3
  120. package/src/solid/face-toggle.tsx +43 -18
  121. package/src/solid/form.tsx +5 -6
  122. package/src/solid/glyph-tile.tsx +48 -21
  123. package/src/solid/hover-card.tsx +287 -25
  124. package/src/solid/icon-picker.tsx +1 -2
  125. package/src/solid/image-picker.tsx +2 -2
  126. package/src/solid/index.ts +1 -3
  127. package/src/solid/input-group.tsx +2 -2
  128. package/src/solid/item.tsx +1 -1
  129. package/src/solid/menu-parts.tsx +610 -155
  130. package/src/solid/option-card.tsx +7 -13
  131. package/src/solid/picker-row.tsx +5 -1
  132. package/src/solid/popover.tsx +423 -80
  133. package/src/solid/preview-tile.tsx +1 -1
  134. package/src/solid/progress.tsx +84 -15
  135. package/src/solid/radio-group.tsx +271 -34
  136. package/src/solid/responsive-dialog.tsx +1 -1
  137. package/src/solid/schema-form.tsx +1 -6
  138. package/src/solid/scroll-area.tsx +1 -1
  139. package/src/solid/section-card.tsx +3 -4
  140. package/src/solid/select.tsx +939 -95
  141. package/src/solid/selection.tsx +165 -74
  142. package/src/solid/sheet.tsx +1 -1
  143. package/src/solid/slider.tsx +115 -65
  144. package/src/solid/sliding-indicator.tsx +4 -16
  145. package/src/solid/sonner.tsx +1 -1
  146. package/src/solid/tabs.tsx +12 -6
  147. package/src/solid/term.tsx +3 -4
  148. package/src/solid/toggle-group.tsx +34 -101
  149. package/src/solid/toggle.tsx +43 -9
  150. package/src/solid/tooltip.tsx +24 -24
  151. package/src/styles/globals.css +61 -50
  152. package/src/styles/theme.css +12 -6
  153. package/src/tokens/material.ts +11 -2
@@ -1,14 +1,16 @@
1
1
  import type { Accessor } from "solid-js";
2
- import { type Layer, type LayerHandle, layerStack } from "./layer-stack";
3
- import { effect } from "./solid";
2
+ import { type Layer, type LayerHandle, layerStack } from "./layer-stack.js";
3
+ import { effect } from "./solid.js";
4
4
 
5
- export type DismissReason = "escape" | "outside-press";
5
+ export type DismissReason = "escape" | "outside-press" | "focus-outside";
6
6
 
7
7
  export interface DismissOptions {
8
8
  layer: LayerHandle;
9
- /** `event` is the keydown for `escape` and the pointerdown for `outside-press`. */
10
- onDismiss: (reason: DismissReason, event: KeyboardEvent | PointerEvent) => void;
9
+ /** `event` is the keydown for `escape`, the pointerdown for `outside-press` and the focusin for `focus-outside`. */
10
+ onDismiss: (reason: DismissReason, event: KeyboardEvent | PointerEvent | FocusEvent) => void;
11
11
  outsidePress?: Accessor<boolean>;
12
+ /** Off unless asked: a non-modal layer closes when focus lands outside it. */
13
+ focusOutside?: Accessor<boolean>;
12
14
  escapeFrom?: "layer" | "document";
13
15
  }
14
16
 
@@ -21,24 +23,63 @@ function rootOf(element: HTMLElement): Document | ShadowRoot {
21
23
 
22
24
  const takesKeys = (entry: Layer): boolean => entry.element() !== undefined;
23
25
 
26
+ // A layer in a shadow root tops its own root: layers newer in other roots never shield it.
27
+ function topsItsRoot(layer: LayerHandle, mine: Layer): boolean {
28
+ if (layer.isTop()) return true;
29
+ const root = mine.element()?.getRootNode();
30
+ if (root?.nodeType !== SHADOW_ROOT_NODE) return false;
31
+ return !layer
32
+ .above()
33
+ .some((other) => other.kind !== "tooltip" && other.element()?.getRootNode() === root);
34
+ }
35
+
36
+ function isOutside(layer: LayerHandle, event: Event): boolean {
37
+ const mine = layer.layer();
38
+ if (!mine || (mine.kind !== "menu" && !topsItsRoot(layer, mine))) return false;
39
+ const full = event.composedPath();
40
+ const listener = event.currentTarget;
41
+ const end = listener === document || !listener ? -1 : full.indexOf(listener);
42
+ return !layer.containsPath(end >= 0 ? full.slice(0, end) : full);
43
+ }
44
+
45
+ function listenersFor(element: HTMLElement) {
46
+ const root = rootOf(element);
47
+ const host = root === document ? undefined : (root as ShadowRoot).host;
48
+ return { host, targets: host ? [root, document] : [root] };
49
+ }
50
+
51
+ function createFocusOutside(options: DismissOptions) {
52
+ const { layer } = options;
53
+ effect(
54
+ () => [layer.layer()?.element(), options.focusOutside?.() ?? false] as const,
55
+ ([element, enabled]) => {
56
+ if (!element || !enabled) return;
57
+ const { host, targets } = listenersFor(element);
58
+ const onFocus = (event: FocusEvent) => {
59
+ if (event.currentTarget === document && host && event.target === host) return;
60
+ if (isOutside(layer, event)) options.onDismiss("focus-outside", event);
61
+ };
62
+ const listener = onFocus as EventListener;
63
+ // After the tick that opened it: focus moved by the opening itself is never outside.
64
+ const timer = setTimeout(() => {
65
+ for (const target of targets) target.addEventListener("focusin", listener, true);
66
+ }, 0);
67
+ return () => {
68
+ clearTimeout(timer);
69
+ for (const target of targets) target.removeEventListener("focusin", listener, true);
70
+ };
71
+ },
72
+ );
73
+ }
74
+
24
75
  function createOutsidePress(options: DismissOptions) {
25
76
  const { layer } = options;
26
77
  effect(
27
78
  () => [layer.layer()?.element(), options.outsidePress?.() ?? true] as const,
28
79
  ([element, enabled]) => {
29
80
  if (!element || !enabled) return;
30
- const root = rootOf(element);
31
- const host = root === document ? undefined : (root as ShadowRoot).host;
32
- const targets = host ? [root, document] : [root];
33
-
34
- const outside = (event: Event): boolean => {
35
- const mine = layer.layer();
36
- if (!mine || (mine.kind !== "menu" && !layer.isTop())) return false;
37
- const full = event.composedPath();
38
- const listener = event.currentTarget;
39
- const end = listener === document || !listener ? -1 : full.indexOf(listener);
40
- return !layer.containsPath(end >= 0 ? full.slice(0, end) : full);
41
- };
81
+ const { host, targets } = listenersFor(element);
82
+ const outside = (event: Event): boolean => isOutside(layer, event);
42
83
 
43
84
  let pending: { target: EventTarget; click: (e: Event) => void } | undefined;
44
85
  const dropPending = () => {
@@ -105,20 +146,18 @@ function createEscape(options: DismissOptions) {
105
146
  if (!entry || !element) return;
106
147
  if (from === "tooltip") return createTooltipEscape(options);
107
148
  escapeHandlers.set(entry, (event) => options.onDismiss("escape", event));
108
- // The root element, so the key is taken before Kobalte's document listeners hear it.
149
+ // The root element, so the key is taken before any document listener hears it.
109
150
  const target = from === "document" ? document.documentElement : element;
110
151
  const onKey = (event: KeyboardEvent) => {
111
152
  if (event.key !== "Escape" || event.isComposing || claimedKeys.has(event)) return;
112
153
  const mine = layer.layer();
113
154
  if (!mine || !takesKeys(mine)) return;
114
155
  const stack = layerStack.layers().slice(layerStack.layers().indexOf(mine));
115
- const topmost = stack.findLast((other) => other.kind !== "tooltip" && takesKeys(other));
116
- if (from === "document" && topmost !== mine && topmost?.readsOwnEscape) return;
117
156
  const claims = stack.findLast(
118
157
  (other) =>
119
158
  other.kind !== "tooltip" &&
120
159
  takesKeys(other) &&
121
- (other.escape() || (other.kind === "modal" && !other.readsOwnEscape)),
160
+ (other.escape() || other.kind === "modal"),
122
161
  );
123
162
  if (!claims) return;
124
163
  claimedKeys.add(event);
@@ -141,5 +180,6 @@ function createEscape(options: DismissOptions) {
141
180
 
142
181
  export function createDismiss(options: DismissOptions): void {
143
182
  createOutsidePress(options);
183
+ createFocusOutside(options);
144
184
  createEscape(options);
145
185
  }
@@ -1,6 +1,6 @@
1
1
  import { type Accessor, onCleanup, untrack } from "solid-js";
2
- import { layerStack } from "./layer-stack";
3
- import { effect } from "./solid";
2
+ import { layerStack } from "./layer-stack.js";
3
+ import { effect } from "./solid.js";
4
4
 
5
5
  export const CANDIDATES =
6
6
  'a[href], button:not([disabled]), input:not([disabled]), select:not([disabled]), textarea:not([disabled]), summary, [contenteditable]:not([contenteditable="false"]), [tabindex]:not([tabindex="-1"])';
@@ -33,11 +33,77 @@ export interface FocusScope {
33
33
  untrap(): void;
34
34
  }
35
35
 
36
- type FocusRoot = Document | ShadowRoot;
36
+ const DOCUMENT_NODE = 9;
37
+ const SHADOW_ROOT_NODE = 11;
37
38
 
38
- const activeOf = (el: Element): Element | null => (el.getRootNode() as FocusRoot).activeElement;
39
+ const outermostHost = (root: ShadowRoot): Element => {
40
+ let host = root.host;
41
+ for (let up = host.getRootNode(); up.nodeType === SHADOW_ROOT_NODE; up = host.getRootNode())
42
+ host = (up as ShadowRoot).host;
43
+ return host;
44
+ };
39
45
 
40
- export const hasFocus = (el: Element): boolean => activeOf(el) === el;
46
+ function readFocus(root: Node): Element | null {
47
+ if (root.nodeType === DOCUMENT_NODE) return (root as Document).activeElement;
48
+ const host = outermostHost(root as ShadowRoot);
49
+ // A shadow root holds focus only while the document's focus sits on its outermost host.
50
+ return host.ownerDocument.activeElement === host ? (root as ShadowRoot).activeElement : null;
51
+ }
52
+
53
+ const focusByRoot = new WeakMap<Node, { at: Element | null }>();
54
+
55
+ /** The focused element in the node's own root, kept from focusin and focusout, which a sealed widget receives without asking the page. */
56
+ export function focusedIn(node: Node): Element | null {
57
+ const root = node.getRootNode();
58
+ if (root.nodeType !== DOCUMENT_NODE && root.nodeType !== SHADOW_ROOT_NODE) return null;
59
+ let tracked = focusByRoot.get(root);
60
+ if (!tracked) {
61
+ // One read when the listeners attach; a focus move runs its events inside the call that makes it.
62
+ const seen = { at: readFocus(root) };
63
+ root.addEventListener(
64
+ "focusin",
65
+ (e) => {
66
+ seen.at = e.target instanceof Element ? e.target : null;
67
+ },
68
+ true,
69
+ );
70
+ root.addEventListener("focusout", () => (seen.at = null), true);
71
+ focusByRoot.set(root, seen);
72
+ tracked = seen;
73
+ }
74
+ const at = tracked.at;
75
+ if (!at?.isConnected || at.getRootNode() !== root) return null;
76
+ return at === at.ownerDocument.body ? null : at;
77
+ }
78
+
79
+ /** Whether focus sits on nothing, or still inside `el`, so a closing panel may hand it back. */
80
+ export function focusFell(el: Element): boolean {
81
+ const inner = focusedIn(el);
82
+ if (inner) return el.contains(inner);
83
+ const root = el.getRootNode();
84
+ if (root.nodeType === DOCUMENT_NODE) return true;
85
+ // A panel already taken out of the page answers from the page's own focus.
86
+ if (root.nodeType !== SHADOW_ROOT_NODE) return !focusedIn(el.ownerDocument);
87
+ const host = outermostHost(root as ShadowRoot);
88
+ const page = focusedIn(host);
89
+ return !page || page === host;
90
+ }
91
+
92
+ /** Whether `el` holds focus, from its own focus and blur events, which a sealed widget receives without asking the page. */
93
+ export function trackFocus(el: Element): { has: () => boolean; stop: () => void } {
94
+ let has = false;
95
+ const on = () => (has = true);
96
+ const off = () => (has = false);
97
+ el.addEventListener("focus", on);
98
+ el.addEventListener("blur", off);
99
+ return {
100
+ has: () => has,
101
+ stop: () => {
102
+ el.removeEventListener("focus", on);
103
+ el.removeEventListener("blur", off);
104
+ },
105
+ };
106
+ }
41
107
 
42
108
  export function focusWithoutTracking(
43
109
  el: HTMLElement | null | undefined,
@@ -45,7 +111,7 @@ export function focusWithoutTracking(
45
111
  ): boolean {
46
112
  if (!el) return false;
47
113
  untrack(() => el.focus({ preventScroll: options?.preventScroll ?? true }));
48
- return activeOf(el) === el;
114
+ return focusedIn(el) === el;
49
115
  }
50
116
 
51
117
  // Scopes in activation order: a later one sits above the earlier ones.
@@ -96,7 +162,7 @@ export function createFocusScope(options: FocusScopeOptions): FocusScope {
96
162
  trapped: boolean,
97
163
  ): { release: () => void; untrap: () => void } => {
98
164
  skipNext = false;
99
- const previous = pendingRestore ? pendingRestore.target : activeOf(container);
165
+ const previous = pendingRestore ? pendingRestore.target : focusedIn(container);
100
166
  pendingRestore = undefined;
101
167
  activeScopes.push(container);
102
168
 
@@ -139,7 +205,7 @@ export function createFocusScope(options: FocusScopeOptions): FocusScope {
139
205
  // Chromium fires focusout while removing the focused node; refocusing then strands keys on a detached node.
140
206
  const pressed = tab;
141
207
  queueMicrotask(() => {
142
- const current = activeOf(container);
208
+ const current = focusedIn(container);
143
209
  if (trapping && container.isConnected && !(current && container.contains(current))) {
144
210
  if (pressed) toCandidate(pressed.shift);
145
211
  else focusWithoutTracking(container);
@@ -172,7 +238,7 @@ export function createFocusScope(options: FocusScopeOptions): FocusScope {
172
238
  queueMicrotask(() => {
173
239
  if (pendingRestore !== pending) return;
174
240
  pendingRestore = undefined;
175
- const current = activeOf(container);
241
+ const current = focusedIn(container);
176
242
  const tookOver = activeScopes.some((scope) => current && scope.contains(current));
177
243
  if (!tookOver && previous instanceof HTMLElement && previous.isConnected) {
178
244
  focusWithoutTracking(previous);
@@ -1,6 +1,6 @@
1
1
  import { type Accessor, onCleanup } from "solid-js";
2
- import type { LayerHandle } from "./layer-stack";
3
- import { effect } from "./solid";
2
+ import type { LayerHandle } from "./layer-stack.js";
3
+ import { effect } from "./solid.js";
4
4
 
5
5
  const KEPT = '[aria-live], [role="status"], [role="alert"], [data-kb-top-layer]';
6
6
  const ELEMENT = 1;
@@ -1,5 +1,5 @@
1
1
  import { type Accessor, createMemo, createRoot, createSignal } from "solid-js";
2
- import { effect } from "./solid";
2
+ import { effect } from "./solid.js";
3
3
 
4
4
  export type LayerKind = "modal" | "popover" | "menu" | "tooltip" | "tour";
5
5
  export type TopLayer = "auto" | "manual";
@@ -9,19 +9,20 @@ export interface LayerOptions {
9
9
  open: Accessor<boolean>;
10
10
  kind: LayerKind;
11
11
  escape: Accessor<boolean>;
12
- readsOwnEscape?: boolean;
13
12
  dismiss?: () => void;
14
13
  trigger?: Accessor<Element | undefined>;
15
14
  topLayer?: TopLayer;
15
+ /** While open, the page takes no pointer events; this layer and the ones above it still do. */
16
+ blockPointer?: Accessor<boolean>;
16
17
  }
17
18
 
18
19
  export interface Layer {
19
20
  readonly id: number;
20
21
  readonly kind: LayerKind;
21
- readonly readsOwnEscape: boolean;
22
22
  element(): HTMLElement | undefined;
23
23
  trigger(): Element | undefined;
24
24
  escape(): boolean;
25
+ readonly blocksPointer: boolean;
25
26
  dismiss?: () => void;
26
27
  }
27
28
 
@@ -45,6 +46,30 @@ export const layerStack: {
45
46
 
46
47
  let nextId = 0;
47
48
 
49
+ function blockPointerBelow(above: readonly HTMLElement[]): () => void {
50
+ const body = document.body;
51
+ const prior = body.style.pointerEvents;
52
+ body.style.pointerEvents = "none";
53
+ const kept = above.map((element) => [element, element.style.pointerEvents] as const);
54
+ for (const [element] of kept) element.style.pointerEvents = "auto";
55
+ return () => {
56
+ body.style.pointerEvents = prior;
57
+ if (body.getAttribute("style") === "") body.removeAttribute("style");
58
+ for (const [element, value] of kept) element.style.pointerEvents = value;
59
+ };
60
+ }
61
+
62
+ let releasePointer: (() => void) | undefined;
63
+
64
+ function setStack(list: readonly Layer[]): void {
65
+ setLayers(list);
66
+ releasePointer?.();
67
+ releasePointer = undefined;
68
+ const from = list.findLastIndex((layer) => layer.blocksPointer);
69
+ if (from >= 0)
70
+ releasePointer = blockPointerBelow(list.slice(from).flatMap((layer) => layer.element() ?? []));
71
+ }
72
+
48
73
  function enterTopLayer(element: HTMLElement, mode: TopLayer, dismiss: (() => void) | undefined) {
49
74
  if (typeof element.showPopover !== "function") return undefined;
50
75
  element.setAttribute("popover", mode);
@@ -72,19 +97,19 @@ export function registerLayer(options: LayerOptions): LayerHandle {
72
97
  const [layer, setLayer] = createSignal<Layer | undefined>();
73
98
 
74
99
  effect(
75
- () => [options.element(), options.open()] as const,
76
- ([element, open]) => {
100
+ () => [options.element(), options.open(), options.blockPointer?.() ?? false] as const,
101
+ ([element, open, blocksPointer]) => {
77
102
  if (!element || !open) return;
78
103
  const entry: Layer = {
79
104
  id: ++nextId,
80
105
  kind: options.kind,
81
- readsOwnEscape: options.readsOwnEscape ?? false,
82
106
  element: options.element,
83
107
  trigger: () => options.trigger?.(),
84
108
  escape: options.escape,
109
+ blocksPointer,
85
110
  dismiss: options.dismiss,
86
111
  };
87
- setLayers([...layers(), entry]);
112
+ setStack([...layers(), entry]);
88
113
  setLayer(entry);
89
114
  const leaveTopLayer = options.topLayer
90
115
  ? enterTopLayer(element, options.topLayer, () => {
@@ -93,7 +118,7 @@ export function registerLayer(options: LayerOptions): LayerHandle {
93
118
  : undefined;
94
119
  return () => {
95
120
  leaveTopLayer?.();
96
- setLayers(layers().filter((other) => other !== entry));
121
+ setStack(layers().filter((other) => other !== entry));
97
122
  setLayer(undefined);
98
123
  };
99
124
  },