@gemologic/sheen 0.2.0 → 0.3.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 (214) hide show
  1. package/README.md +1 -1
  2. package/THIRD_PARTY_NOTICES.md +1 -1
  3. package/dist/ai.d.ts +8 -0
  4. package/dist/ai.js +5 -0
  5. package/dist/core.d.ts +11 -4
  6. package/dist/core.js +32 -28
  7. package/dist/formisch.js +1 -2
  8. package/dist/forms.d.ts +2 -0
  9. package/dist/forms.js +16 -15
  10. package/dist/index.d.ts +25 -5
  11. package/dist/index.js +86 -76
  12. package/dist/layout/Layout.js +1 -2
  13. package/dist/metadata.js +1 -2
  14. package/dist/navigation.d.ts +2 -1
  15. package/dist/navigation.js +16 -16
  16. package/dist/primitives/Accordion.js +9 -9
  17. package/dist/primitives/ActivityTimeline.js +57 -49
  18. package/dist/primitives/AlertDialog.js +1 -2
  19. package/dist/primitives/Avatar.js +16 -17
  20. package/dist/primitives/Board.d.ts +39 -0
  21. package/dist/primitives/Board.js +471 -0
  22. package/dist/primitives/Breadcrumb.js +1 -2
  23. package/dist/primitives/Button.js +38 -27
  24. package/dist/primitives/ButtonGroup.js +1 -2
  25. package/dist/primitives/Checkbox.js +1 -2
  26. package/dist/primitives/CheckboxGroup.js +11 -12
  27. package/dist/primitives/Collapsible.js +6 -6
  28. package/dist/primitives/Combobox.js +203 -201
  29. package/dist/primitives/CommandPalette.js +2 -4
  30. package/dist/primitives/ConfirmDialog.js +5 -6
  31. package/dist/primitives/ContextMenu.js +7 -8
  32. package/dist/primitives/Conversation.d.ts +17 -0
  33. package/dist/primitives/Conversation.js +107 -0
  34. package/dist/primitives/DescriptionList.js +1 -2
  35. package/dist/primitives/Dialog.js +101 -68
  36. package/dist/primitives/Drawer.js +12 -13
  37. package/dist/primitives/DropdownMenu.js +163 -157
  38. package/dist/primitives/EditableTextField.js +3 -8
  39. package/dist/primitives/EmptyState.js +1 -2
  40. package/dist/primitives/Field.js +1 -2
  41. package/dist/primitives/FileDropzone.js +19 -18
  42. package/dist/primitives/Form.d.ts +23 -0
  43. package/dist/primitives/Form.js +76 -0
  44. package/dist/primitives/Glyph.d.ts +40 -0
  45. package/dist/primitives/Glyph.js +65 -0
  46. package/dist/primitives/IconButton.js +5 -6
  47. package/dist/primitives/Input.js +1 -2
  48. package/dist/primitives/InputGroup.js +8 -9
  49. package/dist/primitives/Link.d.ts +9 -1
  50. package/dist/primitives/Link.js +23 -17
  51. package/dist/primitives/LinkTooltip.js +6 -7
  52. package/dist/primitives/List.d.ts +34 -0
  53. package/dist/primitives/List.js +135 -0
  54. package/dist/primitives/Message.d.ts +13 -0
  55. package/dist/primitives/Message.js +75 -0
  56. package/dist/primitives/NavList.js +15 -16
  57. package/dist/primitives/Notice.d.ts +15 -1
  58. package/dist/primitives/Notice.js +91 -43
  59. package/dist/primitives/NumberField.js +81 -81
  60. package/dist/primitives/NumberText.d.ts +4 -0
  61. package/dist/primitives/NumberText.js +50 -25
  62. package/dist/primitives/Pagination.js +81 -60
  63. package/dist/primitives/Popover.js +57 -57
  64. package/dist/primitives/Progress.js +1 -2
  65. package/dist/primitives/PromptInput.d.ts +23 -0
  66. package/dist/primitives/PromptInput.js +135 -0
  67. package/dist/primitives/RadioGroup.js +12 -17
  68. package/dist/primitives/Resizable.js +1 -2
  69. package/dist/primitives/ScrollArea.js +1 -2
  70. package/dist/primitives/SearchInput.js +45 -38
  71. package/dist/primitives/SegmentedControl.d.ts +2 -0
  72. package/dist/primitives/SegmentedControl.js +92 -78
  73. package/dist/primitives/Select.js +105 -100
  74. package/dist/primitives/Separator.js +1 -2
  75. package/dist/primitives/ShortcutPending.js +11 -12
  76. package/dist/primitives/ShortcutProvider.d.ts +5 -0
  77. package/dist/primitives/ShortcutProvider.js +71 -65
  78. package/dist/primitives/ShortcutScope.js +8 -9
  79. package/dist/primitives/ShortcutSheet.js +30 -24
  80. package/dist/primitives/Skeleton.js +1 -2
  81. package/dist/primitives/Slider.js +1 -2
  82. package/dist/primitives/SortableList.d.ts +19 -0
  83. package/dist/primitives/SortableList.js +235 -0
  84. package/dist/primitives/Spinner.js +1 -2
  85. package/dist/primitives/Status.js +14 -14
  86. package/dist/primitives/Stepper.js +54 -52
  87. package/dist/primitives/StreamingText.d.ts +12 -0
  88. package/dist/primitives/StreamingText.js +42 -0
  89. package/dist/primitives/Surface.js +1 -2
  90. package/dist/primitives/Switch.js +1 -2
  91. package/dist/primitives/Table.js +1 -2
  92. package/dist/primitives/Tabs.js +20 -17
  93. package/dist/primitives/TagInput.js +6 -9
  94. package/dist/primitives/Textarea.js +37 -63
  95. package/dist/primitives/Toast.js +42 -41
  96. package/dist/primitives/Toaster.js +27 -28
  97. package/dist/primitives/Tooltip.js +32 -32
  98. package/dist/primitives/Tree.js +1 -2
  99. package/dist/primitives/Typography.d.ts +6 -2
  100. package/dist/primitives/Typography.js +20 -12
  101. package/dist/primitives/boolean-input-state.js +3 -8
  102. package/dist/primitives/button-variants.js +2 -3
  103. package/dist/primitives/choice-options.js +1 -2
  104. package/dist/primitives/create-confirm.js +1 -2
  105. package/dist/primitives/create-toaster.js +1 -2
  106. package/dist/primitives/link-focus.js +1 -2
  107. package/dist/primitives/menu-focus.js +1 -2
  108. package/dist/primitives/sortable-core.d.ts +70 -0
  109. package/dist/primitives/sortable-core.js +109 -0
  110. package/dist/primitives/sortable-drag.d.ts +29 -0
  111. package/dist/primitives/sortable-drag.js +50 -0
  112. package/dist/primitives/tooltip-layer.js +26 -27
  113. package/dist/sortable.d.ts +6 -0
  114. package/dist/sortable.js +4 -0
  115. package/dist/theme/ThemeProvider.d.ts +6 -1
  116. package/dist/theme/ThemeProvider.js +65 -58
  117. package/dist/theme/intl.js +1 -2
  118. package/dist/theme/keyboard-script.js +1 -2
  119. package/dist/theme/layers.js +1 -2
  120. package/dist/theme/messages.d.ts +26 -0
  121. package/dist/theme/messages.js +9 -2
  122. package/dist/theme/number-format-cache.js +1 -2
  123. package/dist/theme/script.d.ts +1 -0
  124. package/dist/theme/script.js +3 -3
  125. package/dist/theme/state.d.ts +4 -4
  126. package/dist/theme/state.js +12 -13
  127. package/dist/utils/auto-resize.d.ts +6 -0
  128. package/dist/utils/auto-resize.js +31 -0
  129. package/dist/utils/browser-status.js +1 -2
  130. package/dist/utils/change-motion.d.ts +8 -0
  131. package/dist/utils/change-motion.js +19 -0
  132. package/dist/utils/cn.js +1 -2
  133. package/dist/utils/media-query.d.ts +10 -0
  134. package/dist/utils/media-query.js +16 -0
  135. package/dist/utils/optimistic.js +1 -2
  136. package/dist/utils/shortcut-platform.js +1 -2
  137. package/dist/utils/shortcut-registry.d.ts +5 -0
  138. package/dist/utils/shortcut-registry.js +61 -51
  139. package/dist/vite.js +3 -4
  140. package/package.json +23 -5
  141. package/src/ai.ts +8 -0
  142. package/src/core.ts +11 -4
  143. package/src/forms.ts +2 -0
  144. package/src/index.ts +25 -5
  145. package/src/navigation.ts +2 -1
  146. package/src/primitives/Accordion.tsx +1 -1
  147. package/src/primitives/ActivityTimeline.tsx +12 -7
  148. package/src/primitives/Board.tsx +406 -0
  149. package/src/primitives/Button.tsx +15 -4
  150. package/src/primitives/Collapsible.tsx +1 -1
  151. package/src/primitives/Combobox.tsx +2 -1
  152. package/src/primitives/CommandPalette.tsx +2 -2
  153. package/src/primitives/Conversation.tsx +108 -0
  154. package/src/primitives/Dialog.tsx +5 -1
  155. package/src/primitives/DropdownMenu.tsx +12 -6
  156. package/src/primitives/FileDropzone.tsx +2 -2
  157. package/src/primitives/Form.tsx +58 -0
  158. package/src/primitives/Glyph.tsx +55 -0
  159. package/src/primitives/Link.tsx +15 -6
  160. package/src/primitives/List.tsx +68 -0
  161. package/src/primitives/Message.tsx +40 -0
  162. package/src/primitives/Notice.tsx +45 -12
  163. package/src/primitives/NumberField.tsx +3 -2
  164. package/src/primitives/NumberText.tsx +31 -4
  165. package/src/primitives/Pagination.tsx +6 -5
  166. package/src/primitives/Popover.tsx +2 -1
  167. package/src/primitives/PromptInput.tsx +116 -0
  168. package/src/primitives/SearchInput.tsx +4 -3
  169. package/src/primitives/SegmentedControl.tsx +29 -4
  170. package/src/primitives/Select.tsx +3 -2
  171. package/src/primitives/ShortcutProvider.tsx +14 -1
  172. package/src/primitives/ShortcutSheet.tsx +1 -1
  173. package/src/primitives/SortableList.tsx +208 -0
  174. package/src/primitives/Status.tsx +1 -1
  175. package/src/primitives/Stepper.tsx +7 -7
  176. package/src/primitives/StreamingText.tsx +32 -0
  177. package/src/primitives/Tabs.tsx +2 -1
  178. package/src/primitives/TagInput.tsx +1 -1
  179. package/src/primitives/Textarea.tsx +3 -47
  180. package/src/primitives/Toast.tsx +2 -1
  181. package/src/primitives/Tooltip.tsx +4 -2
  182. package/src/primitives/Typography.tsx +11 -2
  183. package/src/primitives/button-variants.ts +1 -1
  184. package/src/primitives/sortable-core.ts +139 -0
  185. package/src/primitives/sortable-drag.ts +75 -0
  186. package/src/sortable.ts +6 -0
  187. package/src/styles/ai.css +57 -0
  188. package/src/styles/core.css +321 -0
  189. package/src/styles/forms.css +261 -0
  190. package/src/styles/navigation.css +137 -0
  191. package/src/styles/overlays.css +104 -0
  192. package/src/styles/sortable.css +87 -0
  193. package/src/styles.css +5 -658
  194. package/src/theme/ThemeProvider.tsx +20 -8
  195. package/src/theme/messages.ts +20 -1
  196. package/src/theme/script.ts +2 -2
  197. package/src/theme/state.ts +5 -5
  198. package/src/utils/auto-resize.ts +58 -0
  199. package/src/utils/change-motion.ts +28 -0
  200. package/src/utils/media-query.ts +26 -0
  201. package/src/utils/shortcut-registry.ts +19 -2
  202. package/src/vite.ts +3 -3
  203. package/vendor/integrity.json +13 -13
  204. package/vendor/kobalte-core/chunk/3D6FM2PJ.js +7 -1
  205. package/vendor/kobalte-core/chunk/G3KI2B4X.js +2 -1
  206. package/vendor/kobalte-core/chunk/KEL2LLJM.jsx +2 -1
  207. package/vendor/kobalte-core/chunk/RFN6X5VH.jsx +7 -1
  208. package/vendor/origins.json +4 -4
  209. package/vendor/solid-web/dev.cjs +21 -17
  210. package/vendor/solid-web/dev.js +21 -17
  211. package/vendor/solid-web/server.cjs +1 -1
  212. package/vendor/solid-web/server.js +1 -1
  213. package/vendor/solid-web/web.cjs +21 -17
  214. package/vendor/solid-web/web.js +21 -17
@@ -1,7 +1,7 @@
1
1
  import { createContext, createEffect, createMemo, createSignal, createUniqueId, onCleanup, onMount, useContext } from "solid-js";
2
2
  import type { Accessor, JSX, ParentProps } from "solid-js";
3
3
  import { I18nProvider } from "#sheen-kobalte/i18n";
4
- import { bundledThemeMetadata, iconSetForTheme } from "@gemologic/sheen-tokens/catalog";
4
+ import { accentNames, bundledThemeMetadata, iconSetForTheme } from "@gemologic/sheen-tokens/catalog";
5
5
  import type { ThemeMetadata } from "@gemologic/sheen-tokens/catalog";
6
6
  import type { Mode } from "@gemologic/sheen-tokens";
7
7
  import { defaultThemeState, readThemeState, resolveThemeState } from "./state.ts";
@@ -21,19 +21,22 @@ interface ThemeRuntime {
21
21
  portal: Accessor<HTMLElement | undefined>;
22
22
  tokenTarget: Accessor<HTMLElement | undefined>;
23
23
  themes: readonly ThemeMetadata[];
24
+ /** Every selectable accent ID: the bundled accents plus registered custom accents. */
25
+ accents: readonly string[];
24
26
  nonce: string | undefined;
25
27
  layers: OverlayStack;
26
28
  messages: Accessor<Messages>;
27
29
  set: (next: Partial<ThemeState>) => Promise<void>;
28
30
  }
29
31
 
