@vaadin/app-layout 25.0.0-alpha2 → 25.0.0-alpha20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/app-layout",
-  "version": "25.0.0-alpha2",
+  "version": "25.0.0-alpha20",
   "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-alpha2",
-    "@vaadin/button": "25.0.0-alpha2",
-    "@vaadin/component-base": "25.0.0-alpha2",
-    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha2",
-    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha2",
+    "@vaadin/a11y-base": "25.0.0-alpha20",
+    "@vaadin/button": "25.0.0-alpha20",
+    "@vaadin/component-base": "25.0.0-alpha20",
+    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha20",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "25.0.0-alpha2",
-    "@vaadin/test-runner-commands": "25.0.0-alpha2",
+    "@vaadin/chai-plugins": "25.0.0-alpha20",
+    "@vaadin/test-runner-commands": "25.0.0-alpha20",
     "@vaadin/testing-helpers": "^2.0.0",
-    "sinon": "^18.0.0"
+    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha20",
+    "sinon": "^21.0.0"
   },
   "web-types": [
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "67ffcd5355cf21ce1b5039c598525109fc4c164b"
+  "gitHead": "c948aae591a30b432f3784000d4677674cae56e0"
 }

package/src/safe-area-inset.js

@@ -1,3 +1,9 @@
+/**
+ * @license
+ * Copyright (c) 2000 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+
 const template = document.createElement('template');
 
 template.innerHTML = `

package/src/{vaadin-app-layout-styles.js → styles/vaadin-app-layout-base-styles.js}

@@ -3,16 +3,17 @@
  * Copyright (c) 2018 - 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';
+import '@vaadin/component-base/src/styles/style-props.js';
+import { css } from 'lit';
 
 export const appLayoutStyles = css`
   :host {
     display: block;
     box-sizing: border-box;
     height: 100%;
-    --vaadin-app-layout-transition: 200ms;
-    transition: padding var(--vaadin-app-layout-transition);
-    --_vaadin-app-layout-drawer-width: var(--vaadin-app-layout-drawer-width, 16em);
+    --vaadin-app-layout-transition-duration: 0s;
+    transition: padding var(--vaadin-app-layout-transition-duration);
+    --_vaadin-app-layout-drawer-width: var(--vaadin-app-layout-drawer-width, auto);
     --vaadin-app-layout-touch-optimized: false;
     --vaadin-app-layout-navbar-offset-top: var(--_vaadin-app-layout-navbar-offset-size);
     --vaadin-app-layout-navbar-offset-bottom: var(--_vaadin-app-layout-navbar-offset-size-bottom);
@@ -25,8 +26,10 @@ export const appLayoutStyles = css`
     display: none !important;
   }
 
-  :host([no-anim]) {
-    --vaadin-app-layout-transition: none !important;
+  @media (prefers-reduced-motion: no-preference) {
+    :host(:not([no-anim])) {
+      --vaadin-app-layout-transition-duration: 200ms;
+    }
   }
 
   :host([drawer-opened]) {
@@ -58,11 +61,21 @@ export const appLayoutStyles = css`
     align-items: center;
     top: 0;
     inset-inline: 0;
-    transition: inset-inline-start var(--vaadin-app-layout-transition);
-    padding-top: var(--safe-area-inset-top);
-    padding-left: var(--safe-area-inset-left);
-    padding-right: var(--safe-area-inset-right);
+    transition: inset-inline-start var(--vaadin-app-layout-transition-duration);
+    padding-top: max(var(--vaadin-app-layout-navbar-padding-top, var(--vaadin-padding-s)), var(--safe-area-inset-top));
+    padding-bottom: var(--vaadin-app-layout-navbar-padding-bottom, var(--vaadin-padding-s));
+    padding-inline-start: max(
+      var(--vaadin-app-layout-navbar-padding-inline-start, var(--vaadin-padding-s)),
+      var(--safe-area-inset-left)
+    );
+    /* stylelint-disable-next-line declaration-block-no-redundant-longhand-properties */
+    padding-inline-end: max(
+      var(--vaadin-app-layout-navbar-padding-inline-end, var(--vaadin-padding-s)),
+      var(--safe-area-inset-right)
+    );
     z-index: 1;
+    gap: var(--vaadin-app-layout-navbar-gap, var(--vaadin-gap-s));
+    background: var(--vaadin-app-layout-navbar-background, var(--vaadin-background-container));
   }
 
   :host([primary-section='drawer'][drawer-opened]:not([overlay])) [part='navbar'] {
@@ -76,18 +89,23 @@ export const appLayoutStyles = css`
   [part='navbar'][bottom] {
     top: auto;
     bottom: 0;
-    padding-bottom: var(--safe-area-inset-bottom);
+    padding-top: var(--vaadin-app-layout-navbar-padding-top, var(--vaadin-padding-s));
+    padding-bottom: max(
+      var(--vaadin-app-layout-navbar-padding-bottom, var(--vaadin-padding-s)),
+      var(--safe-area-inset-bottom)
+    );
   }
 
   [part='drawer'] {
     overflow: auto;
+    overscroll-behavior: contain;
     position: fixed;
     top: var(--vaadin-app-layout-navbar-offset-top, 0);
     bottom: var(--vaadin-app-layout-navbar-offset-bottom, var(--vaadin-viewport-offset-bottom, 0));
     inset-inline: var(--vaadin-app-layout-navbar-offset-left, 0) auto;
     transition:
-      transform var(--vaadin-app-layout-transition),
-      visibility var(--vaadin-app-layout-transition);
+      transform var(--vaadin-app-layout-transition-duration),
+      visibility var(--vaadin-app-layout-transition-duration);
     transform: translateX(-100%);
     max-width: 90%;
     width: var(--_vaadin-app-layout-drawer-width);
@@ -98,6 +116,7 @@ export const appLayoutStyles = css`
     visibility: hidden;
     display: flex;
     flex-direction: column;
+    background: var(--vaadin-app-layout-drawer-background, transparent);
   }
 
   :host([drawer-opened]) [part='drawer'] {
@@ -108,25 +127,27 @@ export const appLayoutStyles = css`
   }
 
   [part='backdrop'] {
-    background-color: #000;
-    opacity: 0.3;
+    background: var(--vaadin-overlay-backdrop-background, rgba(0, 0, 0, 0.2));
+    forced-color-adjust: none;
   }
 
   :host(:not([drawer-opened])) [part='backdrop'] {
-    opacity: 0;
+    opacity: 0 !important;
   }
 
   :host([overlay]) [part='backdrop'] {
     position: fixed;
     inset: 0;
     pointer-events: none;
-    transition: opacity var(--vaadin-app-layout-transition);
+    transition: opacity var(--vaadin-app-layout-transition-duration);
     -webkit-tap-highlight-color: transparent;
   }
 
   :host([overlay]) [part='drawer'] {
     top: 0;
     bottom: 0;
+    box-shadow: var(--vaadin-overlay-box-shadow, 0 8px 24px -4px rgba(0, 0, 0, 0.3));
+    background: var(--vaadin-app-layout-drawer-background, var(--vaadin-background-color));
   }
 
   :host([overlay]) [part='drawer'],
@@ -154,7 +175,7 @@ export const appLayoutStyles = css`
   @media (max-width: 800px), (max-height: 600px) {
     :host {
       --vaadin-app-layout-drawer-overlay: true;
-      --_vaadin-app-layout-drawer-width: var(--vaadin-app-layout-drawer-width, 20em);
+      --_vaadin-app-layout-drawer-width: var(--vaadin-app-layout-drawer-width, 320px);
     }
   }
 
@@ -163,4 +184,10 @@ export const appLayoutStyles = css`
     flex: 1;
     overscroll-behavior: contain;
   }
+
+  @media (forced-colors: active) {
+    :host([overlay]) [part='drawer'] {
+      border: 3px solid;
+    }
+  }
 `;

package/src/styles/vaadin-drawer-toggle-base-styles.js

@@ -0,0 +1,27 @@
+/**
+ * @license
+ * Copyright (c) 2018 - 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';
+
+export const drawerToggle = css`
+  [part='icon'] {
+    background: currentColor;
+    display: block;
+    height: var(--vaadin-icon-size, 1lh);
+    mask-image: var(--_vaadin-icon-menu);
+    width: var(--vaadin-icon-size, 1lh);
+  }
+
+  [hidden] {
+    display: none !important;
+  }
+
+  @media (forced-colors: active) {
+    [part='icon'] {
+      background: CanvasText;
+    }
+  }
+`;

package/src/vaadin-app-layout-mixin.d.ts

@@ -21,7 +21,7 @@ export declare class AppLayoutMixinClass {
    * just the individual properties you want to change.
    *
    * The object has the following structure and default values:
-   * ```
+   * ```js
    * {
    *   drawer: 'Drawer'
    * }

package/src/vaadin-app-layout-mixin.js

@@ -69,6 +69,7 @@ export const AppLayoutMixin = (superclass) =>
           readOnly: true,
           value: false,
           reflectToAttribute: true,
+          observer: '__overlayChanged',
           sync: true,
         },
 
@@ -104,7 +105,7 @@ export const AppLayoutMixin = (superclass) =>
      * just the individual properties you want to change.
      *
      * The object has the following structure and default values:
-     * ```
+     * ```js
      * {
      *   drawer: 'Drawer'
      * }
@@ -247,6 +248,22 @@ export const AppLayoutMixin = (superclass) =>
       this.__setAriaExpanded();
     }
 
+    /**
+     * A callback for the `overlay` property observer.
+     *
+     * When layout resizes while in the overlay mode, drawer opened state
+     * is not changed, but focus trap needs to be removed.
+     *
+     * @param {boolean} overlay
+     * @param {boolean} oldOverlay
+     * @private
+     */
+    __overlayChanged(_overlay, oldOverlay) {
+      if (oldOverlay) {
+        this.__restoreFocus();
+      }
+    }
+
     /**
      * A callback for the `i18n` property observer.
      *
@@ -363,8 +380,8 @@ export const AppLayoutMixin = (superclass) =>
     /**
      * Returns a promise that resolves when the drawer opening/closing CSS transition ends.
      *
-     * The method relies on the `--vaadin-app-layout-transition` CSS variable to detect whether
-     * the drawer has a CSS transition that needs to be awaited. If the CSS variable equals `none`,
+     * The method relies on the `--vaadin-app-layout-transition-duration` CSS variable to detect whether
+     * the drawer has a CSS transition that needs to be awaited. If the CSS variable equals `0s`,
      * the promise resolves immediately.
      *
      * @return {Promise}
@@ -372,7 +389,7 @@ export const AppLayoutMixin = (superclass) =>
      */
     __drawerTransitionComplete() {
       return new Promise((resolve) => {
-        if (this._getCustomPropertyValue('--vaadin-app-layout-transition') === 'none') {
+        if (this._getCustomPropertyValue('--vaadin-app-layout-transition-duration') === '0s') {
           resolve();
           return;
         }
@@ -409,18 +426,22 @@ export const AppLayoutMixin = (superclass) =>
         return;
       }
 
-      this.__ariaModalController.close();
-      this.__focusTrapController.releaseFocus();
-      this.$.drawer.removeAttribute('tabindex');
+      this.__restoreFocus();
 
       // Move focus to the drawer toggle when closing the drawer.
       const toggle = this.querySelector('vaadin-drawer-toggle');
       if (toggle) {
         toggle.focus();
-        toggle.setAttribute('focus-ring', 'focus');
       }
     }
 
+    /** @private */
+    __restoreFocus() {
+      this.__ariaModalController.close();
+      this.__focusTrapController.releaseFocus();
+      this.$.drawer.removeAttribute('tabindex');
+    }
+
     /**
      * Closes the drawer on Escape press if it has been opened in the overlay mode.
      *

package/src/vaadin-app-layout.d.ts

@@ -37,7 +37,7 @@ export type AppLayoutEventMap = AppLayoutCustomEventMap & HTMLElementEventMap;
 /**
  * `<vaadin-app-layout>` is a Web Component providing a quick and easy way to get a common application layout structure done.
  *
- * ```
+ * ```html
  * <vaadin-app-layout primary-section="navbar|drawer">
  *  <vaadin-drawer-toggle slot="navbar [touch-optimized]"></vaadin-drawer-toggle>
  *  <h3 slot="navbar [touch-optimized]">Company Name</h3>
@@ -55,17 +55,17 @@ export type AppLayoutEventMap = AppLayoutCustomEventMap & HTMLElementEventMap;
  * For best results, the component should be added to the root level of your application (i.e., as a direct child of `<body>`).
  *
  * The page should include a viewport meta tag which contains `viewport-fit=cover`, like the following:
- * ```
+ * ```html
  * <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
  * ```
+ *
  * This causes the viewport to be scaled to fill the device display.
- * To ensure that important content is displayed, use the provided css variables.
- * ```
- * --safe-area-inset-top
- * --safe-area-inset-right
- * --safe-area-inset-bottom
- * --safe-area-inset-left
- * ```
+ * To ensure that important content is displayed, use the provided css variables:
+ *
+ * - `--safe-area-inset-top`
+ * - `--safe-area-inset-right`
+ * - `--safe-area-inset-bottom`
+ * - `--safe-area-inset-left`
  *
  * ### Styling
  *

package/src/vaadin-app-layout.js

@@ -9,14 +9,15 @@ 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 { appLayoutStyles } from './styles/vaadin-app-layout-base-styles.js';
 import { AppLayoutMixin } from './vaadin-app-layout-mixin.js';
-import { appLayoutStyles } from './vaadin-app-layout-styles.js';
 
 /**
  * `<vaadin-app-layout>` is a Web Component providing a quick and easy way to get a common application layout structure done.
  *
- * ```
+ * ```html
  * <vaadin-app-layout primary-section="navbar|drawer">
  *  <vaadin-drawer-toggle slot="navbar [touch-optimized]"></vaadin-drawer-toggle>
  *  <h3 slot="navbar [touch-optimized]">Company Name</h3>
@@ -34,17 +35,17 @@ import { appLayoutStyles } from './vaadin-app-layout-styles.js';
  * For best results, the component should be added to the root level of your application (i.e., as a direct child of `<body>`).
  *
  * The page should include a viewport meta tag which contains `viewport-fit=cover`, like the following:
- * ```
+ * ```html
  * <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
  * ```
+ *
  * This causes the viewport to be scaled to fill the device display.
- * To ensure that important content is displayed, use the provided css variables.
- * ```
- * --safe-area-inset-top
- * --safe-area-inset-right
- * --safe-area-inset-bottom
- * --safe-area-inset-left
- * ```
+ * To ensure that important content is displayed, use the provided css variables:
+ *
+ * - `--safe-area-inset-top`
+ * - `--safe-area-inset-right`
+ * - `--safe-area-inset-bottom`
+ * - `--safe-area-inset-left`
  *
  * ### Styling
  *
@@ -107,7 +108,7 @@ import { appLayoutStyles } from './vaadin-app-layout-styles.js';
  * @mixes ElementMixin
  * @mixes ThemableMixin
  */
-class AppLayout extends AppLayoutMixin(ElementMixin(ThemableMixin(PolylitMixin(LitElement)))) {
+class AppLayout extends AppLayoutMixin(ElementMixin(ThemableMixin(PolylitMixin(LumoInjectionMixin(LitElement))))) {
   static get is() {
     return 'vaadin-app-layout';
   }

package/src/vaadin-drawer-toggle.d.ts

@@ -10,7 +10,7 @@ import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mix
 /**
  * The Drawer Toggle component controls the drawer in App Layout component.
  *
- * ```
+ * ```html
  * <vaadin-app-layout>
  *   <vaadin-drawer-toggle slot="navbar">Toggle drawer</vaadin-drawer-toggle>
  * </vaadin-app-layout>

package/src/vaadin-drawer-toggle.js

@@ -4,19 +4,20 @@
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
 import { html, LitElement } from 'lit';
-import { buttonStyles } from '@vaadin/button/src/vaadin-button-core-styles.js';
+import { buttonStyles } from '@vaadin/button/src/styles/vaadin-button-base-styles.js';
 import { ButtonMixin } from '@vaadin/button/src/vaadin-button-mixin.js';
 import { defineCustomElement } from '@vaadin/component-base/src/define.js';
 import { DirMixin } from '@vaadin/component-base/src/dir-mixin.js';
 import { isEmptyTextNode } from '@vaadin/component-base/src/dom-utils.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 { drawerToggle } from './vaadin-drawer-toggle-styles.js';
+import { drawerToggle } from './styles/vaadin-drawer-toggle-base-styles.js';
 
 /**
  * The Drawer Toggle component controls the drawer in App Layout component.
  *
- * ```
+ * ```html
  * <vaadin-app-layout>
  *   <vaadin-drawer-toggle slot="navbar">Toggle drawer</vaadin-drawer-toggle>
  * </vaadin-app-layout>
@@ -28,7 +29,7 @@ import { drawerToggle } from './vaadin-drawer-toggle-styles.js';
  * @mixes DirMixin
  * @mixes ThemableMixin
  */
-class DrawerToggle extends ButtonMixin(DirMixin(ThemableMixin(PolylitMixin(LitElement)))) {
+class DrawerToggle extends ButtonMixin(DirMixin(ThemableMixin(PolylitMixin(LumoInjectionMixin(LitElement))))) {
   static get is() {
     return 'vaadin-drawer-toggle';
   }

package/vaadin-app-layout.js

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

package/vaadin-drawer-toggle.js

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

package/web-types.json

@@ -1,14 +1,14 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/app-layout",
-  "version": "25.0.0-alpha2",
+  "version": "25.0.0-alpha20",
   "description-markup": "markdown",
   "contributions": {
     "html": {
       "elements": [
         {
           "name": "vaadin-app-layout",
-          "description": "`<vaadin-app-layout>` is a Web Component providing a quick and easy way to get a common application layout structure done.\n\n```\n<vaadin-app-layout primary-section=\"navbar|drawer\">\n <vaadin-drawer-toggle slot=\"navbar [touch-optimized]\"></vaadin-drawer-toggle>\n <h3 slot=\"navbar [touch-optimized]\">Company Name</h3>\n <vaadin-tabs orientation=\"vertical\" slot=\"drawer\">\n   <vaadin-tab>Menu item 1</vaadin-tab>\n </vaadin-tabs>\n <!-- Everything else will be the page content -->\n <div>\n   <h3>Page title</h3>\n   <p>Page content</p>\n </div>\n</vaadin-app-layout>\n```\n\nFor best results, the component should be added to the root level of your application (i.e., as a direct child of `<body>`).\n\nThe page should include a viewport meta tag which contains `viewport-fit=cover`, like the following:\n```\n<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, viewport-fit=cover\">\n```\nThis causes the viewport to be scaled to fill the device display.\nTo ensure that important content is displayed, use the provided css variables.\n```\n--safe-area-inset-top\n--safe-area-inset-right\n--safe-area-inset-bottom\n--safe-area-inset-left\n```\n\n### Styling\n\nThe following Shadow DOM parts of the `<vaadin-app-layout>` are available for styling:\n\nPart name     | Description\n--------------|---------------------------------------------------------|\n`backdrop`    | Backdrop covering the layout when drawer is open as an overlay\n`navbar`      | Container for the navigation bar\n`drawer`      | Container for the drawer area\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.\n\n### Component's slots\n\nThe following slots are available to be set\n\nSlot name          | Description\n-------------------|---------------------------------------------------|\nno name            | Default container for the page content\n`navbar `          | Container for the top navbar area\n`drawer`           | Container for an application menu\n`touch-optimized`  | Container for the bottom navbar area (only visible for mobile devices)\n\n#### Touch optimized\n\nApp Layout has a pseudo-slot `touch-optimized` in order to give more control of the presentation of\nelements with `slot[navbar]`. Internally, when the user is interacting with App Layout from a\ntouchscreen device, the component will search for elements with `slot[navbar touch-optimized]` and move\nthem to the bottom of the page.\n\n### Navigation\n\nAs the drawer opens as an overlay in small devices, it makes sense to close it once a navigation happens.\nIf you are using Vaadin Router, this will happen automatically unless you change the `closeDrawerOn` event name.\n\nIn order to do so, there are two options:\n- If the `vaadin-app-layout` instance is available, then `drawerOpened` can be set to `false`\n- If not, a custom event `close-overlay-drawer` can be dispatched either by calling\n `window.dispatchEvent(new CustomEvent('close-overlay-drawer'))` or by calling\n `AppLayout.dispatchCloseOverlayDrawerEvent()`\n\n### Scrolling areas\n\nBy default, the component will act with the \"body scrolling\", so on mobile (iOS Safari and Android Chrome),\nthe toolbars will collapse when a scroll happens.\n\nTo use the \"content scrolling\", in case of the content of the page relies on a pre-defined height (for instance,\nit has a `height:100%`), then the developer can set `height: 100%` to both `html` and `body`.\nThat will make the `[content]` element of app layout scrollable.\nOn this case, the toolbars on mobile device won't collapse.",
+          "description": "`<vaadin-app-layout>` is a Web Component providing a quick and easy way to get a common application layout structure done.\n\n```html\n<vaadin-app-layout primary-section=\"navbar|drawer\">\n <vaadin-drawer-toggle slot=\"navbar [touch-optimized]\"></vaadin-drawer-toggle>\n <h3 slot=\"navbar [touch-optimized]\">Company Name</h3>\n <vaadin-tabs orientation=\"vertical\" slot=\"drawer\">\n   <vaadin-tab>Menu item 1</vaadin-tab>\n </vaadin-tabs>\n <!-- Everything else will be the page content -->\n <div>\n   <h3>Page title</h3>\n   <p>Page content</p>\n </div>\n</vaadin-app-layout>\n```\n\nFor best results, the component should be added to the root level of your application (i.e., as a direct child of `<body>`).\n\nThe page should include a viewport meta tag which contains `viewport-fit=cover`, like the following:\n```html\n<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, viewport-fit=cover\">\n```\n\nThis causes the viewport to be scaled to fill the device display.\nTo ensure that important content is displayed, use the provided css variables:\n\n- `--safe-area-inset-top`\n- `--safe-area-inset-right`\n- `--safe-area-inset-bottom`\n- `--safe-area-inset-left`\n\n### Styling\n\nThe following Shadow DOM parts of the `<vaadin-app-layout>` are available for styling:\n\nPart name     | Description\n--------------|---------------------------------------------------------|\n`backdrop`    | Backdrop covering the layout when drawer is open as an overlay\n`navbar`      | Container for the navigation bar\n`drawer`      | Container for the drawer area\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.\n\n### Component's slots\n\nThe following slots are available to be set\n\nSlot name          | Description\n-------------------|---------------------------------------------------|\nno name            | Default container for the page content\n`navbar `          | Container for the top navbar area\n`drawer`           | Container for an application menu\n`touch-optimized`  | Container for the bottom navbar area (only visible for mobile devices)\n\n#### Touch optimized\n\nApp Layout has a pseudo-slot `touch-optimized` in order to give more control of the presentation of\nelements with `slot[navbar]`. Internally, when the user is interacting with App Layout from a\ntouchscreen device, the component will search for elements with `slot[navbar touch-optimized]` and move\nthem to the bottom of the page.\n\n### Navigation\n\nAs the drawer opens as an overlay in small devices, it makes sense to close it once a navigation happens.\nIf you are using Vaadin Router, this will happen automatically unless you change the `closeDrawerOn` event name.\n\nIn order to do so, there are two options:\n- If the `vaadin-app-layout` instance is available, then `drawerOpened` can be set to `false`\n- If not, a custom event `close-overlay-drawer` can be dispatched either by calling\n `window.dispatchEvent(new CustomEvent('close-overlay-drawer'))` or by calling\n `AppLayout.dispatchCloseOverlayDrawerEvent()`\n\n### Scrolling areas\n\nBy default, the component will act with the \"body scrolling\", so on mobile (iOS Safari and Android Chrome),\nthe toolbars will collapse when a scroll happens.\n\nTo use the \"content scrolling\", in case of the content of the page relies on a pre-defined height (for instance,\nit has a `height:100%`), then the developer can set `height: 100%` to both `html` and `body`.\nThat will make the `[content]` element of app layout scrollable.\nOn this case, the toolbars on mobile device won't collapse.",
           "attributes": [
             {
               "name": "i18n",
@@ -62,7 +62,7 @@
             "properties": [
               {
                 "name": "i18n",
-                "description": "The object used to localize this component. To change the default\nlocalization, replace this with an object that provides all properties, or\njust the individual properties you want to change.\n\nThe object has the following structure and default values:\n```\n{\n  drawer: 'Drawer'\n}\n```",
+                "description": "The object used to localize this component. To change the default\nlocalization, replace this with an object that provides all properties, or\njust the individual properties you want to change.\n\nThe object has the following structure and default values:\n```js\n{\n  drawer: 'Drawer'\n}\n```",
                 "value": {
                   "type": [
                     "AppLayoutI18n"
@@ -119,7 +119,7 @@
         },
         {
           "name": "vaadin-drawer-toggle",
-          "description": "The Drawer Toggle component controls the drawer in App Layout component.\n\n```\n<vaadin-app-layout>\n  <vaadin-drawer-toggle slot=\"navbar\">Toggle drawer</vaadin-drawer-toggle>\n</vaadin-app-layout>\n```",
+          "description": "The Drawer Toggle component controls the drawer in App Layout component.\n\n```html\n<vaadin-app-layout>\n  <vaadin-drawer-toggle slot=\"navbar\">Toggle drawer</vaadin-drawer-toggle>\n</vaadin-app-layout>\n```",
           "attributes": [
             {
               "name": "disabled",

package/web-types.lit.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/app-layout",
-  "version": "25.0.0-alpha2",
+  "version": "25.0.0-alpha20",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {
@@ -16,7 +16,7 @@
       "elements": [
         {
           "name": "vaadin-app-layout",
-          "description": "`<vaadin-app-layout>` is a Web Component providing a quick and easy way to get a common application layout structure done.\n\n```\n<vaadin-app-layout primary-section=\"navbar|drawer\">\n <vaadin-drawer-toggle slot=\"navbar [touch-optimized]\"></vaadin-drawer-toggle>\n <h3 slot=\"navbar [touch-optimized]\">Company Name</h3>\n <vaadin-tabs orientation=\"vertical\" slot=\"drawer\">\n   <vaadin-tab>Menu item 1</vaadin-tab>\n </vaadin-tabs>\n <!-- Everything else will be the page content -->\n <div>\n   <h3>Page title</h3>\n   <p>Page content</p>\n </div>\n</vaadin-app-layout>\n```\n\nFor best results, the component should be added to the root level of your application (i.e., as a direct child of `<body>`).\n\nThe page should include a viewport meta tag which contains `viewport-fit=cover`, like the following:\n```\n<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, viewport-fit=cover\">\n```\nThis causes the viewport to be scaled to fill the device display.\nTo ensure that important content is displayed, use the provided css variables.\n```\n--safe-area-inset-top\n--safe-area-inset-right\n--safe-area-inset-bottom\n--safe-area-inset-left\n```\n\n### Styling\n\nThe following Shadow DOM parts of the `<vaadin-app-layout>` are available for styling:\n\nPart name     | Description\n--------------|---------------------------------------------------------|\n`backdrop`    | Backdrop covering the layout when drawer is open as an overlay\n`navbar`      | Container for the navigation bar\n`drawer`      | Container for the drawer area\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.\n\n### Component's slots\n\nThe following slots are available to be set\n\nSlot name          | Description\n-------------------|---------------------------------------------------|\nno name            | Default container for the page content\n`navbar `          | Container for the top navbar area\n`drawer`           | Container for an application menu\n`touch-optimized`  | Container for the bottom navbar area (only visible for mobile devices)\n\n#### Touch optimized\n\nApp Layout has a pseudo-slot `touch-optimized` in order to give more control of the presentation of\nelements with `slot[navbar]`. Internally, when the user is interacting with App Layout from a\ntouchscreen device, the component will search for elements with `slot[navbar touch-optimized]` and move\nthem to the bottom of the page.\n\n### Navigation\n\nAs the drawer opens as an overlay in small devices, it makes sense to close it once a navigation happens.\nIf you are using Vaadin Router, this will happen automatically unless you change the `closeDrawerOn` event name.\n\nIn order to do so, there are two options:\n- If the `vaadin-app-layout` instance is available, then `drawerOpened` can be set to `false`\n- If not, a custom event `close-overlay-drawer` can be dispatched either by calling\n `window.dispatchEvent(new CustomEvent('close-overlay-drawer'))` or by calling\n `AppLayout.dispatchCloseOverlayDrawerEvent()`\n\n### Scrolling areas\n\nBy default, the component will act with the \"body scrolling\", so on mobile (iOS Safari and Android Chrome),\nthe toolbars will collapse when a scroll happens.\n\nTo use the \"content scrolling\", in case of the content of the page relies on a pre-defined height (for instance,\nit has a `height:100%`), then the developer can set `height: 100%` to both `html` and `body`.\nThat will make the `[content]` element of app layout scrollable.\nOn this case, the toolbars on mobile device won't collapse.",
+          "description": "`<vaadin-app-layout>` is a Web Component providing a quick and easy way to get a common application layout structure done.\n\n```html\n<vaadin-app-layout primary-section=\"navbar|drawer\">\n <vaadin-drawer-toggle slot=\"navbar [touch-optimized]\"></vaadin-drawer-toggle>\n <h3 slot=\"navbar [touch-optimized]\">Company Name</h3>\n <vaadin-tabs orientation=\"vertical\" slot=\"drawer\">\n   <vaadin-tab>Menu item 1</vaadin-tab>\n </vaadin-tabs>\n <!-- Everything else will be the page content -->\n <div>\n   <h3>Page title</h3>\n   <p>Page content</p>\n </div>\n</vaadin-app-layout>\n```\n\nFor best results, the component should be added to the root level of your application (i.e., as a direct child of `<body>`).\n\nThe page should include a viewport meta tag which contains `viewport-fit=cover`, like the following:\n```html\n<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, viewport-fit=cover\">\n```\n\nThis causes the viewport to be scaled to fill the device display.\nTo ensure that important content is displayed, use the provided css variables:\n\n- `--safe-area-inset-top`\n- `--safe-area-inset-right`\n- `--safe-area-inset-bottom`\n- `--safe-area-inset-left`\n\n### Styling\n\nThe following Shadow DOM parts of the `<vaadin-app-layout>` are available for styling:\n\nPart name     | Description\n--------------|---------------------------------------------------------|\n`backdrop`    | Backdrop covering the layout when drawer is open as an overlay\n`navbar`      | Container for the navigation bar\n`drawer`      | Container for the drawer area\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.\n\n### Component's slots\n\nThe following slots are available to be set\n\nSlot name          | Description\n-------------------|---------------------------------------------------|\nno name            | Default container for the page content\n`navbar `          | Container for the top navbar area\n`drawer`           | Container for an application menu\n`touch-optimized`  | Container for the bottom navbar area (only visible for mobile devices)\n\n#### Touch optimized\n\nApp Layout has a pseudo-slot `touch-optimized` in order to give more control of the presentation of\nelements with `slot[navbar]`. Internally, when the user is interacting with App Layout from a\ntouchscreen device, the component will search for elements with `slot[navbar touch-optimized]` and move\nthem to the bottom of the page.\n\n### Navigation\n\nAs the drawer opens as an overlay in small devices, it makes sense to close it once a navigation happens.\nIf you are using Vaadin Router, this will happen automatically unless you change the `closeDrawerOn` event name.\n\nIn order to do so, there are two options:\n- If the `vaadin-app-layout` instance is available, then `drawerOpened` can be set to `false`\n- If not, a custom event `close-overlay-drawer` can be dispatched either by calling\n `window.dispatchEvent(new CustomEvent('close-overlay-drawer'))` or by calling\n `AppLayout.dispatchCloseOverlayDrawerEvent()`\n\n### Scrolling areas\n\nBy default, the component will act with the \"body scrolling\", so on mobile (iOS Safari and Android Chrome),\nthe toolbars will collapse when a scroll happens.\n\nTo use the \"content scrolling\", in case of the content of the page relies on a pre-defined height (for instance,\nit has a `height:100%`), then the developer can set `height: 100%` to both `html` and `body`.\nThat will make the `[content]` element of app layout scrollable.\nOn this case, the toolbars on mobile device won't collapse.",
           "extension": true,
           "attributes": [
             {
@@ -28,7 +28,7 @@
             },
             {
               "name": ".i18n",
-              "description": "The object used to localize this component. To change the default\nlocalization, replace this with an object that provides all properties, or\njust the individual properties you want to change.\n\nThe object has the following structure and default values:\n```\n{\n  drawer: 'Drawer'\n}\n```",
+              "description": "The object used to localize this component. To change the default\nlocalization, replace this with an object that provides all properties, or\njust the individual properties you want to change.\n\nThe object has the following structure and default values:\n```js\n{\n  drawer: 'Drawer'\n}\n```",
               "value": {
                 "kind": "expression"
               }
@@ -79,7 +79,7 @@
         },
         {
           "name": "vaadin-drawer-toggle",
-          "description": "The Drawer Toggle component controls the drawer in App Layout component.\n\n```\n<vaadin-app-layout>\n  <vaadin-drawer-toggle slot=\"navbar\">Toggle drawer</vaadin-drawer-toggle>\n</vaadin-app-layout>\n```",
+          "description": "The Drawer Toggle component controls the drawer in App Layout component.\n\n```html\n<vaadin-app-layout>\n  <vaadin-drawer-toggle slot=\"navbar\">Toggle drawer</vaadin-drawer-toggle>\n</vaadin-app-layout>\n```",
           "extension": true,
           "attributes": [
             {

package/src/vaadin-drawer-toggle-styles.js

@@ -1,43 +0,0 @@
-/**
- * @license
- * Copyright (c) 2018 - 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 drawerToggle = css`
-  :host {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    cursor: default;
-    position: relative;
-    outline: none;
-    height: 24px;
-    width: 24px;
-    padding: 4px;
-  }
-
-  [part='icon'],
-  [part='icon']::after,
-  [part='icon']::before {
-    position: absolute;
-    top: 8px;
-    height: 3px;
-    width: 24px;
-    background-color: #000;
-  }
-
-  [part='icon']::after,
-  [part='icon']::before {
-    content: '';
-  }
-
-  [part='icon']::after {
-    top: 6px;
-  }
-
-  [part='icon']::before {
-    top: 12px;
-  }
-`;

package/theme/lumo/vaadin-app-layout-styles.d.ts

@@ -1,3 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/color.js';
-import '@vaadin/vaadin-lumo-styles/spacing.js';
-import '@vaadin/vaadin-lumo-styles/typography.js';

package/theme/lumo/vaadin-app-layout-styles.js

@@ -1,56 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/color.js';
-import '@vaadin/vaadin-lumo-styles/spacing.js';
-import '@vaadin/vaadin-lumo-styles/typography.js';
-import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-
-registerStyles(
-  'vaadin-app-layout',
-  css`
-    [part='navbar'],
-    [part='drawer'] {
-      background-color: var(--lumo-base-color);
-      background-clip: padding-box;
-    }
-
-    [part='navbar'] {
-      min-height: var(--lumo-size-xl);
-      border-bottom: 1px solid var(--lumo-contrast-10pct);
-    }
-
-    [part='navbar'][bottom] {
-      border-bottom: none;
-      border-top: 1px solid var(--lumo-contrast-10pct);
-    }
-
-    [part='drawer'] {
-      border-inline-end: 1px solid var(--lumo-contrast-10pct);
-    }
-
-    :host([overlay]) [part='drawer'] {
-      border-inline-end: none;
-      box-shadow: var(--lumo-box-shadow-s);
-    }
-
-    :host([primary-section='navbar']) [part='navbar'] {
-      border: none;
-      background-image: linear-gradient(var(--lumo-contrast-5pct), var(--lumo-contrast-5pct));
-    }
-
-    :host([primary-section='drawer']:not([overlay])) [part='drawer'] {
-      background-image: linear-gradient(var(--lumo-shade-5pct), var(--lumo-shade-5pct));
-    }
-
-    [part='backdrop'] {
-      background-color: var(--lumo-shade-20pct);
-      opacity: 1;
-    }
-
-    [part] ::slotted(h2),
-    [part] ::slotted(h3),
-    [part] ::slotted(h4) {
-      margin-top: var(--lumo-space-xs) !important;
-      margin-bottom: var(--lumo-space-xs) !important;
-    }
-  `,
-  { moduleId: 'lumo-app-layout' },
-);

package/theme/lumo/vaadin-app-layout.d.ts

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

package/theme/lumo/vaadin-app-layout.js

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

package/theme/lumo/vaadin-drawer-toggle-styles.d.ts

@@ -1 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/font-icons.js';

package/theme/lumo/vaadin-drawer-toggle-styles.js

@@ -1,36 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/font-icons.js';
-import { button } from '@vaadin/button/theme/lumo/vaadin-button-styles.js';
-import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-
-const drawerToggle = css`
-  :host {
-    width: var(--lumo-size-l);
-    height: var(--lumo-size-l);
-    min-width: auto;
-    margin: 0 var(--lumo-space-s);
-    padding: 0;
-    background: transparent;
-  }
-
-  [part='icon'],
-  [part='icon']::after,
-  [part='icon']::before {
-    position: inherit;
-    height: auto;
-    width: auto;
-    background: transparent;
-    top: auto;
-  }
-
-  [part='icon']::before {
-    font-family: lumo-icons;
-    font-size: var(--lumo-icon-size-m);
-    content: var(--lumo-icons-menu);
-  }
-
-  :host([slot~='navbar']) {
-    color: var(--lumo-secondary-text-color);
-  }
-`;
-
-registerStyles('vaadin-drawer-toggle', [button, drawerToggle], { moduleId: 'lumo-drawer-toggle' });

package/theme/lumo/vaadin-drawer-toggle.d.ts

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

package/theme/lumo/vaadin-drawer-toggle.js

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