@vaadin/side-nav 25.0.0-alpha1 → 25.0.0-alpha10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/side-nav",
-  "version": "25.0.0-alpha1",
+  "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",
@@ -35,16 +37,16 @@
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@vaadin/a11y-base": "25.0.0-alpha1",
-    "@vaadin/component-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-alpha10",
+    "@vaadin/component-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": "25.0.0-alpha1",
-    "@vaadin/test-runner-commands": "25.0.0-alpha1",
-    "@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",
     "lit": "^3.0.0",
     "sinon": "^18.0.0"
   },
@@ -52,5 +54,5 @@
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "b8c22a4a0c64156210d0daac96b43ae4e5526d49"
+  "gitHead": "6cc6c94079e805fa5b2f0af4dbf3b2a7485e57d0"
 }

package/src/styles/vaadin-side-nav-base-styles.d.ts

@@ -0,0 +1,10 @@
+/**
+ * @license
+ * Copyright (c) 2023 - 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 sideNavStyles: CSSResult;
+
+export const sideNavSlotStyles: CSSResult;

package/src/styles/vaadin-side-nav-base-styles.js

@@ -0,0 +1,42 @@
+/**
+ * @license
+ * Copyright (c) 2023 - 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 { sharedStyles } from './vaadin-side-nav-shared-base-styles.js';
+
+const sideNav = css`
+  :host {
+    white-space: nowrap;
+    touch-action: manipulation;
+  }
+
+  [part='label'] {
+    align-self: start;
+    display: flex;
+    align-items: center;
+    justify-content: start;
+    gap: var(--vaadin-side-nav-item-gap, var(--vaadin-gap-container-inline));
+    padding: var(--vaadin-side-nav-item-padding, var(--vaadin-padding-container));
+    font-size: var(--vaadin-side-nav-label-font-size, 0.875em);
+    font-weight: var(--vaadin-side-nav-label-font-weight, 500);
+    color: var(--vaadin-side-nav-label-color, var(--vaadin-color-subtle));
+    line-height: var(--vaadin-side-nav-label-line-height, inherit);
+    border-radius: var(--vaadin-side-nav-item-border-radius, var(--vaadin-radius-m));
+    touch-action: manipulation;
+  }
+`;
+
+export const sideNavStyles = [sharedStyles, sideNav];
+
+export const sideNavSlotStyles = css`
+  :where(vaadin-side-nav:has(vaadin-icon[slot='prefix'])) {
+    --_has-prefix-icon: '';
+  }
+
+  :where(vaadin-side-nav-item:has(> vaadin-icon[slot='prefix']))::part(link) {
+    --_has-prefix-icon:;
+  }
+`;

package/src/styles/vaadin-side-nav-core-styles.d.ts

@@ -0,0 +1,10 @@
+/**
+ * @license
+ * Copyright (c) 2023 - 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 sideNavStyles: CSSResult;
+
+export const sideNavSlotStyles: CSSResult;

package/src/styles/vaadin-side-nav-core-styles.js

@@ -0,0 +1,39 @@
+/**
+ * @license
+ * Copyright (c) 2023 - 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 sideNavStyles = css`
+  :host {
+    display: block;
+  }
+
+  :host([hidden]) {
+    display: none !important;
+  }
+
+  button {
+    display: flex;
+    align-items: center;
+    justify-content: inherit;
+    width: 100%;
+    margin: 0;
+    padding: 0;
+    background-color: initial;
+    color: inherit;
+    border: initial;
+    outline: none;
+    font: inherit;
+    text-align: inherit;
+  }
+
+  [part='children'] {
+    padding: 0;
+    margin: 0;
+    list-style-type: none;
+  }
+`;
+
+export const sideNavSlotStyles = css``;

package/src/styles/vaadin-side-nav-item-base-styles.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright (c) 2023 - 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 sideNavItemStyles: CSSResult;

package/src/styles/vaadin-side-nav-item-base-styles.js

@@ -0,0 +1,122 @@
+/**
+ * @license
+ * Copyright (c) 2023 - 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 { sharedStyles } from './vaadin-side-nav-shared-base-styles.js';
+
+const sideNavItem = css`
+  [part='content'] {
+    display: flex;
+    align-items: center;
+    padding: var(--vaadin-side-nav-item-padding, var(--vaadin-padding-container));
+    gap: var(--vaadin-side-nav-item-gap, var(--vaadin-gap-container-inline));
+    font-size: var(--vaadin-side-nav-item-font-size, 1em);
+    font-weight: var(--vaadin-side-nav-item-font-weight, 500);
+    line-height: var(--vaadin-side-nav-item-line-height, inherit);
+    color: var(--vaadin-side-nav-item-color, var(--vaadin-color-subtle));
+    background: var(--vaadin-side-nav-item-background, transparent);
+    background-origin: border-box;
+    border: var(--vaadin-side-nav-item-border-width, 0) solid var(--vaadin-side-nav-item-border-color, transparent);
+    border-radius: var(--vaadin-side-nav-item-border-radius, var(--vaadin-radius-m));
+    cursor: var(--vaadin-clickable-cursor);
+    touch-action: manipulation;
+  }
+
+  :host([current]) [part='content'] {
+    --vaadin-side-nav-item-background: var(--vaadin-background-container);
+    --vaadin-side-nav-item-color: var(--vaadin-color);
+  }
+
+  :host([disabled]) {
+    --vaadin-clickable-cursor: var(--vaadin-disabled-cursor);
+  }
+
+  :host([disabled]) [part='content'] {
+    --vaadin-side-nav-item-color: var(--vaadin-color-disabled);
+  }
+
+  [part='link'] {
+    flex: auto;
+    min-width: 0;
+    display: flex;
+    align-items: center;
+    gap: inherit;
+    text-decoration: none;
+    color: inherit;
+    outline: 0;
+  }
+
+  :host(:not([has-children])) [part='toggle-button'] {
+    display: none !important;
+  }
+
+  slot:not([name]) {
+    display: block;
+    flex: auto;
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    /* Don't clip ascenders or descenders */
+    padding-block: 0.25em;
+    margin-block: -0.25em;
+  }
+
+  slot:is([name='prefix'], [name='suffix'])::slotted(*) {
+    flex: none;
+  }
+
+  /* Reserved space for icon */
+  slot[name='prefix']::before {
+    content: var(--_has-prefix-icon);
+    display: block;
+    width: var(--vaadin-icon-size, 1lh);
+    flex: none;
+  }
+
+  [part='content']:not(:has([href])):has([part='toggle-button']:focus-visible),
+  [part='content']:has(:not([part='toggle-button']):focus-visible),
+  [part='content']:has([href]) [part='toggle-button']:focus-visible {
+    outline: var(--vaadin-focus-ring-width) solid var(--vaadin-focus-ring-color);
+  }
+
+  [part='content']:not(:has([href])) [part='toggle-button']:focus-visible {
+    outline: 0;
+  }
+
+  /* Hierarchy indentation */
+  [part='content']::before {
+    content: '';
+    --_hierarchy-indent: calc(var(--_level, 0) * var(--vaadin-side-nav-child-indent, var(--vaadin-icon-size, 1lh)));
+    --_icon-indent: calc(var(--_level, 0) * var(--vaadin-side-nav-item-gap, var(--vaadin-gap-container-inline)));
+    width: calc(var(--_hierarchy-indent) + var(--_icon-indent));
+    flex: none;
+    margin-inline-start: calc(var(--vaadin-side-nav-item-gap, var(--vaadin-gap-container-inline)) * -1);
+  }
+
+  slot[name='children'] {
+    --_level: calc(var(--_level-2, 0) + 1);
+  }
+
+  slot[name='children']::slotted(*) {
+    --_level-2: var(--_level);
+  }
+
+  @media (forced-colors: active) {
+    :host([current]) [part='content'] {
+      color: Highlight;
+    }
+
+    :host([disabled]) [part='content'] {
+      --vaadin-side-nav-item-color: GrayText;
+    }
+
+    :host([disabled]) [part='toggle-button']::before {
+      background: GrayText;
+    }
+  }
+`;
+
+export const sideNavItemStyles = [sharedStyles, sideNavItem];

package/src/styles/vaadin-side-nav-item-core-styles.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright (c) 2023 - 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 sideNavItemStyles: CSSResult;

package/src/{vaadin-side-nav-base-styles.js → styles/vaadin-side-nav-item-core-styles.js}

@@ -5,7 +5,7 @@
  */
 import { css } from 'lit';
 
-export const sideNavItemBaseStyles = css`
+export const sideNavItemStyles = css`
   :host {
     display: block;
   }
@@ -35,7 +35,6 @@ export const sideNavItemBaseStyles = css`
   }
 
   button {
-    -webkit-appearance: none;
     appearance: none;
     flex: none;
     position: relative;
@@ -69,34 +68,3 @@ export const sideNavItemBaseStyles = css`
     white-space: nowrap;
   }
 `;
-
-export const sideNavBaseStyles = css`
-  :host {
-    display: block;
-  }
-
-  :host([hidden]) {
-    display: none !important;
-  }
-
-  button {
-    display: flex;
-    align-items: center;
-    justify-content: inherit;
-    width: 100%;
-    margin: 0;
-    padding: 0;
-    background-color: initial;
-    color: inherit;
-    border: initial;
-    outline: none;
-    font: inherit;
-    text-align: inherit;
-  }
-
-  [part='children'] {
-    padding: 0;
-    margin: 0;
-    list-style-type: none;
-  }
-`;

package/src/styles/vaadin-side-nav-shared-base-styles.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright (c) 2023 - 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 sharedStyles: CSSResult;

package/src/styles/vaadin-side-nav-shared-base-styles.js

@@ -0,0 +1,91 @@
+/**
+ * @license
+ * Copyright (c) 2023 - 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';
+
+export const sharedStyles = css`
+  :host {
+    display: flex;
+    flex-direction: column;
+    gap: var(--vaadin-side-nav-items-gap, var(--vaadin-gap-container-block));
+    cursor: default;
+    -webkit-tap-highlight-color: transparent;
+  }
+
+  :host([hidden]),
+  [hidden] {
+    display: none !important;
+  }
+
+  button {
+    appearance: none;
+    margin: 0;
+    padding: 0;
+    border: 0;
+    background: transparent;
+    color: inherit;
+    font: inherit;
+    text-align: inherit;
+    cursor: var(--vaadin-clickable-cursor);
+    flex: none;
+  }
+
+  [part='toggle-button'] {
+    border-radius: var(--vaadin-side-nav-item-border-radius, var(--vaadin-radius-s));
+    color: var(--vaadin-color-subtle);
+  }
+
+  [part='toggle-button']::before {
+    content: '';
+    display: block;
+    background: currentColor;
+    mask-image: var(--_vaadin-icon-chevron-down);
+    width: var(--vaadin-icon-size, 1lh);
+    height: var(--vaadin-icon-size, 1lh);
+    rotate: -90deg;
+  }
+
+  :host([dir='rtl']) [part='toggle-button']::before {
+    scale: -1;
+  }
+
+  :host(:is(vaadin-side-nav-item[expanded], vaadin-side-nav:not([collapsed]))) [part='toggle-button'] {
+    rotate: 90deg;
+  }
+
+  :host([dir='rtl']:is(vaadin-side-nav-item[expanded], vaadin-side-nav:not([collapsed]))) [part='toggle-button'] {
+    rotate: -90deg;
+  }
+
+  @media (prefers-reduced-motion: no-preference) {
+    [part='toggle-button'] {
+      transition: rotate 150ms;
+    }
+  }
+
+  :host([disabled]) [part='toggle-button'] {
+    opacity: 0.5;
+  }
+
+  [part='children'] {
+    padding: 0;
+    margin: 0;
+    list-style-type: none;
+    display: flex;
+    flex-direction: column;
+    gap: var(--vaadin-side-nav-items-gap, var(--vaadin-gap-container-block));
+  }
+
+  :focus-visible {
+    outline: var(--vaadin-focus-ring-width) solid var(--vaadin-focus-ring-color);
+  }
+
+  @media (forced-colors: active) {
+    [part='toggle-button']::before {
+      background: CanvasText;
+    }
+  }
+`;

package/src/vaadin-side-nav-item.js

@@ -10,9 +10,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 { matchPaths } from '@vaadin/component-base/src/url-utils.js';
+import { LumoInjectionMixin } from '@vaadin/vaadin-themable-mixin/lumo-injection-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 import { location } from './location.js';
-import { sideNavItemBaseStyles } from './vaadin-side-nav-base-styles.js';
+import { sideNavItemStyles } from './styles/vaadin-side-nav-item-core-styles.js';
 import { SideNavChildrenMixin } from './vaadin-side-nav-children-mixin.js';
 
 /**
@@ -80,7 +81,9 @@ import { SideNavChildrenMixin } from './vaadin-side-nav-children-mixin.js';
  * @mixes ElementMixin
  * @mixes SideNavChildrenMixin
  */
-class SideNavItem extends SideNavChildrenMixin(DisabledMixin(ElementMixin(ThemableMixin(PolylitMixin(LitElement))))) {
+class SideNavItem extends SideNavChildrenMixin(
+  DisabledMixin(ElementMixin(ThemableMixin(PolylitMixin(LumoInjectionMixin(LitElement))))),
+) {
   static get is() {
     return 'vaadin-side-nav-item';
   }
@@ -175,7 +178,7 @@ class SideNavItem extends SideNavChildrenMixin(DisabledMixin(ElementMixin(Themab
   }
 
   static get styles() {
-    return [sideNavItemBaseStyles];
+    return sideNavItemStyles;
   }
 
   constructor() {
@@ -283,9 +286,13 @@ class SideNavItem extends SideNavChildrenMixin(DisabledMixin(ElementMixin(Themab
   }
 
   /** @private */
-  _onContentClick() {
+  _onContentClick(e) {
+    // Navigate if path is defined and not clicking on the link directly
+    if (this.path && !e.composedPath().find((el) => el === this.$.link)) {
+      this.$.link.click();
+    }
     // Toggle item expanded state unless the link has a non-empty path
-    if (this.path == null && this.hasAttribute('has-children')) {
+    else if (this.path == null && this.hasAttribute('has-children') && !this.disabled) {
       this.__toggleExpanded();
     }
   }

package/src/vaadin-side-nav.js

@@ -3,14 +3,17 @@
  * Copyright (c) 2023 - 2025 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
+import './vaadin-side-nav-item.js';
 import { html, LitElement } from 'lit';
 import { FocusMixin } from '@vaadin/a11y-base/src/focus-mixin.js';
 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 { SlotStylesMixin } from '@vaadin/component-base/src/slot-styles-mixin.js';
 import { generateUniqueId } from '@vaadin/component-base/src/unique-id-utils.js';
+import { LumoInjectionMixin } from '@vaadin/vaadin-themable-mixin/lumo-injection-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-import { sideNavBaseStyles } from './vaadin-side-nav-base-styles.js';
+import { sideNavSlotStyles, sideNavStyles } from './styles/vaadin-side-nav-core-styles.js';
 import { SideNavChildrenMixin } from './vaadin-side-nav-children-mixin.js';
 
 /**
@@ -70,7 +73,9 @@ import { SideNavChildrenMixin } from './vaadin-side-nav-children-mixin.js';
  * @mixes ElementMixin
  * @mixes SideNavChildrenMixin
  */
-class SideNav extends SideNavChildrenMixin(FocusMixin(ElementMixin(ThemableMixin(PolylitMixin(LitElement))))) {
+class SideNav extends SideNavChildrenMixin(
+  SlotStylesMixin(FocusMixin(ElementMixin(ThemableMixin(PolylitMixin(LumoInjectionMixin(LitElement)))))),
+) {
   static get is() {
     return 'vaadin-side-nav';
   }
@@ -149,7 +154,12 @@ class SideNav extends SideNavChildrenMixin(FocusMixin(ElementMixin(ThemableMixin
   }
 
   static get styles() {
-    return sideNavBaseStyles;
+    return sideNavStyles;
+  }
+
+  /** @protected */
+  get slotStyles() {
+    return [sideNavSlotStyles];
   }
 
   constructor() {

package/theme/lumo/vaadin-side-nav-item-styles.js

@@ -72,17 +72,15 @@ export const sideNavItemStyles = css`
     transform: none;
   }
 
-  @supports selector(:focus-visible) {
-    [part='link'],
-    [part='toggle-button'] {
-      outline: none;
-    }
+  [part='link'],
+  [part='toggle-button'] {
+    outline: none;
+  }
 
-    [part='link']:focus-visible,
-    [part='toggle-button']:focus-visible {
-      border-radius: var(--lumo-border-radius-m);
-      box-shadow: 0 0 0 var(--_focus-ring-width) var(--_focus-ring-color);
-    }
+  [part='link']:focus-visible,
+  [part='toggle-button']:focus-visible {
+    border-radius: var(--lumo-border-radius-m);
+    box-shadow: 0 0 0 var(--_focus-ring-width) var(--_focus-ring-color);
   }
 
   [part='link']:active {

package/web-types.json

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