@vaadin/field-highlighter 25.0.0-alpha8 → 25.0.0-beta1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/field-highlighter",
-  "version": "25.0.0-alpha8",
+  "version": "25.0.0-beta1",
   "publishConfig": {
     "access": "public"
   },
@@ -21,7 +21,6 @@
   "type": "module",
   "files": [
     "src",
-    "theme",
     "vaadin-*.d.ts",
     "vaadin-*.js"
   ],
@@ -33,29 +32,29 @@
     "field"
   ],
   "dependencies": {
-    "@vaadin/a11y-base": "25.0.0-alpha8",
-    "@vaadin/component-base": "25.0.0-alpha8",
-    "@vaadin/overlay": "25.0.0-alpha8",
-    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha8",
-    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha8",
+    "@vaadin/a11y-base": "25.0.0-beta1",
+    "@vaadin/component-base": "25.0.0-beta1",
+    "@vaadin/overlay": "25.0.0-beta1",
+    "@vaadin/vaadin-themable-mixin": "25.0.0-beta1",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "25.0.0-alpha8",
-    "@vaadin/checkbox": "25.0.0-alpha8",
-    "@vaadin/checkbox-group": "25.0.0-alpha8",
-    "@vaadin/date-picker": "25.0.0-alpha8",
-    "@vaadin/date-time-picker": "25.0.0-alpha8",
-    "@vaadin/item": "25.0.0-alpha8",
-    "@vaadin/list-box": "25.0.0-alpha8",
-    "@vaadin/radio-group": "25.0.0-alpha8",
-    "@vaadin/select": "25.0.0-alpha8",
-    "@vaadin/test-runner-commands": "25.0.0-alpha8",
+    "@vaadin/chai-plugins": "25.0.0-beta1",
+    "@vaadin/checkbox": "25.0.0-beta1",
+    "@vaadin/checkbox-group": "25.0.0-beta1",
+    "@vaadin/date-picker": "25.0.0-beta1",
+    "@vaadin/date-time-picker": "25.0.0-beta1",
+    "@vaadin/item": "25.0.0-beta1",
+    "@vaadin/list-box": "25.0.0-beta1",
+    "@vaadin/radio-group": "25.0.0-beta1",
+    "@vaadin/select": "25.0.0-beta1",
+    "@vaadin/test-runner-commands": "25.0.0-beta1",
     "@vaadin/testing-helpers": "^2.0.0",
-    "@vaadin/text-area": "25.0.0-alpha8",
-    "@vaadin/text-field": "25.0.0-alpha8",
-    "@vaadin/time-picker": "25.0.0-alpha8",
-    "sinon": "^18.0.0"
+    "@vaadin/text-area": "25.0.0-beta1",
+    "@vaadin/text-field": "25.0.0-beta1",
+    "@vaadin/time-picker": "25.0.0-beta1",
+    "@vaadin/vaadin-lumo-styles": "25.0.0-beta1",
+    "sinon": "^21.0.0"
   },
-  "gitHead": "ebf53673d5f639d2b1b6f2b31f640f530643ee2f"
+  "gitHead": "1d20cf54e582d1f2e209126d4586f8b4c01c50e0"
 }

package/src/fields/outline.js

