@threadlabs/looma 0.47.0 → 0.47.1

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.
package/docs/README.md CHANGED
@@ -124,7 +124,7 @@ The starting themes make different choices within the same controls:
124
124
 
125
125
  The summary stays above the editor and updates as decisions change; Undo, Redo and Reset remain available there. Optional accent swatches offer None inside the picker, without a separate mode selector.
126
126
 
127
- A refined preset keeps its name with “customized” beside it. **Reset material** resets only material and light; **Reset palette** resets only the palette. Status color relationships offer **Semantic colors**, **Less color**, and **Primary + icons**. **Reset status colors** restores the selected status relationship without changing brand colors, type, or material; advanced per-status relationships remain available. These family choices are recorded in the recipe's optional `presets` mapping. The `values` mapping remains the complete source of the generated theme; a preset is a named combination of those values.
127
+ A refined preset keeps its name with “customized” beside it. The shared toolbar provides Undo, Redo, and a single Reset for the theme. Cmd/Ctrl+Z and Cmd/Ctrl+Shift+Z also undo and redo theme changes, including while a dropdown has focus; text fields retain their native editing history. Status color relationships offer **Semantic colors**, **Less color**, and **Primary + icons**, with advanced per-status relationships available. These family choices are recorded in the recipe's optional `presets` mapping. The `values` mapping remains the complete source of the generated theme; a preset is a named combination of those values.
128
128
 
129
129
  Number controls accept arithmetic such as `1rem / 1.2` or `150ms * 2`, calculate on entry and show the result. Unit changes preserve the quantity. Sliders include exact entry, and curve handles support dragging and arrow keys alongside numeric coordinates. LightEditor keeps its coordinate fields under **Exact position**. Light and curve drags preserve the grab offset; Escape or pointer cancellation restores the gesture start without creating a saved edit.
130
130
 
package/docs/catalog.json CHANGED
@@ -463,7 +463,7 @@
463
463
  ],
464
464
  "schemaVersion": 1,
465
465
  "package": "@threadlabs/looma",
