@vaadin/radio-group 25.0.0-alpha1 → 25.0.0-alpha11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/radio-group",
-  "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",
@@ -37,22 +36,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-radio-button-base-styles.js

@@ -0,0 +1,25 @@
+/**
+ * @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-base-styles.js';
+import { field } from '@vaadin/field-base/src/styles/field-base-styles.js';
+
+const radioButton = css`
+  [part='radio'] {
+    border-radius: 50%;
+  }
+
+  [part='radio']::after {
+    top: 50%;
+    left: 50%;
+    translate: -50% -50%;
+    width: var(--vaadin-radio-button-dot-size, 50%);
+    height: var(--vaadin-radio-button-dot-size, 50%);
+    border-radius: 50%;
+  }
+`;
+
+export const radioButtonStyles = [field, checkable('radio', 'radio-button'), radioButton];

package/src/styles/vaadin-radio-group-base-styles.js

@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright (c) 2017 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import { field } from '@vaadin/field-base/src/styles/field-base-styles.js';
+import { group } from '@vaadin/field-base/src/styles/group-base-styles.js';
+
+export const radioGroupStyles = [field, group('radio')];

package/src/vaadin-radio-button.js

@@ -7,9 +7,10 @@ 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 { LumoInjectionMixin } from '@vaadin/vaadin-themable-mixin/lumo-injection-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
+import { radioButtonStyles } from './styles/vaadin-radio-button-base-styles.js';
 import { RadioButtonMixin } from './vaadin-radio-button-mixin.js';
-import { radioButtonStyles } from './vaadin-radio-button-styles.js';
 
 /**
  * `<vaadin-radio-button>` is a web component representing a choice in a radio group.
@@ -52,7 +53,7 @@ import { radioButtonStyles } from './vaadin-radio-button-styles.js';
  * @mixes ElementMixin
  * @mixes RadioButtonMixin
  */
-class RadioButton extends RadioButtonMixin(ElementMixin(ThemableMixin(PolylitMixin(LitElement)))) {
+class RadioButton extends RadioButtonMixin(ElementMixin(ThemableMixin(PolylitMixin(LumoInjectionMixin(LitElement))))) {
   static get is() {
     return 'vaadin-radio-button';
   }

package/src/vaadin-radio-group.js

@@ -8,9 +8,10 @@ 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 { LumoInjectionMixin } from '@vaadin/vaadin-themable-mixin/lumo-injection-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
+import { radioGroupStyles } from './styles/vaadin-radio-group-base-styles.js';
 import { RadioGroupMixin } from './vaadin-radio-group-mixin.js';
-import { radioGroupStyles } from './vaadin-radio-group-styles.js';
 
 /**
  * `<vaadin-radio-group>` is a web component that allows the user to choose one item from a group of choices.
@@ -60,7 +61,7 @@ import { radioGroupStyles } from './vaadin-radio-group-styles.js';
  * @mixes ElementMixin
  * @mixes RadioGroupMixin
  */
-class RadioGroup extends RadioGroupMixin(ElementMixin(ThemableMixin(PolylitMixin(LitElement)))) {
+class RadioGroup extends RadioGroupMixin(ElementMixin(ThemableMixin(PolylitMixin(LumoInjectionMixin(LitElement))))) {
   static get is() {
     return 'vaadin-radio-group';
   }

package/vaadin-radio-button.js

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

package/vaadin-radio-group.js

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

package/web-types.json

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

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

@@ -1,77 +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 radioButtonStyles = css`
-  :host {
-    display: inline-block;
-  }
-
-  :host([hidden]) {
-    display: none !important;
-  }
-
-  :host([disabled]) {
-    -webkit-tap-highlight-color: transparent;
-  }
-
-  .vaadin-radio-button-container {
-    display: grid;
-    grid-template-columns: auto 1fr;
-    align-items: baseline;
-  }
-
-  [part='radio'],
-  ::slotted(input),
-  ::slotted(label) {
-    grid-row: 1;
-  }
-
-  [part='radio'],
-  ::slotted(input) {
-    grid-column: 1;
-  }
-
-  [part='radio'] {
-    width: var(--vaadin-radio-button-size, 1em);
-    height: var(--vaadin-radio-button-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='radio']::before {
-    display: block;
-    content: '\\202F';
-    line-height: var(--vaadin-radio-button-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='radio'] {
-      outline: 1px solid;
-      outline-offset: -1px;
-    }
-
-    :host([focused]) [part='radio'] {
-      outline-width: 2px;
-    }
-
-    :host([disabled]) [part='radio'] {
-      outline-color: GrayText;
-    }
-  }
-`;

package/src/vaadin-radio-group-styles.js

@@ -1,37 +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 radioGroupStyles = css`
-  :host {
-    display: inline-flex;
-  }
-
-  :host::before {
-    content: '\\2003';
-    width: 0;
-    display: inline-block;
-  }
-
-  :host([hidden]) {
-    display: none !important;
-  }
-
-  .vaadin-group-field-container {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-  }
-
-  [part='group-field'] {
-    display: flex;
-    flex-wrap: wrap;
-  }
-
-  :host(:not([has-label])) [part='label'] {
-    display: none;
-  }
-`;

package/theme/lumo/vaadin-radio-button-styles.d.ts

@@ -1,5 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/color.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-radio-button-styles.js

@@ -1,149 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/color.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-radio-button',
-  css`
-    :host {
-      color: var(--vaadin-radio-button-label-color, var(--lumo-body-text-color));
-      font-size: var(--vaadin-radio-button-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;
-      --_radio-button-size: var(--vaadin-radio-button-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));
-    }
-
-    :host([has-label]) ::slotted(label) {
-      padding: var(
-        --vaadin-radio-button-label-padding,
-        var(--lumo-space-xs) var(--lumo-space-s) var(--lumo-space-xs) var(--lumo-space-xs)
-      );
-    }
-
-    [part='radio'] {
-      width: var(--_radio-button-size);
-      height: var(--_radio-button-size);
-      margin: var(--lumo-space-xs);
-      position: relative;
-      border-radius: 50%;
-      background: var(--vaadin-radio-button-background, var(--lumo-contrast-20pct));
-      transition:
-        transform 0.2s cubic-bezier(0.12, 0.32, 0.54, 2),
-        background-color 0.15s;
-      will-change: transform;
-      cursor: var(--lumo-clickable-cursor);
-      /* Default field border color */
-      --_input-border-color: var(--vaadin-input-field-border-color, var(--lumo-contrast-50pct));
-    }
-
-    /* Used for activation "halo" */
-    [part='radio']::before {
-      pointer-events: none;
-      color: transparent;
-      width: 100%;
-      height: 100%;
-      line-height: var(--_radio-button-size);
-      border-radius: inherit;
-      background-color: inherit;
-      transform: scale(1.4);
-      opacity: 0;
-      transition:
-        transform 0.1s,
-        opacity 0.8s;
-      will-change: transform, opacity;
-    }
-
-    /* Used for the dot */
-    [part='radio']::after {
-      content: '';
-      pointer-events: none;
-      width: 0;
-      height: 0;
-      border: var(--vaadin-radio-button-dot-size, 3px) solid
-        var(--vaadin-radio-button-dot-color, var(--lumo-primary-contrast-color));
-      border-radius: 50%;
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      transform: translate(-50%, -50%) scale(0);
-      transition: 0.25s transform;
-      will-change: transform;
-      background-clip: content-box;
-    }
-
-    :host([checked]) {
-      --vaadin-input-field-border-color: transparent;
-    }
-
-    :host([checked]) [part='radio'] {
-      background-color: var(--_selection-color);
-    }
-
-    :host([checked]) [part='radio']::after {
-      transform: translate(-50%, -50%) scale(1);
-    }
-
-    :host(:not([checked]):not([disabled]):hover) [part='radio'] {
-      background: var(--vaadin-radio-button-background-hover, var(--lumo-contrast-30pct));
-    }
-
-    :host([active]) [part='radio'] {
-      transform: scale(0.9);
-      transition-duration: 0.05s;
-    }
-
-    :host([active][checked]) [part='radio'] {
-      transform: scale(1.1);
-    }
-
-    :host([active]:not([checked])) [part='radio']::before {
-      transition-duration: 0.01s, 0.01s;
-      transform: scale(0);
-      opacity: 0.4;
-    }
-
-    :host([focus-ring]) [part='radio'] {
-      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([disabled]) {
-      pointer-events: none;
-      color: var(--lumo-disabled-text-color);
-      --vaadin-input-field-border-color: var(--lumo-contrast-20pct);
-    }
-
-    :host([disabled]) ::slotted(label) {
-      color: inherit;
-    }
-
-    :host([disabled]) [part='radio'] {
-      background-color: var(--vaadin-radio-button-disabled-background, var(--lumo-contrast-10pct));
-    }
-
-    :host([disabled]) [part='radio']::after {
-      border-color: var(--vaadin-radio-button-disabled-dot-color, var(--lumo-contrast-30pct));
-    }
-
-    /* RTL specific styles */
-    :host([dir='rtl'][has-label]) ::slotted(label) {
-      padding: var(--lumo-space-xs) var(--lumo-space-xs) var(--lumo-space-xs) var(--lumo-space-s);
-    }
-  `,
-  { moduleId: 'lumo-radio-button' },
-);

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

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

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

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

package/theme/lumo/vaadin-radio-group-styles.d.ts

@@ -1,5 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/color.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-radio-group-styles.js

@@ -1,55 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/color.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 { helper } from '@vaadin/vaadin-lumo-styles/mixins/helper.js';
-import { requiredField } from '@vaadin/vaadin-lumo-styles/mixins/required-field.js';
-import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-
-const radioGroup = css`
-  :host {
-    color: var(--lumo-body-text-color);
-    font-size: var(--lumo-font-size-m);
-    font-family: var(--lumo-font-family);
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-    -webkit-tap-highlight-color: transparent;
-    padding: var(--lumo-space-xs) 0;
-  }
-
-  :host::before {
-    /* Effective height of vaadin-radio-button */
-    height: var(--lumo-size-s);
-    box-sizing: border-box;
-    display: inline-flex;
-    align-items: center;
-  }
-
-  :host([theme~='vertical']) [part='group-field'] {
-    flex-direction: column;
-  }
-
-  :host([disabled]) [part='label'] {
-    color: var(--lumo-disabled-text-color);
-    -webkit-text-fill-color: var(--lumo-disabled-text-color);
-  }
-
-  :host([focused]:not([readonly])) [part='label'] {
-    color: var(--lumo-primary-text-color);
-  }
-
-  :host(:hover:not([readonly]):not([focused])) [part='label'],
-  :host(:hover:not([readonly])) [part='helper-text'] {
-    color: var(--lumo-body-text-color);
-  }
-
-  /* Touch device adjustment */
-  @media (pointer: coarse) {
-    :host(:hover:not([readonly]):not([focused])) [part='label'] {
-      color: var(--lumo-secondary-text-color);
-    }
-  }
-`;
-
-registerStyles('vaadin-radio-group', [requiredField, helper, radioGroup], { moduleId: 'lumo-radio-group' });

package/theme/lumo/vaadin-radio-group.d.ts

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

package/theme/lumo/vaadin-radio-group.js

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