npm - @vaadin/vaadin-app-layout - Versions diffs - 22.0.0-alpha6 → 22.0.0-beta1 - Mend

@vaadin/vaadin-app-layout 22.0.0-alpha6 → 22.0.0-beta1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

package/package.json +23 -31
package/src/vaadin-app-layout.d.ts +9 -165
package/src/vaadin-app-layout.js +4 -622
package/src/vaadin-drawer-toggle.d.ts +13 -17
package/src/vaadin-drawer-toggle.js +4 -81
package/theme/lumo/vaadin-app-layout.js +1 -2
package/theme/lumo/vaadin-drawer-toggle.js +1 -2
package/theme/material/vaadin-app-layout.js +1 -2
package/theme/material/vaadin-drawer-toggle.js +1 -2
package/src/detect-ios-navbar.js +0 -17
package/src/safe-area-inset.js +0 -24
package/theme/lumo/vaadin-app-layout-styles.js +0 -72
package/theme/lumo/vaadin-drawer-toggle-styles.js +0 -32
package/theme/material/vaadin-app-layout-styles.js +0 -60
package/theme/material/vaadin-drawer-toggle-styles.js +0 -51

package/package.json CHANGED Viewed

@@ -1,10 +1,29 @@
 {
   "name": "@vaadin/vaadin-app-layout",
-  "version": "22.0.0-alpha6",
+  "version": "22.0.0-beta1",
+  "publishConfig": {
+    "access": "public"
+  },
   "description": "vaadin-app-layout",
+  "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/vaadin/web-components.git",
+    "directory": "packages/vaadin-app-layout"
+  },
+  "author": "Vaadin Ltd",
+  "homepage": "https://vaadin.com/components",
+  "bugs": {
+    "url": "https://github.com/vaadin/vaadin-app-layout/issues"
+  },
   "main": "vaadin-app-layout.js",
   "module": "vaadin-app-layout.js",
-  "repository": "vaadin/vaadin-app-layout",
+  "files": [
+    "src",
+    "theme",
+    "vaadin-*.d.ts",
+    "vaadin-*.js"
+  ],
   "keywords": [
     "Vaadin",
     "vaadin-app-layout",
@@ -12,35 +31,8 @@
     "web-component",
     "polymer"
   ],
-  "author": "Vaadin Ltd",
-  "license": "Apache-2.0",
-  "bugs": {
-    "url": "https://github.com/vaadin/vaadin-app-layout/issues"
-  },
-  "homepage": "https://vaadin.com/components",
-  "files": [
-    "vaadin-*.d.ts",
-    "vaadin-*.js",
-    "src",
-    "theme"
-  ],
   "dependencies": {
-    "@polymer/iron-resizable-behavior": "^3.0.0",
-    "@polymer/polymer": "^3.0.0",
-    "@vaadin/button": "^22.0.0-alpha6",
-    "@vaadin/vaadin-element-mixin": "^22.0.0-alpha6",
-    "@vaadin/vaadin-lumo-styles": "^22.0.0-alpha6",
-    "@vaadin/vaadin-material-styles": "^22.0.0-alpha6",
-    "@vaadin/vaadin-themable-mixin": "^22.0.0-alpha6"
-  },
-  "devDependencies": {
-    "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/testing-helpers": "^0.3.0",
-    "@vaadin/vaadin-tabs": "^22.0.0-alpha6",
-    "sinon": "^9.2.1"
-  },
-  "publishConfig": {
-    "access": "public"
+    "@vaadin/app-layout": "22.0.0-beta1"
   },
-  "gitHead": "4b136b1c7da8942960e7255f40c27859125b3a45"
+  "gitHead": "4cf8a9d0504994200c610e44b3676114fef49c1e"
 }

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

@@ -1,174 +1,18 @@
-import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-import { ElementMixin } from '@vaadin/vaadin-element-mixin/vaadin-element-mixin.js';
-/**
- * Fired when the `drawerOpened` property changes.
- */
-export type AppLayoutDrawerOpenedChangedEvent = CustomEvent<{ value: boolean }>;
 /**
- * Fired when the `overlay` property changes.
+ * @license
+ * Copyright (c) 2021 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-export type AppLayoutOverlayChangedEvent = CustomEvent<{ value: boolean }>;
+import { AppLayout } from '@vaadin/app-layout/src/vaadin-app-layout.js';
 /**
- * Fired when the `primarySection` property changes.
+ * @deprecated Import `AppLayout` from `@vaadin/app-layout` instead.
  */
