@vaadin/checkbox 25.0.0-alpha3 → 25.0.0-alpha4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/checkbox",
-  "version": "25.0.0-alpha3",
+  "version": "25.0.0-alpha4",
   "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",
@@ -35,16 +37,16 @@
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@vaadin/a11y-base": "25.0.0-alpha3",
-    "@vaadin/component-base": "25.0.0-alpha3",
-    "@vaadin/field-base": "25.0.0-alpha3",
-    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha3",
-    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha3",
+    "@vaadin/a11y-base": "25.0.0-alpha4",
+    "@vaadin/component-base": "25.0.0-alpha4",
+    "@vaadin/field-base": "25.0.0-alpha4",
+    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha4",
+    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha4",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "25.0.0-alpha3",
-    "@vaadin/test-runner-commands": "25.0.0-alpha3",
+    "@vaadin/chai-plugins": "25.0.0-alpha4",
+    "@vaadin/test-runner-commands": "25.0.0-alpha4",
     "@vaadin/testing-helpers": "^2.0.0",
     "sinon": "^18.0.0"
   },
@@ -52,5 +54,5 @@
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "8367dd20a47f53ca5589ad349a8e286ec2673055"
+  "gitHead": "ce4421f0daf26027b863b91787a474e4cc264344"
 }

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

@@ -0,0 +1,35 @@
+/**
+ * @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`
+  @layer base {
+    [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-strong);
+    }
+
+    :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.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 { CSSInjectionMixin } from '@vaadin/vaadin-themable-mixin/css-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';
 
 /**
  * `<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(CSSInjectionMixin(PolylitMixin(LitElement))))) {
   static get is() {
     return 'vaadin-checkbox';
   }

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": "25.0.0-alpha3",
+  "version": "25.0.0-alpha4",
   "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-alpha3",
+  "version": "25.0.0-alpha4",
   "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;
-    }
-  }
-`;