Merge branch 'main' into fix/2671-nested-slots

Author: jpzwarte

.changeset/dark-ravens-join.md

@@ -0,0 +1,5 @@
+---
+'@sl-design-system/button': patch
+---
+
+Fix text color of disabled buttons with a variant

chromatic/package.json

@@ -40,13 +40,13 @@
     }
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "^9.1.10",
-    "@storybook/addon-docs": "^9.1.10",
-    "@storybook/addon-themes": "^9.1.10",
-    "@storybook/web-components-vite": "^9.1.10",
+    "@storybook/addon-a11y": "^9.1.13",
+    "@storybook/addon-docs": "^9.1.13",
+    "@storybook/addon-themes": "^9.1.13",
+    "@storybook/web-components-vite": "^9.1.13",
     "lit": "^3.3.1",
-    "storybook": "^9.1.10",
-    "storybook-addon-pseudo-states": "^9.1.10",
+    "storybook": "^9.1.13",
+    "storybook-addon-pseudo-states": "^9.1.13",
     "tslib": "^2.8.1",
     "typescript": "^5.5.4",
     "wireit": "^0.14.12"

package.json

@@ -457,11 +457,11 @@
     "@custom-elements-manifest/analyzer": "^0.10.10",
     "@faker-js/faker": "^10.1.0",
     "@lit/localize-tools": "^0.8.0",
-    "@storybook/addon-a11y": "^9.1.10",
-    "@storybook/addon-docs": "^9.1.10",
-    "@storybook/addon-vitest": "^9.1.10",
-    "@storybook/web-components": "^9.1.10",
-    "@storybook/web-components-vite": "^9.1.10",
+    "@storybook/addon-a11y": "^9.1.13",
+    "@storybook/addon-docs": "^9.1.13",
+    "@storybook/addon-vitest": "^9.1.13",
+    "@storybook/web-components": "^9.1.13",
+    "@storybook/web-components-vite": "^9.1.13",
     "@types/chai-dom": "^1.11.3",
     "@types/sinon": "^17.0.4",
     "@types/sinon-chai": "^4.0.0",
@@ -474,15 +474,15 @@
     "chromatic": "^13.3.0",
     "eslint": "^9.27.0",
     "husky": "^9.1.7",
-    "lint-staged": "^16.2.4",
+    "lint-staged": "^16.2.5",
     "lit": "^3.3.1",
-    "playwright": "^1.56.0",
+    "playwright": "^1.56.1",
     "sinon": "^21.0.0",
     "sinon-chai": "^4.0.1",
-    "storybook": "^9.1.10",
+    "storybook": "^9.1.13",
     "stylelint": "^16.19.1",
     "typescript": "^5.5.4",
-    "vite": "^7.1.10",
+    "vite": "^7.1.11",
     "vitest": "^3.2.4",
     "wireit": "^0.14.12"
   }

packages/angular/package.json

@@ -86,8 +86,8 @@
     "@angular/platform-browser": "^19.2.14",
     "@angular/platform-browser-dynamic": "^19.2.14",
     "@angular/router": "^19.2.14",
-    "@storybook/angular": "^9.1.10",
-    "@types/jasmine": "~5.1.10",
+    "@storybook/angular": "^9.1.13",
+    "@types/jasmine": "~5.1.12",
     "jasmine-core": "~5.12.0",
     "karma": "~6.4.4",
     "karma-chrome-launcher": "~3.2.0",
@@ -96,7 +96,7 @@
     "karma-jasmine-html-reporter": "~2.1.0",
     "ng-packagr": "^19.2.2",
     "rxjs": "~7.8.2",
-    "storybook": "^9.1.10",
+    "storybook": "^9.1.13",
     "tslib": "^2.8.1",
     "typescript": "~5.5.4",
     "wireit": "^0.14.12",

packages/components/button/src/button.scss

@@ -206,20 +206,20 @@
   pointer-events: none;
 }
 
-:host(:where([disabled], [aria-disabled='true'])) {
+:host(:is([disabled], [aria-disabled='true'])) {
   color: var(--sl-color-foreground-disabled);
   cursor: default;
 }
 
-:host(:where([disabled], [aria-disabled='true']):where(:not([fill]), [fill='solid'])) {
+:host(:is([disabled], [aria-disabled='true']):where(:not([fill]), [fill='solid'])) {
   background: var(--sl-color-background-disabled);
 }
 
-:host(:where([disabled], [aria-disabled='true']):where([fill='ghost'], [fill='link'], [fill='outline'])) {
+:host(:is([disabled], [aria-disabled='true']):where([fill='ghost'], [fill='link'], [fill='outline'])) {
   background: transparent;
 }
 
-:host(:where([disabled], [aria-disabled='true'])[fill='outline']) {
+:host(:is([disabled], [aria-disabled='true'])[fill='outline']) {
   border-color: var(--sl-color-border-disabled);
 }
 

tools/eslint-config/package.json

@@ -51,7 +51,7 @@
   },
   "devDependencies": {
     "eslint": "^9.27.0",
-    "storybook": "^9.1.10",
+    "storybook": "^9.1.13",
     "typescript": "^5.5.4"
   }
 }