466
- "version": "0.47.0",
466
+ "version": "0.47.1",
467
467
  "groups": [
468
468
  {
469
469
  "id": "layout",
@@ -2915,8 +2915,7 @@
2915
2915
  {
2916
2916
  "name": "--ui-surface-highlight",
2917
2917
  "fallbacks": [
2918
- "none",
2919
- "linear-gradient(transparent, transparent)"
2918
+ "none"
2920
2919
  ]
2921
2920
  },
2922
2921
  {
@@ -10478,13 +10477,6 @@
10478
10477
  {
10479
10478
  "name": "--ui-surface-default"
10480
10479
  },
10481
- {
10482
- "name": "--ui-surface-highlight",
10483
- "fallbacks": [
10484
- "none",
10485
- "linear-gradient(transparent, transparent)"
10486
- ]
10487
- },
10488
10480
  {
10489
10481
  "name": "--ui-text"
10490
10482
  },
@@ -77,9 +77,9 @@ export function customizerResource(site, input = defaultRecipe()) {
77
77
  const materialSurfaces = `<ui-grid columns="2" min="sm"><ui-card variant="elevated" data-material-standard><ui-stack gap="s"><ui-text weight="medium" size="md">Everyday surface</ui-text><ui-text variant="caption">A restrained lift for ordinary content.</ui-text><ui-button variant="outline" tone="neutral">Read memo</ui-button></ui-stack></ui-card><ui-card variant="elevated" treatment="expressive" data-material-expressive><ui-stack gap="s"><ui-text weight="medium" size="md">Expressive surface</ui-text><ui-text variant="caption">Finish, edge light, glow and the decorative rim.</ui-text><ui-button variant="solid" tone="accent">Join briefing</ui-button></ui-stack></ui-card></ui-grid><ui-cluster><ui-button id="material-popover-trigger" variant="outline" tone="accent">Open popover</ui-button><ui-popover for="material-popover-trigger"><ui-stack gap="s"><ui-text size="md">Floating material</ui-text><ui-text variant="caption">Adjust glass, separation and translucency with this open.</ui-text></ui-stack></ui-popover><ui-button id="material-dialog-trigger" variant="outline" tone="neutral">Open dialog</ui-button><ui-dialog id="material-preview-dialog" for="material-dialog-trigger" label="Surface and light"><ui-text size="md">Compare the backdrop, content plane and frame as the material changes.</ui-text><ui-button slot="actions" variant="solid" commandfor="material-preview-dialog" command="close">Done</ui-button></ui-dialog></ui-cluster>`;
78
78
  const materialSample = `<ui-card treatment="expressive"><ui-stack gap="m"><ui-text variant="heading" as="h3">Fellowship briefing</ui-text><ui-text>Content stays readable while the rim reveals the scene.</ui-text><ui-input label="Office search" placeholder="Search the Fellowship office"></ui-input><ui-action-bar><ui-button slot="secondary" preset="standard">Keep draft</ui-button><ui-button slot="primary" preset="primary">Send briefing</ui-button></ui-action-bar></ui-stack></ui-card>`;
79
79
  const lightEditor = `<ui-light-editor data-light-editor x="${recipe.values['light-x']}" y="${recipe.values['light-y']}" label="Theme light position"><ui-stack gap="s"><ui-text variant="heading">Move the light</ui-text><ui-button preset="primary">Material response</ui-button></ui-stack></ui-light-editor>`;
80
- const materialView = editor('material', `<ui-stack>${materialSample}${materialSurfaces}</ui-stack>`, `<div class="settings-section"><ui-cluster align="end">${renderPreset('material', 'refinement')}<ui-button size="sm" data-action="restore-material" aria-label="Reset material">Reset</ui-button></ui-cluster></div>${fieldsFor(['finish','translucency','glassiness'])}<div class="settings-section"><ui-cluster gap="xs"><ui-text weight="medium">Lighting</ui-text><ui-icon-button id="help-lighting" size="sm" label="About lighting"><ui-icon name="help"></ui-icon></ui-icon-button><ui-tooltip for="help-lighting" trigger="click"><span data-material-dependencies></span></ui-tooltip></ui-cluster></div><ui-stack gap="s" data-glass-hint hidden><ui-text variant="caption">No transmission to blur.</ui-text><ui-button size="sm" data-action="use-glass">Use frosted glass</ui-button></ui-stack><div class="settings-section">${lightEditor}<div class="settings-grid">${fieldsFor(['light-color','light-spread','light-strength','edge-light','glow','outer-depth','inner-depth','surface-separation'])}</div></div><div class="settings-section"><ui-disclosure summary="Try floating surfaces"><ui-stack>${documentationCard('ui-card','/04-expressive-surface')}${documentationCard('ui-tooltip')}${documentationCard('ui-popover')}${documentationCard('ui-dialog')}</ui-stack></ui-disclosure></div>`);
80
+ const materialView = editor('material', `<ui-stack>${materialSample}${materialSurfaces}</ui-stack>`, `<div class="settings-section">${renderPreset('material', 'refinement')}</div>${fieldsFor(['finish','translucency','glassiness'])}<div class="settings-section"><ui-cluster gap="xs"><ui-text weight="medium">Lighting</ui-text><ui-icon-button id="help-lighting" size="sm" label="About lighting"><ui-icon name="help"></ui-icon></ui-icon-button><ui-tooltip for="help-lighting" trigger="click"><span data-material-dependencies></span></ui-tooltip></ui-cluster></div><ui-stack gap="s" data-glass-hint hidden><ui-text variant="caption">No transmission to blur.</ui-text><ui-button size="sm" data-action="use-glass">Use frosted glass</ui-button></ui-stack><div class="settings-section">${lightEditor}<div class="settings-grid">${fieldsFor(['light-color','light-spread','light-strength','edge-light','glow','outer-depth','inner-depth','surface-separation'])}</div></div><div class="settings-section"><ui-disclosure summary="Try floating surfaces"><ui-stack>${documentationCard('ui-card','/04-expressive-surface')}${documentationCard('ui-tooltip')}${documentationCard('ui-popover')}${documentationCard('ui-dialog')}</ui-stack></ui-disclosure></div>`);
81
81
  const statusControls = ['success','danger','warning','info'].map(role => fieldsFor([role + '-source'])).join('');
82
- const paletteView = refinement('palette', `<div class="refinement-layout"><div class="controls-panel"><ui-card padding="sm"><ui-stack gap="s"><ui-cluster align="end">${renderPreset('palette', 'refinement')}<ui-button size="sm" data-action="restore-palette" aria-label="Reset palette">Reset</ui-button></ui-cluster><ui-cluster gap="xs"><ui-text weight="medium">Base colors</ui-text>${help('base-colors','base colors',['action','canvas','surface','text'].map(id => { const f=themeFields.find(field=>field.id===id); return f.label+': '+f.description; }).join(' '),true)}</ui-cluster><div class="color-row" data-base-colors>${fieldsFor(['action','canvas','surface','text'])}</div><ui-cluster gap="xs"><ui-text weight="medium">Supporting accents</ui-text>${help('supporting-colors','supporting accents','Optional second and third accents. Choose None inside a picker to leave it unset. Components use these only when that accent is chosen.',true)}</ui-cluster><div class="color-row" data-supporting-colors>${fieldsFor(['secondary-action','tertiary-action'])}</div><ui-text weight="medium">Use colors for</ui-text><div class="settings-grid">${fieldsFor(['selection-accent','focus-accent','link-accent'])}</div><ui-text weight="medium">Neutrals & borders</ui-text><div class="settings-grid">${fieldsFor(['neutral-source','neutral-strength','neutral-border-contrast'])}</div><ui-text weight="medium">Status colors</ui-text><ui-cluster>${renderPreset('status', 'refinement')}<ui-button size="sm" data-action="restore-status" aria-label="Reset status colors">Reset</ui-button></ui-cluster><div class="settings-grid">${statusControls}${fieldsFor(['status-chroma'])}</div><ui-disclosure summary="Color character"><div class="settings-grid">${fieldsFor(['warmth','color-intensity'])}</div>${paletteRelationships}</ui-disclosure></ui-stack></ui-card></div><div class="palette-preview"><ui-stack>${paletteDetails}</ui-stack></div></div>`);
82
+ const paletteView = refinement('palette', `<div class="refinement-layout"><div class="controls-panel"><ui-card padding="sm"><ui-stack gap="s">${renderPreset('palette', 'refinement')}<ui-cluster gap="xs"><ui-text weight="medium">Base colors</ui-text>${help('base-colors','base colors',['action','canvas','surface','text'].map(id => { const f=themeFields.find(field=>field.id===id); return f.label+': '+f.description; }).join(' '),true)}</ui-cluster><div class="color-row" data-base-colors>${fieldsFor(['action','canvas','surface','text'])}</div><ui-cluster gap="xs"><ui-text weight="medium">Supporting accents</ui-text>${help('supporting-colors','supporting accents','Optional second and third accents. Choose None inside a picker to leave it unset. Components use these only when that accent is chosen.',true)}</ui-cluster><div class="color-row" data-supporting-colors>${fieldsFor(['secondary-action','tertiary-action'])}</div><ui-text weight="medium">Use colors for</ui-text><div class="settings-grid">${fieldsFor(['selection-accent','focus-accent','link-accent'])}</div><ui-text weight="medium">Neutrals & borders</ui-text><div class="settings-grid">${fieldsFor(['neutral-source','neutral-strength','neutral-border-contrast'])}</div><ui-text weight="medium">Status colors</ui-text>${renderPreset('status', 'refinement')}<div class="settings-grid">${statusControls}${fieldsFor(['status-chroma'])}</div><ui-disclosure summary="Color character"><div class="settings-grid">${fieldsFor(['warmth','color-intensity'])}</div>${paletteRelationships}</ui-disclosure></ui-stack></ui-card></div><div class="palette-preview"><ui-stack>${paletteDetails}</ui-stack></div></div>`);
83
83
  const options = site.catalog.groups.map(group => `<optgroup label="${escape(group.label)}">${examples.filter(example => example.category === group.id).map(example => `<option value="${escape(example.id)}" data-description="${escape(example.category + ' · ' + example.tag)}" data-example="${escape(JSON.stringify(example))}" data-search="${escape(`${example.title} ${example.tag} ${example.description} ${example.exampleTitle}`.toLocaleLowerCase())}">${escape(example.title)} · ${escape(example.exampleTitle)}</option>`).join('')}</optgroup>`).join('');
84
84
  const links = ['ui-menu','ui-menu-item','ui-tooltip','ui-icon-button','ui-action-bar','ui-stack','ui-grid','ui-cluster','ui-form-field','ui-input','ui-select','ui-color-picker','ui-button','ui-disclosure','ui-textarea','ui-number-input','ui-slider','ui-curve-editor','ui-card','ui-text','ui-light-editor','ui-combobox','ui-checkbox','ui-badge','ui-icon','ui-callout','ui-popover','ui-dialog','ui-list','ui-list-item'].map(tag => `<link rel="component" href="@threadlabs/looma/components/${tag}/${tag}.html">`).join('\n');
85
85
  return `${links}\n${exampleResources(site.catalog.components.flatMap(component => component.examples), site.catalog)}\n<link rel="component" href="./card.html">\n<link rel="component" href="./preview-choice.html">\n<template component="looma-customizer" module="./customizer.js"><defs>
@@ -135,7 +135,7 @@ export function customizerResource(site, input = defaultRecipe()) {
135
135
  .examples { min-inline-size: 0; }
136
136
  .refinement-layout { display: grid !important; grid-template-columns: minmax(0, 1.15fr) minmax(20rem, 0.85fr); gap: var(--ui-space-6) !important; align-items: start !important; }
137
137
  [data-refinement-view] { scroll-margin-block-start: calc(var(--_editor-chrome-height, 4.25rem) + var(--_customizer-summary-height, 8rem) + var(--ui-space-2)); }
138
- .palette-preview, .editor-preview { position: sticky; inset-block-start: calc(var(--_editor-chrome-height, 4.25rem) + var(--_customizer-summary-height, 8rem) + var(--ui-space-2)); max-block-size: calc(100dvh - var(--_editor-chrome-height, 4.25rem) - var(--ui-space-4)); overflow: auto; padding: max(var(--ui-space-2), calc(var(--ui-focus-width) * 2)) !important; }
138
+ .palette-preview, .editor-preview { position: sticky; inset-block-start: calc(var(--_editor-chrome-height, 4.25rem) + var(--_customizer-summary-height, 8rem) + var(--ui-space-2)); max-block-size: calc(100dvh - var(--_editor-chrome-height, 4.25rem) - var(--ui-space-4)); overflow: auto; }
139
139
  .spacing-samples { display: flex !important; align-items: center !important; gap: 0 !important; padding-block: var(--ui-space-3) !important; }
140
140
  .spacing-samples > span { display: block !important; block-size: var(--ui-space-1); inline-size: var(--ui-space-1); border-radius: 50%; background: var(--ui-accent); }
141
141
  .spacing-samples > span:nth-child(2) { margin-inline-start: var(--ui-space-2) !important; }
@@ -138,7 +138,6 @@ export function connect(host) {
138
138
  const muted = Boolean(origin && Object.keys(Object.values(presets)[0].values).every(key => origin.values[key] === recipe.values[key]));
139
139
  componentRegistry.update(select, { muted });
140
140
  }
141
- componentRegistry.update(root.querySelector(`[data-action="restore-${family}"]`), { disabled: state.id === 'custom' || !state.customized });
142
141
  }
143
142
  for (const control of root.querySelectorAll('[data-font-picker]')) {
144
143
  control.querySelector('option[value=custom]').textContent = recipe.values[control.dataset.fontPicker].split(',')[0].replaceAll('"', '').trim();
@@ -305,11 +304,6 @@ export function connect(host) {
305
304
  }
306
305
  case 'back': navigate(''); break;
307
306
  case 'use-glass': show(applyRefinement(recipe, 'material', 'glass')); sayApplied('Frosted glass applied. Your colors and type are unchanged.'); break;
308
- case 'restore-material': case 'restore-palette': case 'restore-status': {
309
- const family = button.dataset.action.slice(8), state = refinementState(recipe, family);
310
- if (state.id !== 'custom') { show(applyRefinement(recipe, family, state.id)); sayApplied(`${{ material: 'Material', palette: 'Palette', status: 'Status color' }[family]} preset restored; other theme decisions are unchanged.`); }
311
- break;
312
- }
313
307
  case 'add': {
314
308
  const option = [...root.querySelectorAll('[data-add-example] option')].find(option => option.value === selectedExample);
315
309
  if (!option) break;
@@ -396,7 +390,7 @@ export function connect(host) {
396
390
  const synchronize = () => { if (!pending && theme && JSON.stringify(recipe) !== JSON.stringify(theme.recipe)) show(theme.recipe, false); };
397
391
  const cancel = event => { if (event.target.matches('[data-light-editor], [data-editor-kind="curve"]')) { flush(false); say('Drag cancelled; the previous value is restored.'); } };
398
392
  const keyboard = event => {
399
- if (!(event.ctrlKey || event.metaKey) || event.key.toLowerCase() !== 'z' || event.target.closest?.('input,textarea,select,[contenteditable="true"]')) return;
393
+ if (!(event.ctrlKey || event.metaKey) || event.key.toLowerCase() !== 'z' || event.target.closest?.('input,textarea,[contenteditable="true"]')) return;
400
394
  event.preventDefault(); flush(); theme?.[event.shiftKey ? 'redo' : 'undo'](); show(theme?.recipe ?? recipe, false);
401
395
  };
402
396
  const remove = event => {
package/docs/theme.mjs CHANGED
@@ -266,8 +266,8 @@ const alphaSurface = (fill, background, alpha) => {
266
266
  };
267
267
  const luminanceContrast = (a, b) => (Math.max(a, b) + .05) / (Math.min(a, b) + .05);
268
268
  const contrast = (a, b) => luminanceContrast(luminance(a), luminance(b));
269
- // Bound both material stops for opaque ink. The shade scales each sRGB channel
270
- // down, so the darkest mixtures lie on its segment with the reflected light.
269
+ // Bound opaque ink against the complete sRGB gradient. Different chromatic
270
+ // stops can mix darker than either endpoint, so inspect the interior as well.
271
271
  function materialLuminances(start, end) {
272
272
  const a = rgb(start), b = rgb(end);
273
273
  const at = t => channelLuminance(a.map((n, i) => n + (b[i] - n) * t));
@@ -282,16 +282,37 @@ function materialContrast(start, end, ink) {
282
282
  const [minimum, maximum] = materialLuminances(start, end);
283
283
  return ink < minimum ? luminanceContrast(minimum, ink) : ink > maximum ? luminanceContrast(maximum, ink) : 1;
284
284
  }
285
- function materialColours(fill, text, light, minimum = 4.55) {
285
+ // Darker colored paint needs more saturation to avoid a muddy shadow. Keep
286
+ // chroma before moving hue; a bounded hue adjustment recovers colorfulness when
287
+ // the requested shade otherwise loses it at the sRGB gamut boundary.
288
+ function chromaticRecession([l, c, h], lightness) {
289
+ const depth = Math.max(0, l - lightness);
290
+ if (c < .01) return fromLch([lightness, c * lightness / (l || 1), h]);
291
+ const target = c * (1 + depth * .5), minimum = c * (1 + depth * .25) - .002;
292
+ let best = fromLch([lightness, target, h]), bestChroma = toLch(best)[1];
293
+ for (let offset = 1; offset <= 12 && bestChroma < minimum; offset++) {
294
+ for (const direction of [-1, 1]) {
295
+ const candidate = fromLch([lightness, target, h + offset * direction]), chroma = toLch(candidate)[1];
296
+ if (chroma > bestChroma + .0005) { best = candidate; bestChroma = chroma; }
297
+ }
298
+ }
299
+ return best;
300
+ }
301
+
302
+ function materialColours(fill, text, light, minimum = 4.55, minimumRange = 0) {
286
303
  const labels = (Array.isArray(text) ? text : [text]).map(label => typeof label === 'number' ? label : luminance(label));
287
304
  const [l, c, h] = toLch(fill), [lightness] = toLch(light);
288
- // Recede perceptually while retaining relative saturation and hue. Scaling
289
- // L and C together scales linear RGB, keeping every shade channel <= fill.
305
+ // Content surfaces retain restrained lighting. Filled pigment gains chroma
306
+ // as it recedes, so a darker gold reads as colored material rather than brown.
290
307
  const response = 1 - .75 * l;
291
308
  let depth = .05 * response;
292
- const shaded = amount => amount === 0 ? fill : fromLch([Math.max(0, l - amount), c * Math.max(0, l - amount) / (l || 1), h]);
309
+ const shaded = amount => {
310
+ if (amount === 0) return fill;
311
+ const lightness = Math.max(0, l - amount);
312
+ return minimumRange ? chromaticRecession([l, c, h], lightness) : fromLch([lightness, c * lightness / (l || 1), h]);
313
+ };
293
314
  while (depth > 0 && labels.some(label => luminanceContrast(luminance(shaded(depth)), label) < minimum)) depth = Math.max(0, depth - .001);
294
- const shade = shaded(depth);
315
+ let shade = shaded(depth);
295
316
  // Lift chroma with lightness, plus a small pigment-dependent saturation boost,
296
317
  // so the broad reflection stays colored instead of becoming a white wash.
297
318
  const [, tintChroma, tintHue] = toLch(mix(light, fill, .18));
@@ -309,6 +330,15 @@ function materialColours(fill, text, light, minimum = 4.55) {
309
330
  };
310
331
  while (amount > 0 && !readableReflection(amount)) amount = Math.max(0, amount - .005);
311
332
  const reflection = mix(target, fill, amount);
333
+ // Bright saturated pigments have little reflection headroom in sRGB. Keep
334
+ // their material visible through a deeper chromatic shade rather than a
335
+ // white wash, bounded by the label's contrast across the complete gradient.
336
+ while (depth + .002 <= .16 && colourDistance(reflection, shade) < minimumRange * lightness) {
337
+ const candidate = shaded(depth + .002);
338
+ if (labels.some(label => materialContrast(reflection, candidate, label) < minimum)) break;
339
+ depth += .002;
340
+ shade = candidate;
341
+ }
312
342
  // A tiny specular peak is allowed to brighten separately from the chromatic
313
343
  // body reflection. Keep the same quantization margin as every material stop.
314
344
  let glare = .55 * lightness;
@@ -344,11 +374,12 @@ const actionBoundary = (fill, surfaces, ink, amplitude) => {
344
374
 
345
375
  // Adjust semantic ink in lightness before sacrificing its hue or chroma. Mixing
346
376
  // amber toward black also removes its color, making a readable warning look brown.
347
- function readableTone(seed, surfaces, minimum, endpoint) {
377
+ function readableTone(seed, surfaces, minimum, endpoint, chromatic = false) {
348
378
  const [l, c, h] = toLch(seed), end = toLch(endpoint)[0];
349
379
  const backgrounds = surfaces.map(surface => typeof surface === 'number' ? surface : luminance(surface));
350
380
  for (let step = 0; step <= 256; step++) {
351
- const next = fromLch([l + (end - l) * step / 256, c, h]);
381
+ const lightness = l + (end - l) * step / 256;
382
+ const next = chromatic && lightness < l ? chromaticRecession([l, c, h], lightness) : fromLch([lightness, c, h]);
352
383
  if (backgrounds.every(background => luminanceContrast(luminance(next), background) >= minimum)) return next;
353
384
  }
354
385
  return endpoint;
@@ -439,7 +470,7 @@ export function deriveTheme(input, { mode } = {}) {
439
470
  tokens[`--ui-${tone}`] = fill;
440
471
  tokens[`--ui-on-${tone}`] = onFill;
441
472
  tokens[`--ui-${tone}-on-strong`] = onFill;
442
- for (const [part, colour] of Object.entries(materialColours(fill, onFill, values['light-color']))) tokens[`--ui-${tone}-${part}`] = colour;
473
+ for (const [part, colour] of Object.entries(materialColours(fill, onFill, values['light-color'], 4.55, .14))) tokens[`--ui-${tone}-${part}`] = colour;
443
474
  const stateTarget = onFill === '#000000' ? '#ffffff' : '#000000';
444
475
  const [fillL, fillC, fillH] = toLch(fill);
445
476
  const hoverStep = .035 + .08 * Math.max(0, 1 - fillL / .5);
@@ -538,7 +569,7 @@ export function deriveTheme(input, { mode } = {}) {
538
569
  for (const [role, fill, labels] of [
539
570
  ['surface', tokens['--ui-surface-raised'], [tokens['--ui-text'], tokens['--ui-text-secondary'], ...Object.keys(tones).map(tone => tokens[`--ui-${tone}-subtle-text`])]],
540
571
  ['neutral', tokens['--ui-neutral-surface'], tokens['--ui-text']],
541
- ]) for (const [part, colour] of Object.entries(materialColours(fill, labels, values['light-color']))) tokens[`--ui-${role}-${part}`] = colour;
572
+ ]) for (const [part, colour] of Object.entries(materialColours(fill, labels, values['light-color'], 4.55, role === 'neutral' ? .14 : 0))) tokens[`--ui-${role}-${part}`] = colour;
542
573
  const neutralShift = toLch(tokens['--ui-neutral-hover'])[0] - toLch(tokens['--ui-neutral-surface'])[0];
543
574
  for (const part of ['reflection', 'shade']) {
544
575
  const [l, c, h] = toLch(tokens[`--ui-neutral-${part}`]);
@@ -556,7 +587,7 @@ export function deriveTheme(input, { mode } = {}) {
556
587
  ...[.08, .12].flatMap(alpha => materialLuminances(alphaSurface(pigment, reflection, alpha * tonalOpacity), alphaSurface(pigment, shade, alpha * tonalOpacity))),
557
588
  ...[.08, .12, .18].map(alpha => alphaSurface(pigment, surface, alpha * tonalOpacity))];
558
589
  });
559
- tokens[`--ui-${tone}-outline-border`] = readableTone(pigment, backgrounds, borderMinimum, ink);
590
+ tokens[`--ui-${tone}-outline-border`] = readableTone(pigment, backgrounds, borderMinimum, ink, true);
560
591
  tokens[`--ui-${tone}-subtle-text`] = readableTone(tokens[`--ui-${tone}-subtle-text`], [...readingSurfaces, ...backgrounds], 4.5, ink);
561
592
  tokens[`--ui-${tone}-soft-border`] = alphaSurface(tokens[`--ui-${tone}-subtle-text`], tokens[`--ui-${tone}-soft`], .25);
562
593
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@threadlabs/looma",
3
- "version": "0.47.0",
3
+ "version": "0.47.1",
4
4
  "type": "module",
5
5
  "description": "Looma components as HTML, Vue, and plain DOM, with design tokens.",
6
6
  "license": "MIT",
@@ -212,14 +212,11 @@
212
212
  }
213
213
 
214
214
  :scope:where([data-component~="ui-button"])[data-appearance="outline"]:not([data-tone="neutral"]) {
215
- --_outline-highlight: var(--ui-surface-highlight, linear-gradient(transparent, transparent));
216
215
  --_outline-wash: var(--_tone-wash);
217
216
  border-color: var(--ui-button-border, var(--_tone-outline-border, var(--_tone-text)));
218
217
  background-color: var(--ui-button-surface, transparent);
219
218
  box-shadow: var(--ui-button-shadow, var(--ui-neutral-shadow));
220
- background-image:
221
- linear-gradient(var(--_outline-wash), var(--_outline-wash)),
222
- var(--_outline-highlight);
219
+ background-image: linear-gradient(var(--_outline-wash), var(--_outline-wash));
223
220
  }
224
221
 
225
222
  :scope:where([data-component~="ui-button"])[data-appearance="outline"]:not([data-tone="neutral"]):hover:not(:disabled, [aria-disabled="true"]) {
@@ -345,15 +342,14 @@
345
342
  :scope:where([data-component~="ui-button"])[data-tone="neutral"][data-appearance="outline"] {
346
343
  border-color: var(--ui-button-border, var(--ui-control-border));
347
344
  background-color: var(--ui-button-surface, transparent);
345
+ background-image: none;
348
346
  box-shadow: var(--ui-button-shadow, var(--ui-neutral-shadow));
349
347
  }
350
348
  :scope:where([data-component~="ui-button"])[data-tone="neutral"][data-appearance="outline"]:hover:not(:disabled, [aria-disabled="true"]) {
351
349
  border-color: var(--ui-button-hover-border, var(--ui-control-border-hover));
352
350
  background-color: var(--ui-button-hover-surface, transparent);
353
351
  --_outline-wash: var(--ui-neutral-wash-hover);
354
- background-image:
355
- linear-gradient(var(--_outline-wash), var(--_outline-wash)),
356
- var(--ui-surface-highlight, linear-gradient(transparent, transparent));
352
+ background-image: linear-gradient(var(--_outline-wash), var(--_outline-wash));
357
353
  }
358
354
  :scope:where([data-component~="ui-button"])[data-tone="neutral"][data-appearance="outline"]:active:not(:disabled, [aria-disabled="true"]) {
359
355
  background-image: none;
@@ -369,7 +369,7 @@
369
369
  :scope:where([data-component~="ui-icon-button"])[data-appearance="outline"] {
370
370
  border-color: var(--ui-icon-button-border, var(--_icon-button-border, var(--ui-control-border, var(--ui-border-strong))));
371
371
  background-color: var(--ui-icon-button-outline-surface, var(--_icon-button-outline-surface, var(--ui-surface-default)));
372
- background-image: var(--ui-surface-highlight, none);
372
+ background-image: none;
373
373
  color: var(--ui-icon-button-outline-text, var(--_icon-button-text, var(--ui-text-primary)));
374
374
  box-shadow: var(--ui-neutral-shadow);
375
375
  }
@@ -399,13 +399,10 @@
399
399
  }
400
400
 
401
401
  :scope:where([data-component~="ui-icon-button"])[data-appearance="outline"]:not([data-tone="neutral"]) {
402
- --_outline-highlight: var(--ui-surface-highlight, linear-gradient(transparent, transparent));
403
402
  --_outline-wash: var(--_tone-wash);
404
403
  border-color: var(--ui-icon-button-border, var(--_tone-outline-border));
405
404
  background-color: var(--ui-icon-button-outline-surface, transparent);
406
- background-image:
407
- linear-gradient(var(--_outline-wash), var(--_outline-wash)),
408
- var(--_outline-highlight);
405
+ background-image: linear-gradient(var(--_outline-wash), var(--_outline-wash));
409
406
  }
410
407
 
411
408
  :scope:where([data-component~="ui-icon-button"])[data-appearance="outline"]:not([data-tone="neutral"]):hover:enabled:not([aria-disabled="true"]) {
@@ -420,9 +417,7 @@
420
417
  :scope:where([data-component~="ui-icon-button"])[data-tone="neutral"][data-appearance="outline"]:hover:enabled:not([aria-disabled="true"]) {
421
418
  background-color: var(--ui-icon-button-hover-surface, transparent);
422
419
  --_outline-wash: var(--ui-neutral-wash-hover);
423
- background-image:
424
- linear-gradient(var(--_outline-wash), var(--_outline-wash)),
425
- var(--ui-surface-highlight, linear-gradient(transparent, transparent));
420
+ background-image: linear-gradient(var(--_outline-wash), var(--_outline-wash));
426
421
  }
427
422
  :scope:where([data-component~="ui-icon-button"])[data-tone="neutral"][data-appearance="outline"]:active:enabled:not([aria-disabled="true"]) {
428
423
  background-color: var(--ui-icon-button-active-surface, var(--ui-neutral-active));
package/vue/UiButton.vue CHANGED
@@ -1208,14 +1208,11 @@ useComponentHost(() => import('../components/ui-button/ui-button.js'), {
1208
1208
  }
1209
1209
 
1210
1210
  :global(:scope[data-appearance="outline"]:not([data-tone="neutral"]):where([data-hn-ui-button])) {
1211
- --_outline-highlight: var(--ui-surface-highlight, linear-gradient(transparent, transparent));
1212
1211
  --_outline-wash: var(--_tone-wash);
1213
1212
  border-color: var(--ui-button-border, var(--_tone-outline-border, var(--_tone-text)));
1214
1213
  background-color: var(--ui-button-surface, transparent);
1215
1214
  box-shadow: var(--ui-button-shadow, var(--ui-neutral-shadow));
1216
- background-image:
1217
- linear-gradient(var(--_outline-wash), var(--_outline-wash)),
1218
- var(--_outline-highlight);
1215
+ background-image: linear-gradient(var(--_outline-wash), var(--_outline-wash));
1219
1216
  }
1220
1217
 
1221
1218
  :global(:scope[data-appearance="outline"]:not([data-tone="neutral"]):hover:not(:disabled, [aria-disabled="true"]):where([data-hn-ui-button])) {
@@ -1352,15 +1349,14 @@ useComponentHost(() => import('../components/ui-button/ui-button.js'), {
1352
1349
  :global(:scope[data-tone="neutral"][data-appearance="outline"]:where([data-hn-ui-button])) {
1353
1350
  border-color: var(--ui-button-border, var(--ui-control-border));
1354
1351
  background-color: var(--ui-button-surface, transparent);
1352
+ background-image: none;
1355
1353
  box-shadow: var(--ui-button-shadow, var(--ui-neutral-shadow));
1356
1354
  }
1357
1355
  :global(:scope[data-tone="neutral"][data-appearance="outline"]:hover:not(:disabled, [aria-disabled="true"]):where([data-hn-ui-button])) {
1358
1356
  border-color: var(--ui-button-hover-border, var(--ui-control-border-hover));
1359
1357
  background-color: var(--ui-button-hover-surface, transparent);
1360
1358
  --_outline-wash: var(--ui-neutral-wash-hover);
1361
- background-image:
1362
- linear-gradient(var(--_outline-wash), var(--_outline-wash)),
1363
- var(--ui-surface-highlight, linear-gradient(transparent, transparent));
1359
+ background-image: linear-gradient(var(--_outline-wash), var(--_outline-wash));
1364
1360
  }
1365
1361
  :global(:scope[data-tone="neutral"][data-appearance="outline"]:active:not(:disabled, [aria-disabled="true"]):where([data-hn-ui-button])) {
1366
1362
  background-image: none;
@@ -926,7 +926,7 @@ useComponentHost(() => import('../components/ui-icon-button/ui-icon-button.js'),
926
926
  --ui-icon-button-outline-surface,
927
927
  var(--_icon-button-outline-surface, var(--ui-surface-default))
928
928
  );
929
- background-image: var(--ui-surface-highlight, none);
929
+ background-image: none;
930
930
  color: var(--ui-icon-button-outline-text, var(--_icon-button-text, var(--ui-text-primary)));
931
931
  box-shadow: var(--ui-neutral-shadow);
932
932
  }
@@ -962,13 +962,10 @@ useComponentHost(() => import('../components/ui-icon-button/ui-icon-button.js'),
962
962
  }
963
963
 
964
964
  :global(:scope[data-appearance="outline"]:not([data-tone="neutral"]):where([data-hn-ui-icon-button])) {
965
- --_outline-highlight: var(--ui-surface-highlight, linear-gradient(transparent, transparent));
966
965
  --_outline-wash: var(--_tone-wash);
967
966
  border-color: var(--ui-icon-button-border, var(--_tone-outline-border));
968
967
  background-color: var(--ui-icon-button-outline-surface, transparent);
969
- background-image:
970
- linear-gradient(var(--_outline-wash), var(--_outline-wash)),
971
- var(--_outline-highlight);
968
+ background-image: linear-gradient(var(--_outline-wash), var(--_outline-wash));
972
969
  }
973
970
 
974
971
  :global(:scope[data-appearance="outline"]:not([data-tone="neutral"]):hover:enabled:not([aria-disabled="true"]):where([data-hn-ui-icon-button])) {
@@ -986,9 +983,7 @@ useComponentHost(() => import('../components/ui-icon-button/ui-icon-button.js'),
986
983
  :global(:scope[data-tone="neutral"][data-appearance="outline"]:hover:enabled:not([aria-disabled="true"]):where([data-hn-ui-icon-button])) {
987
984
  background-color: var(--ui-icon-button-hover-surface, transparent);
988
985
  --_outline-wash: var(--ui-neutral-wash-hover);
989
- background-image:
990
- linear-gradient(var(--_outline-wash), var(--_outline-wash)),
991
- var(--ui-surface-highlight, linear-gradient(transparent, transparent));
986
+ background-image: linear-gradient(var(--_outline-wash), var(--_outline-wash));
992
987
  }
993
988
  :global(:scope[data-tone="neutral"][data-appearance="outline"]:active:enabled:not([aria-disabled="true"]):where([data-hn-ui-icon-button])) {
994
989
  background-color: var(--ui-icon-button-active-surface, var(--ui-neutral-active));
@@ -876,6 +876,6 @@ var UiButton_default = /*#__PURE__*/ _plugin_vue_export_helper_default(/* @__PUR
876
876
  }]]);
877
877
  };
878
878
  }
879
- }), [["__scopeId", "data-v-dfc6be5d"]]);
879
+ }), [["__scopeId", "data-v-b387e0f5"]]);
880
880
  //#endregion
881
881
  export { UiButton_default as t };
@@ -464,6 +464,6 @@ var UiIconButton_default = /*#__PURE__*/ _plugin_vue_export_helper_default(/* @_
464
464
  }]]);
465
465
  };
466
466
  }
467
- }), [["__scopeId", "data-v-a3c6c957"]]);
467
+ }), [["__scopeId", "data-v-c80d216b"]]);
468
468
  //#endregion
469
469
  export { UiIconButton_default as t };
@@ -1187,14 +1187,11 @@ svg,.arc {
1187
1187
  align-self: center;
1188
1188
  }
1189
1189
  :scope[data-appearance="outline"]:not([data-tone="neutral"]):where([data-hn-ui-button]) {
1190
- --_outline-highlight: var(--ui-surface-highlight, linear-gradient(transparent, transparent));
1191
1190
  --_outline-wash: var(--_tone-wash);
1192
1191
  border-color: var(--ui-button-border, var(--_tone-outline-border, var(--_tone-text)));
1193
1192
  background-color: var(--ui-button-surface, transparent);
1194
1193
  box-shadow: var(--ui-button-shadow, var(--ui-neutral-shadow));
1195
- background-image:
1196
- linear-gradient(var(--_outline-wash), var(--_outline-wash)),
1197
- var(--_outline-highlight);
1194
+ background-image: linear-gradient(var(--_outline-wash), var(--_outline-wash));
1198
1195
  }
1199
1196
  :scope[data-appearance="outline"]:not([data-tone="neutral"]):hover:not(:disabled, [aria-disabled="true"]):where([data-hn-ui-button]) {
1200
1197
  --_outline-wash: var(--_tone-wash-hover);
@@ -1318,15 +1315,14 @@ svg,.arc {
1318
1315
  :scope[data-tone="neutral"][data-appearance="outline"]:where([data-hn-ui-button]) {
1319
1316
  border-color: var(--ui-button-border, var(--ui-control-border));
1320
1317
  background-color: var(--ui-button-surface, transparent);
1318
+ background-image: none;
1321
1319
  box-shadow: var(--ui-button-shadow, var(--ui-neutral-shadow));
1322
1320
  }
1323
1321
  :scope[data-tone="neutral"][data-appearance="outline"]:hover:not(:disabled, [aria-disabled="true"]):where([data-hn-ui-button]) {
1324
1322
  border-color: var(--ui-button-hover-border, var(--ui-control-border-hover));
1325
1323
  background-color: var(--ui-button-hover-surface, transparent);
1326
1324
  --_outline-wash: var(--ui-neutral-wash-hover);
1327
- background-image:
1328
- linear-gradient(var(--_outline-wash), var(--_outline-wash)),
1329
- var(--ui-surface-highlight, linear-gradient(transparent, transparent));
1325
+ background-image: linear-gradient(var(--_outline-wash), var(--_outline-wash));
1330
1326
  }
1331
1327
  :scope[data-tone="neutral"][data-appearance="outline"]:active:not(:disabled, [aria-disabled="true"]):where([data-hn-ui-button]) {
1332
1328
  background-image: none;
@@ -4070,7 +4066,7 @@ html[data-ui-input-modality="touch"] :scope:where([data-hn-ui-icon-button])::aft
4070
4066
  --ui-icon-button-outline-surface,
4071
4067
  var(--_icon-button-outline-surface, var(--ui-surface-default))
4072
4068
  );
4073
- background-image: var(--ui-surface-highlight, none);
4069
+ background-image: none;
4074
4070
  color: var(--ui-icon-button-outline-text, var(--_icon-button-text, var(--ui-text-primary)));
4075
4071
  box-shadow: var(--ui-neutral-shadow);
4076
4072
  }
@@ -4102,13 +4098,10 @@ html[data-ui-input-modality="touch"] :scope:where([data-hn-ui-icon-button])::aft
4102
4098
  color: var(--ui-icon-button-hover-text, var(--_icon-button-text, var(--ui-text-primary)));
4103
4099
  }
4104
4100
  :scope[data-appearance="outline"]:not([data-tone="neutral"]):where([data-hn-ui-icon-button]) {
4105
- --_outline-highlight: var(--ui-surface-highlight, linear-gradient(transparent, transparent));
4106
4101
  --_outline-wash: var(--_tone-wash);
4107
4102
  border-color: var(--ui-icon-button-border, var(--_tone-outline-border));
4108
4103
  background-color: var(--ui-icon-button-outline-surface, transparent);
4109
- background-image:
4110
- linear-gradient(var(--_outline-wash), var(--_outline-wash)),
4111
- var(--_outline-highlight);
4104
+ background-image: linear-gradient(var(--_outline-wash), var(--_outline-wash));
4112
4105
  }
4113
4106
  :scope[data-appearance="outline"]:not([data-tone="neutral"]):hover:enabled:not([aria-disabled="true"]):where([data-hn-ui-icon-button]) {
4114
4107
  --_outline-wash: var(--_tone-wash-hover);
@@ -4124,9 +4117,7 @@ html[data-ui-input-modality="touch"] :scope:where([data-hn-ui-icon-button])::aft
4124
4117
  :scope[data-tone="neutral"][data-appearance="outline"]:hover:enabled:not([aria-disabled="true"]):where([data-hn-ui-icon-button]) {
4125
4118
  background-color: var(--ui-icon-button-hover-surface, transparent);
4126
4119
  --_outline-wash: var(--ui-neutral-wash-hover);
4127
- background-image:
4128
- linear-gradient(var(--_outline-wash), var(--_outline-wash)),
4129
- var(--ui-surface-highlight, linear-gradient(transparent, transparent));
4120
+ background-image: linear-gradient(var(--_outline-wash), var(--_outline-wash));
4130
4121
  }
4131
4122
  :scope[data-tone="neutral"][data-appearance="outline"]:active:enabled:not([aria-disabled="true"]):where([data-hn-ui-icon-button]) {
4132
4123
  background-color: var(--ui-icon-button-active-surface, var(--ui-neutral-active));
@@ -13949,14 +13940,11 @@ html[data-ui-input-modality="touch"]
13949
13940
  }
13950
13941
 
13951
13942
  :scope:where([data-component~="ui-button"])[data-appearance="outline"]:not([data-tone="neutral"]) {
13952
- --_outline-highlight: var(--ui-surface-highlight, linear-gradient(transparent, transparent));
13953
13943
  --_outline-wash: var(--_tone-wash);
13954
13944
  border-color: var(--ui-button-border, var(--_tone-outline-border, var(--_tone-text)));
13955
13945
  background-color: var(--ui-button-surface, transparent);
13956
13946
  box-shadow: var(--ui-button-shadow, var(--ui-neutral-shadow));
13957
- background-image:
13958
- linear-gradient(var(--_outline-wash), var(--_outline-wash)),
13959
- var(--_outline-highlight);
13947
+ background-image: linear-gradient(var(--_outline-wash), var(--_outline-wash));
13960
13948
  }
13961
13949
 
13962
13950
  :scope:where([data-component~="ui-button"])[data-appearance="outline"]:not([data-tone="neutral"]):hover:not(:disabled, [aria-disabled="true"]) {
@@ -14082,15 +14070,14 @@ html[data-ui-input-modality="touch"]
14082
14070
  :scope:where([data-component~="ui-button"])[data-tone="neutral"][data-appearance="outline"] {
14083
14071
  border-color: var(--ui-button-border, var(--ui-control-border));
14084
14072
  background-color: var(--ui-button-surface, transparent);
14073
+ background-image: none;
14085
14074
  box-shadow: var(--ui-button-shadow, var(--ui-neutral-shadow));
14086
14075
  }
14087
14076
  :scope:where([data-component~="ui-button"])[data-tone="neutral"][data-appearance="outline"]:hover:not(:disabled, [aria-disabled="true"]) {
14088
14077
  border-color: var(--ui-button-hover-border, var(--ui-control-border-hover));
14089
14078
  background-color: var(--ui-button-hover-surface, transparent);
14090
14079
  --_outline-wash: var(--ui-neutral-wash-hover);
14091
- background-image:
14092
- linear-gradient(var(--_outline-wash), var(--_outline-wash)),
14093
- var(--ui-surface-highlight, linear-gradient(transparent, transparent));
14080
+ background-image: linear-gradient(var(--_outline-wash), var(--_outline-wash));
14094
14081
  }
14095
14082
  :scope:where([data-component~="ui-button"])[data-tone="neutral"][data-appearance="outline"]:active:not(:disabled, [aria-disabled="true"]) {
14096
14083
  background-image: none;
@@ -15030,7 +15017,7 @@ html[data-ui-input-modality="touch"]
15030
15017
  :scope:where([data-component~="ui-icon-button"])[data-appearance="outline"] {
15031
15018
  border-color: var(--ui-icon-button-border, var(--_icon-button-border, var(--ui-control-border, var(--ui-border-strong))));
15032
15019
  background-color: var(--ui-icon-button-outline-surface, var(--_icon-button-outline-surface, var(--ui-surface-default)));
15033
- background-image: var(--ui-surface-highlight, none);
15020
+ background-image: none;
15034
15021
  color: var(--ui-icon-button-outline-text, var(--_icon-button-text, var(--ui-text-primary)));
15035
15022
  box-shadow: var(--ui-neutral-shadow);
15036
15023
  }
@@ -15060,13 +15047,10 @@ html[data-ui-input-modality="touch"]
15060
15047
  }
15061
15048
 
15062
15049
  :scope:where([data-component~="ui-icon-button"])[data-appearance="outline"]:not([data-tone="neutral"]) {
15063
- --_outline-highlight: var(--ui-surface-highlight, linear-gradient(transparent, transparent));
15064
15050
  --_outline-wash: var(--_tone-wash);
15065
15051
  border-color: var(--ui-icon-button-border, var(--_tone-outline-border));
15066
15052
  background-color: var(--ui-icon-button-outline-surface, transparent);
15067
- background-image:
15068
- linear-gradient(var(--_outline-wash), var(--_outline-wash)),
15069
- var(--_outline-highlight);
15053
+ background-image: linear-gradient(var(--_outline-wash), var(--_outline-wash));
15070
15054
  }
15071
15055
 
15072
15056
  :scope:where([data-component~="ui-icon-button"])[data-appearance="outline"]:not([data-tone="neutral"]):hover:enabled:not([aria-disabled="true"]) {
@@ -15081,9 +15065,7 @@ html[data-ui-input-modality="touch"]
15081
15065
  :scope:where([data-component~="ui-icon-button"])[data-tone="neutral"][data-appearance="outline"]:hover:enabled:not([aria-disabled="true"]) {
15082
15066
  background-color: var(--ui-icon-button-hover-surface, transparent);
15083
15067
  --_outline-wash: var(--ui-neutral-wash-hover);
15084
- background-image:
15085
- linear-gradient(var(--_outline-wash), var(--_outline-wash)),
15086
- var(--ui-surface-highlight, linear-gradient(transparent, transparent));
15068
+ background-image: linear-gradient(var(--_outline-wash), var(--_outline-wash));
15087
15069
  }
15088
15070
  :scope:where([data-component~="ui-icon-button"])[data-tone="neutral"][data-appearance="outline"]:active:enabled:not([aria-disabled="true"]) {
15089
15071
  background-color: var(--ui-icon-button-active-surface, var(--ui-neutral-active));