@brightspot/ui 6.3.5 → 6.4.0

package/dist/storybook/project.json

@@ -1 +1 @@
-{"generatedAt":1789745803583,"hasCustomBabel":false,"hasCustomWebpack":false,"hasStaticDirs":true,"hasStorybookEslint":true,"refCount":0,"knownPackages":{"testPackages":{"@storybook/addon-vitest":"10.2.12","@vitest/browser-playwright":"4.0.18","playwright":"1.58.2","vitest":"4.0.18"},"stylingPackages":{"tailwindcss":"^3.4.13","autoprefixer":"10.4.21"}},"hasRouterPackage":false,"packageManager":{"type":"yarn","agent":"yarn","nodeLinker":"undefined"},"preview":{"usesGlobals":true},"framework":{"name":"@storybook/web-components-vite","options":{}},"builder":"@storybook/builder-vite","renderer":"@storybook/web-components","portableStoriesFileCount":0,"applicationFileCount":6,"storybookVersion":"10.2.12","storybookVersionSpecifier":"10.2.12","language":"typescript","storybookPackages":{"@storybook/addon-themes":{"version":"10.2.12"},"@storybook/web-components-vite":{"version":"10.2.12"},"@wc-toolkit/storybook-helpers":{"version":"10.0.0"},"eslint-plugin-storybook":{"version":"10.0.7"},"storybook":{}},"addons":{"@storybook/addon-docs":{"version":"10.2.12"},"@storybook/addon-vitest":{"version":"10.2.12"}},"packageJsonType":"module"}
+{"generatedAt":1789748067369,"hasCustomBabel":false,"hasCustomWebpack":false,"hasStaticDirs":true,"hasStorybookEslint":true,"refCount":0,"knownPackages":{"testPackages":{"@storybook/addon-vitest":"10.2.12","@vitest/browser-playwright":"4.0.18","playwright":"1.58.2","vitest":"4.0.18"},"stylingPackages":{"tailwindcss":"^3.4.13","autoprefixer":"10.4.21"}},"hasRouterPackage":false,"packageManager":{"type":"yarn","agent":"yarn","nodeLinker":"undefined"},"preview":{"usesGlobals":true},"framework":{"name":"@storybook/web-components-vite","options":{}},"builder":"@storybook/builder-vite","renderer":"@storybook/web-components","portableStoriesFileCount":0,"applicationFileCount":6,"storybookVersion":"10.2.12","storybookVersionSpecifier":"10.2.12","language":"typescript","storybookPackages":{"@storybook/addon-themes":{"version":"10.2.12"},"@storybook/web-components-vite":{"version":"10.2.12"},"@wc-toolkit/storybook-helpers":{"version":"10.0.0"},"eslint-plugin-storybook":{"version":"10.0.7"},"storybook":{}},"addons":{"@storybook/addon-docs":{"version":"10.2.12"},"@storybook/addon-vitest":{"version":"10.2.12"}},"packageJsonType":"module"}

package/dist/tailwind-plugin-badge.js

@@ -55,7 +55,7 @@ module.exports = plugin(function ({ addBase, addComponents, theme, e, matchUtili
                 [`${className}-${e(key)}`]: {
                     '--icon-size': iconSizes['xs'],
                     backgroundColor: fill,
-                    color: `var(--badge-color-foreground, oklch(var(--btu-theme-${key}-700)))`,
+                    color: `var(--badge-color-foreground, oklch(var(--btu-theme-${key}-800)))`,
                     textDecoration: 'underline',
                     textDecorationColor: `var(--badge-color-background, oklch(var(--btu-theme-${key}-50)))`,
                 },
@@ -75,7 +75,7 @@ module.exports = plugin(function ({ addBase, addComponents, theme, e, matchUtili
                 // the fill/text/underline all read, so one declaration flips all three
                 // coherently (and the busy pill-fill layer follows the fill var).
                 [`${className}-solid${className}-${e(key)}`]: {
-                    '--badge-color-background': `oklch(var(--btu-theme-${key}-700))`,
+                    '--badge-color-background': `oklch(var(--btu-theme-${key}-800))`,
                     '--badge-color-foreground': `oklch(var(--btu-theme-${key}-50))`,
                 },
                 // Solid busy: foreground and background are swapped versus soft, so reuse

package/dist/tailwind-plugin-badge.ts

@@ -12,7 +12,7 @@ declare let module: any
  *  btu-badge-[sm|md|lg] - Size of the Badge.
  *  btu-badge-[$theme-colors] - Color of the Badge (includes text-decoration-color support).
  *  btu-badge-solid - Solid fill: swaps the resting foreground/background shades
- *                    (fill -> X-700, text -> X-50) for a filled pill instead of
+ *                    (fill -> X-800, text -> X-50) for a filled pill instead of
  *                    the default soft fill. Combine with a btu-badge-<color>
  *                    class; on its own it has no effect.
  *
@@ -113,7 +113,7 @@ module.exports = plugin(
           [`${className}-${e(key)}`]: {
             '--icon-size': iconSizes['xs'],
             backgroundColor: fill,
-            color: `var(--badge-color-foreground, oklch(var(--btu-theme-${key}-700)))`,
+            color: `var(--badge-color-foreground, oklch(var(--btu-theme-${key}-800)))`,
             textDecoration: 'underline',
             textDecorationColor: `var(--badge-color-background, oklch(var(--btu-theme-${key}-50)))`,
           },
@@ -133,7 +133,7 @@ module.exports = plugin(
           // the fill/text/underline all read, so one declaration flips all three
           // coherently (and the busy pill-fill layer follows the fill var).
           [`${className}-solid${className}-${e(key)}`]: {
-            '--badge-color-background': `oklch(var(--btu-theme-${key}-700))`,
+            '--badge-color-background': `oklch(var(--btu-theme-${key}-800))`,
             '--badge-color-foreground': `oklch(var(--btu-theme-${key}-50))`,
           },
           // Solid busy: foreground and background are swapped versus soft, so reuse

package/dist/tailwind-plugin-button-group.js

@@ -7,11 +7,14 @@ import plugin from 'tailwindcss/plugin';
  * children. `btu-icon-button` uses `display: contents` so its inner `<button>`
  * participates directly in the group's flex layout.
  *
- * Selectors target the `button` element, not the `.btu-button` class. So an
- * anchor styled as `.btu-button` (`<a class="btu-button">`) slotted directly
- * into a connected group will NOT get the outer-corner radius. Use a real
- * `<button>` (or `<btu-icon-button>`) for grouped controls; for link-styled
- * ones, use the spaced variant.
+ * Grouped controls may be `<button>`, `<btu-icon-button>`, or an anchor carrying
+ * `.btu-button` (`<a class="btu-button">`) — a segmented view-switcher made of real
+ * links is a normal pattern, so anchors get the connected corners and the selection
+ * treatment too. A bare `<a>` without `.btu-button` is left alone.
+ *
+ * Selected state is read per element type: `aria-pressed="true"` on a button, and
+ * `aria-current` (any value but `false`) on an anchor, which is the correct attribute
+ * for a link marking the active destination.
  *
  * Selection uses a circular wipe transition: a `::after` pseudo-element with
  * `clip-path: circle()` reveals the selection color from the center outward.
@@ -35,6 +38,26 @@ module.exports = plugin(function ({ addComponents, addBase }) {
     const allSelected = `${connected}[data-all-selected]`;
     const borderColor = 'var(--button-group-border-color, oklch(var(--btu-theme-gray-300)))';
     const outerRadius = 'var(--button-group-border-radius, 0.5rem)';
+    // A grouped control is normally a <button>, but a navigational group is built from
+    // links, and those need the same connected and selected treatment. An anchor must
+    // carry .btu-button to opt in — a bare <a> in a group isn't a control.
+    //
+    // Each element type keeps its own selected-state signal: aria-pressed belongs to
+    // toggle buttons, aria-current to a link marking the active destination. Rules are
+    // emitted as comma-separated selectors rather than :is(button, a.btu-button) so the
+    // existing button rules keep their original specificity.
+    //
+    // The anchor is matched as `a[class~="btu-button"]`, not `a.btu-button`. `@apply
+    // btu-button` clones every rule whose selector references the `.btu-button` class,
+    // once per apply-site — the legacy tool-ui has ~200 of them, so the class form
+    // multiplied this plugin's output ~198x and put 1.27 MB into v5.css. The attribute
+    // form selects the same elements at the same specificity without being treated as a
+    // reference to the component. See test/css-bloat.
+    const ITEMS = [
+        { sel: 'button', armed: '[aria-pressed]', on: '[aria-pressed="true"]' },
+        { sel: 'a[class~="btu-button"]', armed: '[aria-current]', on: '[aria-current]:not([aria-current="false"])' },
+    ];
+    const over = (tpl) => ITEMS.map(tpl).join(', ');
     const components = {
         // ─── Base ─────────────────────────────────────────────────────────
         '.btu-button-group': {
@@ -57,30 +80,30 @@ module.exports = plugin(function ({ addComponents, addBase }) {
         },
         // ─── slot="end" auto-margin ──────────────────────────────────────
         // Direct children and inner button (for display:contents wrappers like btu-icon-button)
-        'btu-button-group[orientation="horizontal"] > [slot="end"], btu-button-group[orientation="horizontal"] > [slot="end"] > button': {
+        [over(i => `btu-button-group[orientation="horizontal"] > [slot="end"], btu-button-group[orientation="horizontal"] > [slot="end"] > ${i.sel}`)]: {
             marginInlineStart: 'auto',
         },
-        'btu-button-group[orientation="vertical"] > [slot="end"], btu-button-group[orientation="vertical"] > [slot="end"] > button': {
+        [over(i => `btu-button-group[orientation="vertical"] > [slot="end"], btu-button-group[orientation="vertical"] > [slot="end"] > ${i.sel}`)]: {
             marginBlockStart: 'auto',
         },
         // ─── Size propagation via CSS ─────────────────────────────────────
-        'btu-button-group[size="small"] button': {
+        [over(i => `btu-button-group[size="small"] ${i.sel}`)]: {
             padding: 'var(--button-padding-sm)',
             width: 'var(--button-size-sm, auto)',
             height: 'var(--button-size-sm, auto)',
         },
-        'btu-button-group[size="medium"] button': {
+        [over(i => `btu-button-group[size="medium"] ${i.sel}`)]: {
             padding: 'var(--button-padding-md)',
             width: 'var(--button-size-md, auto)',
             height: 'var(--button-size-md, auto)',
         },
-        'btu-button-group[size="large"] button': {
+        [over(i => `btu-button-group[size="large"] ${i.sel}`)]: {
             padding: 'var(--button-padding-lg)',
             width: 'var(--button-size-lg, auto)',
             height: 'var(--button-size-lg, auto)',
         },
         // ─── Connected: convert outline buttons to border-based ───────────
-        [`${connected} button`]: {
+        [over(i => `${connected} ${i.sel}`)]: {
             outline: 'none',
             border: `1px solid ${borderColor}`,
             transition: 'box-shadow 100ms ease, filter 100ms ease',
@@ -100,13 +123,13 @@ module.exports = plugin(function ({ addComponents, addBase }) {
         // so the button itself must stay at its normal (non-pressed) color.
         // Selection colors default to the button's own --button-tint-* shades,
         // overridable via the documented --button-group-* properties.
-        '.btu-button-group button[aria-pressed]': {
+        [over(i => `.btu-button-group ${i.sel}${i.armed}`)]: {
             '--button-pressed-color': 'initial',
             '--button-pressed-text-color': 'initial',
             isolation: 'isolate',
             transition: 'color 150ms ease-in',
         },
-        '.btu-button-group button[aria-pressed]::after': {
+        [over(i => `.btu-button-group ${i.sel}${i.armed}::after`)]: {
             content: '""',
             position: 'absolute',
             inset: '0',
@@ -117,64 +140,64 @@ module.exports = plugin(function ({ addComponents, addBase }) {
             transition: 'clip-path 150ms ease-in',
         },
         // ─── Selection wipe: active state ─────────────────────────────────
-        '.btu-button-group button[aria-pressed="true"]': {
+        [over(i => `.btu-button-group ${i.sel}${i.on}`)]: {
             color: 'var(--button-group-selection-color, var(--button-tint-strong))',
             transition: 'color 200ms ease-out',
         },
-        '.btu-button-group button[aria-pressed="true"]::after': {
+        [over(i => `.btu-button-group ${i.sel}${i.on}::after`)]: {
             clipPath: 'circle(75% at center)',
             transition: 'clip-path 200ms ease-out',
         },
         // ─── Reduced motion ─────────────────────────────────────────────────
         '@media (prefers-reduced-motion: reduce)': {
-            '.btu-button-group button[aria-pressed]': {
+            [over(i => `.btu-button-group ${i.sel}${i.armed}`)]: {
                 transition: 'color 0.01ms ease',
             },
-            '.btu-button-group button[aria-pressed]::after': {
+            [over(i => `.btu-button-group ${i.sel}${i.armed}::after`)]: {
                 transition: 'clip-path 0.01ms ease',
             },
-            [`${allSelected} button[aria-pressed="true"]`]: {
+            [over(i => `${allSelected} ${i.sel}${i.on}`)]: {
                 animation: 'none',
             },
         },
         // ─── Connected variant — horizontal ───────────────────────────────
-        [`${connectedH} button`]: {
+        [over(i => `${connectedH} ${i.sel}`)]: {
             borderRadius: '0',
             marginInlineEnd: '-1px',
             position: 'relative',
-            '&:hover, &:focus-visible, &:active, &[aria-pressed="true"]': {
+            '&:hover, &:focus-visible, &:active, &[aria-pressed="true"], &[aria-current]:not([aria-current="false"])': {
                 zIndex: '1',
             },
             '&:focus-visible': {
                 zIndex: '2',
             },
         },
-        [`${connectedH} > :first-child:is(button), ${connectedH} > :first-child > button`]: {
+        [over(i => `${connectedH} > :first-child:is(${i.sel}), ${connectedH} > :first-child > ${i.sel}`)]: {
             borderStartStartRadius: outerRadius,
             borderEndStartRadius: outerRadius,
         },
-        [`${connectedH} > :last-child:is(button), ${connectedH} > :last-child > button`]: {
+        [over(i => `${connectedH} > :last-child:is(${i.sel}), ${connectedH} > :last-child > ${i.sel}`)]: {
             borderStartEndRadius: outerRadius,
             borderEndEndRadius: outerRadius,
             marginInlineEnd: '0',
         },
         // ─── Connected variant — vertical ─────────────────────────────────
-        [`${connectedV} button`]: {
+        [over(i => `${connectedV} ${i.sel}`)]: {
             borderRadius: '0',
             marginBlockEnd: '-1px',
             position: 'relative',
-            '&:hover, &:focus-visible, &:active, &[aria-pressed="true"]': {
+            '&:hover, &:focus-visible, &:active, &[aria-pressed="true"], &[aria-current]:not([aria-current="false"])': {
                 zIndex: '1',
             },
             '&:focus-visible': {
                 zIndex: '2',
             },
         },
-        [`${connectedV} > :first-child:is(button), ${connectedV} > :first-child > button`]: {
+        [over(i => `${connectedV} > :first-child:is(${i.sel}), ${connectedV} > :first-child > ${i.sel}`)]: {
             borderStartStartRadius: outerRadius,
             borderStartEndRadius: outerRadius,
         },
-        [`${connectedV} > :last-child:is(button), ${connectedV} > :last-child > button`]: {
+        [over(i => `${connectedV} > :last-child:is(${i.sel}), ${connectedV} > :last-child > ${i.sel}`)]: {
             borderEndStartRadius: outerRadius,
             borderEndEndRadius: outerRadius,
             marginBlockEnd: '0',
@@ -188,7 +211,7 @@ module.exports = plugin(function ({ addComponents, addBase }) {
     };
     // ─── All-selected shimmer (connected only) ─────────────────────────
     // Text color pulse + border color pulse on each button, staggered.
-    components[`${allSelected} button[aria-pressed="true"]`] = {
+    components[over(i => `${allSelected} ${i.sel}${i.on}`)] = {
         animation: 'btu-shimmer-all 500ms ease-in-out both',
         animationDelay: 'calc((var(--_btn-index, 1) - 1) * 100ms)',
     };

package/dist/tailwind-plugin-button-group.js.map

@@ -1 +1 @@
-{"version":3,"file":"tailwind-plugin-button-group.js","sourceRoot":"","sources":["../src/tailwind-plugin-button-group.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tailwind-plugin-button-group.js","sourceRoot":"","sources":["../src/tailwind-plugin-button-group.ts"],"names":[],"mappings":"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"}

package/dist/tailwind-plugin-button-group.ts

@@ -10,11 +10,14 @@ declare let module: any
  * children. `btu-icon-button` uses `display: contents` so its inner `<button>`
  * participates directly in the group's flex layout.
  *
- * Selectors target the `button` element, not the `.btu-button` class. So an
- * anchor styled as `.btu-button` (`<a class="btu-button">`) slotted directly
- * into a connected group will NOT get the outer-corner radius. Use a real
- * `<button>` (or `<btu-icon-button>`) for grouped controls; for link-styled
- * ones, use the spaced variant.
+ * Grouped controls may be `<button>`, `<btu-icon-button>`, or an anchor carrying
+ * `.btu-button` (`<a class="btu-button">`) — a segmented view-switcher made of real
+ * links is a normal pattern, so anchors get the connected corners and the selection
+ * treatment too. A bare `<a>` without `.btu-button` is left alone.
+ *
+ * Selected state is read per element type: `aria-pressed="true"` on a button, and
+ * `aria-current` (any value but `false`) on an anchor, which is the correct attribute
+ * for a link marking the active destination.
  *
  * Selection uses a circular wipe transition: a `::after` pseudo-element with
  * `clip-path: circle()` reveals the selection color from the center outward.
@@ -40,6 +43,27 @@ module.exports = plugin(function ({ addComponents, addBase }) {
   const borderColor = 'var(--button-group-border-color, oklch(var(--btu-theme-gray-300)))'
   const outerRadius = 'var(--button-group-border-radius, 0.5rem)'
 
+  // A grouped control is normally a <button>, but a navigational group is built from
+  // links, and those need the same connected and selected treatment. An anchor must
+  // carry .btu-button to opt in — a bare <a> in a group isn't a control.
+  //
+  // Each element type keeps its own selected-state signal: aria-pressed belongs to
+  // toggle buttons, aria-current to a link marking the active destination. Rules are
+  // emitted as comma-separated selectors rather than :is(button, a.btu-button) so the
+  // existing button rules keep their original specificity.
+  //
+  // The anchor is matched as `a[class~="btu-button"]`, not `a.btu-button`. `@apply
+  // btu-button` clones every rule whose selector references the `.btu-button` class,
+  // once per apply-site — the legacy tool-ui has ~200 of them, so the class form
+  // multiplied this plugin's output ~198x and put 1.27 MB into v5.css. The attribute
+  // form selects the same elements at the same specificity without being treated as a
+  // reference to the component. See test/css-bloat.
+  const ITEMS = [
+    { sel: 'button', armed: '[aria-pressed]', on: '[aria-pressed="true"]' },
+    { sel: 'a[class~="btu-button"]', armed: '[aria-current]', on: '[aria-current]:not([aria-current="false"])' },
+  ]
+  const over = (tpl: (i: (typeof ITEMS)[number]) => string) => ITEMS.map(tpl).join(', ')
+
   const components: CSSRuleObject = {
     // ─── Base ─────────────────────────────────────────────────────────
     '.btu-button-group': {
@@ -66,34 +90,38 @@ module.exports = plugin(function ({ addComponents, addBase }) {
 
     // ─── slot="end" auto-margin ──────────────────────────────────────
     // Direct children and inner button (for display:contents wrappers like btu-icon-button)
-    'btu-button-group[orientation="horizontal"] > [slot="end"], btu-button-group[orientation="horizontal"] > [slot="end"] > button':
-      {
-        marginInlineStart: 'auto',
-      },
-    'btu-button-group[orientation="vertical"] > [slot="end"], btu-button-group[orientation="vertical"] > [slot="end"] > button':
-      {
-        marginBlockStart: 'auto',
-      },
+    [over(
+      i =>
+        `btu-button-group[orientation="horizontal"] > [slot="end"], btu-button-group[orientation="horizontal"] > [slot="end"] > ${i.sel}`,
+    )]: {
+      marginInlineStart: 'auto',
+    },
+    [over(
+      i =>
+        `btu-button-group[orientation="vertical"] > [slot="end"], btu-button-group[orientation="vertical"] > [slot="end"] > ${i.sel}`,
+    )]: {
+      marginBlockStart: 'auto',
+    },
 
     // ─── Size propagation via CSS ─────────────────────────────────────
-    'btu-button-group[size="small"] button': {
+    [over(i => `btu-button-group[size="small"] ${i.sel}`)]: {
       padding: 'var(--button-padding-sm)',
       width: 'var(--button-size-sm, auto)',
       height: 'var(--button-size-sm, auto)',
     },
-    'btu-button-group[size="medium"] button': {
+    [over(i => `btu-button-group[size="medium"] ${i.sel}`)]: {
       padding: 'var(--button-padding-md)',
       width: 'var(--button-size-md, auto)',
       height: 'var(--button-size-md, auto)',
     },
-    'btu-button-group[size="large"] button': {
+    [over(i => `btu-button-group[size="large"] ${i.sel}`)]: {
       padding: 'var(--button-padding-lg)',
       width: 'var(--button-size-lg, auto)',
       height: 'var(--button-size-lg, auto)',
     },
 
     // ─── Connected: convert outline buttons to border-based ───────────
-    [`${connected} button`]: {
+    [over(i => `${connected} ${i.sel}`)]: {
       outline: 'none',
       border: `1px solid ${borderColor}`,
       transition: 'box-shadow 100ms ease, filter 100ms ease',
@@ -115,13 +143,13 @@ module.exports = plugin(function ({ addComponents, addBase }) {
     // so the button itself must stay at its normal (non-pressed) color.
     // Selection colors default to the button's own --button-tint-* shades,
     // overridable via the documented --button-group-* properties.
-    '.btu-button-group button[aria-pressed]': {
+    [over(i => `.btu-button-group ${i.sel}${i.armed}`)]: {
       '--button-pressed-color': 'initial',
       '--button-pressed-text-color': 'initial',
       isolation: 'isolate',
       transition: 'color 150ms ease-in',
     },
-    '.btu-button-group button[aria-pressed]::after': {
+    [over(i => `.btu-button-group ${i.sel}${i.armed}::after`)]: {
       content: '""',
       position: 'absolute',
       inset: '0',
@@ -133,68 +161,68 @@ module.exports = plugin(function ({ addComponents, addBase }) {
     },
 
     // ─── Selection wipe: active state ─────────────────────────────────
-    '.btu-button-group button[aria-pressed="true"]': {
+    [over(i => `.btu-button-group ${i.sel}${i.on}`)]: {
       color: 'var(--button-group-selection-color, var(--button-tint-strong))',
       transition: 'color 200ms ease-out',
     },
 
-    '.btu-button-group button[aria-pressed="true"]::after': {
+    [over(i => `.btu-button-group ${i.sel}${i.on}::after`)]: {
       clipPath: 'circle(75% at center)',
       transition: 'clip-path 200ms ease-out',
     },
 
     // ─── Reduced motion ─────────────────────────────────────────────────
     '@media (prefers-reduced-motion: reduce)': {
-      '.btu-button-group button[aria-pressed]': {
+      [over(i => `.btu-button-group ${i.sel}${i.armed}`)]: {
         transition: 'color 0.01ms ease',
       },
-      '.btu-button-group button[aria-pressed]::after': {
+      [over(i => `.btu-button-group ${i.sel}${i.armed}::after`)]: {
         transition: 'clip-path 0.01ms ease',
       },
-      [`${allSelected} button[aria-pressed="true"]`]: {
+      [over(i => `${allSelected} ${i.sel}${i.on}`)]: {
         animation: 'none',
       },
     },
 
     // ─── Connected variant — horizontal ───────────────────────────────
-    [`${connectedH} button`]: {
+    [over(i => `${connectedH} ${i.sel}`)]: {
       borderRadius: '0',
       marginInlineEnd: '-1px',
       position: 'relative',
-      '&:hover, &:focus-visible, &:active, &[aria-pressed="true"]': {
+      '&:hover, &:focus-visible, &:active, &[aria-pressed="true"], &[aria-current]:not([aria-current="false"])': {
         zIndex: '1',
       },
       '&:focus-visible': {
         zIndex: '2',
       },
     },
-    [`${connectedH} > :first-child:is(button), ${connectedH} > :first-child > button`]: {
+    [over(i => `${connectedH} > :first-child:is(${i.sel}), ${connectedH} > :first-child > ${i.sel}`)]: {
       borderStartStartRadius: outerRadius,
       borderEndStartRadius: outerRadius,
     },
-    [`${connectedH} > :last-child:is(button), ${connectedH} > :last-child > button`]: {
+    [over(i => `${connectedH} > :last-child:is(${i.sel}), ${connectedH} > :last-child > ${i.sel}`)]: {
       borderStartEndRadius: outerRadius,
       borderEndEndRadius: outerRadius,
       marginInlineEnd: '0',
     },
 
     // ─── Connected variant — vertical ─────────────────────────────────
-    [`${connectedV} button`]: {
+    [over(i => `${connectedV} ${i.sel}`)]: {
       borderRadius: '0',
       marginBlockEnd: '-1px',
       position: 'relative',
-      '&:hover, &:focus-visible, &:active, &[aria-pressed="true"]': {
+      '&:hover, &:focus-visible, &:active, &[aria-pressed="true"], &[aria-current]:not([aria-current="false"])': {
         zIndex: '1',
       },
       '&:focus-visible': {
         zIndex: '2',
       },
     },
-    [`${connectedV} > :first-child:is(button), ${connectedV} > :first-child > button`]: {
+    [over(i => `${connectedV} > :first-child:is(${i.sel}), ${connectedV} > :first-child > ${i.sel}`)]: {
       borderStartStartRadius: outerRadius,
       borderStartEndRadius: outerRadius,
     },
-    [`${connectedV} > :last-child:is(button), ${connectedV} > :last-child > button`]: {
+    [over(i => `${connectedV} > :last-child:is(${i.sel}), ${connectedV} > :last-child > ${i.sel}`)]: {
       borderEndStartRadius: outerRadius,
       borderEndEndRadius: outerRadius,
       marginBlockEnd: '0',
@@ -210,7 +238,7 @@ module.exports = plugin(function ({ addComponents, addBase }) {
 
   // ─── All-selected shimmer (connected only) ─────────────────────────
   // Text color pulse + border color pulse on each button, staggered.
-  components[`${allSelected} button[aria-pressed="true"]`] = {
+  components[over(i => `${allSelected} ${i.sel}${i.on}`)] = {
     animation: 'btu-shimmer-all 500ms ease-in-out both',
     animationDelay: 'calc((var(--_btn-index, 1) - 1) * 100ms)',
   }

package/dist/tailwind-plugin-button.js

@@ -157,6 +157,16 @@ module.exports = plugin(function ({ addComponents, addUtilities, theme }) {
         },
     };
     // background & text colors for buttons in different states
+    // -600 doesn't clear WCAG AA (4.5:1) against white for these hues, either as a solid
+    // fill under white text or as fill-none (the color used as text on the page).
+    // Measured against white: warning 3.49:1, teal 3.80:1 — vs primary 5.44:1 and error
+    // 4.85:1, which pass. At -700 warning is 5.43:1 and teal 5.57:1. success was already
+    // stepped down for the same reason; it just predates the other two being noticed.
+    const needsDarkerStep = new Set(['success', 'warning', 'teal']);
+    const solidStep = (k) => (k === 'gray' ? '100' : needsDarkerStep.has(k) ? '700' : '600');
+    const hoverStep = (k) => (k === 'gray' ? '200' : needsDarkerStep.has(k) ? '800' : '700');
+    // success keeps -600 here: only the two measured failures move.
+    const onSurfaceStep = (k) => (k === 'gray' || k === 'warning' || k === 'teal' ? '700' : '600');
     for (const key in colors) {
         if (key === 'currentColor' || key === 'transparent' || key === 'white' || key === 'black' || key === 'ai')
             continue;
@@ -164,9 +174,9 @@ module.exports = plugin(function ({ addComponents, addUtilities, theme }) {
         // Gray buttons borrow primary for their pressed/selected tint.
         const tintKey = key === 'gray' ? 'primary' : key;
         const focusStyle = {
-            '--button-color': `oklch(var(--btu-theme-${key}-${key === 'gray' ? '100' : key === 'success' ? '700' : '600'}))`,
+            '--button-color': `oklch(var(--btu-theme-${key}-${solidStep(key)}))`,
             '--button-fill-none-color': `transparent`,
-            '--button-fill-none-text-color': `oklch(var(--btu-theme-${key}-${key === 'gray' ? '700' : '600'}))`,
+            '--button-fill-none-text-color': `oklch(var(--btu-theme-${key}-${onSurfaceStep(key)}))`,
             '--tw-ring-opacity': '1',
             '--tw-ring-color': `oklch(var(--btu-theme-${ringColorKey}-100))`,
             '--tw-ring-offset-width': '1px',
@@ -176,10 +186,10 @@ module.exports = plugin(function ({ addComponents, addUtilities, theme }) {
             '--tw-ring-color': `oklch(var(--btu-theme-${ringColorKey}-400))`,
         };
         components[prefix + '-' + key] = {
-            '--button-color': `oklch(var(--btu-theme-${key}-${key === 'gray' ? '100' : key === 'success' ? '700' : '600'}))`,
+            '--button-color': `oklch(var(--btu-theme-${key}-${solidStep(key)}))`,
             '--button-text-color': `${key === 'gray' ? 'oklch(var(--btu-theme-gray-700))' : 'var(--btu-theme-white)'}`,
             '--button-fill-none-color': 'transparent',
-            '--button-fill-none-text-color': `oklch(var(--btu-theme-${key}-${key === 'gray' ? '700' : '600'}))`,
+            '--button-fill-none-text-color': `oklch(var(--btu-theme-${key}-${onSurfaceStep(key)}))`,
             '--button-outline-color': `oklch(var(--btu-theme-${key}-300))`,
             '--button-disabled-color-fill': `oklch(var(--btu-theme-${key}-${key === 'gray' ? '100' : key === 'primary' ? '300' : '200'}))`,
             '--button-disabled-color-fill-none': `var(--button-fill-none) oklch(var(--btu-theme-white))`,
@@ -191,7 +201,7 @@ module.exports = plugin(function ({ addComponents, addUtilities, theme }) {
             '--button-tint-strong': `oklch(var(--btu-theme-${tintKey}-800))`,
             '--button-tint-highlight': `oklch(var(--btu-theme-${tintKey}-200))`,
             '&:hover': {
-                '--button-color': `oklch(var(--btu-theme-${key}-${key === 'gray' ? '200' : key === 'success' ? '800' : '700'}))`,
+                '--button-color': `oklch(var(--btu-theme-${key}-${hoverStep(key)}))`,
                 '--button-fill-none-color': `oklch(var(--btu-theme-${key}-${key === 'gray' ? '200' : '50'}))`,
                 '--button-fill-none-text-color': `oklch(var(--btu-theme-${key}-${key === 'gray' ? '900' : '800'}))`,
             },

package/dist/tailwind-plugin-button.js.map

@@ -1 +1 @@
-{"version":3,"file":"tailwind-plugin-button.js","sourceRoot":"","sources":["../src/tailwind-plugin-button.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAA;AAIvC;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,aAAa,EAAE,YAAY,EAAE,KAAK,EAAE;IACtE,MAAM,SAAS,GAAqC,KAAK,CAAC,UAAU,CAAC,CAAA;IACrE,MAAM,MAAM,GAAkB,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAA;IACnD,MAAM,SAAS,GAAkB,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,CAAA;IACxD,MAAM,MAAM,GAAG,aAAa,CAAA;IAE5B,MAAM,aAAa,GAAkB;QACnC,yBAAyB,EAAE,6GAA6G;QACxI,8BAA8B,EAAE,yGAAyG;QACzI,aAAa,EAAE,MAAM;QACrB,UAAU,EAAE,MAAM;KACnB,CAAA;IAED,MAAM,WAAW,GAAkB;QACjC,kBAAkB,EAAE,GAAG;KACxB,CAAA;IAED,MAAM,UAAU,GAAkB;QAChC,aAAa,EAAE;YACb,iBAAiB;YACjB,gBAAgB,EAAE,EAAE;YACpB,qBAAqB,EAAE,EAAE;YACzB,kBAAkB,EAAE,SAAS;YAC7B,oBAAoB,EAAE,SAAS;YAC/B,oEAAoE;YACpE,wEAAwE;YACxE,qEAAqE;YACrE,sBAAsB,EAAE,oCAAoC;YAC5D,sBAAsB,EAAE,qCAAqC;YAC7D,yBAAyB,EAAE,qCAAqC;YAChE,qBAAqB,EAAE,gBAAgB;YACvC,qBAAqB,EAAE,iBAAiB;YACxC,qBAAqB,EAAE,eAAe;YACtC,qBAAqB,EAAE,mBAAmB;YAC1C,qBAAqB,EAAE,iBAAiB;YACxC,sBAAsB,EAAE,cAAc;YACtC,oBAAoB,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACxC,sBAAsB,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC1C,OAAO,EAAE,aAAa;YACtB,UAAU,EAAE,QAAQ;YACpB,MAAM,EAAE,SAAS;YACjB,UAAU,EAAE,QAAQ;YACpB,cAAc,EAAE,QAAQ;YACxB,GAAG,EAAE,QAAQ;YACb,UAAU,EAAE,gFAAgF;YAC5F,YAAY,EAAE,qCAAqC;YACnD,KAAK,EAAE,+FAA+F;YACtG,OAAO,EAAE,0BAA0B;YACnC,QAAQ,EAAE,yBAAyB;YACnC,UAAU,EAAE,2BAA2B;YACvC,UAAU,EAAE,KAAK,CAAC,qBAAqB,CAAC;YACxC,QAAQ,EAAE,UAAU;YACpB,MAAM,EAAE,6BAA6B;YACrC,KAAK,EAAE,6BAA6B;YACpC,wBAAwB,EAAE,WAAW;YACrC,YAAY,EAAE,aAAa;YAC3B,aAAa,EAAE,aAAa;YAC5B,cAAc,EAAE,MAAM;YACtB,6FAA6F;YAC7F,OAAO,EAAE,MAAM;YACf,UAAU,EAAE,kBAAkB;YAC9B,SAAS,EAAE;gBACT,KAAK,EAAE,+FAA+F;aACvG;YACD,UAAU,EAAE;gBACV,KAAK,EAAE,MAAM;aACd;YACD,yCAAyC,EAAE;gBACzC,UAAU,EAAE,mBAAmB;gBAC/B,UAAU,EAAE;oBACV,KAAK,EAAE,GAAG;iBACX;aACF;SACF;QACD,yBAAyB,EAAE;YACzB,qBAAqB,EAAE,SAAS;YAChC,qBAAqB,EAAE,QAAQ;YAC/B,qBAAqB,EAAE,UAAU;YACjC,qBAAqB,EAAE,SAAS;YAChC,qBAAqB,EAAE,UAAU;YACjC,sBAAsB,EAAE,MAAM;YAC9B,yBAAyB,EAAE,KAAK;YAChC,2BAA2B,EAAE,GAAG;YAChC,oBAAoB,EAAE,8BAA8B;YACpD,sBAAsB,EAAE,gCAAgC;YACxD,kBAAkB,EAAE,SAAS;YAC7B,kBAAkB,EAAE,SAAS;YAC7B,kBAAkB,EAAE,QAAQ;YAC5B,kBAAkB,EAAE,SAAS;YAC7B,kBAAkB,EAAE,MAAM;YAC1B,mBAAmB,EAAE,QAAQ;YAC7B,QAAQ,EAAE,QAAQ;YAClB,GAAG,EAAE,GAAG;SACT;QACD,qBAAqB,EAAE;YACrB,+BAA+B,EAAE,KAAK;YACtC,+BAA+B,EAAE,6BAA6B;YAC9D,OAAO,EAAE,uCAAuC;YAChD,iBAAiB,EAAE;gBACjB,OAAO,EAAE,MAAM;aAChB;SACF;QACD,uBAAuB,EAAE;YACvB,oBAAoB,EAAE,GAAG;YACzB,eAAe,EAAE,4DAA4D;YAC7E,KAAK,EAAE,yGAAyG;YAChH,SAAS,EAAE;gBACT,KAAK,EACH,yGAAyG;aAC5G;SACF;QACD,sBAAsB,EAAE,aAAa;QACrC,qBAAqB,EAAE,WAAW;QAClC,gBAAgB,EAAE;YAChB,gBAAgB,EAAE,aAAa;YAC/B,qBAAqB,EAAE,iBAAiB;YACxC,0BAA0B,EAAE,aAAa;YACzC,+BAA+B,EAAE,4BAA4B;YAC7D,wBAAwB,EAAE,4BAA4B;YACtD,8BAA8B,EAAE,kCAAkC;YAClE,mCAAmC,EAAE,uDAAuD;YAC5F,wCAAwC,EAAE,0DAA0D;YACpG,wBAAwB,EAAE,8EAA8E;YACxG,6BAA6B,EAAE,iFAAiF;YAChH,UAAU,EAAE,2BAA2B,KAAK,CAAC,6BAA6B,CAAC,GAAG;YAC9E,SAAS,EAAE;gBACT,0BAA0B,EAAE,kCAAkC;gBAC9D,+BAA+B,EAAE,0BAA0B;gBAC3D,UAAU,EAAE,2BAA2B,KAAK,CAAC,6BAA6B,CAAC,GAAG;aAC/E;SACF;KACF,CAAA;IAED,2DAA2D;IAC3D,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QACzB,IAAI,GAAG,KAAK,cAAc,IAAI,GAAG,KAAK,aAAa,IAAI,GAAG,KAAK,OAAO,IAAI,GAAG,KAAK,OAAO,IAAI,GAAG,KAAK,IAAI;YAAE,SAAQ;QACnH,MAAM,YAAY,GAAG,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAA;QAC3E,+DAA+D;QAC/D,MAAM,OAAO,GAAG,GAAG,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAA;QAChD,MAAM,UAAU,GAAkB;YAChC,gBAAgB,EAAE,yBAAyB,GAAG,IAAI,GAAG,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI;YAChH,0BAA0B,EAAE,aAAa;YACzC,+BAA+B,EAAE,yBAAyB,GAAG,IAAI,GAAG,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI;YACnG,mBAAmB,EAAE,GAAG;YACxB,iBAAiB,EAAE,yBAAyB,YAAY,QAAQ;YAChE,wBAAwB,EAAE,KAAK;YAC/B,wBAAwB,EAAE,GAAG,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,yDAAyD,CAAC,CAAC,CAAC,qCAAqC,EAAE;SACxK,CAAA;QACD,MAAM,sBAAsB,GAAkB;YAC5C,iBAAiB,EAAE,yBAAyB,YAAY,QAAQ;SACjE,CAAA;QACD,UAAU,CAAC,MAAM,GAAG,GAAG,GAAG,GAAG,CAAC,GAAG;YAC/B,gBAAgB,EAAE,yBAAyB,GAAG,IAAI,GAAG,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI;YAChH,qBAAqB,EAAE,GAAG,GAAG,KAAK,MAAM,CAAC,CAAC,CAAC,kCAAkC,CAAC,CAAC,CAAC,wBAAwB,EAAE;YAC1G,0BAA0B,EAAE,aAAa;YACzC,+BAA+B,EAAE,yBAAyB,GAAG,IAAI,GAAG,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI;YACnG,wBAAwB,EAAE,yBAAyB,GAAG,QAAQ;YAC9D,8BAA8B,EAAE,yBAAyB,GAAG,IAAI,GAAG,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI;YAC9H,mCAAmC,EAAE,uDAAuD;YAC5F,wCAAwC,EAAE,iDAAiD,GAAG,IAAI,GAAG,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI;YACpI,wBAAwB,EAAE,4EAA4E,OAAO,QAAQ;YACrH,6BAA6B,EAAE,iFAAiF,OAAO,SAAS;YAChI,uEAAuE;YACvE,sBAAsB,EAAE,yBAAyB,OAAO,OAAO;YAC/D,sBAAsB,EAAE,yBAAyB,OAAO,QAAQ;YAChE,yBAAyB,EAAE,yBAAyB,OAAO,QAAQ;YACnE,SAAS,EAAE;gBACT,gBAAgB,EAAE,yBAAyB,GAAG,IAAI,GAAG,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI;gBAChH,0BAA0B,EAAE,yBAAyB,GAAG,IAAI,GAAG,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI;gBAC7F,+BAA+B,EAAE,yBAAyB,GAAG,IAAI,GAAG,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI;aACpG;YACD,cAAc,EAAE,UAAU;YAC1B,iBAAiB,EAAE,UAAU;YAC7B,uCAAuC,EAAE,sBAAsB;YAC/D,sEAAsE,EAAE;gBACtE,+CAA+C,EAAE,sBAAsB;aACxE;SACF,CAAA;IACH,CAAC;IAED,MAAM,WAAW,GAAkB;QACjC,EAAE,EAAE;YACF,QAAQ,EAAE,gCAAgC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG;YAC/D,UAAU,EAAE,kCAAkC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG;YACnE,OAAO,EAAE,0BAA0B;YACnC,KAAK,EAAE,6BAA6B;YACpC,MAAM,EAAE,6BAA6B;SACtC;QACD,EAAE,EAAE;YACF,QAAQ,EAAE,gCAAgC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG;YAC/D,UAAU,EAAE,kCAAkC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG;YACnE,OAAO,EAAE,0BAA0B;YACnC,KAAK,EAAE,6BAA6B;YACpC,MAAM,EAAE,6BAA6B;SACtC;QACD,EAAE,EAAE;YACF,QAAQ,EAAE,gCAAgC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG;YAC/D,UAAU,EAAE,kCAAkC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG;YACnE,OAAO,EAAE,0BAA0B;YACnC,KAAK,EAAE,6BAA6B;YACpC,MAAM,EAAE,6BAA6B;SACtC;QACD,EAAE,EAAE;YACF,QAAQ,EAAE,gCAAgC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG;YAC/D,UAAU,EAAE,kCAAkC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG;YACnE,OAAO,EAAE,0BAA0B;YACnC,KAAK,EAAE,6BAA6B;YACpC,MAAM,EAAE,6BAA6B;SACtC;QACD,EAAE,EAAE;YACF,QAAQ,EAAE,gCAAgC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG;YAC/D,UAAU,EAAE,kCAAkC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG;YACnE,OAAO,EAAE,0BAA0B;YACnC,KAAK,EAAE,6BAA6B;YACpC,MAAM,EAAE,6BAA6B;SACtC;QACD,KAAK,EAAE;YACL,aAAa,EAAE,SAAS,CAAC,IAAI,CAAC;YAC9B,QAAQ,EAAE,gCAAgC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG;YAC/D,UAAU,EAAE,kCAAkC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG;YACnE,OAAO,EAAE,2BAA2B;YACpC,KAAK,EAAE,8BAA8B;YACrC,MAAM,EAAE,8BAA8B;SACvC;KACF,CAAA;IACD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QAC9B,UAAU,CAAC,MAAM,GAAG,GAAG,GAAG,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,CAAA;IACnD,CAAC;IACD,aAAa,CAAC,UAAU,CAAC,CAAA;IAEzB;;;;;MAKE;IACF,MAAM,iBAAiB,GAAkB;QACvC,4BAA4B,EAAE;YAC5B,OAAO,EAAE,GAAG;YACZ,OAAO,EAAE,aAAa;YACtB,eAAe,EAAE,aAAa;YAC9B,KAAK,EAAE,yGAAyG;YAChH,SAAS,EAAE;gBACT,KAAK,EACH,yGAAyG;aAC5G;SACF;KACF,CAAA;IACD,YAAY,CAAC,iBAAiB,CAAC,CAAA;AACjC,CAAC,CAAC,CAAA"}
+{"version":3,"file":"tailwind-plugin-button.js","sourceRoot":"","sources":["../src/tailwind-plugin-button.ts"],"names":[],"mappings":"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"}