-export type AppLayoutPrimarySectionChangedEvent = CustomEvent<{ value: 'navbar' | 'drawer' }>;
-export interface AppLayoutElementEventMap {
-  'drawer-opened-changed': AppLayoutDrawerOpenedChangedEvent;
-  'overlay-changed': AppLayoutOverlayChangedEvent;
-  'primary-section-changed': AppLayoutPrimarySectionChangedEvent;
-}
-export type AppLayoutEventMap = HTMLElementEventMap & AppLayoutElementEventMap;
+export type AppLayoutElement = AppLayout;
 /**
- * `<vaadin-app-layout>` is a Web Component providing a quick and easy way to get a common application layout structure done.
- *
- * ```
- * <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>
- *  <vaadin-tabs orientation="vertical" slot="drawer">
- *    <vaadin-tab>Menu item 1</vaadin-tab>
- *  </vaadin-tabs>
- *  <!-- Everything else will be the page content -->
- *  <div>
- *    <h3>Page title</h3>
- *    <p>Page content</p>
- *  </div>
- * </vaadin-app-layout>
- * ```
- *
- * 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:
- * ```
- * <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
- * ```
- *
- * ### Styling
- *
- * The following Shadow DOM parts of the `<vaadin-app-layout>` are available for styling:
- *
- * Part name     | Description
- * --------------|---------------------------------------------------------|
- * `navbar`      | Container for the navigation bar
- * `drawer`      | Container for the drawer area
- * `content`     | Container for page content.
- *
- * See [Styling Components](https://vaadin.com/docs/latest/ds/customization/styling-components) documentation.
- *
- * ### Component's slots
- *
- * The following slots are available to be set
- *
- * Slot name          | Description
- * -------------------|---------------------------------------------------|
- * no name            | Default container for the page content
- * `navbar `          | Container for the top navbar area
- * `drawer`           | Container for an application menu
- * `touch-optimized`  | Container for the bottom navbar area (only visible for mobile devices)
- *
- * #### Touch optimized
- *
- * App Layout has a pseudo-slot `touch-optimized` in order to give more control of the presentation of
- * elements with `slot[navbar]`. Internally, when the user is interacting with App Layout from a
- * touchscreen device, the component will search for elements with `slot[navbar touch-optimized]` and move
- * them to the bottom of the page.
- *
- * ### Navigation
- *
- * As the drawer opens as an overlay in small devices, it makes sense to close it once a navigation happens.
- * If you are using Vaadin Router, this will happen automatically unless you change the `closeDrawerOn` event name.
- *
- * In order to do so, there are two options:
- * - If the `vaadin-app-layout` instance is available, then `drawerOpened` can be set to `false`
- * - If not, a custom event `close-overlay-drawer` can be dispatched either by calling
- *  `window.dispatchEvent(new CustomEvent('close-overlay-drawer'))` or by calling
- *  `AppLayoutElement.dispatchCloseOverlayDrawerEvent()`
- *
- * ### Scrolling areas
- *
- * By default, the component will act with the "body scrolling", so on mobile (iOS Safari and Android Chrome),
- * the toolbars will collapse when a scroll happens.
- *
- * To use the "content scrolling", in case of the content of the page relies on a pre-defined height (for instance,
- * it has a `height:100%`), then the developer can set `height: 100%` to both `html` and `body`.
- * That will make the `[content]` element of app layout scrollable.
- * On this case, the toolbars on mobile device won't collapse.
- *
- * @fires {CustomEvent} drawer-opened-changed - Fired when the `drawerOpened` property changes.
- * @fires {CustomEvent} overlay-changed - Fired when the `overlay` property changes.
- * @fires {CustomEvent} primary-section-changed - Fired when the `primarySection` property changes.
+ * @deprecated Import `AppLayout` from `@vaadin/app-layout` instead.
  */
-declare class AppLayoutElement extends ElementMixin(ThemableMixin(HTMLElement)) {
-  /**
-   * Defines whether navbar or drawer will come first visually.
-   * - By default (`primary-section="navbar"`), the navbar takes the full available width and moves the drawer down.
-   * - If `primary-section="drawer"` is set, then the drawer will move the navbar, taking the full available height.
-   * @attr {navbar|drawer} primary-section
-   */
-  primarySection: 'navbar' | 'drawer';
-  /**
-   * Controls whether the drawer is opened (visible) or not.
-   * Its default value depends on the viewport:
-   * - `true`, for desktop size views
-   * - `false`, for mobile size views
-   * @attr {boolean} drawer-opened
-   */
-  drawerOpened: boolean;
-  /**
-   * Drawer is an overlay on top of the content
-   * Controlled via CSS using `--vaadin-app-layout-drawer-overlay: true|false`;
-   */
-  readonly overlay: boolean;
-  /**
-   * A global event that causes the drawer to close (be hidden) when it is in overlay mode.
-   * - The default is `vaadin-router-location-changed` dispatched by Vaadin Router
-   *
-   * @attr {string} close-drawer-on
-   */
-  closeDrawerOn: string;
-  /**
-   * Helper static method that dispatches a `close-overlay-drawer` event
-   */
-  static dispatchCloseOverlayDrawerEvent(): void;
-  addEventListener<K extends keyof AppLayoutEventMap>(
-    type: K,
-    listener: (this: AppLayoutElement, ev: AppLayoutEventMap[K]) => void,
-    options?: boolean | AddEventListenerOptions
-  ): void;
-  removeEventListener<K extends keyof AppLayoutEventMap>(
-    type: K,
-    listener: (this: AppLayoutElement, ev: AppLayoutEventMap[K]) => void,
-    options?: boolean | EventListenerOptions
-  ): void;
-}
-declare global {
-  interface HTMLElementTagNameMap {
-    'vaadin-app-layout': AppLayoutElement;
-  }
-}
+export const AppLayoutElement: typeof AppLayout;
-export { AppLayoutElement };
+export * from '@vaadin/app-layout/src/vaadin-app-layout.js';

package/src/vaadin-app-layout.js CHANGED Viewed

@@ -3,629 +3,11 @@
  * Copyright (c) 2021 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { PolymerElement, html } from '@polymer/polymer/polymer-element.js';
-import { beforeNextRender, afterNextRender } from '@polymer/polymer/lib/utils/render-status.js';
-import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js';
-import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-import { ElementMixin } from '@vaadin/vaadin-element-mixin/vaadin-element-mixin.js';
-import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js';
-import { IronResizableBehavior } from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js';
-import './safe-area-inset.js';
-import './detect-ios-navbar.js';
+import { AppLayout } from '@vaadin/app-layout/src/vaadin-app-layout.js';
 /**
- * `<vaadin-app-layout>` is a Web Component providing a quick and easy way to get a common application layout structure done.
- *
- * ```
- * <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>
- *  <vaadin-tabs orientation="vertical" slot="drawer">
- *    <vaadin-tab>Menu item 1</vaadin-tab>
- *  </vaadin-tabs>
- *  <!-- Everything else will be the page content -->
- *  <div>
- *    <h3>Page title</h3>
- *    <p>Page content</p>
- *  </div>
- * </vaadin-app-layout>
- * ```
- *
- * 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:
- * ```
- * <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
- * ```
- *
- * ### Styling
- *
- * The following Shadow DOM parts of the `<vaadin-app-layout>` are available for styling:
- *
- * Part name     | Description
- * --------------|---------------------------------------------------------|
- * `navbar`      | Container for the navigation bar
- * `drawer`      | Container for the drawer area
- * `content`     | Container for page content.
- *
- * See [Styling Components](https://vaadin.com/docs/latest/ds/customization/styling-components) documentation.
- *
- * ### Component's slots
- *
- * The following slots are available to be set
- *
- * Slot name          | Description
- * -------------------|---------------------------------------------------|
- * no name            | Default container for the page content
- * `navbar `          | Container for the top navbar area
- * `drawer`           | Container for an application menu
- * `touch-optimized`  | Container for the bottom navbar area (only visible for mobile devices)
- *
- * #### Touch optimized
- *
- * App Layout has a pseudo-slot `touch-optimized` in order to give more control of the presentation of
- * elements with `slot[navbar]`. Internally, when the user is interacting with App Layout from a
- * touchscreen device, the component will search for elements with `slot[navbar touch-optimized]` and move
- * them to the bottom of the page.
- *
- * ### Navigation
- *
- * As the drawer opens as an overlay in small devices, it makes sense to close it once a navigation happens.
- * If you are using Vaadin Router, this will happen automatically unless you change the `closeDrawerOn` event name.
- *
- * In order to do so, there are two options:
- * - If the `vaadin-app-layout` instance is available, then `drawerOpened` can be set to `false`
- * - If not, a custom event `close-overlay-drawer` can be dispatched either by calling
- *  `window.dispatchEvent(new CustomEvent('close-overlay-drawer'))` or by calling
- *  `AppLayoutElement.dispatchCloseOverlayDrawerEvent()`
- *
- * ### Scrolling areas
- *
- * By default, the component will act with the "body scrolling", so on mobile (iOS Safari and Android Chrome),
- * the toolbars will collapse when a scroll happens.
- *
- * To use the "content scrolling", in case of the content of the page relies on a pre-defined height (for instance,
- * it has a `height:100%`), then the developer can set `height: 100%` to both `html` and `body`.
- * That will make the `[content]` element of app layout scrollable.
- * On this case, the toolbars on mobile device won't collapse.
- *
- * @fires {CustomEvent} drawer-opened-changed - Fired when the `drawerOpened` property changes.
- * @fires {CustomEvent} overlay-changed - Fired when the `overlay` property changes.
- * @fires {CustomEvent} primary-section-changed - Fired when the `primarySection` property changes.
- *
- * @extends HTMLElement
- * @mixes ElementMixin
- * @mixes ThemableMixin
+ * @deprecated Import `AppLayout` from `@vaadin/app-layout` instead.
  */
-class AppLayoutElement extends ElementMixin(ThemableMixin(mixinBehaviors([IronResizableBehavior], PolymerElement))) {
-  static get template() {
-    return html`
-      <style>
-        :host {
-          display: block;
-          box-sizing: border-box;
-          height: 100%;
-          --vaadin-app-layout-transition: 200ms;
-          transition: padding var(--vaadin-app-layout-transition);
-          --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);
-          padding-top: var(--vaadin-app-layout-navbar-offset-top);
-          padding-bottom: var(--vaadin-app-layout-navbar-offset-bottom);
-          padding-left: var(--vaadin-app-layout-navbar-offset-left);
-        }
+export const AppLayoutElement = AppLayout;
-        :host([dir='rtl']) {
-          padding-left: 0;
-          padding-right: var(--vaadin-app-layout-navbar-offset-left);
-        }
-        :host([hidden]),
-        [hidden] {
-          display: none !important;
-        }
-        :host([no-anim]) {
-          --vaadin-app-layout-transition: none !important;
-        }
-        :host([drawer-opened]) {
-          --vaadin-app-layout-drawer-offset-left: var(--_vaadin-app-layout-drawer-offset-size);
-        }
-        :host([overlay]) {
-          --vaadin-app-layout-drawer-offset-left: 0;
-          --vaadin-app-layout-navbar-offset-left: 0;
-        }
-        :host(:not([no-scroll])) [content] {
-          overflow: auto;
-          -webkit-overflow-scrolling: touch;
-        }
-        [content] {
-          height: 100%;
-        }
-        @media (pointer: coarse) and (max-width: 800px) and (min-height: 500px) {
-          :host {
-            --vaadin-app-layout-touch-optimized: true;
-          }
-        }
-        [part='navbar'],
-        [part='navbar']::before {
-          position: fixed;
-          display: flex;
-          align-items: center;
-          top: 0;
-          right: 0;
-          left: 0;
-          transition: left 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);
-          z-index: 1;
-        }
-        :host(:not([dir='rtl'])[primary-section='drawer'][drawer-opened]:not([overlay])) [part='navbar'] {
-          left: var(--vaadin-app-layout-drawer-offset-left, 0);
-        }
-        :host([dir='rtl'][primary-section='drawer'][drawer-opened]:not([overlay])) [part='navbar'] {
-          right: var(--vaadin-app-layout-drawer-offset-left, 0);
-        }
-        :host([primary-section='drawer']) [part='drawer'] {
-          top: 0;
-        }
-        [part='navbar'][bottom] {
-          top: auto;
-          bottom: 0;
-          padding-bottom: var(--safe-area-inset-bottom);
-        }
-        [part='drawer'] {
-          overflow: auto;
-          position: fixed;
-          top: var(--vaadin-app-layout-navbar-offset-top, 0);
-          right: auto;
-          bottom: var(--vaadin-app-layout-navbar-offset-bottom, var(--vaadin-viewport-offset-bottom, 0));
-          left: var(--vaadin-app-layout-navbar-offset-left, 0);
-          transition: transform var(--vaadin-app-layout-transition);
-          transform: translateX(-100%);
-          max-width: 90%;
-          width: 16em;
-          box-sizing: border-box;
-          padding: var(--safe-area-inset-top) 0 var(--safe-area-inset-bottom) var(--safe-area-inset-left);
-          outline: none;
-        }
-        :host([drawer-opened]) [part='drawer'] {
-          transform: translateX(0%);
-          touch-action: manipulation;
-        }
-        [part='backdrop'] {
-          background-color: #000;
-          opacity: 0.3;
-        }
-        :host(:not([drawer-opened])) [part='backdrop'] {
-          opacity: 0;
-        }
-        :host([overlay]) [part='backdrop'] {
-          position: fixed;
-          top: 0;
-          right: 0;
-          bottom: 0;
-          left: 0;
-          pointer-events: none;
-          transition: opacity var(--vaadin-app-layout-transition);
-          -webkit-tap-highlight-color: transparent;
-        }
-        :host([overlay]) [part='drawer'] {
-          top: 0;
-          bottom: 0;
-        }
-        :host([overlay]) [part='drawer'],
-        :host([overlay]) [part='backdrop'] {
-          z-index: 2;
-        }
-        :host([drawer-opened][overlay]) [part='backdrop'] {
-          pointer-events: auto;
-          touch-action: manipulation;
-        }
-        :host([dir='rtl']) [part='drawer'] {
-          left: auto;
-          right: var(--vaadin-app-layout-navbar-offset-start, 0);
-          transform: translateX(100%);
-        }
-        :host([dir='rtl']) [part='navbar'],
-        :host([dir='rtl']) [part='navbar']::before {
-          transition: right var(--vaadin-app-layout-transition);
-        }
-        :host([dir='rtl'][drawer-opened]) [part='drawer'] {
-          transform: translateX(0%);
-        }
-        :host(:not([dir='rtl'])[drawer-opened]:not([overlay])) {
-          padding-left: var(--vaadin-app-layout-drawer-offset-left);
-        }
-        :host([dir='rtl'][drawer-opened]:not([overlay])) {
-          padding-right: var(--vaadin-app-layout-drawer-offset-left);
-        }
-        @media (max-width: 800px), (max-height: 600px) {
-          :host {
-            --vaadin-app-layout-drawer-overlay: true;
-          }
-          [part='drawer'] {
-            width: 20em;
-          }
-        }
-      </style>
-      <div part="navbar" id="navbarTop">
-        <slot name="navbar"></slot>
-      </div>
-      <div part="backdrop" on-click="_close" on-touchstart="_close"></div>
-      <div part="drawer" id="drawer">
-        <slot name="drawer" id="drawerSlot"></slot>
-      </div>
-      <div content>
-        <slot></slot>
-      </div>
-      <div part="navbar" id="navbarBottom" bottom hidden>
-        <slot name="navbar-bottom"></slot>
-      </div>
-      <div hidden><slot id="touchSlot" name="navbar touch-optimized"></slot></div>
-    `;
-  }
-  static get is() {
-    return 'vaadin-app-layout';
-  }
-  static get properties() {
-    return {
-      /**
-       * Defines whether navbar or drawer will come first visually.
-       * - By default (`primary-section="navbar"`), the navbar takes the full available width and moves the drawer down.
-       * - If `primary-section="drawer"` is set, then the drawer will move the navbar, taking the full available height.
-       * @attr {navbar|drawer} primary-section
-       * @type {!PrimarySection}
-       */
-      primarySection: {
-        type: String,
-        value: 'navbar',
-        notify: true,
-        reflectToAttribute: true,
-        observer: '_primarySectionObserver'
-      },
-      /**
-       * Controls whether the drawer is opened (visible) or not.
-       * Its default value depends on the viewport:
-       * - `true`, for desktop size views
-       * - `false`, for mobile size views
-       * @attr {boolean} drawer-opened
-       * @type {boolean}
-       */
-      drawerOpened: {
-        type: Boolean,
-        notify: true,
-        value: true,
-        reflectToAttribute: true,
-        observer: '_drawerOpenedObserver'
-      },
-      /**
-       * Drawer is an overlay on top of the content
-       * Controlled via CSS using `--vaadin-app-layout-drawer-overlay: true|false`;
-       * @type {boolean}
-       */
-      overlay: {
-        type: Boolean,
-        notify: true,
-        readOnly: true,
-        value: false,
-        reflectToAttribute: true
-      },
-      /**
-       * A global event that causes the drawer to close (be hidden) when it is in overlay mode.
-       * - The default is `vaadin-router-location-changed` dispatched by Vaadin Router
-       *
-       * @attr {string} close-drawer-on
-       * @type {string}
-       */
-      closeDrawerOn: {
-        type: String,
-        value: 'vaadin-router-location-changed',
-        observer: '_closeDrawerOnChanged'
-      }
-    };
-  }
-  constructor() {
-    super();
-    // TODO(jouni): might want to debounce
-    this.__boundResizeListener = this._resize.bind(this);
-    this.__drawerToggleClickListener = this._drawerToggleClick.bind(this);
-    this.__closeOverlayDrawerListener = this.__closeOverlayDrawer.bind(this);
-  }
-  /** @protected */
-  connectedCallback() {
-    super.connectedCallback();
-    this._blockAnimationUntilAfterNextRender();
-    window.addEventListener('resize', this.__boundResizeListener);
-    this.addEventListener('drawer-toggle-click', this.__drawerToggleClickListener);
-    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();
-    window.addEventListener('close-overlay-drawer', this.__closeOverlayDrawerListener);
-  }
-  /** @protected */
-  disconnectedCallback() {
-    super.disconnectedCallback();
-    this._navbarChildObserver && this._navbarChildObserver.disconnect();
-    this._drawerChildObserver && this._drawerChildObserver.disconnect();
-    this._touchChildObserver && this._touchChildObserver.disconnect();
-    window.removeEventListener('resize', this.__boundResizeListener);
-    this.removeEventListener('drawer-toggle-click', this.__drawerToggleClickListener);
-    window.removeEventListener('close-overlay-drawer', this.__drawerToggleClickListener);
-  }
-  /**
-   * Helper static method that dispatches a `close-overlay-drawer` event
-   */
-  static dispatchCloseOverlayDrawerEvent() {
-    window.dispatchEvent(new CustomEvent('close-overlay-drawer'));
-  }
-  /** @private */
-  _primarySectionObserver(value) {
-    const isValid = ['navbar', 'drawer'].indexOf(value) !== -1;
-    if (!isValid) {
-      this.set('primarySection', 'navbar');
-    }
-  }
-  /** @private */
-  _drawerOpenedObserver() {
-    const drawer = this.$.drawer;
-    drawer.removeAttribute('tabindex');
-    if (this.overlay) {
-      if (this.drawerOpened) {
-        drawer.setAttribute('tabindex', 0);
-        drawer.focus();
-        this._updateDrawerHeight();
-      }
-    }
-    this.notifyResize();
-  }
-  /** @protected */
-  _afterFirstRender() {
-    this._blockAnimationUntilAfterNextRender();
-    this._updateOffsetSize();
-  }
-  /** @private */
-  _drawerToggleClick(e) {
-    e.stopPropagation();
-    this.drawerOpened = !this.drawerOpened;
-  }
-  /** @private */
-  __closeOverlayDrawer() {
-    if (this.overlay) {
-      this.drawerOpened = false;
-    }
-  }
-  /** @protected */
-  _updateDrawerSize() {
-    const childCount = this.querySelectorAll('[slot=drawer]').length;
-    const drawer = this.$.drawer;
-    if (childCount === 0) {
-      drawer.setAttribute('hidden', '');
-    } else {
-      drawer.removeAttribute('hidden');
-    }
-    this._updateOffsetSize();
-  }
-  /** @private */
-  _resize() {
-    this._blockAnimationUntilAfterNextRender();
-    this._updateTouchOptimizedMode();
-    this._updateOverlayMode();
-  }
-  /** @protected */
-  _updateOffsetSize() {
-    const navbar = this.$.navbarTop;
-    const navbarRect = navbar.getBoundingClientRect();
-    const navbarBottom = this.$.navbarBottom;
-    const navbarBottomRect = navbarBottom.getBoundingClientRect();
-    this.style.setProperty('--_vaadin-app-layout-navbar-offset-size', navbarRect.height + 'px');
-    this.style.setProperty('--_vaadin-app-layout-navbar-offset-size-bottom', navbarBottomRect.height + 'px');
-    const drawer = this.$.drawer;
-    const drawerRect = drawer.getBoundingClientRect();
-    this.style.setProperty('--_vaadin-app-layout-drawer-offset-size', drawerRect.width + 'px');
-    this.notifyResize();
-  }
-  /** @protected */
-  _updateDrawerHeight() {
-    const { scrollHeight, offsetHeight } = this.$.drawer;
-    const height = scrollHeight > offsetHeight ? `${scrollHeight}px` : '100%';
-    this.style.setProperty('--_vaadin-app-layout-drawer-scroll-size', height);
-  }
-  /** @protected */
-  _updateOverlayMode() {
-    const overlay = this._getCustomPropertyValue('--vaadin-app-layout-drawer-overlay') == 'true';
-    const drawer = this.$.drawer;
-    if (!this.overlay && overlay) {
-      // Changed from not overlay to overlay
-      this._drawerStateSaved = this.drawerOpened;
-      this.drawerOpened = false;
-    }
-    this._setOverlay(overlay);
-    if (this.overlay) {
-      drawer.setAttribute('role', 'dialog');
-      drawer.setAttribute('aria-modal', 'true');
-      drawer.setAttribute('aria-label', 'drawer');
-    } else {
-      if (this._drawerStateSaved) {
-        this.drawerOpened = this._drawerStateSaved;
-        this._drawerStateSaved = null;
-      }
-      drawer.removeAttribute('role');
-      drawer.removeAttribute('aria-modal');
-      drawer.removeAttribute('aria-label');
-    }
-    this._updateDrawerHeight();
-    if (this.overlay !== overlay) {
-      this.notifyResize();
-    }
-    // TODO(jouni): ARIA attributes. The drawer should act similar to a modal dialog when in ”overlay” mode
-  }
-  /** @private */
-  _closeDrawerOnChanged(closeDrawerOn, oldCloseDrawerOn) {
-    if (oldCloseDrawerOn) {
-      window.removeEventListener(oldCloseDrawerOn, this.__closeOverlayDrawerListener);
-    }
-    if (closeDrawerOn) {
-      window.addEventListener(closeDrawerOn, this.__closeOverlayDrawerListener);
-    }
-  }
-  /** @protected */
-  _close() {
-    this.drawerOpened = false;
-  }
-  /** @private */
-  _getCustomPropertyValue(customProperty) {
-    const customPropertyValue = getComputedStyle(this).getPropertyValue(customProperty);
-    return (customPropertyValue || '').trim().toLowerCase();
-  }
-  /** @protected */
-  _updateTouchOptimizedMode() {
-    const touchOptimized = this._getCustomPropertyValue('--vaadin-app-layout-touch-optimized') == 'true';
-    const navbarItems = this.querySelectorAll('[slot*="navbar"]');
-    if (navbarItems.length > 0) {
-      Array.from(navbarItems).forEach((navbar) => {
-        if (navbar.getAttribute('slot').indexOf('touch-optimized') > -1) {
-          navbar.__touchOptimized = true;
-        }
-        if (touchOptimized && navbar.__touchOptimized) {
-          navbar.setAttribute('slot', 'navbar-bottom');
-        } else {
-          navbar.setAttribute('slot', 'navbar');
-        }
-      });
-    }
-    if (this.$.navbarTop.querySelector('[name=navbar]').assignedNodes().length === 0) {
-      this.$.navbarTop.setAttribute('hidden', '');
-    } else {
-      this.$.navbarTop.removeAttribute('hidden');
-    }
-    if (touchOptimized) {
-      this.$.navbarBottom.removeAttribute('hidden');
-    } else {
-      this.$.navbarBottom.setAttribute('hidden', '');
-    }
-    this._updateOffsetSize();
-  }
-  /** @protected */
-  _blockAnimationUntilAfterNextRender() {
-    this.setAttribute('no-anim', '');
-    afterNextRender(this, () => {
-      this.removeAttribute('no-anim');
-    });
-  }
-  /**
-   * App Layout listens to `close-overlay-drawer` on the window level.
-   * A custom event can be dispatched and the App Layout will close the drawer in overlay.
-   *
-   * That can be used, for instance, when a navigation occurs when user clicks in a menu item inside the drawer.
-   *
-   * See `dispatchCloseOverlayDrawerEvent()` helper method.
-   *
-   * @event close-overlay-drawer
-   */
-}
-customElements.define(AppLayoutElement.is, AppLayoutElement);
-export { AppLayoutElement };
+export * from '@vaadin/app-layout/src/vaadin-app-layout.js';

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

@@ -1,22 +1,18 @@
-import { Button } from '@vaadin/button/src/vaadin-button.js';
+/**
+ * @license
+ * Copyright (c) 2021 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import { DrawerToggle } from '@vaadin/app-layout/src/vaadin-drawer-toggle.js';
 /**
- * The Drawer Toggle component controls the drawer in App Layout component.
- *
- * ```
- * <vaadin-app-layout>
- *   <vaadin-drawer-toggle slot="navbar">Toggle drawer</vaadin-drawer-toggle>
- * </vaadin-app-layout>
- * ```
+ * @deprecated Import `DrawerToggle` from `@vaadin/app-layout/vaadin-drawer-toggle` instead.
  */
-declare class DrawerToggleElement extends Button {
-  ariaLabel: string | null | undefined;
-}
+export type DrawerToggleElement = DrawerToggle;
-declare global {
-  interface HTMLElementTagNameMap {
-    'vaadin-drawer-toggle': DrawerToggleElement;
-  }
-}
+/**
+ * @deprecated Import `DrawerToggle` from `@vaadin/app-layout/vaadin-drawer-toggle` instead.
+ */
+export const DrawerToggleElement: typeof DrawerToggle;
-export { DrawerToggleElement };
+export * from '@vaadin/app-layout/src/vaadin-drawer-toggle.js';

package/src/vaadin-drawer-toggle.js CHANGED Viewed

@@ -3,88 +3,11 @@
  * Copyright (c) 2021 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { html } from '@polymer/polymer/lib/utils/html-tag.js';
-import { Button } from '@vaadin/button/src/vaadin-button.js';
+import { DrawerToggle } from '@vaadin/app-layout/src/vaadin-drawer-toggle.js';
 /**
- * The Drawer Toggle component controls the drawer in App Layout component.
- *
- * ```
- * <vaadin-app-layout>
- *   <vaadin-drawer-toggle slot="navbar">Toggle drawer</vaadin-drawer-toggle>
- * </vaadin-app-layout>
- * ```
- *
- * @extends Button
+ * @deprecated Import `DrawerToggle` from `@vaadin/app-layout/vaadin-drawer-toggle` instead.
  */
-class DrawerToggleElement extends Button {
-  static get template() {
-    return html`
-      <style>
-        :host {
-          display: inline-flex;
-          align-items: center;
-          justify-content: center;
-          cursor: default;
-          position: relative;
-          outline: none;
-          height: 24px;
-          width: 24px;
-          padding: 4px;
-        }
+export const DrawerToggleElement = DrawerToggle;
-        [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;
-        }
-      </style>
-      <slot>
-        <div part="icon"></div>
-      </slot>
-    `;
-  }
-  static get is() {
-    return 'vaadin-drawer-toggle';
-  }
-  static get properties() {
-    return {
-      ariaLabel: {
-        type: String,
-        value: 'Toggle',
-        reflectToAttribute: true
-      }
-    };
-  }
-  constructor() {
-    super();
-    this.addEventListener('click', () => {
-      this.dispatchEvent(new CustomEvent('drawer-toggle-click', { bubbles: true, composed: true }));
-    });
-  }
-}
-customElements.define(DrawerToggleElement.is, DrawerToggleElement);
-export { DrawerToggleElement };
+export * from '@vaadin/app-layout/src/vaadin-drawer-toggle.js';

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

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

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

@@ -1,2 +1 @@
-import './vaadin-drawer-toggle-styles.js';
-import '../../src/vaadin-drawer-toggle.js';
+import '@vaadin/app-layout/theme/lumo/vaadin-drawer-toggle.js';

package/theme/material/vaadin-app-layout.js CHANGED Viewed

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

package/theme/material/vaadin-drawer-toggle.js CHANGED Viewed

@@ -1,2 +1 @@
-import './vaadin-drawer-toggle-styles.js';
-import '../../src/vaadin-drawer-toggle.js';
+import '@vaadin/app-layout/theme/material/vaadin-drawer-toggle.js';

package/src/detect-ios-navbar.js DELETED Viewed

@@ -1,17 +0,0 @@
-export const _detectIosNavbar = function () {
-  /* c8 ignore next 11 */
-  if (window.navigator.userAgent.match(/iPhone|iPad/i)) {
-    const innerHeight = window.innerHeight;
-    const innerWidth = window.innerWidth;
-    const landscape = innerWidth > innerHeight;
-    const clientHeight = document.documentElement.clientHeight;
-    if (landscape && clientHeight > innerHeight) {
-      document.documentElement.style.setProperty('--vaadin-viewport-offset-bottom', clientHeight - innerHeight + 'px');
-    } else {
-      document.documentElement.style.setProperty('--vaadin-viewport-offset-bottom', '');
-    }
-  }
-};
-_detectIosNavbar();
-window.addEventListener('resize', _detectIosNavbar);

package/src/safe-area-inset.js DELETED Viewed

@@ -1,24 +0,0 @@
-const $_documentContainer = document.createElement('template');
-$_documentContainer.innerHTML = `
-  <style>
-    /* Use units so that the values can be used in calc() */
-    html {
-      --safe-area-inset-top: constant(safe-area-inset-top, 0px);
-      --safe-area-inset-right: constant(safe-area-inset-right, 0px);
-      --safe-area-inset-bottom: constant(safe-area-inset-bottom, 0px);
-      --safe-area-inset-left: constant(safe-area-inset-left, 0px);
-    }
-    @supports (padding-left: env(safe-area-inset-left)) {
-      html {
-        --safe-area-inset-top: env(safe-area-inset-top, 0px);
-        --safe-area-inset-right: env(safe-area-inset-right, 0px);
-        --safe-area-inset-bottom: env(safe-area-inset-bottom, 0px);
-        --safe-area-inset-left: env(safe-area-inset-left, 0px);
-      }
-    }
-  </style>
-`;
-document.head.appendChild($_documentContainer.content);

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

@@ -1,72 +0,0 @@
-import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js';
-import '@vaadin/vaadin-lumo-styles/color.js';
-import '@vaadin/vaadin-lumo-styles/spacing.js';
-import '@vaadin/vaadin-lumo-styles/typography.js';
-registerStyles(
-  'vaadin-app-layout',
-  css`
-    [part='navbar']::before {
-      background: var(--lumo-base-color) linear-gradient(var(--lumo-contrast-5pct), var(--lumo-contrast-5pct));
-    }
-    :host(:not([dir='rtl']):not([overlay])) [part='drawer'] {
-      border-right: 1px solid var(--lumo-contrast-10pct);
-    }
-    :host([dir='rtl']:not([overlay])) [part='drawer'] {
-      border-left: 1px solid var(--lumo-contrast-10pct);
-    }
-    :host([overlay]) [part='drawer']::before {
-      background: var(--lumo-base-color);
-    }
-    [part='navbar']::before,
-    :host([overlay]) [part='drawer']::before {
-      position: absolute;
-      content: '';
-      width: 100%;
-      height: 100%;
-      z-index: -1;
-    }
-    :host([overlay]) [part='drawer']::before {
-      background: var(--lumo-base-color);
-      height: var(--_vaadin-app-layout-drawer-scroll-size, 100%);
-    }
-    [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;
-    }
-    @supports (-webkit-backdrop-filter: blur(1px)) or (backdrop-filter: blur(1px)) {
-      [part='navbar']::before {
-        opacity: 0.8;
-      }
-      [part='navbar'] {
-        -webkit-backdrop-filter: blur(24px);
-        backdrop-filter: blur(24px);
-      }
-      :host([overlay]) [part='drawer']::before {
-        opacity: 0.9;
-      }
-      :host([overlay]) [part='drawer'] {
-        -webkit-backdrop-filter: blur(24px);
-        backdrop-filter: blur(24px);
-      }
-    }
-  `,
-  { moduleId: 'lumo-app-layout' }
-);

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

@@ -1,32 +0,0 @@
-import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js';
-import { button } from '@vaadin/button/theme/lumo/vaadin-button-styles.js';
-import '@vaadin/vaadin-lumo-styles/font-icons.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);
-  }
-`;
-registerStyles('vaadin-drawer-toggle', [button, drawerToggle], { moduleId: 'lumo-drawer-toggle' });

package/theme/material/vaadin-app-layout-styles.js DELETED Viewed

@@ -1,60 +0,0 @@
-import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js';
-import '@vaadin/vaadin-material-styles/color.js';
-import '@vaadin/vaadin-material-styles/shadow.js';
-import '@vaadin/vaadin-material-styles/typography.js';
-registerStyles(
-  'vaadin-app-layout',
-  css`
-    :host {
-      background-color: var(--material-background-color);
-    }
-    [part='navbar'] {
-      padding: 0.25em 0.5em;
-      background: var(--vaadin-app-layout-navbar-background, var(--material-secondary-background-color));
-      box-shadow: var(--material-shadow-elevation-8dp);
-    }
-    [part='drawer'] {
-      background: var(--material-background-color);
-    }
-    :host(:not([dir='rtl'])) [part='drawer'] {
-      border-right: 1px solid var(--material-secondary-background-color);
-    }
-    :host([dir='rtl']) [part='drawer'] {
-      border-left: 1px solid var(--material-secondary-background-color);
-    }
-    :host([primary-section='drawer']) [part='drawer'] {
-      z-index: 1;
-    }
-    :host([primary-section='navbar']:not([overlay])) [part='navbar'] {
-      z-index: 1;
-    }
-    [part] ::slotted(h2),
-    [part] ::slotted(h3),
-    [part] ::slotted(h4) {
-      line-height: 2.5rem;
-      margin-top: 0.25rem !important;
-      margin-bottom: 0.25rem !important;
-    }
-    [part='navbar'][bottom] {
-      padding: 0 1em;
-      box-shadow: var(--material-shadow-elevation-4dp);
-    }
-    @media (min-width: 700px) {
-      [part='navbar'] {
-        padding: 0.5em 0.75em;
-        box-shadow: var(--material-shadow-elevation-4dp);
-      }
-    }
-  `,
-  { moduleId: 'material-app-layout' }
-);

package/theme/material/vaadin-drawer-toggle-styles.js DELETED Viewed

@@ -1,51 +0,0 @@
-import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js';
-import { button } from '@vaadin/button/theme/material/vaadin-button-styles.js';
-import '@vaadin/vaadin-material-styles/color.js';
-const drawerToggle = css`
-  :host {
-    min-width: 0 !important;
-    width: 48px;
-    height: 48px;
-    padding: 0;
-    border-radius: 50%;
-  }
-  :host(:not([dir='rtl'])) {
-    margin-right: 1em;
-  }
-  :host([dir='rtl']) {
-    margin-left: 1em;
-  }
-  [part='icon'],
-  [part='icon']::after,
-  [part='icon']::before {
-    background-color: currentColor;
-  }
-  [part='icon'] {
-    top: 18px;
-    left: 15px;
-  }
-  [part='icon'],
-  [part='icon']::after,
-  [part='icon']::before {
-    height: 2px;
-    width: 18px;
-  }
-  [part='icon']::after {
-    top: 5px;
-  }
-  [part='icon']::before {
-    top: 10px;
-  }
-`;
-registerStyles('vaadin-drawer-toggle', [button, drawerToggle], {
-  moduleId: 'material-drawer-toggle'
-});