@vaadin/app-layout 24.2.0-alpha1 → 24.2.0-alpha11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/app-layout",
-  "version": "24.2.0-alpha1",
+  "version": "24.2.0-alpha11",
   "publishConfig": {
     "access": "public"
   },
@@ -36,22 +36,22 @@
   ],
   "dependencies": {
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/a11y-base": "24.2.0-alpha1",
-    "@vaadin/button": "24.2.0-alpha1",
-    "@vaadin/component-base": "24.2.0-alpha1",
-    "@vaadin/vaadin-lumo-styles": "24.2.0-alpha1",
-    "@vaadin/vaadin-material-styles": "24.2.0-alpha1",
-    "@vaadin/vaadin-themable-mixin": "24.2.0-alpha1"
+    "@vaadin/a11y-base": "24.2.0-alpha11",
+    "@vaadin/button": "24.2.0-alpha11",
+    "@vaadin/component-base": "24.2.0-alpha11",
+    "@vaadin/vaadin-lumo-styles": "24.2.0-alpha11",
+    "@vaadin/vaadin-material-styles": "24.2.0-alpha11",
+    "@vaadin/vaadin-themable-mixin": "24.2.0-alpha11"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/tabs": "24.2.0-alpha1",
-    "@vaadin/testing-helpers": "^0.4.2",
+    "@vaadin/tabs": "24.2.0-alpha11",
+    "@vaadin/testing-helpers": "^0.5.0",
     "sinon": "^13.0.2"
   },
   "web-types": [
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "0dbb118320203ab6c0c07450a3e718815367589f"
+  "gitHead": "a958207d5f6a09ca0e2dcf9f62194b3f92c8766a"
 }

package/src/vaadin-app-layout.js

@@ -5,7 +5,6 @@
  */
 import './safe-area-inset.js';
 import './detect-ios-navbar.js';
-import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js';
 import { afterNextRender, beforeNextRender } from '@polymer/polymer/lib/utils/render-status.js';
 import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
 import { AriaModalController } from '@vaadin/a11y-base/src/aria-modal-controller.js';
@@ -273,11 +272,11 @@ class AppLayout extends ElementMixin(ThemableMixin(ControllerMixin(PolymerElemen
         }
       </style>
       <div part="navbar" id="navbarTop">
-        <slot name="navbar"></slot>
+        <slot name="navbar" on-slotchange="_updateTouchOptimizedMode"></slot>
       </div>
       <div part="backdrop" on-click="_onBackdropClick" on-touchend="_onBackdropTouchend"></div>
-      <div part="drawer" id="drawer" on-keydown="__onDrawerKeyDown">
-        <slot name="drawer" id="drawerSlot"></slot>
+      <div part="drawer" id="drawer">
+        <slot name="drawer" id="drawerSlot" on-slotchange="_updateDrawerSize"></slot>
       </div>
       <div content>
         <slot></slot>
@@ -285,7 +284,9 @@ class AppLayout extends ElementMixin(ThemableMixin(ControllerMixin(PolymerElemen
       <div part="navbar" id="navbarBottom" bottom hidden>
         <slot name="navbar-bottom"></slot>
       </div>
-      <div hidden><slot id="touchSlot" name="navbar touch-optimized"></slot></div>
+      <div hidden>
+        <slot id="touchSlot" name="navbar touch-optimized" on-slotchange="_updateTouchOptimizedMode"></slot>
+      </div>
     `;
   }
 
@@ -399,6 +400,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);
@@ -422,32 +424,25 @@ class AppLayout extends ElementMixin(ThemableMixin(ControllerMixin(PolymerElemen
     beforeNextRender(this, this._afterFirstRender);
 
     this._updateTouchOptimizedMode();
-
-    const navbarSlot = this.$.navbarTop.firstElementChild;
-    this._navbarChildObserver = new FlattenedNodesObserver(navbarSlot, () => {
-      this._updateTouchOptimizedMode();
-    });
-
-    this._touchChildObserver = new FlattenedNodesObserver(this.$.touchSlot, () => {
-      this._updateTouchOptimizedMode();
-    });
-
-    this._drawerChildObserver = new FlattenedNodesObserver(this.$.drawerSlot, () => {
-      this._updateDrawerSize();
-    });
     this._updateDrawerSize();
     this._updateOverlayMode();
 
     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 */
@@ -455,25 +450,34 @@ 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 */
   disconnectedCallback() {
     super.disconnectedCallback();
 
-    if (this._navbarChildObserver) {
-      this._navbarChildObserver.disconnect();
-    }
-    if (this._drawerChildObserver) {
-      this._drawerChildObserver.disconnect();
-    }
-    if (this._touchChildObserver) {
-      this._touchChildObserver.disconnect();
-    }
-
     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/src/vaadin-drawer-toggle.js

@@ -3,7 +3,6 @@
  * Copyright (c) 2018 - 2023 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { Button } from '@vaadin/button/src/vaadin-button.js';
 import { isEmptyTextNode } from '@vaadin/component-base/src/dom-utils.js';
@@ -108,7 +107,9 @@ class DrawerToggle extends Button {
   ready() {
     super.ready();
 
-    this._observer = new FlattenedNodesObserver(this, () => {
+    this._toggleFallbackIcon();
+
+    this.$.slot.addEventListener('slotchange', () => {
       this._toggleFallbackIcon();
     });
   }

package/web-types.json

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