30
- export interface ThemeContextValue extends Omit<ThemeRuntime, "themes"> {
32
+ export interface ThemeContextValue extends Omit<ThemeRuntime, "themes" | "accents"> {
31
33
  theme: Accessor<string>;
32
34
  mode: Accessor<ThemeState["mode"]>;
33
35
  accent: Accessor<ThemeState["accent"]>;
34
36
  density: Accessor<ThemeState["density"]>;
35
37
  radius: Accessor<ThemeState["radius"]>;
36
38
  themes: Accessor<readonly ThemeMetadata[]>;
39
+ accents: Accessor<readonly string[]>;
37
40
  setTheme: (value: string) => Promise<void>;
38
41
  setMode: (value: ThemeState["mode"]) => Promise<void>;
39
42
  setAccent: (value: ThemeState["accent"]) => Promise<void>;
@@ -52,6 +55,7 @@ function exposeTheme(runtime: ThemeRuntime): ThemeContextValue {
52
55
  density: () => runtime.state().density,
53
56
  radius: () => runtime.state().radius,
54
57
  themes: () => runtime.themes,
58
+ accents: () => runtime.accents,
55
59
  setTheme: theme => runtime.set({ theme }),
56
60
  setMode: mode => runtime.set({ mode }),
57
61
  setAccent: accent => runtime.set({ accent }),
@@ -104,6 +108,8 @@ export interface ThemeProviderProps extends ParentProps {
104
108
  direction?: ThemeState["direction"];
105
109
  locale?: string;
106
110
  themes?: readonly ThemeMetadata[];
111
+ /** Custom accent IDs built with `defineAccent`/`buildAccent`; their CSS must be loaded by the app. */
112
+ accents?: readonly string[];
107
113
  storageKey?: string;
108
114
  hydration?: "client" | "cookie";
109
115
  persist?: (state: ThemeState) => Promise<void>;
@@ -115,6 +121,7 @@ export interface ThemeProviderProps extends ParentProps {
115
121
  export function ThemeProvider(props: ThemeProviderProps): JSX.Element {
116
122
  const numberFormat = createNumberFormatCache();
117
123
  const themes = () => props.themes ?? bundledThemeMetadata;
124
+ const accents = createMemo<readonly string[]>(() => [...accentNames, ...(props.accents ?? []).filter(id => !accentNames.some(name => name === id))]);
118
125
  const defaults: ThemeState = {
119
126
  ...defaultThemeState,
120
127
  theme: props.defaultTheme ?? defaultThemeState.theme, mode: props.defaultMode ?? "dark", accent: props.defaultAccent ?? "jade",
@@ -139,17 +146,17 @@ export function ThemeProvider(props: ThemeProviderProps): JSX.Element {
139
146
  if (props.hydration !== "cookie") {
140
147
  const root = document.documentElement;
141
148
  const snapshot = Object.fromEntries(Object.keys(defaults).map(name => [name, root.getAttribute(`data-sheen-${name}`)]));
142
- setState(readThemeState({ ...snapshot, mode: root.getAttribute("data-sheen-preference") ?? snapshot.mode }, defaults, themes().map(theme => theme.id)));
149
+ setState(readThemeState({ ...snapshot, mode: root.getAttribute("data-sheen-preference") ?? snapshot.mode }, defaults, themes().map(theme => theme.id), accents()));
143
150
  }
144
151
  setReady(true);
145
152
  updateDocument();
146
153
  });
147
154
  createEffect(() => { if (ready()) updateDocument(); });
148
155
  const context = exposeTheme({
149
- state, defaults, resolvedMode: mode, ready, portal, tokenTarget: () => document.documentElement, themes: themes(), nonce: props.nonce, layers: createOverlayStack(),
156
+ state, defaults, resolvedMode: mode, ready, portal, tokenTarget: () => document.documentElement, themes: themes(), accents: accents(), nonce: props.nonce, layers: createOverlayStack(),
150
157
  messages: createMemo(() => resolveMessages(englishMessages, props.messages)),
151
158
  async set(next) {
152
- const candidate = readThemeState({ ...state(), ...next }, defaults, context.themes().map(theme => theme.id));
159
+ const candidate = readThemeState({ ...state(), ...next }, defaults, context.themes().map(theme => theme.id), context.accents());
153
160
  const token = ++revision;
154
161
  if (props.hydration === "cookie") {
155
162
  if (!props.persist) throw new Error("Cookie hydration requires an app persistence callback");
@@ -193,11 +200,16 @@ export function ThemeScope(props: ThemeScopeProps): JSX.Element {
193
200
  const system = modeSignal();
194
201
  const mode = createMemo<Mode>(() => state().mode === "system" ? system() : state().mode === "light" ? "light" : "dark");
195
202
  const themes = () => parent.themes();
196
- const context = exposeTheme({ ...parent, themes: parent.themes(), state, portal, tokenTarget: () => portal()?.parentElement ?? undefined, resolvedMode: mode,
203
+ const context = exposeTheme({ ...parent, themes: parent.themes(), accents: parent.accents(), state, portal, tokenTarget: () => portal()?.parentElement ?? undefined, resolvedMode: mode,
197
204
  messages: createMemo(() => resolveMessages(parent.messages(), props.messages)),
198
205
  async set(next) {
199
- if (!props.controllable) throw new Error("ThemeScope setters require controllable=true");
200
- setLocal(previous => ({ ...previous, ...next }));
206
+ if (props.controllable) {
207
+ setLocal(previous => ({ ...previous, ...next }));
208
+ return;
209
+ }
210
+ const pinned = Object.keys(next).filter(axis => Object.hasOwn(overrides(), axis));
211
+ if (pinned.length) throw new Error(`ThemeScope pins ${pinned.join(", ")}; changing a pinned axis requires controllable=true`);
212
+ await parent.set(next);
201
213
  } });
202
214
  const id = createUniqueId();
203
215
  const overrides = (): ThemeOverrides => {
@@ -1,5 +1,5 @@
1
1
  export const englishMessages = Object.freeze({
2
- close: "Close", cancel: "Cancel", confirm: "Confirm", retry: "Retry", remove: "Remove", breadcrumb: "Breadcrumb",
2
+ close: "Close", dismiss: "Dismiss", announcement: "Announcement", cancel: "Cancel", confirm: "Confirm", retry: "Retry", remove: "Remove", breadcrumb: "Breadcrumb",
3
3
  loading: "Loading", notifications: "Notifications", noNotifications: "No notifications", unread: "Unread", markAllNotificationsRead: "Mark all read", noResults: "No results", empty: "Nothing here yet", selectOption: "Select an option",
4
4
  avatarOverflow: "{count} more",
5
5
  nextPage: "Next page", previousPage: "Previous page", firstPage: "First page", lastPage: "Last page",
@@ -18,6 +18,7 @@ export const englishMessages = Object.freeze({
18
18
  increaseValue: "Increase {label}", decreaseValue: "Decrease {label}", minimumValue: "Minimum {label}", maximumValue: "Maximum {label}",
19
19
  expandTreeItem: "Expand {label}", collapseTreeItem: "Collapse {label}",
20
20
  shortcutInventory: "All registered shortcuts. Availability depends on the active scope.", shortcutShadowed: "Replaced by a newer binding", shortcutDisabled: "Character shortcut disabled",
21
+ promptInput: "Message", sendMessage: "Send message", stopResponse: "Stop response", conversation: "Conversation", jumpToLatest: "Jump to latest message", responseComplete: "Response complete",
21
22
  unsavedTitle: "Discard unsaved changes?", unsavedDescription: "Your unsaved changes will be lost if you leave this page.", discardChanges: "Discard changes", navigationFailed: "Navigation failed. Your changes have been retained.",
22
23
  });
23
24
 
@@ -149,6 +150,24 @@ export interface ExtensionMessages {
149
150
  readonly chartZoomOut?: string;
150
151
  readonly chartResetZoom?: string;
151
152
  readonly chartKeyboardInstructions?: string;
153
+ readonly chartGridKeyboardInstructions?: string;
154
+ readonly chartSeriesColumn?: string;
155
+ readonly chartShareColumn?: string;
156
+ readonly sortableInstructions?: string;
157
+ readonly sortableHandle?: string;
158
+ readonly sortableLifted?: string;
159
+ readonly sortableMoved?: string;
160
+ readonly sortableDropped?: string;
161
+ readonly sortableCancelled?: string;
162
+ readonly boardInstructions?: string;
163
+ readonly boardCardHandle?: string;
164
+ readonly boardColumnHandle?: string;
165
+ readonly boardLifted?: string;
166
+ readonly boardMoved?: string;
167
+ readonly boardDropped?: string;
168
+ readonly boardCancelled?: string;
169
+ readonly boardEmptyColumn?: string;
170
+ readonly boardCardCount?: string;
152
171
  }
153
172
 
154
173
  type CoreMessages = Readonly<Record<keyof typeof englishMessages, string>>;
@@ -30,13 +30,13 @@ function bootstrap(config: ScriptConfig): void {
30
30
  root.setAttribute("lang", state.locale ?? "en-US");
31
31
  }
32
32
 
33
- export function createThemeScript(options: { defaults?: ThemeState; storageKey?: string; themeIds?: readonly string[]; themes?: readonly ThemeMetadata[] } = {}): string {
33
+ export function createThemeScript(options: { defaults?: ThemeState; storageKey?: string; themeIds?: readonly string[]; themes?: readonly ThemeMetadata[]; accents?: readonly string[] } = {}): string {
34
34
  const themes = options.themes ?? bundledThemeMetadata;
35
35
  const themeIds = options.themeIds ?? themes.map(theme => theme.id);
36
36
  const config: ScriptConfig = {
37
37
  defaults: options.defaults ?? { ...defaultThemeState },
38
38
  storageKey: options.storageKey ?? "sheen",
39
- choices: { ...themeChoices, theme: themeIds },
39
+ choices: { ...themeChoices, theme: themeIds, accent: [...themeChoices.accent, ...(options.accents ?? []).filter(id => !themeChoices.accent.some(name => name === id))] },
40
40
  iconSets: Object.fromEntries(themes.map(theme => [theme.id, theme.iconSet])),
41
41
  };
42
42
  const json = JSON.stringify(config).replaceAll("<", "\\u003c").replaceAll("\u2028", "\\u2028").replaceAll("\u2029", "\\u2029");
@@ -1,11 +1,11 @@
1
- import { accentNames, bundledThemeMetadata, isAccentName } from "@gemologic/sheen-tokens/catalog";
2
- import type { AccentName } from "@gemologic/sheen-tokens/catalog";
1
+ import { accentNames, bundledThemeMetadata } from "@gemologic/sheen-tokens/catalog";
3
2
  import type { Mode } from "@gemologic/sheen-tokens";
4
3
 
5
4
  export interface ThemeState {
6
5
  theme: string;
7
6
  mode: Mode | "system";
8
- accent: AccentName;
7
+ /** A bundled accent name or a custom accent ID registered with ThemeProvider `accents`. */
8
+ accent: string;
9
9
  density: "compact" | "comfortable" | "spacious";
10
10
  radius: "sharp" | "soft" | "round";
11
11
  motion: "full" | "reduced";
@@ -29,12 +29,12 @@ export function resolveThemeState(parent: ThemeState, overrides: ThemeOverrides,
29
29
  };
30
30
  }
31
31
 
32
- export function readThemeState(value: unknown, fallback: ThemeState, themeIds: readonly string[] = bundledThemeMetadata.map(theme => theme.id)): ThemeState {
32
+ export function readThemeState(value: unknown, fallback: ThemeState, themeIds: readonly string[] = bundledThemeMetadata.map(theme => theme.id), accentIds: readonly string[] = accentNames): ThemeState {
33
33
  if (typeof value !== "object" || value === null) return { ...fallback };
34
34
  const result = { ...fallback };
35
35
  if ("theme" in value && typeof value.theme === "string" && themeIds.includes(value.theme)) result.theme = value.theme;
36
36
  if ("mode" in value && (value.mode === "dark" || value.mode === "light" || value.mode === "system")) result.mode = value.mode;
37
- if ("accent" in value && typeof value.accent === "string" && isAccentName(value.accent)) result.accent = value.accent;
37
+ if ("accent" in value && typeof value.accent === "string" && accentIds.includes(value.accent)) result.accent = value.accent;
38
38
  if ("density" in value && (value.density === "compact" || value.density === "comfortable" || value.density === "spacious")) result.density = value.density;
39
39
  if ("radius" in value && (value.radius === "sharp" || value.radius === "soft" || value.radius === "round")) result.radius = value.radius;
40
40
  if ("motion" in value && (value.motion === "full" || value.motion === "reduced")) result.motion = value.motion;
@@ -0,0 +1,58 @@
1
+ import { onCleanup, onMount } from "solid-js";
2
+
3
+ /**
4
+ * Sizes a textarea's block size to its content once per animation frame while `enabled` is true.
5
+ * Width changes, font loads, and form resets reschedule measurement; the returned function schedules it explicitly.
6
+ * Disabling restores the inline block size the element had before resizing took ownership.
7
+ */
8
+ export function createAutoResize(element: () => HTMLTextAreaElement | undefined, enabled: () => boolean): () => void {
9
+ let mounted = false;
10
+ let frame: number | undefined;
11
+ let ownedSize = false;
12
+ let originalSize = "";
13
+ const measure = () => {
14
+ frame = undefined;
15
+ const textarea = element();
16
+ if (!textarea || !mounted) return;
17
+ if (!enabled()) {
18
+ if (ownedSize) textarea.style.blockSize = originalSize;
19
+ ownedSize = false;
20
+ return;
21
+ }
22
+ if (!textarea.getClientRects().length) return;
23
+ if (!ownedSize) originalSize = textarea.style.blockSize;
24
+ ownedSize = true;
25
+ textarea.style.blockSize = "auto";
26
+ textarea.style.blockSize = `${textarea.scrollHeight + textarea.offsetHeight - textarea.clientHeight}px`;
27
+ };
28
+ const schedule = () => {
29
+ const textarea = element();
30
+ if (!mounted || !textarea || frame !== undefined) return;
31
+ frame = textarea.ownerDocument.defaultView?.requestAnimationFrame(measure);
32
+ };
33
+ onMount(() => {
34
+ const textarea = element();
35
+ if (!textarea) return;
36
+ mounted = true;
37
+ let width = -1;
38
+ const observer = new ResizeObserver(entries => {
39
+ const next = entries[0]?.contentRect.width;
40
+ if (next !== undefined && next !== width) { width = next; schedule(); }
41
+ });
42
+ observer.observe(textarea);
43
+ const fonts = textarea.ownerDocument.fonts;
44
+ void fonts.ready.then(schedule);
45
+ fonts.addEventListener("loadingdone", schedule);
46
+ const reset = (event: Event) => { if (event.target === textarea.form) schedule(); };
47
+ textarea.ownerDocument.addEventListener("reset", reset, true);
48
+ schedule();
49
+ onCleanup(() => {
50
+ mounted = false;
51
+ observer.disconnect();
52
+ fonts.removeEventListener("loadingdone", schedule);
53
+ textarea.ownerDocument.removeEventListener("reset", reset, true);
54
+ if (frame !== undefined) textarea.ownerDocument.defaultView?.cancelAnimationFrame(frame);
55
+ });
56
+ });
57
+ return schedule;
58
+ }
@@ -0,0 +1,28 @@
1
+ export type ChangeDirection = "up" | "down";
2
+
3
+ const flashId = "sheen-change-flash";
4
+
5
+ /** Milliseconds of `--sheen-duration-slow` on the element, which reduced motion zeroes. */
6
+ export function motionDuration(element: Element): number {
7
+ const value = getComputedStyle(element).getPropertyValue("--sheen-duration-slow").trim();
8
+ const amount = Number.parseFloat(value);
9
+ if (!Number.isFinite(amount) || amount <= 0) return 0;
10
+ return value.endsWith("ms") ? amount : amount * 1000;
11
+ }
12
+
13
+ /**
14
+ * Briefly tints an element with its market direction after a value change. Callers
15
+ * skip the initial render; reduced motion turns this into a no-op.
16
+ */
17
+ export function flashChange(element: HTMLElement, direction: ChangeDirection): void {
18
+ const duration = motionDuration(element) * 4;
19
+ if (duration === 0 || typeof element.animate !== "function") return;
20
+ const tint = getComputedStyle(element).getPropertyValue(direction === "up" ? "--sheen-color-market-up" : "--sheen-color-market-down").trim();
21
+ if (!tint) return;
22
+ for (const animation of element.getAnimations()) if (animation.id === flashId) animation.cancel();
23
+ const animation = element.animate([
24
+ { boxShadow: `inset 0 0 0 100vmax color-mix(in srgb, ${tint} 22%, transparent)` },
25
+ { boxShadow: "inset 0 0 0 100vmax transparent" },
26
+ ], { duration, easing: "cubic-bezier(0, 0, 0, 1)" });
27
+ animation.id = flashId;
28
+ }
@@ -0,0 +1,26 @@
1
+ import { createSignal, onCleanup, onMount } from "solid-js";
2
+ import type { Accessor } from "solid-js";
3
+ import { breakpointQuery } from "@gemologic/sheen-tokens/catalog";
4
+ import type { BreakpointName } from "@gemologic/sheen-tokens/catalog";
5
+
6
+ /**
7
+ * Tracks a media query. Server markup and the first client frame use `serverValue`, so hydration stays
8
+ * deterministic; the live value applies after mount. Use it for behavior (drawer versus persistent panel),
9
+ * never to hide content: CSS owns layout.
10
+ */
11
+ export function createMediaQuery(query: string, serverValue = false): Accessor<boolean> {
12
+ const [matches, setMatches] = createSignal(serverValue);
13
+ onMount(() => {
14
+ const media = window.matchMedia(query);
15
+ const update = (): void => { setMatches(media.matches); };
16
+ update();
17
+ media.addEventListener("change", update);
18
+ onCleanup(() => media.removeEventListener("change", update));
19
+ });
20
+ return matches;
21
+ }
22
+
23
+ /** `up` matches at and above the breakpoint, `down` strictly below it. */
24
+ export function useBreakpoint(name: BreakpointName, direction: "up" | "down" = "up", serverValue = false): Accessor<boolean> {
25
+ return createMediaQuery(breakpointQuery(name, direction), serverValue);
26
+ }
@@ -81,6 +81,24 @@ function parseChord(keys: string, platform: ShortcutRegistryOptions["platform"])
81
81
  return chord;
82
82
  }
83
83
 
84
+ const keyLabels = new Map([["escape", "Esc"], [" ", "Space"], ["enter", "Enter"]]);
85
+
86
+ function chordLabel(chord: Chord, platform: ShortcutRegistryOptions["platform"]): string {
87
+ return [chord.ctrl ? "Ctrl" : "", chord.alt ? platform === "mac" ? "⌥" : "Alt" : "", chord.shift ? platform === "mac" ? "⇧" : "Shift" : "", chord.meta ? platform === "mac" ? "⌘" : "Meta" : "", keyLabels.get(chord.key) ?? chord.key.toUpperCase()].filter(Boolean).join("+");
88
+ }
89
+
90
+ /**
91
+ * Display text for a shortcut definition such as `mod+k` or `g i`, using the platform's
92
+ * modifier names. Text that is not a shortcut definition is returned unchanged.
93
+ */
94
+ export function formatShortcut(keys: string, platform: ShortcutRegistryOptions["platform"]): string {
95
+ try {
96
+ return keys.trim().replace(/\s*\+\s*/g, "+").split(/\s+/).map(chord => chordLabel(parseChord(chord, platform), platform)).join(" → ");
97
+ } catch {
98
+ return keys;
99
+ }
100
+ }
101
+
84
102
  /** Pure registry core. The browser owner supplies active scopes, input context, and event prevention. */
85
103
  export function createShortcutRegistry(options: ShortcutRegistryOptions) {
86
104
  const scopes = new Map<string, Map<string, ShortcutEntry[]>>();
@@ -132,8 +150,7 @@ export function createShortcutRegistry(options: ShortcutRegistryOptions) {
132
150
  return chord;
133
151
  });
134
152
  const chords = parsed.map(identity);
135
- const keyLabels = new Map([["escape", "Esc"], [" ", "Space"], ["enter", "Enter"]]);
136
- const displayKeys = parsed.map(chord => [chord.ctrl ? "Ctrl" : "", chord.alt ? options.platform === "mac" ? "⌥" : "Alt" : "", chord.shift ? options.platform === "mac" ? "⇧" : "Shift" : "", chord.meta ? options.platform === "mac" ? "⌘" : "Meta" : "", keyLabels.get(chord.key) ?? chord.key.toUpperCase()].filter(Boolean).join("+")).join(" → ");
153
+ const displayKeys = parsed.map(chord => chordLabel(chord, options.platform)).join(" → ");
137
154
  const characterOnly = parsed.every(chord => !chord.ctrl && !chord.meta && !chord.alt && Array.from(chord.key).length === 1);
138
155
  const key = JSON.stringify(chords);
139
156
  const scope = scopes.get(definition.scope) ?? new Map<string, ShortcutEntry[]>();
package/src/vite.ts CHANGED
@@ -40,11 +40,11 @@ export function sheenRuntime(): Plugin {
40
40
  try {
41
41
  filename = application.resolve("solid-js/package.json");
42
42
  } catch {
43
- throw new Error("sheenRuntime requires solid-js@1.9.15 as an application dependency");
43
+ throw new Error("sheenRuntime requires solid-js@1.9.19 as an application dependency");
44
44
  }
45
45
  const metadata: unknown = JSON.parse(await readFile(filename, "utf8"));
46
- if (typeof metadata !== "object" || metadata === null || !("version" in metadata) || metadata.version !== "1.9.15") {
47
- throw new Error("sheenRuntime is qualified for solid-js@1.9.15; install that version before using its vendored DOM renderer");
46
+ if (typeof metadata !== "object" || metadata === null || !("version" in metadata) || metadata.version !== "1.9.19") {
47
+ throw new Error("sheenRuntime is qualified for solid-js@1.9.19; install that version before using its vendored DOM renderer");
48
48
  }
49
49
  },
50
50
  };
@@ -1,5 +1,5 @@
1
1
  {
2
- "patches/@kobalte__core@0.13.13.patch": "7caf49d26c38061957228a593644bc637db6a1493fa20ea38aceeeb5f94ce879661ae6acc71efef6c2fdebc92e64d4b5f7603c4806c9f4a8d1509382a2052af1",
2
+ "patches/@kobalte__core@0.13.13.patch": "ead9547927d76dd29d6fde53c93f0d11c567db197d21eb71a5f73902de28f94e0e3a2e512ebf99c50c52d30204f19028c6564fd36e7d5a178362ed5fb8ce2660",
3
3
  "kobalte-core/LICENSE.md": "6c1603e5b6d665e99ca197e462897582e29d11dbd9f5fe559f6a0419fe2b9de929f7e986e4e33dc4cb750519b1dc96480697c8fe6b500699c7f99458fec023ea",
4
4
  "kobalte-core/NOTICE.txt": "4db8c5ade8a5d383f9c7188f5c12a535685638ac1346ffec9beacfb8d62a9f6740f4ac733819923d2764d22412d2755df2fd88c1f66336bd9b10e6517c2ad1a1",
5
5
  "kobalte-core/accordion/index.d.ts": "10d9384e6acfaa7234976638f70cb56a8693dbd059af1e3ae86e686c889df2977e8c9850d0ec8f230e626bb37c1c3ba872bebd988f4a825ad7ada42c1afd7f60",
@@ -32,7 +32,7 @@
32
32
  "kobalte-core/chunk/2YCOH52P.js": "999eddacb9b34047e9e208c03b08376bdfe32799a8b221e118c2f8bf05312a3c3469f9e8f8561c759b5f06323a892e70ed20c54da11ccf33a0cf94403afa6564",
33
33
  "kobalte-core/chunk/3565MS4H.jsx": "2f0842175d88ad1a8c04cb6265e846f7787371eeb03e671e5857f5bbad054de415f0e1ef724aad5a20aa0530f1bfef77462c22dfed60bb4c4859df1f58adb1d8",
34
34
  "kobalte-core/chunk/3ARTUDH2.jsx": "7ccab5c7a71046331f46b36c5d0142e1ec8a7772cfbbe2ca65622b05357fd25ed8fbf1be9680980f23ca11d08c7be2c044c7abef068f6ef2c1809d15d9fffe11",
35
- "kobalte-core/chunk/3D6FM2PJ.js": "0d9c815123009bd541fe0d205f02085286d13a9234b0da236c0eaca0bd7403079a517f64bde18e8bbebabddd52a680f4a710ac1dea878959239e94bc6f881cd4",
35
+ "kobalte-core/chunk/3D6FM2PJ.js": "8cc90359a905edc23a03ad8cf4de43cd7f847d2a2d457042c2d0db7c9fc33b8ee53feb12d4b65007469f18ddeda448643357e4c1497f390694cee97733e4fdce",
36
36
  "kobalte-core/chunk/3DLZMX4Z.jsx": "526c125e0407574b2fa032fea66aaf0a09e55fcf170d398dd7223926723dedd977d2429190496138feeb39eac2e230177de5d9be38e1635a3c29dc61ff25d508",
37
37
  "kobalte-core/chunk/3DZKSKAQ.jsx": "ae32744b66477402d52163ff5b6d22279a0ab21955dc48d38399d86b37838e062993307964ff6760d2294c868aa00c63ef770dd56fe06c30d63384e2d5dad2e4",
38
38
  "kobalte-core/chunk/3JA5IX2L.jsx": "153ea3f925a24550f2055bf1763b8a6ab59f9ee831d3fd14d7478fc7415742ea74885c602d9db98ac90c6298fcd1ee0bfb773ab57240f5359f1e740a326b1176",
@@ -81,7 +81,7 @@
81
81
  "kobalte-core/chunk/FLVHQV4A.jsx": "f5a003866efe6fb07714c0c5d472525b5af79ca3d1cb95dcfddcb95d011602e901344ac29a1aa6724da0f38087c0546e1ea1852fa331c57f44ffb52721ca3b25",
82
82
  "kobalte-core/chunk/FN6EICGO.jsx": "c960b28897ae16ad5a8df2824de542db06d8ac303a207721f62e3955e521d49d3eb68daa20b5467970b8902f26d6315f02f792971d896e3c72257f4164e65228",
83
83
  "kobalte-core/chunk/FOXVCQFV.jsx": "2761f2b332b36613b28cf448bf0ebc7b4d1cd139eecebb12b009e99301eba1f939eb301370381bf1729b2360d6e6fba4c162b131975d7f59af6c25c82ccde83d",
84
- "kobalte-core/chunk/G3KI2B4X.js": "7871a89d323ed7ef70fe9b73e42c85561fd0ca07c7ee862c0c093c837e6e739ef51aa619bd6b6885746c48fce2c7940417c42dd0aa3df935f65ff061960b709b",
84
+ "kobalte-core/chunk/G3KI2B4X.js": "b0c81a8f1b71a1b1d5f648ed3296df9a66cd17b85514a00d3f29da65977db73eb10489758227b87ede87d678394e8e2823a669fc848f8ae2c756ea917c8af014",
85
85
  "kobalte-core/chunk/G4JQYERT.jsx": "791a970aa038d1f37057e27f0d5e4c06bb9c8b9ca1a92dc0bf711f43e406dd79fdc9817ab32d614035fc4a1f69a6da2ea1d1fa7475e3421667622c572da5cb3c",
86
86
  "kobalte-core/chunk/GAVSAJBM.jsx": "281eb593581f5459cc99f6a7babd80971e48c6d2f2ada72976e69ef64c6f617b06fa20b08a694c325eee0b19961a642179006dddd24b60cc811cd13593adbdb2",
87
87
  "kobalte-core/chunk/GIRHAWVP.jsx": "9752fd16a7383ec977b08d62282564de714793f4b0537ed18f3810ff270f173f333435140b68d3c703a5410ffca34ad87648de161444fd58467f72a231e95c09",
@@ -102,7 +102,7 @@
102
102
  "kobalte-core/chunk/JNCCF6MP.jsx": "c61facfc48d73f491a29ddb6bb4b17f511c32042f749270bb1b1cad844b8b2cbf59edb636175a27adb6645c4fba67aa43dcd3f860f6e54986c910e0eba8e7c05",
103
103
  "kobalte-core/chunk/K6ON3K7Z.js": "f189668755f13b9cf74d4bcedd292df8945d439da4391512986343bda5fd9bb1c1ff66bd8f33c5953297c3a71c77f9a677956b9106ee228664187bec250efc4a",
104
104
  "kobalte-core/chunk/K6P57S75.js": "feeb402b3c017990944157b42be0e738c74f62f5fdfb8655f6a2bb03af349bfff820adc1b629eaf7604879898da990bbcf192895cc172f72292a7b5e9e2f55e7",
105
- "kobalte-core/chunk/KEL2LLJM.jsx": "cd319e845c7a3523eb46b641b10b5684759e29cee04687e0f56de6207628a6bbb88c87a34fd7c43a622f8c082be86e96070d07fb63a872df25b81d856468aaad",
105
+ "kobalte-core/chunk/KEL2LLJM.jsx": "58f492c11eaaa0a2933a58ea368f64ff3ea2b4e9af7e3aa0a07f60f2ffee39b97929ca15fcf39bd2f20dee77553889a79867423a00c00bac00472cd617baef7f",
106
106
  "kobalte-core/chunk/KQVCPTCE.js": "17ab3cfe25e060799e38d1579d283ff12449f56bface3bae59e7232ca858162806d7d0595d412bfa8ab3772ff367d1e203562b0401bab55547749f636e3b7165",
107
107
  "kobalte-core/chunk/KR2RRKPK.jsx": "059670c69a6adc62c115916d2b21798200308cd5b734e8bf55eeb1ab733a5f25ef4b50c17ef27721b7fc349ad4b34cb0439e7df18cb6d41ce7d52ce037874854",
108
108
  "kobalte-core/chunk/KVL5CS3M.jsx": "707e72eb3d8fe2144ce36f0c03cfb0b267454b6d5d26b12918fdd09237501d869936496ab3eae6772e840d8f269dcd557cb6073130f47067f1222c3fb7c13662",
@@ -131,7 +131,7 @@
131
131
  "kobalte-core/chunk/QJK6CGTE.js": "fbbadc6c73316474583dcf47d4ee8f0eed561e3f44f958fa083819a1b985ab9c9cd256c8aaf5c0458d9794ab061cd12765644dd69bbf5a8e2d84ec0b385728c2",
132
132
  "kobalte-core/chunk/R4V3527Z.js": "c86bed64cf46e10b800ecb630e0722afaf1b267c681cd0816ce647ebb3086c95b2c879b79bc41c469449bd2f2ea9a3245305da4768405601e9795445b1ce9457",
133
133
  "kobalte-core/chunk/R5JXRO27.js": "791a970aa038d1f37057e27f0d5e4c06bb9c8b9ca1a92dc0bf711f43e406dd79fdc9817ab32d614035fc4a1f69a6da2ea1d1fa7475e3421667622c572da5cb3c",
134
- "kobalte-core/chunk/RFN6X5VH.jsx": "96ea137f350eabaf36117bbb10385d236f3143300b5658fb1d23f0edbe3de15132536871ceb832b8f8c69f5d7430d2a094b6a8a1abee60d00d8e7e6086f809de",
134
+ "kobalte-core/chunk/RFN6X5VH.jsx": "e9bfd94e5fc21242190517b6032ade6b1869ff9faa3be05798c10d4c9faa088f244b3eb480477b8bf728f4de14bc2ac99d073a90bc3321a07bd88ef6fcc0c894",
135
135
  "kobalte-core/chunk/SD3NY4DU.js": "6eaa96aa5812826d56e9a7d9d72edf992dd75464b9962391444903a6a9264936b192fee2b5709949ac837391c6204f592c2d723334c566f118eeffadc09c2a0b",
136
136
  "kobalte-core/chunk/SLRA6PIF.jsx": "1b49e49e8b6fc08155f330ef2a6d0bd3ad1e9278b310a72fae179bf41c40ee12cd1c94ae00ade3ea30645f2c21e0ea74d13e09f0d731d5ac71636f4d77c408bf",
137
137
  "kobalte-core/chunk/SOM3K36D.jsx": "579be65999aed5dd54a6c022ed93196a676664817d64131cbde3238982c5517da6652fb8e495ae63e95224d2fd1fe661339eeb81255af29668a1b376c4006379",
@@ -419,20 +419,20 @@
419
419
  "kobalte-utils/index.d.cts": "aad929f075ec79e54ba3791fd1a5b991dad71602313c5d981b5af1a90dca59051046838845c71fcf874d157b587c1b06e4401f5127876d1f3dae355bed8c390c",
420
420
  "kobalte-utils/index.d.ts": "aad929f075ec79e54ba3791fd1a5b991dad71602313c5d981b5af1a90dca59051046838845c71fcf874d157b587c1b06e4401f5127876d1f3dae355bed8c390c",
421
421
  "kobalte-utils/index.js": "5d93b063cf33189c0c12d6150427831e87e852e53c2a2b9ba39fecdb4d7704d031d52a01b8c80ab8b3ebcc9f5bf902b3178a8fe67bed784b68a48db62cf5972e",
422
- "patches/solid-js@1.9.15.patch": "c868cf09c089b018199a1cae731a7f1bc9f044daf18783ae4460cd48a5e949d44990018bfce15f1cd0ea301ec793d9f288c9f4737a54e0a478ad220350b76567",
422
+ "patches/solid-js@1.9.19.patch": "fe3fd3ee4466db1f4b33d09cc300c5dfa17bb07c7f184cf5300c5727274e07aaf0c2eb657fb02ce9dafb726b6e3a31434d899bc25222c473b98352f2a51e708f",
423
423
  "solid-web/LICENSE": "cd5aaa2f9c28777c86ee6cce4862b9986ded41ef5704dd81c16e53c9bf0c77243772ec378c4499e1055deca7900fed22d8271b2fa242b83a677b0499ff157596",
424
- "solid-web/dev.cjs": "897411a7ccb1d3c1bf06ba46bab1c2ffacfebdadaa67440bea2497a6e84b19fca78e0bf08a1e6197f45e9325ba6dcd6b5af851c63552ca72660381d06e7270e1",
425
- "solid-web/dev.js": "97e6e49a4658dedd48e027f5f62f6f8267858b6a0b0ecaee50a967d83eda63412b5a42cd382af904fc1e93a8d21f04b39aace17dbb3dc54f4fc7601ac6d38b43",
426
- "solid-web/server.cjs": "5935f127efd7010d55c35c463afa570ec5090c8481d70a6bf1891ef36afe749ce80f58fa2e7f740b1df8e7012f9ff37eb0ca4e594f9aa2da23a1dc1fb6365c54",
427
- "solid-web/server.js": "0935a8d5351ff1af9f4c6f4635555b8780f14c47db423ac8d11337290f43caaada0ba55f5efc3db33ec44f56f97002695f45b71f0421317ac7c792c9c03b779e",
424
+ "solid-web/dev.cjs": "516a3b32390ccbb6e97359bfc5251eaf589513f1258a03dfd851be06d695d02351b86454ef4c147ddd8b6cfed9b1edad695b9a08dcd00d3f17a0721e90d25d3e",
425
+ "solid-web/dev.js": "b1532cf36e44cf5f6e37e8262deb657a44d059d412d75f2ddd0d0d433916bdb0a5662801c0060a0d59cf3475409b2f541312b9c89a6920255fb8e4b1f906d142",
426
+ "solid-web/server.cjs": "d760f209c0f7fb9fcc8220e01440250ef69defd15d1f122cab62abbdca820e6ddc62bfddc7706a1a4c31f3a6c202e679ef939f1c182fa2894ecc296a66479c89",
427
+ "solid-web/server.js": "902136bf2752705dbaf61878052a8051f69b7ef4184dc216c59e8164518815550acf207de0487e297a71a1480772170b9492c476ef1aa4d6eec6e4b8480d66fd",
428
428
  "solid-web/types/client.d.ts": "e38af0abf6fb512f1b4bae7f103ee7bdeccecc4965d136e041445df8bd8f437983920d7fb3c8bad9f892d6d62b65d81bfd07eab5bc0aa61bca0fdd9b056f429f",
429
429
  "solid-web/types/core.d.ts": "c892ea9dc99e43a683bbf49543d4071cba81c0d4e782fe90ffea45035f963c95f9e358b319dae6664919306ab30beaf4586985727359349a7272c925f6f71f96",
430
430
  "solid-web/types/index.d.ts": "99b485fc08543259dba67170bc278cd3377db1c8b67eb7a026fc70471125ea6525c7bc545ca0246d3c7ffad2298d0e4f47f407573d44e53057f055492265f19a",
431
431
  "solid-web/types/jsx.d.ts": "d86e41ff457bf257b753c36a7581130cfe6d02b817b5b98626e9a46510c5f1afcf78e2cfed4422d4f4740bcc05117a103977b25e47ac096c15e2e346e44e3c64",
432
432
  "solid-web/types/server-mock.d.ts": "80e755eed8bde8fbe4ca06362fe07991db3338cee9415e9657171da004d4c71588e8793527683b21ded849d106bfd25785bc5567c8341b4ff9107719c2c726f3",
433
433
  "solid-web/types/server.d.ts": "e8c8243084a8be21303a1f80c3b51508079df9d2695e48f80d72d1215a9ac74e0c306a737b01f8644e9559e949c9fe6ca6a1a84feca83f1b1e3e256e74b897f3",
434
- "solid-web/web.cjs": "848406a2edc7a53b8d31f87f91fdbe76ad7450450e10ac64d0fe774fef073a9c655e86f68576107fe7727aed35d93b774a049920d8f62d447787258fa1d2bbd7",
435
- "solid-web/web.js": "a172207df7b7314bbf60ff064dc1817cb4ed798dbf7e6204113cbb88c3449d8f9e5097c96f6c9fbce0f28ef0ec3d8b85687594d7bc50b4b5fda563c5fa3e885b",
434
+ "solid-web/web.cjs": "ea3bc9da0f8f39a1de6855c4ef37014da1a22de08e3478359d8d7ed2a3e635db7c2fae4a98dc18cdc9cb29f94bff78b950008fc643aba6d402d5919471db0daf",
435
+ "solid-web/web.js": "4c6deffdae716be237924f2dea252b7bf89225c641c0e2dd0ae12afc5a93192f797eb6b18e75d23283a7696531d88db7827dbbfdd827e1c678d5c579b1e46e44",
436
436
  "cmdk-solid/LICENSE": "82f59f1e6b5198cb2bd2cf84c9d00dd211db58d5e290c402ebc4dbdd993dfb42b9848e65f3ccb0bdf000e26976a071e17631a4ba2cd6bd93d8af77f607609bee",
437
437
  "cmdk-solid/chunk/5WIGIOAJ.jsx": "4540afe2a6652d5144e370316bb7f500d932aac64a9354936954ca46096b357141dbb07bb2b8127699a78e6d738220b173bf1dab88153bc925ce279048384324",
438
438
  "cmdk-solid/chunk/IOVUHIGA.js": "32e4149e371e8bbb4d4e4b76ab02da7bbba59096a7d41bbb92d57f7cfaeace44418aeec6029aad7f20cb81a72c1a58d7f230dc987239a9638b55b694580b183f",
@@ -446,5 +446,5 @@
446
446
  "cmdk-solid/index.d.ts": "80a2673b25da8c27deb5963dd388a71078f15f7fd05f941d6a99bfe33e041f113f9f3540d65695778d1b63e89d3220dbb8a9e6f88a525fd9c158eed3bf03c014",
447
447
  "cmdk-solid/index.js": "37aec61dd96b94247f877898b875690e9712ad0515d87be8d092859f69590df471ab55a841c09d00bbed7dbfd2683fdb888b077f96b7ea73d400cedcfd8f0da1",
448
448
  "cmdk-solid/index.jsx": "c13ba357db8945973f194b7548e9c09fd191fdbc40374ef52781a58a774c9127fa4cbc56a4aeca078016e72e7a3caca9de7199a658c7985b643df2cc8f96db77",
449
- "origins.json": "3c4ceec7c0acbe9fab078d17905e32a12527973e5ed1f56c5f516e471c0c1a64a5719a391a81be21745af1d141ef5fac6e36793a49fb3319fe75f425b897fd8b"
449
+ "origins.json": "ffea9c0bb7c5a2a7341311a87ca56df43f6bc5d12284ba18229ac394f7f34884d538a83a1aa59ab1e9b380b423bcfa8fa9be0503593b3a3b14cb4cd0eb4b9970"
450
450
  }
@@ -441,7 +441,13 @@ function createSelectableCollection(props, ref, scrollRef) {
441
441
  };
442
442
  onMount(() => {
443
443
  if (mergedProps.deferAutoFocus) {
444
- setTimeout(tryAutoFocus, 0);
444
+ // A deferred autofocus must not override focus that moved while it waited, such as keyboard navigation into a submenu.
445
+ const scheduledFocus = document.activeElement;
446
+ setTimeout(() => {
447
+ const active = document.activeElement;
448
+ if (active !== scheduledFocus && active !== ref() && active !== document.body) return;
449
+ tryAutoFocus();
450
+ }, 0);
445
451
  } else {
446
452
  tryAutoFocus();
447
453
  }
@@ -94,7 +94,8 @@ function createFocusScope(props, ref) {
94
94
  if (restored) return;
95
95
  restored = true;
96
96
  clearTimeout(mountTimer);
97
- const preventAutoFocus = isPaused() || shouldPreventUnmountAutoFocus();
97
+ // Focus still on the element that held it at open was never moved by the user, so closing restores it as usual.
98
+ const preventAutoFocus = isPaused() || getActiveElement(container) !== previouslyFocusedElement && shouldPreventUnmountAutoFocus();
98
99
  focusScope.pause();
99
100
  focusScopeStack.remove(focusScope);
100
101
  const unmountEvent = new CustomEvent(AUTOFOCUS_ON_UNMOUNT_EVENT, EVENT_OPTIONS);
@@ -106,7 +106,8 @@ function createFocusScope(props, ref) {
106
106
  if (restored) return;
107
107
  restored = true;
108
108
  clearTimeout(mountTimer);
109
- const preventAutoFocus = isPaused() || shouldPreventUnmountAutoFocus();
109
+ // Focus still on the element that held it at open was never moved by the user, so closing restores it as usual.
110
+ const preventAutoFocus = isPaused() || getActiveElement(container) !== previouslyFocusedElement && shouldPreventUnmountAutoFocus();
110
111
  focusScope.pause();
111
112
  focusScopeStack.remove(focusScope);
112
113
  const unmountEvent = new CustomEvent(AUTOFOCUS_ON_UNMOUNT_EVENT, EVENT_OPTIONS);
@@ -473,7 +473,13 @@ function createSelectableCollection(props, ref, scrollRef) {
473
473
  };
474
474
  onMount(() => {
475
475
  if (mergedProps.deferAutoFocus) {
476
- setTimeout(tryAutoFocus, 0);
476
+ // A deferred autofocus must not override focus that moved while it waited, such as keyboard navigation into a submenu.
477
+ const scheduledFocus = document.activeElement;
478
+ setTimeout(() => {
479
+ const active = document.activeElement;
480
+ if (active !== scheduledFocus && active !== ref() && active !== document.body) return;
481
+ tryAutoFocus();
482
+ }, 0);
477
483
  } else {
478
484
  tryAutoFocus();
479
485
  }
@@ -17,11 +17,11 @@
17
17
  },
18
18
  {
19
19
  "name": "solid-js",
20
- "version": "1.9.15",
20
+ "version": "1.9.19",
21
21
  "directory": "solid-web",
22
- "tarball": "https://registry.npmjs.org/solid-js/-/solid-js-1.9.15.tgz",
23
- "integrity": "sha512-EeiY2xfpZJqPLjXspVEKjAII4yv8NyG//NxZ3IpOFHdUNnnTyL0uJOeS9LWGvA7cFCz5y94cjFwYlmw5Luncsg==",
24
- "patch": "patches/solid-js@1.9.15.patch"
22
+ "tarball": "https://registry.npmjs.org/solid-js/-/solid-js-1.9.19.tgz",
23
+ "integrity": "sha512-NIrV/6o1FtmrA9iuAAYvnQJZaHrGcaH3LKSVj4kCiZfwqjCtJNDgIgR9XcqYl6KR/Lb3oRx1HrlyswPWR8SRvw==",
24
+ "patch": "patches/solid-js@1.9.19.patch"
25
25
  },
26
26
  {
27
27
  "name": "cmdk-solid",
@@ -1,4 +1,4 @@
1
- // Vendored and modified by Gemologic Sheen from solid-js@1.9.15; see package THIRD_PARTY_NOTICES.md.
1
+ // Vendored and modified by Gemologic Sheen from solid-js@1.9.19; see package THIRD_PARTY_NOTICES.md.
2
2
  'use strict';
3
3
 
4
4
  var solidJs = require('solid-js');
@@ -199,7 +199,7 @@ function render(code, element, init, options = {}) {
199
199
  let disposer;
200
200
  solidJs.createRoot(dispose => {
201
201
  disposer = dispose;
202
- element === document ? code() : insert(element, code(), element.firstChild ? null : undefined, init);
202
+ element === document ? code() : insert(element, code(), !init && element.firstChild ? null : undefined, init);
203
203
  }, options.owner);
204
204
  return () => {
205
205
  disposer();
@@ -517,24 +517,28 @@ function eventHandler(e) {
517
517
  }
518
518
  });
519
519
  if (solidJs.sharedConfig.registry && !solidJs.sharedConfig.done && !solidJs.sharedConfig.count) solidJs.sharedConfig.done = _$HY.done = true;
520
- const path = e.composedPath && e.composedPath();
521
- if (path && path.length) {
522
- retarget(path[0]);
523
- for (let i = 0; i < path.length - 2; i++) {
524
- node = path[i];
525
- if (!handleNode()) break;
526
- if (node._$host) {
527
- node = node._$host;
528
- walkUpTree();
529
- break;
530
- }
531
- if (node.parentNode === oriCurrentTarget) {
532
- break;
520
+ try {
521
+ const path = e.composedPath && e.composedPath();
522
+ if (path && path.length) {
523
+ retarget(path[0]);
524
+ for (let i = 0; i < path.length - 2; i++) {
525
+ node = path[i];
526
+ if (!handleNode()) break;
527
+ if (node._$host) {
528
+ node = node._$host;
529
+ walkUpTree();
530
+ break;
531
+ }
532
+ if (node.parentNode === oriCurrentTarget) {
533
+ break;
534
+ }
533
535
  }
534
536
  }
537
+ else walkUpTree();
538
+ retarget(oriTarget);
539
+ } finally {
540
+ e = node = null;
535
541
  }
536
- else walkUpTree();
537
- retarget(oriTarget);
538
542
  }
539
543
  function insertExpression(parent, value, current, marker, unwrapArray) {
540
544
  const hydrating = isHydrating(parent);