@vaadin/button 25.0.0-alpha4 → 25.0.0-alpha6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/button",
-  "version": "25.0.0-alpha4",
+  "version": "25.0.0-alpha6",
   "publishConfig": {
     "access": "public"
   },
@@ -37,16 +37,17 @@
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@vaadin/a11y-base": "25.0.0-alpha4",
-    "@vaadin/component-base": "25.0.0-alpha4",
-    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha4",
-    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha4",
+    "@vaadin/a11y-base": "25.0.0-alpha6",
+    "@vaadin/component-base": "25.0.0-alpha6",
+    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha6",
+    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha6",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "25.0.0-alpha4",
-    "@vaadin/icon": "25.0.0-alpha4",
-    "@vaadin/test-runner-commands": "25.0.0-alpha4",
+    "@vaadin/chai-plugins": "25.0.0-alpha6",
+    "@vaadin/icon": "25.0.0-alpha6",
+    "@vaadin/icons": "25.0.0-alpha6",
+    "@vaadin/test-runner-commands": "25.0.0-alpha6",
     "@vaadin/testing-helpers": "^2.0.0",
     "sinon": "^18.0.0"
   },
@@ -54,5 +55,5 @@
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "ce4421f0daf26027b863b91787a474e4cc264344"
+  "gitHead": "cd1d084198d2b326c58d44bb39fa4845b71ce551"
 }

package/src/styles/vaadin-button-base-styles.js

@@ -13,7 +13,7 @@ export const buttonStyles = css`
       align-items: center;
       justify-content: center;
       text-align: center;
-      gap: var(--vaadin-button-gap, 0 var(--_vaadin-gap-container-inline));
+      gap: var(--vaadin-button-gap, 0 var(--vaadin-gap-container-inline));
       white-space: nowrap;
       -webkit-tap-highlight-color: transparent;
       -webkit-user-select: none;
@@ -24,19 +24,19 @@ export const buttonStyles = css`
       flex-shrink: 0;
       height: var(--vaadin-button-height, auto);
       margin: var(--vaadin-button-margin, 0);
-      padding: var(--vaadin-button-padding, var(--_vaadin-padding-container));
+      padding: var(--vaadin-button-padding, var(--vaadin-padding-container));
       font-family: var(--vaadin-button-font-family, inherit);
       font-size: var(--vaadin-button-font-size, inherit);
       line-height: var(--vaadin-button-line-height, inherit);
       font-weight: var(--vaadin-button-font-weight, 500);
-      color: var(--vaadin-button-text-color, var(--_vaadin-color-strong));
-      background: var(--vaadin-button-background, var(--_vaadin-background-container));
+      color: var(--vaadin-button-text-color, var(--vaadin-color));
+      background: var(--vaadin-button-background, var(--vaadin-background-container));
       background-origin: border-box;
       border: var(
         --vaadin-button-border,
-        var(--vaadin-button-border-width, 1px) solid var(--vaadin-button-border-color, var(--_vaadin-border-color))
+        var(--vaadin-button-border-width, 1px) solid var(--vaadin-button-border-color, var(--vaadin-border-color))
       );
-      border-radius: var(--vaadin-button-border-radius, var(--_vaadin-radius-m));
+      border-radius: var(--vaadin-button-border-radius, var(--vaadin-radius-m));
       touch-action: manipulation;
     }
 
@@ -51,14 +51,14 @@ export const buttonStyles = css`
       display: contents;
     }
 
-    :host([focus-ring]) {
+    :host(:is([focus-ring], :focus-visible)) {
       outline: var(--vaadin-focus-ring-width) solid var(--vaadin-focus-ring-color);
       outline-offset: 1px;
     }
 
     :host([theme~='primary']) {
-      --vaadin-button-background: var(--_vaadin-color-strong);
-      --vaadin-button-text-color: var(--_vaadin-background);
+      --vaadin-button-background: var(--vaadin-color);
+      --vaadin-button-text-color: var(--vaadin-background-color);
       --vaadin-button-border-color: transparent;
     }
 
@@ -75,8 +75,8 @@ export const buttonStyles = css`
     }
 
     :host([disabled][theme~='primary']) {
-      --vaadin-button-text-color: var(--_vaadin-background-container-strong);
-      --vaadin-button-background: var(--_vaadin-color-subtle);
+      --vaadin-button-text-color: var(--vaadin-background-container-strong);
+      --vaadin-button-background: var(--vaadin-color-disabled);
     }
 
     @media (forced-colors: active) {

package/src/vaadin-button.js

@@ -8,7 +8,7 @@ import { defineCustomElement } from '@vaadin/component-base/src/define.js';
 import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
 import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
 import { TooltipController } from '@vaadin/component-base/src/tooltip-controller.js';
-import { CSSInjectionMixin } from '@vaadin/vaadin-themable-mixin/css-injection-mixin.js';
+import { LumoInjectionMixin } from '@vaadin/vaadin-themable-mixin/lumo-injection-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 import { buttonStyles } from './styles/vaadin-button-core-styles.js';
 import { ButtonMixin } from './vaadin-button-mixin.js';
@@ -47,7 +47,7 @@ import { ButtonMixin } from './vaadin-button-mixin.js';
  * @mixes ElementMixin
  * @mixes ThemableMixin
  */
-class Button extends ButtonMixin(ElementMixin(CSSInjectionMixin(ThemableMixin(PolylitMixin(LitElement))))) {
+class Button extends ButtonMixin(ElementMixin(LumoInjectionMixin(ThemableMixin(PolylitMixin(LitElement))))) {
   static get is() {
     return 'vaadin-button';
   }

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/button",
-  "version": "25.0.0-alpha4",
+  "version": "25.0.0-alpha6",
   "description-markup": "markdown",
   "contributions": {
     "html": {

package/web-types.lit.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/button",
-  "version": "25.0.0-alpha4",
+  "version": "25.0.0-alpha6",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {