@vaadin/button 24.8.0-alpha9 → 25.0.0-alpha1

package/README.md

@@ -28,29 +28,6 @@ Once installed, import the component in your application:
 import '@vaadin/button';
 ```
 
-## Themes
-
-Vaadin components come with two built-in [themes](https://vaadin.com/docs/latest/styling), Lumo and Material.
-The [main entrypoint](https://github.com/vaadin/web-components/blob/main/packages/button/vaadin-button.js) of the package uses the Lumo theme.
-
-To use the Material theme, import the component from the `theme/material` folder:
-
-```js
-import '@vaadin/button/theme/material/vaadin-button.js';
-```
-
-You can also import the Lumo version of the component explicitly:
-
-```js
-import '@vaadin/button/theme/lumo/vaadin-button.js';
-```
-
-Finally, you can import the un-themed component from the `src` folder to get a minimal starting point:
-
-```js
-import '@vaadin/button/src/vaadin-button.js';
-```
-
 ## Contributing
 
 Read the [contributing guide](https://vaadin.com/docs/latest/contributing) to learn about our development process, how to propose bugfixes and improvements, and how to test your changes to Vaadin components.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/button",
-  "version": "24.8.0-alpha9",
+  "version": "25.0.0-alpha1",
   "publishConfig": {
     "access": "public"
   },
@@ -21,6 +21,8 @@
   "type": "module",
   "files": [
     "src",
+    "!src/vaadin-button-base-styles.d.ts",
+    "!src/vaadin-button-base-styles.js",
     "theme",
     "vaadin-*.d.ts",
     "vaadin-*.js",
@@ -35,18 +37,16 @@
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@polymer/polymer": "^3.0.0",
-    "@vaadin/a11y-base": "24.8.0-alpha9",
-    "@vaadin/component-base": "24.8.0-alpha9",
-    "@vaadin/vaadin-lumo-styles": "24.8.0-alpha9",
-    "@vaadin/vaadin-material-styles": "24.8.0-alpha9",
-    "@vaadin/vaadin-themable-mixin": "24.8.0-alpha9",
+    "@vaadin/a11y-base": "25.0.0-alpha1",
+    "@vaadin/component-base": "25.0.0-alpha1",
+    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha1",
+    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha1",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "24.8.0-alpha9",
-    "@vaadin/icon": "24.8.0-alpha9",
-    "@vaadin/test-runner-commands": "24.8.0-alpha9",
+    "@vaadin/chai-plugins": "25.0.0-alpha1",
+    "@vaadin/icon": "25.0.0-alpha1",
+    "@vaadin/test-runner-commands": "25.0.0-alpha1",
     "@vaadin/testing-helpers": "^1.1.0",
     "sinon": "^18.0.0"
   },
@@ -54,5 +54,5 @@
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "4de3809275ddfd733b0d13fd02af8faf73eb6770"
+  "gitHead": "b8c22a4a0c64156210d0daac96b43ae4e5526d49"
 }

package/src/{vaadin-lit-button.d.ts → vaadin-button-core-styles.d.ts}

@@ -3,4 +3,6 @@
  * Copyright (c) 2017 - 2025 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-export * from './vaadin-button.js';
+import type { CSSResult } from 'lit';
+
+export const buttonStyles: CSSResult;

package/src/{vaadin-button-base.js → vaadin-button-core-styles.js}

@@ -70,18 +70,3 @@ export const buttonStyles = css`
     }
   }
 `;
-
-export const buttonTemplate = (html) => html`
-  <div class="vaadin-button-container">
-    <span part="prefix" aria-hidden="true">
-      <slot name="prefix"></slot>
-    </span>
-    <span part="label">
-      <slot></slot>
-    </span>
-    <span part="suffix" aria-hidden="true">
-      <slot name="suffix"></slot>
-    </span>
-  </div>
-  <slot name="tooltip"></slot>
-`;

package/src/vaadin-button.d.ts

@@ -3,7 +3,6 @@
  * Copyright (c) 2017 - 2025 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { ControllerMixin } from '@vaadin/component-base/src/controller-mixin.js';
 import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 import { ButtonMixin } from './vaadin-button-mixin.js';
@@ -36,7 +35,7 @@ import { ButtonMixin } from './vaadin-button-mixin.js';
  *
  * See [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.
  */
-declare class Button extends ButtonMixin(ElementMixin(ThemableMixin(ControllerMixin(HTMLElement)))) {
+declare class Button extends ButtonMixin(ElementMixin(ThemableMixin(HTMLElement))) {
   /**
    * When disabled, the button is rendered as "dimmed" and prevents all
    * user interactions (mouse and keyboard).

package/src/vaadin-button.js

@@ -3,17 +3,15 @@
  * Copyright (c) 2017 - 2025 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
-import { ControllerMixin } from '@vaadin/component-base/src/controller-mixin.js';
+import { html, LitElement } from 'lit';
 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 { registerStyles, ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-import { buttonStyles, buttonTemplate } from './vaadin-button-base.js';
+import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
+import { buttonStyles } from './vaadin-button-core-styles.js';
 import { ButtonMixin } from './vaadin-button-mixin.js';
 
-registerStyles('vaadin-button', buttonStyles, { moduleId: 'vaadin-button-styles' });
-
 /**
  * `<vaadin-button>` is an accessible and customizable button that allows users to perform actions.
  *
@@ -45,11 +43,18 @@ registerStyles('vaadin-button', buttonStyles, { moduleId: 'vaadin-button-styles'
  * @customElement
  * @extends HTMLElement
  * @mixes ButtonMixin
- * @mixes ControllerMixin
  * @mixes ElementMixin
  * @mixes ThemableMixin
  */
-class Button extends ButtonMixin(ElementMixin(ThemableMixin(ControllerMixin(PolymerElement)))) {
+class Button extends ButtonMixin(ElementMixin(ThemableMixin(PolylitMixin(LitElement)))) {
+  static get is() {
+    return 'vaadin-button';
+  }
+
+  static get styles() {
+    return buttonStyles;
+  }
+
   static get properties() {
     return {
       /**
@@ -72,16 +77,29 @@ class Button extends ButtonMixin(ElementMixin(ThemableMixin(ControllerMixin(Poly
       disabled: {
         type: Boolean,
         value: false,
+        observer: '_disabledChanged',
+        reflectToAttribute: true,
+        sync: true,
       },
     };
   }
 
-  static get is() {
-    return 'vaadin-button';
-  }
-
-  static get template() {
-    return buttonTemplate(html);
+  /** @protected */
+  render() {
+    return html`
+      <div class="vaadin-button-container">
+        <span part="prefix" aria-hidden="true">
+          <slot name="prefix"></slot>
+        </span>
+        <span part="label">
+          <slot></slot>
+        </span>
+        <span part="suffix" aria-hidden="true">
+          <slot name="suffix"></slot>
+        </span>
+      </div>
+      <slot name="tooltip"></slot>
+    `;
   }
 
   /** @protected */

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/button",
-  "version": "24.8.0-alpha9",
+  "version": "25.0.0-alpha1",
   "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": "24.8.0-alpha9",
+  "version": "25.0.0-alpha1",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {

package/src/vaadin-button-base.d.ts

@@ -1,13 +0,0 @@
-/**
- * @license
- * Copyright (c) 2017 - 2025 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import type { CSSResult, TemplateResult } from 'lit';
-
-export const buttonStyles: CSSResult;
-
-export function buttonTemplate<
-  T extends HTMLTemplateElement | TemplateResult,
-  F extends (strings: TemplateStringsArray, ...values: any[]) => T,
->(tag: F): T;

package/src/vaadin-lit-button.js

@@ -1,54 +0,0 @@
-/**
- * @license
- * Copyright (c) 2017 - 2025 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import { html, LitElement } from 'lit';
-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 { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-import { buttonStyles, buttonTemplate } from './vaadin-button-base.js';
-import { ButtonMixin } from './vaadin-button-mixin.js';
-
-/**
- * LitElement based version of `<vaadin-button>` web component.
- *
- * ## Disclaimer
- *
- * This component is an experiment and not yet a part of Vaadin platform.
- * There is no ETA regarding specific Vaadin version where it'll land.
- * Feel free to try this code in your apps as per Apache 2.0 license.
- */
-class Button extends ButtonMixin(ElementMixin(ThemableMixin(PolylitMixin(LitElement)))) {
-  static get is() {
-    return 'vaadin-button';
-  }
-
-  static get styles() {
-    return buttonStyles;
-  }
-
-  /** @protected */
-  render() {
-    return buttonTemplate(html);
-  }
-
-  /** @protected */
-  ready() {
-    super.ready();
-
-    this._tooltipController = new TooltipController(this);
-    this.addController(this._tooltipController);
-  }
-
-  /** @override */
-  __shouldAllowFocusWhenDisabled() {
-    return window.Vaadin.featureFlags.accessibleDisabledButtons;
-  }
-}
-
-defineCustomElement(Button);
-
-export { Button };

package/theme/lumo/vaadin-lit-button.d.ts

@@ -1,2 +0,0 @@
-import './vaadin-button-styles.js';
-import '../../src/vaadin-lit-button.js';

package/theme/lumo/vaadin-lit-button.js

@@ -1,2 +0,0 @@
-import './vaadin-button-styles.js';
-import '../../src/vaadin-lit-button.js';

package/theme/material/vaadin-button-styles.d.ts

@@ -1,5 +0,0 @@
-import '@vaadin/vaadin-material-styles/color.js';
-import '@vaadin/vaadin-material-styles/shadow.js';
-import '@vaadin/vaadin-material-styles/typography.js';
-declare const button: import("lit").CSSResult;
-export { button };

package/theme/material/vaadin-button-styles.js

@@ -1,169 +0,0 @@
-import '@vaadin/vaadin-material-styles/color.js';
-import '@vaadin/vaadin-material-styles/shadow.js';
-import '@vaadin/vaadin-material-styles/typography.js';
-import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-
-const button = css`
-  :host {
-    padding: 8px;
-    min-width: 64px;
-    box-sizing: border-box;
-    display: inline-flex;
-    align-items: baseline;
-    justify-content: center;
-    border-radius: 4px;
-    color: var(--material-primary-text-color);
-    font-family: var(--material-font-family);
-    text-transform: uppercase;
-    font-size: var(--material-button-font-size);
-    line-height: 20px;
-    font-weight: 500;
-    letter-spacing: 0.05em;
-    white-space: nowrap;
-    overflow: hidden;
-    transition: box-shadow 0.2s;
-    -webkit-tap-highlight-color: transparent;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-    flex-shrink: 0;
-  }
-
-  :host::before,
-  :host::after {
-    content: '';
-    pointer-events: none;
-    position: absolute;
-    border-radius: inherit;
-    opacity: 0;
-    background-color: currentColor;
-  }
-
-  :host::before {
-    width: 100%;
-    height: 100%;
-    top: 0;
-    left: 0;
-    transition: opacity 0.5s;
-  }
-
-  :host::after {
-    border-radius: 50%;
-    width: 320px;
-    height: 320px;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    transition: all 0.9s;
-  }
-
-  [part='label'] ::slotted(*) {
-    vertical-align: middle;
-  }
-
-  :host(:hover:not([disabled]))::before,
-  :host([focus-ring])::before {
-    opacity: 0.08;
-    transition-duration: 0.2s;
-  }
-
-  :host([active])::before {
-    opacity: 0.16;
-    transition: opacity 0.4s;
-  }
-
-  :host([active])::after {
-    transform: translate(-50%, -50%) scale(0.0000001); /* animation works weirdly with scale(0) */
-    opacity: 0.1;
-    transition: 0s;
-  }
-
-  :host(:hover:not([active]):not([disabled]))::after {
-    transform: translate(-50%, -50%) scale(1);
-    opacity: 0;
-  }
-
-  :host([disabled]) {
-    color: var(--material-disabled-text-color);
-  }
-
-  /* Contained and outline variants */
-  :host([theme~='contained']),
-  :host([theme~='outlined']) {
-    padding: 8px 16px;
-  }
-
-  :host([theme~='outlined']) {
-    box-shadow: inset 0 0 0 1px var(--_material-button-outline-color, rgba(0, 0, 0, 0.2));
-  }
-
-  :host([theme~='contained']:not([disabled])) {
-    background-color: var(--material-primary-color);
-    color: var(--material-primary-contrast-color);
-    box-shadow: var(--material-shadow-elevation-2dp);
-  }
-
-  :host([theme~='contained'][disabled]) {
-    background-color: var(--material-secondary-background-color);
-  }
-
-  :host([theme~='contained']:not([disabled]):hover) {
-    box-shadow: var(--material-shadow-elevation-4dp);
-  }
-
-  :host([theme~='contained'][active]) {
-    box-shadow: var(--material-shadow-elevation-8dp);
-  }
-
-  /* Icon alignment */
-
-  [part] ::slotted(vaadin-icon) {
-    display: block;
-    width: 18px;
-    height: 18px;
-  }
-
-  [part='prefix'] ::slotted(vaadin-icon) {
-    margin-right: 8px;
-    margin-left: -4px;
-  }
-
-  [part='suffix'] ::slotted(vaadin-icon) {
-    margin-left: 8px;
-    margin-right: -4px;
-  }
-
-  /* RTL specific styles */
-
-  :host([dir='rtl'])::before {
-    left: auto;
-    right: 0;
-  }
-
-  :host([dir='rtl'])::after {
-    left: auto;
-    right: 50%;
-    transform: translate(50%, -50%);
-  }
-
-  :host([active][dir='rtl'])::after {
-    transform: translate(50%, -50%) scale(0.0000001);
-  }
-
-  :host(:hover:not([active]):not([disabled])[dir='rtl'])::after {
-    transform: translate(50%, -50%) scale(1);
-  }
-
-  :host([dir='rtl']) [part='prefix'] ::slotted(vaadin-icon) {
-    margin-right: -4px;
-    margin-left: 8px;
-  }
-
-  :host([dir='rtl']) [part='suffix'] ::slotted(vaadin-icon) {
-    margin-left: -4px;
-    margin-right: 8px;
-  }
-`;
-
-registerStyles('vaadin-button', button, { moduleId: 'material-button' });
-
-export { button };

package/theme/material/vaadin-button.d.ts

@@ -1,2 +0,0 @@
-import './vaadin-button-styles.js';
-import '../../src/vaadin-button.js';

package/theme/material/vaadin-button.js

@@ -1,2 +0,0 @@
-import './vaadin-button-styles.js';
-import '../../src/vaadin-button.js';

package/theme/material/vaadin-lit-button.d.ts

@@ -1,2 +0,0 @@
-import './vaadin-button-styles.js';
-import '../../src/vaadin-lit-button.js';

package/theme/material/vaadin-lit-button.js

@@ -1,2 +0,0 @@
-import './vaadin-button-styles.js';
-import '../../src/vaadin-lit-button.js';

package/vaadin-lit-button.d.ts

@@ -1 +0,0 @@
-export * from './src/vaadin-button.js';

package/vaadin-lit-button.js

@@ -1,3 +0,0 @@
-import './theme/lumo/vaadin-lit-button.js';
-
-export * from './src/vaadin-lit-button.js';