@vaadin/app-layout 25.3.0-dev.3a3c2d7d2a → 25.3.0-rc1

package/custom-elements.json

@@ -287,34 +287,6 @@
               "name": "primary-section-changed"
             }
           ],
-          "mixins": [
-            {
-              "name": "AppLayoutMixin",
-              "module": "src/vaadin-app-layout-mixin.js"
-            },
-            {
-              "name": "ElementMixin",
-              "package": "@vaadin/component-base/src/element-mixin.js"
-            },
-            {
-              "name": "ThemableMixin",
-              "package": "@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js"
-            },
-            {
-              "name": "PolylitMixin",
-              "package": "@vaadin/component-base/src/polylit-mixin.js"
-            },
-            {
-              "name": "LumoInjectionMixin",
-              "package": "@vaadin/vaadin-themable-mixin/lumo-injection-mixin.js"
-            }
-          ],
-          "superclass": {
-            "name": "LitElement",
-            "package": "lit"
-          },
-          "tagName": "vaadin-app-layout",
-          "customElement": true,
           "attributes": [
             {
               "name": "close-drawer-on",
@@ -375,8 +347,43 @@
                 "name": "AppLayoutMixin",
                 "module": "src/vaadin-app-layout-mixin.js"
               }
+            },
+            {
+              "type": {
+                "text": "string"
+              },
+              "description": "The theme variants to apply to the component.",
+              "name": "theme"
             }
-          ]
+          ],
+          "mixins": [
+            {
+              "name": "AppLayoutMixin",
+              "module": "src/vaadin-app-layout-mixin.js"
+            },
+            {
+              "name": "ElementMixin",
+              "package": "@vaadin/component-base/src/element-mixin.js"
+            },
+            {
+              "name": "ThemableMixin",
+              "package": "@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js"
+            },
+            {
+              "name": "PolylitMixin",
+              "package": "@vaadin/component-base/src/polylit-mixin.js"
+            },
+            {
+              "name": "LumoInjectionMixin",
+              "package": "@vaadin/vaadin-themable-mixin/lumo-injection-mixin.js"
+            }
+          ],
+          "superclass": {
+            "name": "LitElement",
+            "package": "lit"
+          },
+          "tagName": "vaadin-app-layout",
+          "customElement": true
         }
       ],
       "exports": [
@@ -442,6 +449,13 @@
                 "name": "DisabledMixin",
                 "package": "@vaadin/a11y-base/src/disabled-mixin.js"
               }
+            },
+            {
+              "type": {
+                "text": "string"
+              },
+              "description": "The theme variants to apply to the component.",
+              "name": "theme"
             }
           ],
           "mixins": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/app-layout",
-  "version": "25.3.0-dev.3a3c2d7d2a",
+  "version": "25.3.0-rc1",
   "publishConfig": {
     "access": "public"
   },
@@ -35,18 +35,18 @@
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@vaadin/a11y-base": "25.3.0-dev.3a3c2d7d2a",
-    "@vaadin/button": "25.3.0-dev.3a3c2d7d2a",
-    "@vaadin/component-base": "25.3.0-dev.3a3c2d7d2a",
-    "@vaadin/vaadin-themable-mixin": "25.3.0-dev.3a3c2d7d2a",
+    "@vaadin/a11y-base": "25.3.0-rc1",
+    "@vaadin/button": "25.3.0-rc1",
+    "@vaadin/component-base": "25.3.0-rc1",
+    "@vaadin/vaadin-themable-mixin": "25.3.0-rc1",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/aura": "25.3.0-dev.3a3c2d7d2a",
-    "@vaadin/chai-plugins": "25.3.0-dev.3a3c2d7d2a",
-    "@vaadin/test-runner-commands": "25.3.0-dev.3a3c2d7d2a",
+    "@vaadin/aura": "25.3.0-rc1",
+    "@vaadin/chai-plugins": "25.3.0-rc1",
+    "@vaadin/test-runner-commands": "25.3.0-rc1",
     "@vaadin/testing-helpers": "^2.0.0",
-    "@vaadin/vaadin-lumo-styles": "25.3.0-dev.3a3c2d7d2a",
+    "@vaadin/vaadin-lumo-styles": "25.3.0-rc1",
     "sinon": "^22.0.0"
   },
   "customElements": "custom-elements.json",
@@ -54,5 +54,5 @@
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "ac506ca7800c23e05da55863c56bcedf12812d37"
+  "gitHead": "d4809590b2f61bd607e376ab3dec84f4bfb059a7"
 }

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

@@ -154,6 +154,18 @@ export const AppLayoutMixin = (superclass) =>
       this.addController(this.__focusTrapController);
       this.__setAriaExpanded();
 
