@vaadin/checkbox 24.8.4 → 25.0.0-alpha10

package/README.md

@@ -28,29 +28,6 @@ Once installed, import the component in your application:
 import '@vaadin/checkbox';
 ```
 
-## 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/checkbox/vaadin-checkbox.js) of the package uses the Lumo theme.
-
-To use the Material theme, import the component from the `theme/material` folder:
-
-```js
-import '@vaadin/checkbox/theme/material/vaadin-checkbox.js';
-```
-
-You can also import the Lumo version of the component explicitly:
-
-```js
-import '@vaadin/checkbox/theme/lumo/vaadin-checkbox.js';
-```
-
-Finally, you can import the un-themed component from the `src` folder to get a minimal starting point:
-
-```js
-import '@vaadin/checkbox/src/vaadin-checkbox.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/checkbox",
-  "version": "24.8.4",
+  "version": "25.0.0-alpha10",
   "publishConfig": {
     "access": "public"
   },
@@ -21,6 +21,8 @@
   "type": "module",
   "files": [
     "src",
+    "!src/styles/*-base-styles.d.ts",
+    "!src/styles/*-base-styles.js",
     "theme",
     "vaadin-*.d.ts",
     "vaadin-*.js",
@@ -31,29 +33,26 @@
     "Vaadin",
     "checkbox",
     "web-components",
-    "web-component",
-    "polymer"
+    "web-component"
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@polymer/polymer": "^3.0.0",
-    "@vaadin/a11y-base": "~24.8.4",
-    "@vaadin/component-base": "~24.8.4",
-    "@vaadin/field-base": "~24.8.4",
-    "@vaadin/vaadin-lumo-styles": "~24.8.4",
-    "@vaadin/vaadin-material-styles": "~24.8.4",
-    "@vaadin/vaadin-themable-mixin": "~24.8.4",
+    "@vaadin/a11y-base": "25.0.0-alpha10",
+    "@vaadin/component-base": "25.0.0-alpha10",
+    "@vaadin/field-base": "25.0.0-alpha10",
+    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha10",
+    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha10",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "~24.8.4",
-    "@vaadin/test-runner-commands": "~24.8.4",
-    "@vaadin/testing-helpers": "^1.1.0",
+    "@vaadin/chai-plugins": "25.0.0-alpha10",
+    "@vaadin/test-runner-commands": "25.0.0-alpha10",
+    "@vaadin/testing-helpers": "^2.0.0",
     "sinon": "^18.0.0"
   },
   "web-types": [
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "849e54e967563080a685965e2dced02060b3ab23"
+  "gitHead": "6cc6c94079e805fa5b2f0af4dbf3b2a7485e57d0"
 }

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

@@ -0,0 +1,33 @@
+/**
+ * @license
+ * Copyright (c) 2017 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import '@vaadin/component-base/src/style-props.js';
+import { css } from 'lit';
+import { checkable } from '@vaadin/field-base/src/styles/checkable-base-styles.js';
+import { field } from '@vaadin/field-base/src/styles/field-base-styles.js';
+
+const checkbox = css`
+  [part='checkbox']::after {
+    inset: 0;
+    mask-image: var(--_vaadin-icon-checkmark);
+  }
+
+  :host([readonly]) {
+    --vaadin-checkbox-background: transparent;
+    --vaadin-checkbox-border-color: var(--vaadin-border-color-strong);
+    --vaadin-checkbox-color: var(--vaadin-color);
+  }
+
+  :host([readonly]) [part='checkbox'] {
+    border-style: dashed;
+  }
+
+  :host([indeterminate]) [part='checkbox']::after {
+    inset: calc(var(--_border-width) * -1);
+    mask-image: var(--_vaadin-icon-minus);
+  }
+`;
+
+export const checkboxStyles = [field, checkable('checkbox'), checkbox];

package/src/styles/vaadin-checkbox-core-styles.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @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 } from 'lit';
+
+export const checkboxStyles: CSSResult;

package/src/styles/vaadin-checkbox-core-styles.js

@@ -0,0 +1,44 @@
+/**
+ * @license
+ * Copyright (c) 2017 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import { css } from 'lit';
+import { checkable } from '@vaadin/field-base/src/styles/checkable-core-styles.js';
+
+const checkbox = css`
+  [part='helper-text'],
+  [part='error-message'] {
+    grid-column: 2;
+  }
+
+  :host(:not([has-helper])) [part='helper-text'],
+  :host(:not([has-error-message])) [part='error-message'] {
+    display: none;
+  }
+
+  @media (forced-colors: active) {
+    [part='checkbox'] {
+      outline: 1px solid;
+      outline-offset: -1px;
+    }
+
+    :host([disabled]) [part='checkbox'],
+    :host([disabled]) [part='checkbox']::after {
+      outline-color: GrayText;
+    }
+
+    :host(:is([checked], [indeterminate])) [part='checkbox']::after {
+      outline: 1px solid;
+      outline-offset: -1px;
+      border-radius: inherit;
+    }
+
+    :host([focused]) [part='checkbox'],
+    :host([focused]) [part='checkbox']::after {
+      outline-width: 2px;
+    }
+  }
+`;
+
+export const checkboxStyles = [checkable('checkbox'), checkbox];

package/src/vaadin-checkbox-mixin.d.ts

@@ -9,7 +9,6 @@ import type { DelegateFocusMixinClass } from '@vaadin/a11y-base/src/delegate-foc
 import type { DisabledMixinClass } from '@vaadin/a11y-base/src/disabled-mixin.js';
 import type { FocusMixinClass } from '@vaadin/a11y-base/src/focus-mixin.js';
 import type { KeyboardMixinClass } from '@vaadin/a11y-base/src/keyboard-mixin.js';
-import type { ControllerMixinClass } from '@vaadin/component-base/src/controller-mixin.js';
 import type { DelegateStateMixinClass } from '@vaadin/component-base/src/delegate-state-mixin.js';
 import type { SlotStylesMixinClass } from '@vaadin/component-base/src/slot-styles-mixin.js';
 import type { CheckedMixinClass } from '@vaadin/field-base/src/checked-mixin.js';
@@ -26,7 +25,6 @@ export declare function CheckboxMixin<T extends Constructor<HTMLElement>>(
 ): Constructor<ActiveMixinClass> &
   Constructor<CheckboxMixinClass> &
   Constructor<CheckedMixinClass> &
-  Constructor<ControllerMixinClass> &
   Constructor<DelegateFocusMixinClass> &
   Constructor<DelegateStateMixinClass> &
   Constructor<DisabledMixinClass> &

package/src/vaadin-checkbox.js

@@ -3,15 +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 { 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 { LumoInjectionMixin } from '@vaadin/vaadin-themable-mixin/lumo-injection-mixin.js';
+import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
+import { checkboxStyles } from './styles/vaadin-checkbox-core-styles.js';
 import { CheckboxMixin } from './vaadin-checkbox-mixin.js';
-import { checkboxStyles } from './vaadin-checkbox-styles.js';
-
-registerStyles('vaadin-checkbox', checkboxStyles, { moduleId: 'vaadin-checkbox-styles' });
 
 /**
  * `<vaadin-checkbox>` is an input field representing a binary choice.
@@ -60,19 +60,24 @@ registerStyles('vaadin-checkbox', checkboxStyles, { moduleId: 'vaadin-checkbox-s
  * @mixes ThemableMixin
  * @mixes ElementMixin
  */
-export class Checkbox extends CheckboxMixin(ElementMixin(ThemableMixin(PolymerElement))) {
+export class Checkbox extends CheckboxMixin(ElementMixin(ThemableMixin(PolylitMixin(LumoInjectionMixin(LitElement))))) {
   static get is() {
     return 'vaadin-checkbox';
   }
 
-  static get template() {
+  static get styles() {
+    return checkboxStyles;
+  }
+
+  /** @protected */
+  render() {
     return html`
       <div class="vaadin-checkbox-container">
         <div part="checkbox" aria-hidden="true"></div>
         <slot name="input"></slot>
         <div part="label">
           <slot name="label"></slot>
-          <div part="required-indicator" on-click="_onRequiredIndicatorClick"></div>
+          <div part="required-indicator" @click="${this._onRequiredIndicatorClick}"></div>
         </div>
         <div part="helper-text">
           <slot name="helper"></slot>

package/theme/lumo/vaadin-checkbox-styles.js

@@ -250,12 +250,13 @@ registerStyles(
     }
 
     :host([invalid]) [part='checkbox'] {
-      background: var(--_invalid-background);
+      background-color: var(--_invalid-background);
       background-image: linear-gradient(var(--_invalid-background) 0%, var(--_invalid-background) 100%);
     }
 
     :host([invalid]:hover) [part='checkbox'] {
-      background-image: linear-gradient(var(--_invalid-background) 0%, var(--_invalid-background) 100%),
+      background-image:
+        linear-gradient(var(--_invalid-background) 0%, var(--_invalid-background) 100%),
         linear-gradient(var(--_invalid-background) 0%, var(--_invalid-background) 100%);
     }
 

package/web-types.json

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

package/web-types.lit.json

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

package/src/vaadin-checkbox-styles.js

@@ -1,95 +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 { css } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-
-export const checkboxStyles = css`
-  :host {
-    display: inline-block;
-  }
-
-  :host([hidden]) {
-    display: none !important;
-  }
-
-  :host([disabled]) {
-    -webkit-tap-highlight-color: transparent;
-  }
-
-  .vaadin-checkbox-container {
-    display: grid;
-    grid-template-columns: auto 1fr;
-    align-items: baseline;
-  }
-
-  [part='checkbox'],
-  ::slotted(input),
-  [part='label'] {
-    grid-row: 1;
-  }
-
-  [part='checkbox'],
-  ::slotted(input) {
-    grid-column: 1;
-  }
-
-  [part='helper-text'],
-  [part='error-message'] {
-    grid-column: 2;
-  }
-
-  :host(:not([has-helper])) [part='helper-text'],
-  :host(:not([has-error-message])) [part='error-message'] {
-    display: none;
-  }
-
-  [part='checkbox'] {
-    width: var(--vaadin-checkbox-size, 1em);
-    height: var(--vaadin-checkbox-size, 1em);
-    --_input-border-width: var(--vaadin-input-field-border-width, 0);
-    --_input-border-color: var(--vaadin-input-field-border-color, transparent);
-    box-shadow: inset 0 0 0 var(--_input-border-width, 0) var(--_input-border-color);
-  }
-
-  [part='checkbox']::before {
-    display: block;
-    content: '\\202F';
-    line-height: var(--vaadin-checkbox-size, 1em);
-    contain: paint;
-  }
-
-  /* visually hidden */
-  ::slotted(input) {
-    cursor: inherit;
-    margin: 0;
-    align-self: stretch;
-    -webkit-appearance: none;
-    width: initial;
-    height: initial;
-  }
-
-  @media (forced-colors: active) {
-    [part='checkbox'] {
-      outline: 1px solid;
-      outline-offset: -1px;
-    }
-
-    :host([disabled]) [part='checkbox'],
-    :host([disabled]) [part='checkbox']::after {
-      outline-color: GrayText;
-    }
-
-    :host(:is([checked], [indeterminate])) [part='checkbox']::after {
-      outline: 1px solid;
-      outline-offset: -1px;
-      border-radius: inherit;
-    }
-
-    :host([focused]) [part='checkbox'],
-    :host([focused]) [part='checkbox']::after {
-      outline-width: 2px;
-    }
-  }
-`;

package/src/vaadin-lit-checkbox.js

@@ -1,64 +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 { CheckboxMixin } from './vaadin-checkbox-mixin.js';
-import { checkboxStyles } from './vaadin-checkbox-styles.js';
-
-/**
- * LitElement based version of `<vaadin-checkbox>` 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.
- */
-export class Checkbox extends CheckboxMixin(ElementMixin(ThemableMixin(PolylitMixin(LitElement)))) {
-  static get is() {
-    return 'vaadin-checkbox';
-  }
-
-  static get styles() {
-    return checkboxStyles;
-  }
-
-  /** @protected */
-  render() {
-    return html`
-      <div class="vaadin-checkbox-container">
-        <div part="checkbox" aria-hidden="true"></div>
-        <slot name="input"></slot>
-        <div part="label">
-          <slot name="label"></slot>
-          <div part="required-indicator" @click="${this._onRequiredIndicatorClick}"></div>
-        </div>
-        <div part="helper-text">
-          <slot name="helper"></slot>
-        </div>
-        <div part="error-message">
-          <slot name="error-message"></slot>
-        </div>
-      </div>
-      <slot name="tooltip"></slot>
-    `;
-  }
-
-  /** @protected */
-  ready() {
-    super.ready();
-
-    this._tooltipController = new TooltipController(this);
-    this._tooltipController.setAriaTarget(this.inputElement);
-    this.addController(this._tooltipController);
-  }
-}
-
-defineCustomElement(Checkbox);

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

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

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

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

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

@@ -1 +0,0 @@
-import '@vaadin/vaadin-material-styles/color.js';

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

@@ -1,189 +0,0 @@
-import '@vaadin/vaadin-material-styles/color.js';
-import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-
-registerStyles(
-  'vaadin-checkbox',
-  css`
-    :host {
-      display: inline-block;
-      -webkit-user-select: none;
-      user-select: none;
-      outline: none;
-      -webkit-tap-highlight-color: transparent;
-      --_checkbox-size: var(--vaadin-checkbox-size, 16px);
-    }
-
-    [part='label'] {
-      display: flex;
-      position: relative;
-      max-width: max-content;
-    }
-
-    :host([has-label]) ::slotted(label) {
-      padding: 3px 12px 3px 6px;
-    }
-
-    [part='checkbox'] {
-      width: var(--_checkbox-size);
-      height: var(--_checkbox-size);
-      margin: 4px;
-      position: relative;
-      border-radius: 2px;
-      box-shadow: inset 0 0 0 2px var(--material-secondary-text-color);
-      background-color: transparent;
-    }
-
-    /* Used for the ripple */
-    [part='checkbox']::before {
-      pointer-events: none;
-      width: 100%;
-      height: 100%;
-      line-height: var(--_checkbox-size);
-      border-radius: 50%;
-      background-color: var(--material-disabled-text-color);
-      transform: scale(0);
-      opacity: 0;
-      transition:
-        transform 0s 0.8s,
-        opacity 0.8s;
-      will-change: transform, opacity;
-    }
-
-    /* Used for the checkmark */
-    [part='checkbox']::after {
-      content: '';
-      pointer-events: none;
-      display: inline-block;
-      width: 10px;
-      height: 19px;
-      border: 0 solid var(--material-background-color);
-      border-width: 3px 0 0 3px;
-      box-sizing: border-box;
-      transform-origin: 0 0;
-      position: absolute;
-      top: 12px;
-      left: 6px;
-      transform: scale(0) rotate(-135deg);
-      transition: transform 0.2s;
-    }
-
-    :host([indeterminate]) [part='checkbox'],
-    :host([checked]) [part='checkbox'] {
-      background-color: var(--material-primary-color);
-      box-shadow: none;
-    }
-
-    :host([checked]) [part='checkbox']::after {
-      transform: scale(0.55) rotate(-135deg);
-    }
-
-    :host(:not([checked]):not([indeterminate]):not([disabled]):hover) [part='checkbox'] {
-      background-color: transparent;
-    }
-
-    :host([focus-ring]) [part='checkbox']::before,
-    :host([active]) [part='checkbox']::before {
-      transition-duration: 0.08s, 0.01s;
-      transition-delay: 0s, 0s;
-      transform: scale(2.5);
-      opacity: 0.15;
-    }
-
-    :host([checked]) [part='checkbox']::before {
-      background-color: var(--material-primary-color);
-    }
-
-    :host([indeterminate]) [part='checkbox']::after {
-      transform: none;
-      opacity: 1;
-      top: 45%;
-      height: 10%;
-      left: 22%;
-      right: 22%;
-      width: auto;
-      border: 0;
-      background-color: var(--material-background-color);
-      transition: opacity 0.4s;
-    }
-
-    :host([disabled]) {
-      pointer-events: none;
-      color: var(--material-disabled-text-color);
-    }
-
-    :host([disabled]) ::slotted(label) {
-      color: inherit;
-    }
-
-    :host([disabled]:not([checked]):not([indeterminate])) [part='checkbox'] {
-      box-shadow: inset 0 0 0 2px var(--material-disabled-color);
-    }
-
-    :host([disabled][checked]) [part='checkbox'],
-    :host([disabled][indeterminate]) [part='checkbox'] {
-      background-color: var(--material-disabled-color);
-    }
-
-    :host([readonly][checked]:not([disabled])) [part='checkbox'],
-    :host([readonly][indeterminate]:not([disabled])) [part='checkbox'],
-    :host([readonly]:not([disabled])) [part='checkbox']::before {
-      background-color: var(--material-secondary-text-color);
-    }
-
-    /* RTL specific styles */
-    :host([dir='rtl'][has-label]) ::slotted(label) {
-      padding: 3px 6px 3px 12px;
-    }
-
-    /* Required */
-    :host([required]) [part='required-indicator'] {
-      position: absolute;
-      top: 3px;
-      right: 2px;
-    }
-
-    :host([dir='rtl'][required]) [part='required-indicator'] {
-      right: auto;
-      left: 2px;
-    }
-
-    :host([required]:not([disabled])) [part='required-indicator'] {
-      color: var(--material-secondary-text-color);
-    }
-
-    :host([required]) [part='required-indicator']::after {
-      content: '*';
-    }
-
-    :host([invalid]) [part='required-indicator']::after {
-      color: var(--material-error-text-color);
-    }
-
-    :host(:not([has-label])) [part='required-indicator'] {
-      display: none;
-    }
-
-    [part='error-message'],
-    [part='helper-text'] {
-      font-size: 0.75em;
-      line-height: 1;
-      padding-left: 6px;
-    }
-
-    [part='error-message'] {
-      color: var(--material-error-text-color);
-    }
-
-    [part='helper-text'] {
-      color: var(--material-secondary-text-color);
-    }
-
-    :host([has-error-message]) [part='error-message']::before,
-    :host([has-helper]) [part='helper-text']::before {
-      content: '';
-      display: block;
-      height: 6px;
-    }
-  `,
-  { moduleId: 'material-checkbox' },
-);

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

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

package/theme/material/vaadin-checkbox.js

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

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

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

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

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

package/vaadin-lit-checkbox.d.ts

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

package/vaadin-lit-checkbox.js

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