@@ -48,12 +48,7 @@ export const initOutline = (field) => {
 
     const style = document.createElement('style');
     style.textContent = `
-      :host([focused]) [part="outline"] {
-        opacity: calc(1 - var(--lumo-input-field-pointer-focus-visible, 0));
-      }
-
-      :host([active]) [part="outline"],
-      :host([focus-ring]) [part="outline"] {
+      :host(:is([active], [focused])) [part="outline"] {
         display: none;
       }
     `;

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

@@ -3,23 +3,28 @@
  * Copyright (c) 2021 - 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/user-colors.js';
 import { css } from 'lit';
 
 export const fieldOutlineStyles = css`
   :host {
     display: block;
-    box-sizing: border-box;
     position: absolute;
     inset: 0;
-    width: 100%;
-    height: 100%;
     pointer-events: none;
-    user-select: none;
     opacity: 0;
     --_active-user-color: transparent;
+    outline: 3px solid var(--_active-user-color);
+    outline-offset: -1px;
+    /* TODO doesn't inherit correctly from vaadin-input-container for some reason, so we use the internal _radius property */
+    border-radius: var(--_radius, inherit);
   }
 
   :host([has-active-user]) {
     opacity: 1;
   }
+
+  :host([context$='item']) {
+    inset: 2px;
+  }
 `;

package/src/styles/vaadin-user-tag-base-styles.js

@@ -0,0 +1,36 @@
+/**
+ * @license
+ * Copyright (c) 2021 - 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 '@vaadin/component-base/src/styles/user-colors.js';
+import { css } from 'lit';
+
+export const userTagStyles = css`
+  :host {
+    display: inline-block;
+    box-sizing: border-box;
+    opacity: 0;
+    padding: var(--vaadin-user-tag-padding, 0.3em);
+    background-color: var(--vaadin-user-tag-color);
+    color: oklch(from var(--vaadin-user-tag-color) clamp(0, (0.62 - l) * 1000, 1) 0 0);
+    font-size: var(--vaadin-user-tag-font-size, 0.75em);
+    font-weight: var(--vaadin-user-tag-font-weight, 500);
+    line-height: var(--vaadin-user-tag-line-height, 1);
+    border: var(--vaadin-user-tag-border-width, 0) solid
+      var(--vaadin-user-tag-border-color, var(--vaadin-border-color-secondary));
+    border-radius: var(--vaadin-user-tag-border-radius, var(--vaadin-radius-m));
+    cursor: default;
+  }
+
+  :host(.show) {
+    opacity: 1;
+  }
+
+  [part='name'] {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+`;

package/src/styles/{vaadin-user-tags-overlay-core-styles.js → vaadin-user-tags-overlay-base-styles.js}

@@ -4,26 +4,21 @@
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
 import { css } from 'lit';
-import { overlayStyles } from '@vaadin/overlay/src/styles/vaadin-overlay-core-styles.js';
+import { overlayStyles } from '@vaadin/overlay/src/styles/vaadin-overlay-base-styles.js';
 
 const userTagsOverlay = css`
   [part='overlay'] {
-    position: relative;
-    left: -4px;
-    padding: 4px;
-    outline: none;
-    overflow: visible;
+    all: initial;
+    display: block;
+    font: inherit;
+    color: inherit;
   }
 
-  ::slotted([part='tags']) {
+  [part='content'] {
     display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-  }
-
-  :host([dir='rtl']) [part='overlay'] {
-    left: auto;
-    right: -4px;
+    flex-wrap: wrap;
+    gap: var(--vaadin-user-tag-overlay-gap, 0.2em);
+    padding: 0.5em 0;
   }
 
   :host([opening]),

package/src/vaadin-field-outline.js

@@ -9,7 +9,7 @@ import { DirMixin } from '@vaadin/component-base/src/dir-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 { fieldOutlineStyles } from './styles/vaadin-field-outline-core-styles.js';
+import { fieldOutlineStyles } from './styles/vaadin-field-outline-base-styles.js';
 
 /**
  * An element used internally by `<vaadin-field-highlighter>`. Not intended to be used separately.

package/src/vaadin-user-tag.js

@@ -9,7 +9,7 @@ import { DirMixin } from '@vaadin/component-base/src/dir-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 { userTagStyles } from './styles/vaadin-user-tag-core-styles.js';
+import { userTagStyles } from './styles/vaadin-user-tag-base-styles.js';
 
 /**
  * An element used internally by `<vaadin-field-highlighter>`. Not intended to be used separately.

package/src/vaadin-user-tags-overlay.js

@@ -11,7 +11,7 @@ import { OverlayMixin } from '@vaadin/overlay/src/vaadin-overlay-mixin.js';
 import { PositionMixin } from '@vaadin/overlay/src/vaadin-overlay-position-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 { userTagsOverlayStyles } from './styles/vaadin-user-tags-overlay-core-styles.js';
+import { userTagsOverlayStyles } from './styles/vaadin-user-tags-overlay-base-styles.js';
 
 /**
  * An element used internally by `<vaadin-field-highlighter>`. Not intended to be used separately.

package/src/vaadin-user-tags.js

@@ -46,11 +46,14 @@ export class UserTags extends PolylitMixin(LitElement) {
     return html`
       <vaadin-user-tags-overlay
         id="overlay"
+        exportparts="overlay:user-tags-overlay, content:user-tags-content"
         modeless
         .opened="${this.opened}"
         no-vertical-overlap
         @vaadin-overlay-open="${this._onOverlayOpen}"
-      ></vaadin-user-tags-overlay>
+      >
+        <slot></slot>
+      </vaadin-user-tags-overlay>
     `;
   }
 
@@ -137,7 +140,8 @@ export class UserTags extends PolylitMixin(LitElement) {
 
   /** @protected */
   get wrapper() {
-    return this.$.overlay.querySelector('[part="tags"]');
+    // Used by Collaboration Kit util
+    return this;
   }
 
   /** @protected */
@@ -162,15 +166,8 @@ export class UserTags extends PolylitMixin(LitElement) {
   ready() {
     super.ready();
 
-    this.$.overlay.renderer = (root) => {
-      if (!root.firstChild) {
-        const tags = document.createElement('div');
-        tags.setAttribute('part', 'tags');
-        root.appendChild(tags);
-      }
-    };
-
-    this.$.overlay.requestContentUpdate();
+    // Export user tags overlay parts for styling
+    this.setAttribute('exportparts', 'user-tags-overlay, user-tags-content');
   }
 
   /** @private */
@@ -222,6 +219,7 @@ export class UserTags extends PolylitMixin(LitElement) {
 
   createUserTag(user) {
     const tag = document.createElement('vaadin-user-tag');
+    tag.setAttribute('part', 'user-tag');
     tag.name = user.name;
     tag.uid = user.id;
     tag.colorIndex = user.colorIndex;
@@ -229,7 +227,7 @@ export class UserTags extends PolylitMixin(LitElement) {
   }
 
   getTagForUser(user) {
-    return Array.from(this.wrapper.children).find((tag) => tag.uid === user.id);
+    return Array.from(this.children).find((tag) => tag.uid === user.id);
   }
 
   getChangedTags(addedUsers, removedUsers) {
@@ -239,21 +237,19 @@ export class UserTags extends PolylitMixin(LitElement) {
   }
 
   applyTagsStart({ added, removed }) {
-    const wrapper = this.wrapper;
     removed.forEach((tag) => {
       if (tag) {
         tag.classList.add('removing');
         tag.classList.remove('show');
       }
     });
-    added.forEach((tag) => wrapper.insertBefore(tag, wrapper.firstChild));
+    added.forEach((tag) => this.insertBefore(tag, this.firstChild));
   }
 
   applyTagsEnd({ added, removed }) {
-    const wrapper = this.wrapper;
     removed.forEach((tag) => {
-      if (tag && tag.parentNode === wrapper) {
-        wrapper.removeChild(tag);
+      if (tag && tag.parentNode === this) {
+        this.removeChild(tag);
       }
     });
     added.forEach((tag) => tag && tag.classList.add('show'));
@@ -329,7 +325,7 @@ export class UserTags extends PolylitMixin(LitElement) {
   /** @private */
   _onOverlayOpen() {
     // Animate all tags except removing ones
-    Array.from(this.wrapper.children).forEach((tag) => {
+    Array.from(this.children).forEach((tag) => {
       if (!tag.classList.contains('removing')) {
         tag.classList.add('show');
       }
@@ -338,17 +334,16 @@ export class UserTags extends PolylitMixin(LitElement) {
 
   flashTags(added) {
     this.flashing = true;
-    const wrapper = this.wrapper;
 
     // Hide existing tags
-    const hidden = Array.from(wrapper.children);
+    const hidden = Array.from(this.children);
     hidden.forEach((tag) => {
       tag.style.display = 'none';
     });
 
     // Render new tags
     added.forEach((tag) => {
-      wrapper.insertBefore(tag, wrapper.firstChild);
+      this.insertBefore(tag, this.firstChild);
     });
 
     this.flashPromise = new Promise((resolve) => {

package/vaadin-field-highlighter.js

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

package/src/styles/vaadin-user-tag-core-styles.js

@@ -1,41 +0,0 @@
-/**
- * @license
- * Copyright (c) 2021 - 2025 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import { css } from 'lit';
-
-export const userTagStyles = css`
-  :host {
-    display: block;
-    box-sizing: border-box;
-    margin: 0 0 var(--vaadin-user-tag-offset);
-    opacity: 0;
-    height: 1.3rem;
-    transition: opacity 0.2s ease-in-out;
-    background-color: var(--vaadin-user-tag-color);
-    color: #fff;
-    cursor: default;
-    -webkit-user-select: none;
-    user-select: none;
-    --vaadin-user-tag-offset: 4px;
-  }
-
-  :host(.show) {
-    opacity: 1;
-  }
-
-  :host(:last-of-type) {
-    margin-bottom: 0;
-  }
-
-  [part='name'] {
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    box-sizing: border-box;
-    padding: 2px 4px;
-    height: 1.3rem;
-    font-size: 13px;
-  }
-`;

package/theme/lumo/vaadin-field-highlighter.d.ts

@@ -1,9 +0,0 @@
-/**
- * @license
- * Copyright (c) 2021 - 2025 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import '@vaadin/vaadin-lumo-styles/user-colors.js';
-import './vaadin-field-outline-styles.js';
-import './vaadin-user-tags.js';
-import '../../src/vaadin-field-highlighter.js';

package/theme/lumo/vaadin-field-highlighter.js

@@ -1,9 +0,0 @@
-/**
- * @license
- * Copyright (c) 2021 - 2025 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import '@vaadin/vaadin-lumo-styles/user-colors.js';
-import './vaadin-field-outline-styles.js';
-import './vaadin-user-tags.js';
-import '../../src/vaadin-field-highlighter.js';

package/theme/lumo/vaadin-field-outline-styles.d.ts

@@ -1,7 +0,0 @@
-/**
- * @license
- * Copyright (c) 2021 - 2025 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import '@vaadin/vaadin-lumo-styles/spacing.js';
-import '@vaadin/vaadin-lumo-styles/style.js';

package/theme/lumo/vaadin-field-outline-styles.js

@@ -1,45 +0,0 @@
-/**
- * @license
- * Copyright (c) 2021 - 2025 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import '@vaadin/vaadin-lumo-styles/spacing.js';
-import '@vaadin/vaadin-lumo-styles/style.js';
-import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-
-registerStyles(
-  'vaadin-field-outline',
-  css`
-    :host {
-      transition: opacity 0.3s;
-      mask-image: none !important;
-    }
-
-    :host::before {
-      content: '';
-      position: absolute;
-      inset: 0;
-      box-shadow: 0 0 0 2px var(--_active-user-color);
-      border-radius: var(--lumo-border-radius-s);
-      transition: box-shadow 0.3s;
-    }
-
-    :host([context$='checkbox'])::before {
-      box-shadow:
-        0 0 0 2px var(--lumo-base-color),
-        0 0 0 4px var(--_active-user-color);
-    }
-
-    :host([context$='radio-button'])::before {
-      border-radius: 50%;
-      box-shadow:
-        0 0 0 3px var(--lumo-base-color),
-        0 0 0 5px var(--_active-user-color);
-    }
-
-    :host([context$='item'])::before {
-      box-shadow: inset 0 0 0 2px var(--_active-user-color);
-    }
-  `,
-  { moduleId: 'lumo-field-outline' },
-);

package/theme/lumo/vaadin-user-tags-styles.d.ts

@@ -1,9 +0,0 @@
-/**
- * @license
- * Copyright (c) 2021 - 2025 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import '@vaadin/vaadin-lumo-styles/color.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-user-tags-styles.js

@@ -1,74 +0,0 @@
-/**
- * @license
- * Copyright (c) 2021 - 2025 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import '@vaadin/vaadin-lumo-styles/color.js';
-import '@vaadin/vaadin-lumo-styles/spacing.js';
-import '@vaadin/vaadin-lumo-styles/style.js';
-import '@vaadin/vaadin-lumo-styles/typography.js';
-import { overlay } from '@vaadin/vaadin-lumo-styles/mixins/overlay.js';
-import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-
-registerStyles(
-  'vaadin-user-tags-overlay',
-  [
-    overlay,
-    css`
-      [part='overlay'] {
-        box-shadow: none;
-        background: transparent;
-        will-change: opacity, transform;
-      }
-
-      [part='content'] {
-        padding: 0;
-      }
-
-      :host([opening]) [part='overlay'] {
-        animation: 0.1s lumo-user-tags-enter ease-out both;
-      }
-
-      @keyframes lumo-user-tags-enter {
-        0% {
-          opacity: 0;
-        }
-      }
-
-      :host([closing]) [part='overlay'] {
-        animation: 0.1s lumo-user-tags-exit both;
-      }
-
-      @keyframes lumo-user-tags-exit {
-        100% {
-          opacity: 0;
-        }
-      }
-    `,
-  ],
-  {
-    moduleId: 'lumo-user-tags-overlay',
-  },
-);
-
-registerStyles(
-  'vaadin-user-tag',
-  css`
-    :host {
-      font-family: var(--lumo-font-family);
-      font-size: var(--lumo-font-size-xxs);
-      border-radius: var(--lumo-border-radius-s);
-      box-shadow: var(--lumo-box-shadow-xs);
-      --vaadin-user-tag-offset: var(--lumo-space-xs);
-    }
-
-    [part='name'] {
-      color: var(--lumo-primary-contrast-color);
-      padding: 0.3em calc(0.3em + var(--lumo-border-radius-s) / 4);
-      line-height: 1;
-      font-weight: 500;
-      min-width: calc(var(--lumo-line-height-xs) * 1em + 0.45em);
-    }
-  `,
-  { moduleId: 'lumo-user-tag' },
-);

package/theme/lumo/vaadin-user-tags.d.ts

@@ -1,7 +0,0 @@
-/**
- * @license
- * Copyright (c) 2021 - 2025 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import './vaadin-user-tags-styles.js';
-import '../../src/vaadin-user-tags.js';

package/theme/lumo/vaadin-user-tags.js

@@ -1,7 +0,0 @@
-/**
- * @license
- * Copyright (c) 2021 - 2025 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import './vaadin-user-tags-styles.js';
-import '../../src/vaadin-user-tags.js';