+      this.__updateDrawerSize();
+      this._blockAnimationUntilAfterNextRender();
+
+      const { overlayMode, touchOptimized } = this.__readCSSState();
+      this.__setOverlayMode(overlayMode);
+      this.__setTouchOptimized(touchOptimized);
+
+      const { drawerOffsetSize, navbarTopOffsetSize, navbarBottomOffsetSize } = this.__readCSSState();
+      this.__setDrawerOffsetSize(drawerOffsetSize);
+      this.__setNavbarTopOffsetSize(navbarTopOffsetSize);
+      this.__setNavbarBottomOffsetSize(navbarBottomOffsetSize);
+
       this.$.drawer.addEventListener('transitionstart', () => {
         this.__isDrawerAnimating = true;
       });
@@ -169,22 +181,28 @@ export const AppLayoutMixin = (superclass) =>
       super.disconnectedCallback();
       this.__resizeObserver.disconnect();
       this.removeEventListener('drawer-toggle-click', this.__drawerToggleClickListener);
-      window.removeEventListener('close-overlay-drawer', this.__drawerToggleClickListener);
+      window.removeEventListener('close-overlay-drawer', this.__closeOverlayDrawerListener);
       window.removeEventListener('keydown', this.__onDrawerKeyDown);
     }
 
     /** @private */
     __onNavbarSlotChange() {
-      this.__scheduleResize(this.$.navbarTop);
-      this.__scheduleResize(this.$.navbarBottom);
+      const { touchOptimized } = this.__readCSSState();
+      this.__setTouchOptimized(touchOptimized);
       this.toggleAttribute('has-navbar', !!this.querySelector('[slot="navbar"]'));
+
+      const { navbarTopOffsetSize, navbarBottomOffsetSize } = this.__readCSSState();
+      this.__setNavbarTopOffsetSize(navbarTopOffsetSize);
+      this.__setNavbarBottomOffsetSize(navbarBottomOffsetSize);
     }
 
     /** @private */
     __onDrawerSlotChange() {
-      this.__scheduleResize(this.$.drawer);
       this.__updateDrawerSize();
       this.toggleAttribute('has-drawer', !!this.querySelector('[slot="drawer"]'));
+
+      const { drawerOffsetSize } = this.__readCSSState();
+      this.__setDrawerOffsetSize(drawerOffsetSize);
     }
 
     /** @private */
@@ -194,12 +212,8 @@ export const AppLayoutMixin = (superclass) =>
       const isHostResized = entries.some(({ target }) => target === this);
       const isNavbarResized = entries.some(({ target }) => [this.$.navbarTop, this.$.navbarBottom].includes(target));
 
-      const overlayMode = this._getCustomPropertyValue('--vaadin-app-layout-drawer-overlay') === 'true';
-      const touchOptimized = this._getCustomPropertyValue('--vaadin-app-layout-touch-optimized') === 'true';
-
-      const drawerRect = this.$.drawer.getBoundingClientRect();
-      const navbarTopRect = this.$.navbarTop.getBoundingClientRect();
-      const navbarBottomRect = this.$.navbarBottom.getBoundingClientRect();
+      const { overlayMode, touchOptimized, drawerOffsetSize, navbarTopOffsetSize, navbarBottomOffsetSize } =
+        this.__readCSSState();
 
       const isDrawerAnimating = this.__isDrawerAnimating;
 
@@ -214,11 +228,9 @@ export const AppLayoutMixin = (superclass) =>
         }
 
         if (!isDrawerAnimating) {
-          this.__setOffsetSize({
-            drawerRect,
-            navbarTopRect,
-            navbarBottomRect,
-          });
+          this.__setDrawerOffsetSize(drawerOffsetSize);
+          this.__setNavbarTopOffsetSize(navbarTopOffsetSize);
+          this.__setNavbarBottomOffsetSize(navbarBottomOffsetSize);
         }
       });
     }
@@ -325,10 +337,18 @@ export const AppLayoutMixin = (superclass) =>
     }
 
     /** @private */
-    __setOffsetSize({ drawerRect, navbarTopRect, navbarBottomRect }) {
-      this.style.setProperty('--_vaadin-app-layout-drawer-offset-size', `${drawerRect.width}px`);
-      this.style.setProperty('--_vaadin-app-layout-navbar-offset-size', `${navbarTopRect.height}px`);
-      this.style.setProperty('--_vaadin-app-layout-navbar-offset-size-bottom', `${navbarBottomRect.height}px`);
+    __setDrawerOffsetSize(offsetSize) {
+      this.style.setProperty('--_vaadin-app-layout-drawer-offset-size', `${offsetSize}px`);
+    }
+
+    /** @private */
+    __setNavbarTopOffsetSize(offsetSize) {
+      this.style.setProperty('--_vaadin-app-layout-navbar-offset-size', `${offsetSize}px`);
+    }
+
+    /** @private */
+    __setNavbarBottomOffsetSize(offsetSize) {
+      this.style.setProperty('--_vaadin-app-layout-navbar-offset-size-bottom', `${offsetSize}px`);
     }
 
     /** @private */
@@ -448,7 +468,9 @@ export const AppLayoutMixin = (superclass) =>
     }
 
     /** @private */
