@vaadin/app-layout 24.0.10 → 24.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/app-layout",
-  "version": "24.0.10",
+  "version": "24.0.12",
   "publishConfig": {
     "access": "public"
   },
@@ -36,15 +36,15 @@
   ],
   "dependencies": {
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/button": "~24.0.10",
-    "@vaadin/component-base": "~24.0.10",
-    "@vaadin/vaadin-lumo-styles": "~24.0.10",
-    "@vaadin/vaadin-material-styles": "~24.0.10",
-    "@vaadin/vaadin-themable-mixin": "~24.0.10"
+    "@vaadin/button": "~24.0.12",
+    "@vaadin/component-base": "~24.0.12",
+    "@vaadin/vaadin-lumo-styles": "~24.0.12",
+    "@vaadin/vaadin-material-styles": "~24.0.12",
+    "@vaadin/vaadin-themable-mixin": "~24.0.12"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/tabs": "~24.0.10",
+    "@vaadin/tabs": "~24.0.12",
     "@vaadin/testing-helpers": "^0.4.0",
     "sinon": "^13.0.2"
   },
@@ -52,5 +52,5 @@
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "0e2bc6342436b434a466d266e75366cc645e5e49"
+  "gitHead": "5c75eeaabb6717cf6c200aba76e1062b78dfbaac"
 }

package/src/vaadin-app-layout.js

@@ -300,7 +300,7 @@ class AppLayout extends ElementMixin(ThemableMixin(ControllerMixin(PolymerElemen
         <slot name="navbar"></slot>
       </div>
       <div part="backdrop" on-click="_onBackdropClick" on-touchend="_onBackdropTouchend"></div>
-      <div part="drawer" id="drawer" on-keydown="__onDrawerKeyDown">
+      <div part="drawer" id="drawer">
         <slot name="drawer" id="drawerSlot"></slot>
       </div>
       <div content>
@@ -423,6 +423,7 @@ class AppLayout extends ElementMixin(ThemableMixin(ControllerMixin(PolymerElemen
     // TODO(jouni): might want to debounce
     this.__boundResizeListener = this._resize.bind(this);
     this.__drawerToggleClickListener = this._drawerToggleClick.bind(this);
+    this.__onDrawerKeyDown = this.__onDrawerKeyDown.bind(this);
     this.__closeOverlayDrawerListener = this.__closeOverlayDrawer.bind(this);
     this.__trapFocusInDrawer = this.__trapFocusInDrawer.bind(this);
     this.__releaseFocusFromDrawer = this.__releaseFocusFromDrawer.bind(this);
@@ -459,14 +460,20 @@ class AppLayout extends ElementMixin(ThemableMixin(ControllerMixin(PolymerElemen
 
     this._navbarSizeObserver = new ResizeObserver(() => {
       requestAnimationFrame(() => {
-        this._blockAnimationUntilAfterNextRender();
-        this._updateOffsetSize();
+        // Prevent updating offset size multiple times
+        // during the drawer open / close transition.
+        if (this.__isDrawerAnimating) {
+          this.__updateOffsetSizePending = true;
+        } else {
+          this._updateOffsetSize();
+        }
       });
     });
     this._navbarSizeObserver.observe(this.$.navbarTop);
     this._navbarSizeObserver.observe(this.$.navbarBottom);
 
     window.addEventListener('close-overlay-drawer', this.__closeOverlayDrawerListener);
+    window.addEventListener('keydown', this.__onDrawerKeyDown);
   }
 
   /** @protected */
@@ -474,6 +481,24 @@ class AppLayout extends ElementMixin(ThemableMixin(ControllerMixin(PolymerElemen
     super.ready();
     this.addController(this.__focusTrapController);
     this.__setAriaExpanded();
+
+    this.$.drawer.addEventListener('transitionstart', () => {
+      this.__isDrawerAnimating = true;
+    });
+
+    this.$.drawer.addEventListener('transitionend', () => {
+      // Update offset size after drawer animation.
+      if (this.__updateOffsetSizePending) {
+        this.__updateOffsetSizePending = false;
+        this._updateOffsetSize();
+      }
+
+      // Delay resetting the flag until animation frame
+      // to avoid updating offset size again on resize.
+      requestAnimationFrame(() => {
+        this.__isDrawerAnimating = false;
+      });
+    });
   }
 
   /** @protected */
@@ -493,6 +518,7 @@ class AppLayout extends ElementMixin(ThemableMixin(ControllerMixin(PolymerElemen
     window.removeEventListener('resize', this.__boundResizeListener);
     this.removeEventListener('drawer-toggle-click', this.__drawerToggleClickListener);
     window.removeEventListener('close-overlay-drawer', this.__drawerToggleClickListener);
+    window.removeEventListener('keydown', this.__onDrawerKeyDown);
   }
 
   /**

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/app-layout",
-  "version": "24.0.10",
+  "version": "24.0.12",
   "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": "24.0.10",
+  "version": "24.0.12",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {