@adea-ai/ui 0.99.1 → 0.99.2

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 (89) hide show
  1. package/dist/components/layout/orbit-layout/orbit-layout.d.ts +5 -1
  2. package/dist/components/layout/orbit-layout/orbit-layout.d.ts.map +1 -1
  3. package/dist/components/layout/orbit-layout/orbit-layout.js.map +1 -1
  4. package/dist/components/layout/side-rail/side-rail.d.ts +4 -1
  5. package/dist/components/layout/side-rail/side-rail.d.ts.map +1 -1
  6. package/dist/components/layout/side-rail/side-rail.js +58 -64
  7. package/dist/components/layout/side-rail/side-rail.js.map +1 -1
  8. package/dist/components/layout/sidebar-nav/sidebar-nav.js +2 -2
  9. package/dist/components/layout/sidebar-nav/sidebar-nav.js.map +1 -1
  10. package/dist/components/motion/presence.d.ts +17 -7
  11. package/dist/components/motion/presence.d.ts.map +1 -1
  12. package/dist/components/motion/presence.js.map +1 -1
  13. package/dist/components/theme/theme-picker.d.ts.map +1 -1
  14. package/dist/components/theme/theme-picker.js +1 -1
  15. package/dist/components/theme/theme-picker.js.map +1 -1
  16. package/dist/components/theme/theme-provider.d.ts.map +1 -1
  17. package/dist/components/theme/theme-provider.js +15 -4
  18. package/dist/components/theme/theme-provider.js.map +1 -1
  19. package/dist/components/ui/aspect-ratio/aspect-ratio.d.ts +2 -2
  20. package/dist/components/ui/aspect-ratio/aspect-ratio.d.ts.map +1 -1
  21. package/dist/components/ui/aspect-ratio/aspect-ratio.js +15 -1
  22. package/dist/components/ui/aspect-ratio/aspect-ratio.js.map +1 -1
  23. package/dist/components/ui/badge/badge.d.ts +1 -1
  24. package/dist/components/ui/button/button.d.ts +1 -1
  25. package/dist/components/ui/calendar/calendar.d.ts.map +1 -1
  26. package/dist/components/ui/calendar/calendar.js +1 -1
  27. package/dist/components/ui/calendar/calendar.js.map +1 -1
  28. package/dist/components/ui/card/card.d.ts +2 -2
  29. package/dist/components/ui/card/card.js +2 -2
  30. package/dist/components/ui/card/card.js.map +1 -1
  31. package/dist/components/ui/chart/chart-options.d.ts +50 -0
  32. package/dist/components/ui/chart/chart-options.d.ts.map +1 -0
  33. package/dist/components/ui/chart/chart-options.js +178 -0
  34. package/dist/components/ui/chart/chart-options.js.map +1 -0
  35. package/dist/components/ui/chart/chart.d.ts +21 -18
  36. package/dist/components/ui/chart/chart.d.ts.map +1 -1
  37. package/dist/components/ui/chart/chart.js +175 -155
  38. package/dist/components/ui/chart/chart.js.map +1 -1
  39. package/dist/components/ui/chart/index.js +2 -1
  40. package/dist/components/ui/input-otp/input-otp.d.ts.map +1 -1
  41. package/dist/components/ui/input-otp/input-otp.js +2 -2
  42. package/dist/components/ui/input-otp/input-otp.js.map +1 -1
  43. package/dist/components/ui/pagination/pagination.d.ts.map +1 -1
  44. package/dist/components/ui/pagination/pagination.js +1 -1
  45. package/dist/components/ui/pagination/pagination.js.map +1 -1
  46. package/dist/components/ui/resizable/resizable.d.ts +0 -12
  47. package/dist/components/ui/resizable/resizable.d.ts.map +1 -1
  48. package/dist/components/ui/resizable/resizable.js +43 -9
  49. package/dist/components/ui/resizable/resizable.js.map +1 -1
  50. package/dist/lib/cn-tables.generated.js +10 -10
  51. package/dist/lib/cn-tables.generated.js.map +1 -1
  52. package/dist/r/chart.json +5 -0
  53. package/dist/r/registry.json +5 -0
  54. package/dist/r/src/components/layout/orbit-layout/orbit-layout.tsx +5 -1
  55. package/dist/r/src/components/layout/side-rail/side-rail.tsx +29 -16
  56. package/dist/r/src/components/layout/sidebar-nav/sidebar-nav.tsx +2 -2
  57. package/dist/r/src/components/motion/presence.tsx +17 -7
  58. package/dist/r/src/components/theme/theme-picker.tsx +5 -1
  59. package/dist/r/src/components/theme/theme-provider.tsx +19 -9
  60. package/dist/r/src/components/ui/aspect-ratio/aspect-ratio.tsx +14 -3
  61. package/dist/r/src/components/ui/calendar/calendar.tsx +6 -1
  62. package/dist/r/src/components/ui/card/card.tsx +2 -2
  63. package/dist/r/src/components/ui/chart/chart-options.ts +196 -0
  64. package/dist/r/src/components/ui/chart/chart.tsx +149 -101
  65. package/dist/r/src/components/ui/input-otp/input-otp.tsx +14 -2
  66. package/dist/r/src/components/ui/pagination/pagination.tsx +8 -1
  67. package/dist/r/src/components/ui/resizable/resizable.tsx +46 -8
  68. package/dist/r/src/lib/cn-tables.generated.ts +10 -10
  69. package/dist/r/src/styles/base.css +4 -1
  70. package/dist/r/src/styles/theme.css +23 -43
  71. package/package.json +1 -1
  72. package/registry.json +5 -0
  73. package/src/components/layout/orbit-layout/orbit-layout.tsx +5 -1
  74. package/src/components/layout/side-rail/side-rail.tsx +29 -16
  75. package/src/components/layout/sidebar-nav/sidebar-nav.tsx +2 -2
  76. package/src/components/motion/presence.tsx +17 -7
  77. package/src/components/theme/theme-picker.tsx +5 -1
  78. package/src/components/theme/theme-provider.tsx +19 -9
  79. package/src/components/ui/aspect-ratio/aspect-ratio.tsx +14 -3
  80. package/src/components/ui/calendar/calendar.tsx +6 -1
  81. package/src/components/ui/card/card.tsx +2 -2
  82. package/src/components/ui/chart/chart-options.ts +196 -0
  83. package/src/components/ui/chart/chart.tsx +149 -101
  84. package/src/components/ui/input-otp/input-otp.tsx +14 -2
  85. package/src/components/ui/pagination/pagination.tsx +8 -1
  86. package/src/components/ui/resizable/resizable.tsx +46 -8
  87. package/src/lib/cn-tables.generated.ts +10 -10
  88. package/src/styles/base.css +4 -1
  89. package/src/styles/theme.css +23 -43
@@ -16,9 +16,10 @@
16
16
  * lightness step reads as the same step in every hue and a re-hue does not
17
17
  * need its ramp re-derived by eye.
18
18
  * - **`@adea-ai/themes` supplies the values.** The two default themes are composed
19
- * there from upstream palettes — Aardvark Ink's canvas and greyscale for Adea
20
- * Dark, Nord Light's for Adea Light, and GitHub's hues for both — and normalized
21
- * against measured contrast floors. The colour declarations in sections 1 and 2
19
+ * there from upstream palettes — GitHub Dark Default's canvas and greyscale,
20
+ * re-greyed to violet, for Adea Dark; GitHub Light Default's white canvas for Adea
21
+ * Light; and GitHub's dark hues for both — and normalized against measured
22
+ * contrast floors. The colour declarations in sections 1 and 2
22
23
  * are *generated* from that catalogue (`bun run theme:build`) rather than written
23
24
  * here; everything else in this file is this system's own.
24
25
  *
@@ -41,11 +42,11 @@
41
42
  * ========================================================================== */
42
43
 
43
44
  /* ---------------------------------------------------------------------------
44
- * 1. Colour — light theme (the default)
45
+ * 1. Colour — light theme (the `:root` fallback; Storybook opens dark)
45
46
  *
46
- * Contrast: body text 8.6:1 on the canvas and 7.7:1 on a card, `--muted-foreground`
47
- * 5.5:1 on the canvas and 5.0:1 on a card, `--primary-foreground` on `--primary`
48
- * 5.9:1. Measured rather than estimated; `tests/tokens.test.ts` asserts each pairing.
47
+ * Contrast: body text 15.8:1 on the canvas and 14.3:1 on a card, `--muted-foreground`
48
+ * 6.2:1 on the canvas and 5.6:1 on a card and the sidebar, `--primary-foreground` on
49
+ * `--primary` 6.1:1. Measured rather than estimated; `tests/tokens.test.ts` asserts each pairing.
49
50
  * ------------------------------------------------------------------------- */
50
51
  :root {
51
52
  /* @generated theme:root — run `bun run theme:build` after changing the catalogue */
@@ -176,13 +177,15 @@
176
177
  /* ---------------------------------------------------------------------------
177
178
  * 2. Colour — dark theme
178
179
  *
179
- * adea's dark theme is a *soft* neutral rather than a near-black: the canvas is a
180
- * light grey and the primary is near-white. That is the product's existing look,
181
- * and it is deliberately not the near-black blue-tinted dark of the donor this
182
- * system's structure came from.
180
+ * A near-black violet-grey canvas — GitHub Dark Default's greyscale with its chroma
181
+ * halved and its hue turned from blue to violet — and a bright violet primary that
182
+ * carries a near-black label. The tint is what pairs it with the light theme's
183
+ * violet; it is deliberately not the blue-tinted dark of the donor this system's
184
+ * structure came from.
183
185
  *
184
- * Contrast: body text 14.9:1, `--muted-foreground` 6.1:1 on the canvas and 4.9:1
185
- * on a card, `--primary-foreground` on `--primary` 10.4:1.
186
+ * Contrast: body text 16.0:1 on the canvas and 14.9:1 on a card,
187
+ * `--muted-foreground` 7.0:1 on the canvas and 6.5:1 on a card and the sidebar,
188
+ * `--primary-foreground` on `--primary` 7.5:1.
186
189
  * ------------------------------------------------------------------------- */
187
190
  .dark {
188
191
  /* @generated theme:dark — run `bun run theme:build` after changing the catalogue */
@@ -304,7 +307,7 @@
304
307
  /* ---------------------------------------------------------------------------
305
308
  * 3. The accent axis
306
309
  *
307
- * adea's six accents, as a selection rather than a constant. `data-accent` sits on
310
+ * adea's six accent presets, as a selection rather than a constant. `data-accent` sits on
308
311
  * the same element as `dark` — in both applications that is `<html>` — and each
309
312
  * block overrides the roles an accent owns: the interactive primary, its label,
310
313
  * its hover rung, its tint and the focus ring.
@@ -319,7 +322,7 @@
319
322
  * for exactly this reason: a bright violet in dark mode carries a black
320
323
  * label, and the same accent's deep light-mode form carries a white one.
321
324
  *
322
- * `theme` (the default) is the monochrome primary above and needs no block.
325
+ * `theme` (the default) is the theme's own primary above and needs no block.
323
326
  * ------------------------------------------------------------------------- */
324
327
 
325
328
  /* @generated accents — run `bun run theme:build` after changing the catalogue */
@@ -490,23 +493,6 @@
490
493
  --ui-word-spacing: -2.5px;
491
494
  }
492
495
 
493
- /* The default, and it has to be declared *above* the blocks above.
494
- *
495
- * `:root` and `[data-font='…']` have the same specificity, so the later one wins
496
- * outright. With the default written after them — which is where it naturally
497
- * belongs, next to the stacks it references — every `[data-font]` block was
498
- * dead: all five typefaces resolved to Space Grotesk while the toolbar reported a
499
- * different selection.
500
- *
501
- * The references resolve fine from here even though `--font-family-*` is declared
502
- * further down, because a custom property is resolved where it is used rather than
503
- * where it is declared. The ordering that matters is between two declarations of
504
- * the *same* property, and there is only one of those below.
505
- *
506
- * `tests/appearance-axes.test.ts` asserts this order, because "the block is above
507
- * the default" is invisible to review and to every behavioural test.
508
- */
509
-
510
496
  /* ---------------------------------------------------------------------------
511
497
  * 4. Non-colour scales
512
498
  *
@@ -596,12 +582,6 @@
596
582
  --row-height-md: 2rem;
597
583
  --row-height-lg: 2.25rem;
598
584
 
599
- /* Space Grotesk is the default because it is the face the visual language was
600
- drawn against: the donor this system's structure comes from sets it, and its
601
- slightly narrow, geometric forms are part of the look. The *selection* that
602
- picks between it and the other four is the `:root` block above, which has to
603
- precede every `[data-font]` block for the reason given there. */
604
-
605
585
  /* Shell geometry. One place to change how wide a rail or sidebar is, so the two
606
586
  consumer apps cannot disagree. 56px keeps the icon column to its content:
607
587
  20px glyphs centred in a 36px row need less chrome than the 74px the donor's
@@ -621,9 +601,9 @@
621
601
  --tooltip-max-width: min(16rem, calc(100vw - 1.5rem));
622
602
 
623
603
  /* Shadows. Two parts on purpose: a tinted spread that reads as elevation, plus a
624
- hairline that keeps an edge visible when the surface behind a panel is the
625
- same colour as the panel — which is the light theme, where `--card` and
626
- `--background` are both white. */
604
+ hairline that keeps an edge visible when the surface behind a panel is
605
+ nearly the same colour as the panel — which is the light theme, where `--card`
606
+ is one faint step off a white `--background`. */
627
607
  --shadow-2xs: 0 1px 2px 0 oklch(0 0 0 / 0.05);
628
608
  --shadow-xs: 0 1px 2px 0 oklch(0 0 0 / 0.06);
629
609
  --shadow-sm: 0 1px 2px oklch(0 0 0 / 0.06), 0 0 0 1px oklch(0 0 0 / 0.04);
@@ -631,8 +611,8 @@
631
611
  --shadow-lg: 0 12px 28px oklch(0 0 0 / 0.12);
632
612
  --shadow-xl: 0 20px 44px oklch(0 0 0 / 0.16);
633
613
 
634
- /* Motion. Two durations cover the system: `fast` for a state change the user is
635
- already watching, `normal` for an entrance. The easing is KiroCrew's entrance
614
+ /* Motion. Three durations cover the system: `fast` for a state change the user is
615
+ already watching, `normal` for an entrance, `slow` for a layout settle. The easing is KiroCrew's entrance
636
616
  curve — a fast start and a long settle, which reads as decisive rather than
637
617
  floaty. */
638
618
  --duration-fast: 120ms;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@adea-ai/ui",
3
- "version": "0.99.1",
3
+ "version": "0.99.2",
4
4
  "description": "The Adea design system: Kobalte-backed Solid components, semantic OKLCH tokens, and the app-shell layout primitives shared by Adea and Cortana.",
5
5
  "keywords": [
6
6
  "adea",
package/registry.json CHANGED
@@ -325,6 +325,11 @@
325
325
  "lib"
326
326
  ],
327
327
  "files": [
328
+ {
329
+ "path": "src/components/ui/chart/chart-options.ts",
330
+ "type": "registry:ui",
331
+ "target": "components/ui/chart/chart-options.ts"
332
+ },
328
333
  {
329
334
  "path": "src/components/ui/chart/chart.tsx",
330
335
  "type": "registry:ui",
@@ -60,7 +60,11 @@ export function OrbitLayout(props: OrbitLayoutProps) {
60
60
  export type OrbitItemProps = Omit<ComponentProps<'div'>, 'style'> & {
61
61
  /** JSX style props are owned by this geometry primitive. */
62
62
  style?: never
63
- /** Zero-based position in the rendered sequence. */
63
+ /**
64
+ * Zero-based position in the rendered sequence. Index 0 sits at three o'clock
65
+ * (the positive x axis) and the sequence runs clockwise, because the y axis
66
+ * points down the screen: with four items, 0 is east, 1 south, 2 west, 3 north.
67
+ */
64
68
  index: number
65
69
  /** Number of items sharing this orbit. */
66
70
  count: number
@@ -205,7 +205,10 @@ export type SideRailItemProps<T extends ValidComponent = 'a'> = PolymorphicProps
205
205
  * being deleted.
206
206
  */
207
207
  label: string
208
- /** A count or a dot, rendered over the icon's corner. */
208
+ /**
209
+ * A count or a dot. Expanded, it trails the label at the row's end; collapsed,
210
+ * it moves onto the icon's corner, so the rail never loses it.
211
+ */
209
212
  badge?: JSX.Element
210
213
  /** An indicator pinned to the trailing edge in the expanded form. */
211
214
  trailing?: JSX.Element
@@ -258,6 +261,7 @@ export function SideRailItem<T extends ValidComponent = 'a'>(props: SideRailItem
258
261
  data-active={local.active ? '' : undefined}
259
262
  class={cn(
260
263
  sideRailItemClass,
264
+ 'relative',
261
265
  local.active ? sideRailItemStateClass.active : sideRailItemStateClass.idle,
262
266
  local.class
263
267
  )}
@@ -267,24 +271,33 @@ export function SideRailItem<T extends ValidComponent = 'a'>(props: SideRailItem
267
271
  onBlur={hideTip}
268
272
  {...(rest as Record<string, unknown>)}
269
273
  >
270
- <Show when={local.badge}>
271
- <span class="relative flex size-5 shrink-0 items-center justify-center [&_svg]:size-5">
272
- {local.children}
273
- <span class="absolute -top-1 -end-1 flex items-center justify-center">
274
- {local.badge}
275
- </span>
276
- </span>
277
- </Show>
278
- <Show when={!local.badge}>
279
- <span class="flex size-5 shrink-0 items-center justify-center [&_svg]:size-5">
280
- {local.children}
281
- </span>
282
- </Show>
274
+ <span class="flex size-5 shrink-0 items-center justify-center [&_svg]:size-5">
275
+ {local.children}
276
+ </span>
283
277
 
284
- <span class="min-w-0 flex-1 truncate group-data-[collapsed=true]/rail:sr-only">
278
+ <span class="min-w-0 flex-1 truncate text-start group-data-[collapsed=true]/rail:sr-only">
285
279
  {local.label}
286
280
  </span>
287
281
 
282
+ {/*
283
+ * One element, two placements, because the badge is caller content and a DOM
284
+ * node cannot be in two places. Expanded, it is a trailing count in the row's
285
+ * flow, after the label — over the icon it would cover the glyph the row is
286
+ * recognised by. Collapsed, there is no label to trail, so it leaves the flow
287
+ * and pins to the icon's top-end corner: anchored to the row's centre (where
288
+ * the centred icon sits) and pushed out by 14px, the icon's half-width plus
289
+ * the 4px overhang, so a wider count grows back over the icon rather than past
290
+ * the rail's edge.
291
+ */}
292
+ <Show when={local.badge}>
293
+ <span
294
+ data-slot="side-rail-badge"
295
+ class="flex shrink-0 items-center justify-center group-data-[collapsed=true]/rail:absolute group-data-[collapsed=true]/rail:end-1/2 group-data-[collapsed=true]/rail:top-1/2 group-data-[collapsed=true]/rail:-me-3.5 group-data-[collapsed=true]/rail:-mt-3.5"
296
+ >
297
+ {local.badge}
298
+ </span>
299
+ </Show>
300
+
288
301
  <Show when={local.shortcut && local.trailing === undefined}>
289
302
  <span
290
303
  aria-hidden="true"
@@ -380,7 +393,7 @@ export function SideRailButton(
380
393
  <span class="flex size-5 shrink-0 items-center justify-center [&_svg]:size-5">
381
394
  {local.children}
382
395
  </span>
383
- <span class="min-w-0 flex-1 truncate group-data-[collapsed=true]/rail:sr-only">
396
+ <span class="min-w-0 flex-1 truncate text-start group-data-[collapsed=true]/rail:sr-only">
384
397
  {local.label}
385
398
  </span>
386
399
  <Show when={local.shortcut}>
@@ -182,7 +182,7 @@ export function SidebarNavSection(props: SidebarNavSectionProps) {
182
182
  })}
183
183
  />
184
184
  </Show>
185
- <span class="min-w-0 flex-1 truncate">{local.label}</span>
185
+ <span class="min-w-0 flex-1 truncate text-start">{local.label}</span>
186
186
  <Show when={local.count !== undefined}>
187
187
  <span class="shrink-0 tabular-nums text-muted-foreground">{local.count}</span>
188
188
  </Show>
@@ -290,7 +290,7 @@ export function SidebarNavLabel(props: ComponentProps<'span'>) {
290
290
  return (
291
291
  <span
292
292
  data-slot="sidebar-nav-label"
293
- class={cn('min-w-0 flex-1 truncate', local.class)}
293
+ class={cn('min-w-0 flex-1 truncate text-start', local.class)}
294
294
  {...rest}
295
295
  />
296
296
  )
@@ -14,14 +14,24 @@ import { Presence as MotionPresence } from 'solid-motionone'
14
14
  * this for mounting and unmounting, which is the split that keeps the common case
15
15
  * free of a runtime while making the rare case correct.
16
16
  *
17
- * <Show when={open()}>
18
- * <Presence initial={{ opacity: 0, scale: 0.96 }} exit={{ opacity: 0, scale: 0.96 }}>
19
- * <div>…</div>
20
- * </Presence>
21
- * </Show>
17
+ * <Presence exitBeforeEnter>
18
+ * <Show when={open()}>
19
+ * <Motion.div
20
+ * initial={{ opacity: 0, scale: 0.96 }}
21
+ * animate={{ opacity: 1, scale: 1 }}
22
+ * exit={{ opacity: 0, scale: 0.96 }}
23
+ * >
24
+ * …
25
+ * </Motion.div>
26
+ * </Show>
27
+ * </Presence>
22
28
  *
23
- * `Presence` keeps the child mounted until its exit finishes, so the `<Show>` above
24
- * can stay the only condition in the tree.
29
+ * `Presence` goes *outside* the condition: it has to outlive the `<Show>`'s child
30
+ * to keep that child mounted until its exit finishes. It takes only two booleans —
31
+ * `initial={false}` skips the enter animation on first render, `exitBeforeEnter`
32
+ * holds a replacement back until the outgoing element has left. The animation
33
+ * itself lives on the `Motion.*` element, which must be the direct child of the
34
+ * condition for its `exit` to run.
25
35
  */
26
36
  export type PresenceProps = ComponentProps<typeof MotionPresence> & {
27
37
  children?: JSX.Element
@@ -159,7 +159,11 @@ export function ThemePicker(props: ThemePickerProps) {
159
159
  role="radio"
160
160
  aria-checked={local.selectedId === theme.id}
161
161
  aria-label={`${theme.familyLabel} ${theme.label}`}
162
- class="h-auto flex-col gap-1.5 p-0 hover:bg-transparent"
162
+ // `justify-start`: the options in a wrapped row stretch to its tallest
163
+ // member, and an option whose label has a second line (the family)
164
+ // is that member. Centred, every shorter option's preview dropped below
165
+ // its neighbours'; pinned to the top, the previews share one line.
166
+ class="h-auto flex-col justify-start gap-1.5 p-0 hover:bg-transparent"
163
167
  onClick={() => local.onThemeSelect(theme)}
164
168
  >
165
169
  <ThemePreview theme={theme} selected={local.selectedId === theme.id} />
@@ -121,11 +121,23 @@ export function useTheme(): ThemeContextValue {
121
121
  return value
122
122
  }
123
123
 
124
+ /**
125
+ * The preference store, or nothing.
126
+ *
127
+ * Only ever called inside a `try`: where storage is blocked — a sandboxed iframe, a
128
+ * privacy mode, a denied site-data permission — merely *reading* the `localStorage`
129
+ * global throws ("Access is denied", `SecurityError`), so even the `typeof` guard
130
+ * has to sit inside the `try` rather than in front of it. Without a store the
131
+ * preference lives only in the provider's signal for the session.
132
+ */
133
+ function preferenceStore(): Storage | undefined {
134
+ return typeof localStorage === 'undefined' ? undefined : localStorage
135
+ }
136
+
124
137
  /** The stored preference, validated against the catalogue. */
125
138
  function readSelection(storageKey: string): ThemeSelection {
126
- if (typeof localStorage === 'undefined') return defaultThemeSelection
127
139
  try {
128
- const raw = localStorage.getItem(storageKey)
140
+ const raw = preferenceStore()?.getItem(storageKey)
129
141
  if (!raw) return defaultThemeSelection
130
142
  const parsed = JSON.parse(raw) as Partial<ThemeSelection>
131
143
  return {
@@ -268,13 +280,11 @@ export function ThemeProvider(props: ThemeProviderProps) {
268
280
  setSelection(patch) {
269
281
  const next = { ...selection(), ...patch }
270
282
  setSelectionState(next)
271
- if (typeof localStorage !== 'undefined') {
272
- try {
273
- localStorage.setItem(storageKey(), JSON.stringify(next))
274
- } catch {
275
- // A full or unavailable store must not break the switch: the preference
276
- // simply does not survive the reload.
277
- }
283
+ try {
284
+ preferenceStore()?.setItem(storageKey(), JSON.stringify(next))
285
+ } catch {
286
+ // A full, blocked or unavailable store must not break the switch: the
287
+ // preference simply does not survive the reload.
278
288
  }
279
289
  },
280
290
  }
@@ -1,4 +1,4 @@
1
- import type { ComponentProps } from 'solid-js'
1
+ import type { ComponentProps, JSX } from 'solid-js'
2
2
  import { splitProps } from 'solid-js'
3
3
  import { cn } from '#lib/utils'
4
4
 
@@ -22,13 +22,24 @@ export type AspectRatioProps = ComponentProps<'div'> & {
22
22
  ratio?: number
23
23
  }
24
24
 
25
+ /**
26
+ * The caller's style with the ratio laid over it. A spread `style` replaces the
27
+ * element's rather than merging, so passing any style used to drop the ratio and
28
+ * collapse the box to zero height. `ratio` is the API for the ratio, so it wins.
29
+ */
30
+ function withRatio(style: AspectRatioProps['style'], ratio: number): JSX.CSSProperties | string {
31
+ const value = String(ratio)
32
+ if (typeof style === 'string') return `${style};aspect-ratio:${value}`
33
+ return { ...style, 'aspect-ratio': value }
34
+ }
35
+
25
36
  export function AspectRatio(props: AspectRatioProps) {
26
- const [local, rest] = splitProps(props, ['class', 'ratio', 'children'])
37
+ const [local, rest] = splitProps(props, ['class', 'ratio', 'style', 'children'])
27
38
 
28
39
  return (
29
40
  <div
30
41
  data-slot="aspect-ratio"
31
- style={{ 'aspect-ratio': String(local.ratio ?? 16 / 9) }}
42
+ style={withRatio(local.style, local.ratio ?? 16 / 9)}
32
43
  class={cn('relative w-full [&>*]:absolute [&>*]:inset-0 [&>*]:size-full', local.class)}
33
44
  {...rest}
34
45
  >
@@ -171,7 +171,12 @@ function CalendarGrid(props: {
171
171
  // Styled from data states, so a day can be a range
172
172
  // end and today at once without a prop per pair.
173
173
  'data-selected:bg-primary data-selected:text-primary-foreground',
174
- 'data-in-range:bg-primary-subtle',
174
+ // corvu marks every day of a range selected, so the
175
+ // span between the ends steps back to the subtle
176
+ // fill and the ends take the solid one again.
177
+ 'data-in-range:bg-primary-subtle data-in-range:text-foreground',
178
+ 'data-range-start:bg-primary data-range-start:text-primary-foreground',
179
+ 'data-range-end:bg-primary data-range-end:text-primary-foreground',
175
180
  'data-range-start:rounded-r-none data-range-end:rounded-l-none',
176
181
  'data-today:ring-1 data-today:ring-ring',
177
182
  'data-disabled:text-muted-foreground data-disabled:line-through',
@@ -6,8 +6,8 @@ import { cn } from '#lib/utils'
6
6
  * Card.
7
7
  *
8
8
  * A surface that sits on the canvas. Every card carries its own edge — a
9
- * border — because in the light theme `--card` and `--background` are both
10
- * white, and a borderless card there is invisible. Making the border
9
+ * border — because in the light theme `--card` is one faint step off a white
10
+ * `--background`, and a borderless card there all but disappears. Making the border
11
11
  * structural rather than optional is what stops one app's cards from reading
12
12
  * as floating panels and another's as nothing at all.
13
13
  *
@@ -0,0 +1,196 @@
1
+ import type { ChartOptions } from 'chart.js'
2
+
3
+ /**
4
+ * The chart's options, as data: no Chart.js runtime and no DOM, so the theme's
5
+ * defaults and the merge rules are testable on their own.
6
+ *
7
+ * Every colour here is written as `var(--token)`. A canvas cannot read a custom
8
+ * property — `fillStyle = 'var(--chart-1)'` is an invalid colour, which the
9
+ * canvas ignores and paints in its default black — so these strings are the
10
+ * *declaration* of which token a colour comes from. The components resolve them
11
+ * against their own element at render time (see `resolveCssVariables` and the
12
+ * resolver in `chart.tsx`).
13
+ */
14
+
15
+ /** The five series colours, in the order a multi-series chart should use them. */
16
+ export const chartSeriesColors = [
17
+ 'var(--chart-1)',
18
+ 'var(--chart-2)',
19
+ 'var(--chart-3)',
20
+ 'var(--chart-4)',
21
+ 'var(--chart-5)',
22
+ ] as const
23
+
24
+ /**
25
+ * The chart furniture, mapped onto existing semantic tokens rather than given
26
+ * tokens of its own. A grid line is a line, so it is `--border`; an axis tick and
27
+ * a legend label are secondary text, so they are `--muted-foreground`, whose
28
+ * contrast on `--card` (the frame's surface) is already measured in
29
+ * `tests/tokens.test.ts`. Dedicated `--chart-grid`/`--chart-axis`/`--chart-label`
30
+ * tokens would be three more values to keep in step with these in every theme
31
+ * for no difference anyone has asked for.
32
+ */
33
+ const furniture = {
34
+ grid: 'var(--border)',
35
+ axis: 'var(--muted-foreground)',
36
+ label: 'var(--muted-foreground)',
37
+ surface: 'var(--card)',
38
+ } as const
39
+
40
+ /**
41
+ * Which scales a chart type draws. Chart.js creates a scale for every key under
42
+ * `options.scales` whatever the chart type, so cartesian defaults handed to a
43
+ * doughnut draw an x and a y axis and a grid behind it. The shape keeps each
44
+ * type's defaults to the scales it actually has.
45
+ */
46
+ export type ChartScaleShape = 'cartesian' | 'radial' | 'none'
47
+
48
+ const tickFont = { size: 10 }
49
+
50
+ function scalesFor(shape: ChartScaleShape): ChartOptions['scales'] {
51
+ if (shape === 'cartesian') {
52
+ return {
53
+ x: {
54
+ border: { color: furniture.grid },
55
+ grid: { color: furniture.grid, drawTicks: false },
56
+ ticks: { color: furniture.axis, font: tickFont },
57
+ },
58
+ y: {
59
+ border: { display: false },
60
+ grid: { color: furniture.grid, drawTicks: false },
61
+ ticks: { color: furniture.axis, font: tickFont },
62
+ },
63
+ }
64
+ }
65
+ if (shape === 'radial') {
66
+ return {
67
+ r: {
68
+ grid: { color: furniture.grid },
69
+ angleLines: { color: furniture.grid },
70
+ pointLabels: { color: furniture.axis, font: tickFont },
71
+ // The default backdrop is a translucent white box, which is a white box
72
+ // on a dark card. The frame's own surface makes it disappear in both.
73
+ ticks: { color: furniture.axis, backdropColor: furniture.surface, font: tickFont },
74
+ },
75
+ }
76
+ }
77
+ return undefined
78
+ }
79
+
80
+ function isPlainObject(value: unknown): value is Record<string, unknown> {
81
+ if (typeof value !== 'object' || value === null) return false
82
+ const prototype = Object.getPrototypeOf(value)
83
+ return prototype === Object.prototype || prototype === null
84
+ }
85
+
86
+ function mergeInto(target: Record<string, unknown>, source: Record<string, unknown>) {
87
+ for (const [key, value] of Object.entries(source)) {
88
+ if (value === undefined) continue
89
+ const current = target[key]
90
+ target[key] =
91
+ isPlainObject(value) && isPlainObject(current)
92
+ ? mergeInto({ ...current }, value)
93
+ : isPlainObject(value)
94
+ ? mergeInto({}, value)
95
+ : value
96
+ }
97
+ return target
98
+ }
99
+
100
+ /**
101
+ * Merge Chart.js options, later sources winning, object by object.
102
+ *
103
+ * Deep, because Chart.js options are deep: `{ scales: { x: { stacked: true } } }`
104
+ * means "also stack x", and a spread would replace the whole axis — its grid,
105
+ * its tick colour, its font — with that one flag. Arrays, functions (scriptable
106
+ * options) and class instances (gradients, patterns) are values and replace
107
+ * rather than merge. No source is mutated.
108
+ */
109
+ export function mergeChartOptions(...sources: (ChartOptions | undefined)[]): ChartOptions {
110
+ const merged: Record<string, unknown> = {}
111
+ for (const source of sources) {
112
+ if (source) mergeInto(merged, source as Record<string, unknown>)
113
+ }
114
+ return merged as ChartOptions
115
+ }
116
+
117
+ /**
118
+ * The theme's defaults as Chart.js options.
119
+ *
120
+ * Exported so a caller can spread it and change one thing, rather than
121
+ * restating every colour. Everything a chart draws that is not data — grid,
122
+ * ticks, legend, tooltip — is decided here once, which is what makes two charts
123
+ * in one application look like they came from the same place. `overrides` is
124
+ * merged deeply; `shape` selects the scales the chart type has.
125
+ */
126
+ export function chartOptions(
127
+ overrides?: ChartOptions,
128
+ shape: ChartScaleShape = 'cartesian'
129
+ ): ChartOptions {
130
+ return mergeChartOptions(
131
+ {
132
+ responsive: true,
133
+ maintainAspectRatio: false,
134
+ interaction: { mode: 'nearest', intersect: false },
135
+ plugins: {
136
+ legend: {
137
+ labels: {
138
+ color: furniture.label,
139
+ boxWidth: 8,
140
+ boxHeight: 8,
141
+ usePointStyle: true,
142
+ pointStyle: 'circle',
143
+ font: { size: 11 },
144
+ },
145
+ },
146
+ tooltip: {
147
+ backgroundColor: 'var(--popover)',
148
+ titleColor: 'var(--popover-foreground)',
149
+ bodyColor: 'var(--popover-foreground)',
150
+ borderColor: 'var(--border)',
151
+ borderWidth: 1,
152
+ padding: 8,
153
+ cornerRadius: 6,
154
+ displayColors: true,
155
+ boxWidth: 8,
156
+ boxHeight: 8,
157
+ usePointStyle: true,
158
+ titleFont: { size: 11, weight: 600 },
159
+ bodyFont: { size: 11 },
160
+ },
161
+ },
162
+ scales: scalesFor(shape),
163
+ },
164
+ overrides
165
+ )
166
+ }
167
+
168
+ const cssVariable = /^\s*var\(\s*(--[\w-]+)\s*(?:,\s*(.*?))?\s*\)\s*$/
169
+
170
+ /**
171
+ * Replace every `var(--token)` string in `value` — options, datasets, nested
172
+ * arrays — with what `read` returns for the token. A token `read` cannot
173
+ * resolve falls back to the `var()`'s own fallback, then to the string as
174
+ * written. Functions and class instances pass through untouched, so scriptable
175
+ * options and gradients keep working.
176
+ */
177
+ export function resolveCssVariables<T>(value: T, read: (name: string) => string | undefined): T {
178
+ if (typeof value === 'string') {
179
+ const match = cssVariable.exec(value)
180
+ if (!match) return value
181
+ const resolved = read(match[1]!)
182
+ if (resolved) return resolved as T
183
+ return (match[2] ? resolveCssVariables(match[2], read) : value) as T
184
+ }
185
+ if (Array.isArray(value)) {
186
+ return value.map((entry: unknown) => resolveCssVariables(entry, read)) as T
187
+ }
188
+ if (isPlainObject(value)) {
189
+ const resolved: Record<string, unknown> = {}
190
+ for (const [key, entry] of Object.entries(value)) {
191
+ resolved[key] = resolveCssVariables(entry, read)
192
+ }
193
+ return resolved as T
194
+ }
195
+ return value
196
+ }