-    _onBackdropClick() {
+    _onBackdropClick(event) {
+      // End the ghost click window on the first click (see `_onBackdropTouchend`).
+      event.currentTarget.style.removeProperty('pointer-events');
       this._close();
     }
 
@@ -458,6 +480,18 @@ export const AppLayoutMixin = (superclass) =>
       // on clickable element behind the backdrop
       event.preventDefault();
 
+      // On iOS home screen (standalone) apps, `preventDefault()` on `touchend`
+      // does not reliably suppress the synthesized "ghost" click, which occurs
+      // on medium-length taps only. Keep the invisible backdrop hit-testable for
+      // a short while after closing, so that if a ghost click occurs it lands on
+      // the backdrop instead of the element behind it.
+      if (navigator.standalone) {
+        const backdrop = event.currentTarget;
+        backdrop.style.pointerEvents = 'auto';
+        // The ghost click arrives shortly after `touchend`.
+        setTimeout(() => backdrop.style.removeProperty('pointer-events'), 400);
+      }
+
       this._close();
     }
 
@@ -489,17 +523,11 @@ export const AppLayoutMixin = (superclass) =>
         });
       }
 
-      if (this.$.navbarTop.querySelector('[name=navbar]').assignedNodes().length === 0) {
-        this.$.navbarTop.setAttribute('hidden', '');
-      } else {
-        this.$.navbarTop.removeAttribute('hidden');
-      }
+      const hasNavbar = this.$.navbarTop.querySelector('[name=navbar]').assignedNodes().length > 0;
+      this.$.navbarTop.toggleAttribute('hidden', !hasNavbar);
 
-      if (this.$.navbarBottom.querySelector('[name=navbar-bottom]').assignedNodes().length === 0) {
-        this.$.navbarBottom.setAttribute('hidden', '');
-      } else {
-        this.$.navbarBottom.removeAttribute('hidden');
-      }
+      const hasNavbarBottom = this.$.navbarBottom.querySelector('[name=navbar-bottom]').assignedNodes().length > 0;
+      this.$.navbarBottom.toggleAttribute('hidden', !hasNavbarBottom);
     }
 
     /** @protected */
@@ -524,4 +552,15 @@ export const AppLayoutMixin = (superclass) =>
       this.__resizeObserver.unobserve(element);
       this.__resizeObserver.observe(element);
     }
+
+    /** @private */
+    __readCSSState() {
+      return {
+        overlayMode: this._getCustomPropertyValue('--vaadin-app-layout-drawer-overlay') === 'true',
+        touchOptimized: this._getCustomPropertyValue('--vaadin-app-layout-touch-optimized') === 'true',
+        drawerOffsetSize: this.$.drawer.getBoundingClientRect().width,
+        navbarTopOffsetSize: this.$.navbarTop.getBoundingClientRect().height,
+        navbarBottomOffsetSize: this.$.navbarBottom.getBoundingClientRect().height,
+      };
+    }
   };

package/src/vaadin-app-layout.js

@@ -127,6 +127,7 @@ import { AppLayoutMixin } from './vaadin-app-layout-mixin.js';
  * @fires {CustomEvent} overlay-changed - Fired when the `overlay` property changes.
  * @fires {CustomEvent} primary-section-changed - Fired when the `primarySection` property changes.
  *
+ * @attr {string} theme - The theme variants to apply to the component.
  * @customElement vaadin-app-layout
  * @extends HTMLElement
  */

package/src/vaadin-drawer-toggle.js

@@ -55,6 +55,7 @@ import { drawerToggle } from './styles/vaadin-drawer-toggle-base-styles.js';
  *
  * See [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.
  *
+ * @attr {string} theme - The theme variants to apply to the component.
  * @customElement vaadin-drawer-toggle
  * @extends HTMLElement
  */

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/app-layout",
-  "version": "25.3.0-dev.3a3c2d7d2a",
+  "version": "25.3.0-rc1",
   "description-markup": "markdown",
   "contributions": {
     "html": {
@@ -42,9 +42,7 @@
               "description": "The theme variants to apply to the component.",
               "value": {
                 "type": [
-                  "string",
-                  "null",
-                  "undefined"
+                  "string"
                 ]
               }
             }
@@ -131,9 +129,7 @@
               "description": "The theme variants to apply to the component.",
               "value": {
                 "type": [
-                  "string",
-                  "null",
-                  "undefined"
+                  "string"
                 ]
               }
             }

package/web-types.lit.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/app-layout",
-  "version": "25.3.0-dev.3a3c2d7d2a",
+  "version": "25.3.0-rc1",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {