@vaadin/app-layout 25.3.0-beta1 → 25.3.0-beta3

package/package.json

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

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

@@ -155,6 +155,16 @@ export const AppLayoutMixin = (superclass) =>
       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;
@@ -177,16 +187,22 @@ export const AppLayoutMixin = (superclass) =>
 
     /** @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 */
@@ -196,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;
 
@@ -216,11 +228,9 @@ export const AppLayoutMixin = (superclass) =>
         }
 
         if (!isDrawerAnimating) {
-          this.__setOffsetSize({
-            drawerRect,
-            navbarTopRect,
-            navbarBottomRect,
-          });
+          this.__setDrawerOffsetSize(drawerOffsetSize);
+          this.__setNavbarTopOffsetSize(navbarTopOffsetSize);
+          this.__setNavbarBottomOffsetSize(navbarBottomOffsetSize);
         }
       });
     }
@@ -327,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 */
@@ -534,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/web-types.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/app-layout",
-  "version": "25.3.0-beta1",
+  "version": "25.3.0-beta3",
   "description-markup": "markdown",
   "contributions": {
     "html": {

package/web-types.lit.json

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