@vaadin/checkbox 25.0.0-alpha1 → 25.0.0-alpha11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/checkbox",
-  "version": "25.0.0-alpha1",
+  "version": "25.0.0-alpha11",
   "publishConfig": {
     "access": "public"
   },
@@ -21,7 +21,6 @@
   "type": "module",
   "files": [
     "src",
-    "theme",
     "vaadin-*.d.ts",
     "vaadin-*.js",
     "web-types.json",
@@ -35,22 +34,22 @@
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@vaadin/a11y-base": "25.0.0-alpha1",
-    "@vaadin/component-base": "25.0.0-alpha1",
-    "@vaadin/field-base": "25.0.0-alpha1",
-    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha1",
-    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha1",
+    "@vaadin/a11y-base": "25.0.0-alpha11",
+    "@vaadin/component-base": "25.0.0-alpha11",
+    "@vaadin/field-base": "25.0.0-alpha11",
+    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha11",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "25.0.0-alpha1",
-    "@vaadin/test-runner-commands": "25.0.0-alpha1",
-    "@vaadin/testing-helpers": "^1.1.0",
+    "@vaadin/chai-plugins": "25.0.0-alpha11",
+    "@vaadin/test-runner-commands": "25.0.0-alpha11",
+    "@vaadin/testing-helpers": "^2.0.0",
+    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha11",
     "sinon": "^18.0.0"
   },
   "web-types": [
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "b8c22a4a0c64156210d0daac96b43ae4e5526d49"
+  "gitHead": "abfd315ba5a7484a613e0768635a4e8fe945a44b"
 }

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/styles/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/vaadin-checkbox.js

@@ -8,9 +8,10 @@ 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 { 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-base-styles.js';
 import { CheckboxMixin } from './vaadin-checkbox-mixin.js';
-import { checkboxStyles } from './vaadin-checkbox-styles.js';
 
 /**
  * `<vaadin-checkbox>` is an input field representing a binary choice.
@@ -59,7 +60,7 @@ import { checkboxStyles } from './vaadin-checkbox-styles.js';
  * @mixes ThemableMixin
  * @mixes ElementMixin
  */
-export class Checkbox extends CheckboxMixin(ElementMixin(ThemableMixin(PolylitMixin(LitElement)))) {
+export class Checkbox extends CheckboxMixin(ElementMixin(ThemableMixin(PolylitMixin(LumoInjectionMixin(LitElement))))) {
   static get is() {
     return 'vaadin-checkbox';
   }

package/vaadin-checkbox.js

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

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/checkbox",
-  "version": "25.0.0-alpha1",
+  "version": "25.0.0-alpha11",
   "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": "25.0.0-alpha1",
+  "version": "25.0.0-alpha11",
   "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/theme/lumo/vaadin-checkbox-styles.d.ts

@@ -1,6 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/color.js';
-import '@vaadin/vaadin-lumo-styles/font-icons.js';
-import '@vaadin/vaadin-lumo-styles/sizing.js';
-import '@vaadin/vaadin-lumo-styles/spacing.js';
-import '@vaadin/vaadin-lumo-styles/style.js';
-import '@vaadin/vaadin-lumo-styles/typography.js';

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

@@ -1,316 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/color.js';
-import '@vaadin/vaadin-lumo-styles/font-icons.js';
-import '@vaadin/vaadin-lumo-styles/sizing.js';
-import '@vaadin/vaadin-lumo-styles/spacing.js';
-import '@vaadin/vaadin-lumo-styles/style.js';
-import '@vaadin/vaadin-lumo-styles/typography.js';
-import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-
-registerStyles(
-  'vaadin-checkbox',
-  css`
-    :host {
-      color: var(--vaadin-checkbox-label-color, var(--lumo-body-text-color));
-      font-size: var(--vaadin-checkbox-label-font-size, var(--lumo-font-size-m));
-      font-family: var(--lumo-font-family);
-      line-height: var(--lumo-line-height-s);
-      -webkit-font-smoothing: antialiased;
-      -moz-osx-font-smoothing: grayscale;
-      -webkit-tap-highlight-color: transparent;
-      -webkit-user-select: none;
-      user-select: none;
-      cursor: default;
-      outline: none;
-      --_checkbox-size: var(--vaadin-checkbox-size, calc(var(--lumo-size-m) / 2));
-      --_focus-ring-color: var(--vaadin-focus-ring-color, var(--lumo-primary-color-50pct));
-      --_focus-ring-width: var(--vaadin-focus-ring-width, 2px);
-      --_selection-color: var(--vaadin-selection-color, var(--lumo-primary-color));
-      --_invalid-background: var(--vaadin-input-field-invalid-background, var(--lumo-error-color-10pct));
-      --_disabled-checkmark-color: var(--vaadin-checkbox-disabled-checkmark-color, var(--lumo-contrast-30pct));
-    }
-
-    [part='label'] {
-      display: flex;
-      position: relative;
-      max-width: max-content;
-    }
-
-    :host([has-label]) ::slotted(label) {
-      padding: var(
-        --vaadin-checkbox-label-padding,
-        var(--lumo-space-xs) var(--lumo-space-s) var(--lumo-space-xs) var(--lumo-space-xs)
-      );
-    }
-
-    :host([dir='rtl'][has-label]) ::slotted(label) {
-      padding: var(--lumo-space-xs) var(--lumo-space-xs) var(--lumo-space-xs) var(--lumo-space-s);
-    }
-
-    :host([has-label][required]) ::slotted(label) {
-      padding-inline-end: var(--lumo-space-m);
-    }
-
-    [part='checkbox'] {
-      width: var(--_checkbox-size);
-      height: var(--_checkbox-size);
-      margin: var(--lumo-space-xs);
-      position: relative;
-      border-radius: var(--vaadin-checkbox-border-radius, var(--lumo-border-radius-s));
-      background: var(--vaadin-checkbox-background, var(--lumo-contrast-20pct));
-      transition:
-        transform 0.2s cubic-bezier(0.12, 0.32, 0.54, 2),
-        background-color 0.15s;
-      cursor: var(--lumo-clickable-cursor);
-      /* Default field border color */
-      --_input-border-color: var(--vaadin-input-field-border-color, var(--lumo-contrast-50pct));
-    }
-
-    :host([indeterminate]),
-    :host([checked]) {
-      --vaadin-input-field-border-color: transparent;
-    }
-
-    :host([indeterminate]) [part='checkbox'],
-    :host([checked]) [part='checkbox'] {
-      background-color: var(--_selection-color);
-    }
-
-    /* Checkmark */
-    [part='checkbox']::after {
-      pointer-events: none;
-      font-family: 'lumo-icons';
-      content: var(--vaadin-checkbox-checkmark-char, var(--lumo-icons-checkmark));
-      color: var(--vaadin-checkbox-checkmark-color, var(--lumo-primary-contrast-color));
-      font-size: var(--vaadin-checkbox-checkmark-size, calc(var(--_checkbox-size) + 2px));
-      line-height: 1;
-      position: absolute;
-      top: -1px;
-      left: -1px;
-      contain: content;
-      opacity: 0;
-    }
-
-    :host([checked]) [part='checkbox']::after {
-      opacity: 1;
-    }
-
-    :host([readonly]:not([checked]):not([indeterminate])) {
-      color: var(--lumo-secondary-text-color);
-    }
-
-    :host([readonly]:not([checked]):not([indeterminate])) [part='checkbox'] {
-      background: transparent;
-      box-shadow: none;
-    }
-
-    :host([readonly]:not([checked]):not([indeterminate])) [part='checkbox']::after {
-      content: '';
-      box-sizing: border-box;
-      width: 100%;
-      height: 100%;
-      border-radius: inherit;
-      top: 0;
-      left: 0;
-      opacity: 1;
-      border: var(--vaadin-input-field-readonly-border, 1px dashed var(--lumo-contrast-50pct));
-    }
-
-    /* Indeterminate checkmark */
-    :host([indeterminate]) [part='checkbox']::after {
-      content: var(--vaadin-checkbox-checkmark-char-indeterminate, '');
-      opacity: 1;
-      top: 45%;
-      height: 10%;
-      left: 22%;
-      right: 22%;
-      width: auto;
-      border: 0;
-      background-color: var(--lumo-primary-contrast-color);
-    }
-
-    /* Focus ring */
-    :host([focus-ring]) [part='checkbox'] {
-      box-shadow:
-        0 0 0 1px var(--lumo-base-color),
-        0 0 0 calc(var(--_focus-ring-width) + 1px) var(--_focus-ring-color),
-        inset 0 0 0 var(--_input-border-width, 0) var(--_input-border-color);
-    }
-
-    :host([focus-ring][readonly]:not([checked]):not([indeterminate])) [part='checkbox'] {
-      box-shadow:
-        0 0 0 1px var(--lumo-base-color),
-        0 0 0 calc(var(--_focus-ring-width) + 1px) var(--_focus-ring-color);
-    }
-
-    /* Disabled */
-    :host([disabled]) {
-      pointer-events: none;
-      --vaadin-input-field-border-color: var(--lumo-contrast-20pct);
-    }
-
-    :host([disabled]) ::slotted(label) {
-      color: inherit;
-    }
-
-    :host([disabled]) [part='checkbox'] {
-      background-color: var(--vaadin-checkbox-disabled-background, var(--lumo-contrast-10pct));
-    }
-
-    :host([disabled]) [part='checkbox']::after {
-      color: var(--_disabled-checkmark-color);
-    }
-
-    :host([disabled]) [part='label'],
-    :host([disabled]) [part='helper-text'] {
-      color: var(--lumo-disabled-text-color);
-      -webkit-text-fill-color: var(--lumo-disabled-text-color);
-    }
-
-    :host([indeterminate][disabled]) [part='checkbox']::after {
-      background-color: var(--_disabled-checkmark-color);
-    }
-
-    :host([readonly][checked]:not([disabled])) [part='checkbox'],
-    :host([readonly][indeterminate]:not([disabled])) [part='checkbox'] {
-      background-color: var(--vaadin-checkbox-readonly-checked-background, var(--lumo-contrast-70pct));
-    }
-
-    /* Used for activation "halo" */
-    [part='checkbox']::before {
-      pointer-events: none;
-      color: transparent;
-      width: 100%;
-      height: 100%;
-      line-height: var(--_checkbox-size);
-      border-radius: inherit;
-      background-color: inherit;
-      transform: scale(1.4);
-      opacity: 0;
-      transition:
-        transform 0.1s,
-        opacity 0.8s;
-    }
-
-    /* Hover */
-    :host(:not([checked]):not([indeterminate]):not([disabled]):not([readonly]):not([invalid]):hover) [part='checkbox'] {
-      background: var(--vaadin-checkbox-background-hover, var(--lumo-contrast-30pct));
-    }
-
-    /* Disable hover for touch devices */
-    @media (pointer: coarse) {
-      /* prettier-ignore */
-      :host(:not([checked]):not([indeterminate]):not([disabled]):not([readonly]):not([invalid]):hover) [part='checkbox'] {
-        background: var(--vaadin-checkbox-background, var(--lumo-contrast-20pct));
-      }
-    }
-
-    /* Active */
-    :host([active]) [part='checkbox'] {
-      transform: scale(0.9);
-      transition-duration: 0.05s;
-    }
-
-    :host([active][checked]) [part='checkbox'] {
-      transform: scale(1.1);
-    }
-
-    :host([active]:not([checked])) [part='checkbox']::before {
-      transition-duration: 0.01s, 0.01s;
-      transform: scale(0);
-      opacity: 0.4;
-    }
-
-    /* Required */
-    :host([required]) [part='required-indicator'] {
-      position: absolute;
-      top: var(--lumo-space-xs);
-      right: var(--lumo-space-xs);
-    }
-
-    :host([required][dir='rtl']) [part='required-indicator'] {
-      right: auto;
-      left: var(--lumo-space-xs);
-    }
-
-    :host([required]) [part='required-indicator']::after {
-      content: var(--lumo-required-field-indicator, '\\2022');
-      transition: opacity 0.2s;
-      color: var(--lumo-required-field-indicator-color, var(--lumo-primary-text-color));
-      width: 1em;
-      text-align: center;
-    }
-
-    :host(:not([has-label])) [part='required-indicator'] {
-      display: none;
-    }
-
-    /* Invalid */
-    :host([invalid]) {
-      --vaadin-input-field-border-color: var(--lumo-error-color);
-    }
-
-    :host([invalid]) [part='checkbox'] {
-      background: 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%),
-        linear-gradient(var(--_invalid-background) 0%, var(--_invalid-background) 100%);
-    }
-
-    :host([invalid][focus-ring]) {
-      --_focus-ring-color: var(--lumo-error-color-50pct);
-    }
-
-    :host([invalid]) [part='required-indicator']::after {
-      color: var(--lumo-required-field-indicator-color, var(--lumo-error-text-color));
-    }
-
-    /* Error message */
-    [part='error-message'] {
-      font-size: var(--vaadin-input-field-error-font-size, var(--lumo-font-size-xs));
-      line-height: var(--lumo-line-height-xs);
-      font-weight: var(--vaadin-input-field-error-font-weight, 400);
-      color: var(--vaadin-input-field-error-color, var(--lumo-error-text-color));
-      will-change: max-height;
-      transition: 0.4s max-height;
-      max-height: 5em;
-      padding-inline-start: var(--lumo-space-xs);
-    }
-
-    :host([has-error-message]) [part='error-message']::after,
-    :host([has-helper]) [part='helper-text']::after {
-      content: '';
-      display: block;
-      height: 0.4em;
-    }
-
-    :host(:not([invalid])) [part='error-message'] {
-      max-height: 0;
-      overflow: hidden;
-    }
-
-    /* Helper */
-    [part='helper-text'] {
-      display: block;
-      color: var(--vaadin-input-field-helper-color, var(--lumo-secondary-text-color));
-      font-size: var(--vaadin-input-field-helper-font-size, var(--lumo-font-size-xs));
-      line-height: var(--lumo-line-height-xs);
-      font-weight: var(--vaadin-input-field-helper-font-weight, 400);
-      margin-left: calc(var(--lumo-border-radius-m) / 4);
-      transition: color 0.2s;
-      padding-inline-start: var(--lumo-space-xs);
-    }
-
-    :host(:hover:not([readonly])) [part='helper-text'] {
-      color: var(--lumo-body-text-color);
-    }
-
-    :host([has-error-message]) ::slotted(label),
-    :host([has-helper]) ::slotted(label) {
-      padding-bottom: 0;
-    }
-  `,
-  { moduleId: 'lumo-checkbox' },
-);

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

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

package/theme/lumo/vaadin-checkbox.js

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