@vaadin/dialog 23.1.0-alpha1 → 23.1.0-alpha2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/dialog",
-  "version": "23.1.0-alpha1",
+  "version": "23.1.0-alpha2",
   "publishConfig": {
     "access": "public"
   },
@@ -35,18 +35,18 @@
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/component-base": "23.1.0-alpha1",
-    "@vaadin/vaadin-lumo-styles": "23.1.0-alpha1",
-    "@vaadin/vaadin-material-styles": "23.1.0-alpha1",
-    "@vaadin/vaadin-overlay": "23.1.0-alpha1",
-    "@vaadin/vaadin-themable-mixin": "23.1.0-alpha1"
+    "@vaadin/component-base": "23.1.0-alpha2",
+    "@vaadin/vaadin-lumo-styles": "23.1.0-alpha2",
+    "@vaadin/vaadin-material-styles": "23.1.0-alpha2",
+    "@vaadin/vaadin-overlay": "23.1.0-alpha2",
+    "@vaadin/vaadin-themable-mixin": "23.1.0-alpha2"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/polymer-legacy-adapter": "23.1.0-alpha1",
+    "@vaadin/polymer-legacy-adapter": "23.1.0-alpha2",
     "@vaadin/testing-helpers": "^0.3.2",
-    "@vaadin/text-area": "23.1.0-alpha1",
+    "@vaadin/text-area": "23.1.0-alpha2",
     "sinon": "^9.2.1"
   },
-  "gitHead": "5d0cdee069f866037c507265fafb4d0476795333"
+  "gitHead": "6842dcb8b163d4512fae8d3d12a6559077a4aee6"
 }

package/src/vaadin-dialog-resizable-mixin.js

@@ -24,6 +24,7 @@ registerStyles(
     .resizer-container {
       overflow: auto;
       flex-grow: 1;
+      border-radius: inherit; /* prevent child elements being drawn outside part=overlay */
     }
 
     [part='overlay'][style] .resizer-container {
@@ -35,6 +36,12 @@ registerStyles(
       display: none;
     }
 
+    :host([resizable]) [part='title'] {
+      cursor: move;
+      -webkit-user-select: none;
+      user-select: none;
+    }
+
     .resizer {
       position: absolute;
       height: 16px;

package/src/vaadin-dialog.d.ts

@@ -110,6 +110,7 @@ export type DialogEventMap = HTMLElementEventMap & DialogCustomEventMap;
  * `has-title`      | Set when the element has a title
  * `has-header`     | Set when the element has header renderer
  * `has-footer`     | Set when the element has footer renderer
+ * `overflow`       | Set to `top`, `bottom`, none or both
  *
  * Note: the `theme` attribute value set on `<vaadin-dialog>` is
  * propagated to the internal `<vaadin-dialog-overlay>` component.

package/src/vaadin-dialog.js

@@ -15,9 +15,24 @@ import { DialogResizableMixin } from './vaadin-dialog-resizable-mixin.js';
 registerStyles(
   'vaadin-dialog-overlay',
   css`
-    /* prefixing with the element tag to avoid styling confirm-dialog header part */
-    header[part='header'] {
+    /* prefixing with the element tags to avoid styling confirm-dialog header part */
+    header[part='header'],
+    [part='header-content'],
+    footer[part='footer'] {
       display: flex;
+      align-items: center;
+      flex-wrap: wrap;
+      flex: none;
+      pointer-events: none;
+      z-index: 1;
+    }
+
+    :host(:is([has-title], [has-header])) ::slotted([slot='header']),
+    ::slotted([slot='header-content']),
+    ::slotted([slot='title']),
+    :host([has-footer]) ::slotted([slot='footer']) {
+      display: contents;
+      pointer-events: auto;
     }
 
     [part='header-content'] {
@@ -25,8 +40,8 @@ registerStyles(
     }
 
     /* prefixing with the element tag to avoid styling confirm-dialog footer part */
+    [part='header-content'],
     footer[part='footer'] {
-      display: flex;
       justify-content: flex-end;
     }
 
@@ -40,7 +55,6 @@ registerStyles(
     }
 
     :host(:is([has-title], [has-header], [has-footer])) [part='content'] {
-      min-height: 100%;
       height: auto;
     }
 
@@ -54,8 +68,6 @@ registerStyles(
       :host(:is([has-title], [has-header], [has-footer])) [part='content'] {
         flex: 1;
         overflow: auto;
-        min-height: auto;
-        height: 100%;
       }
     }
 
@@ -150,11 +162,23 @@ export class DialogOverlay extends OverlayElement {
     };
   }
 
+  /** @protected */
   ready() {
     super.ready();
 
     const uniqueId = (DialogOverlay._uniqueId = 1 + DialogOverlay._uniqueId || 0);
     this._titleId = `${this.constructor.is}-title-${uniqueId}`;
+
+    // Update overflow attribute on resize
+    this.__resizeObserver = new ResizeObserver(() => {
+      this.__updateOverflow();
+    });
+    this.__resizeObserver.observe(this.$.resizerContainer);
+
+    // Update overflow attribute on scroll
+    this.$.content.addEventListener('scroll', () => {
+      this.__updateOverflow();
+    });
   }
 
   /** @private */
@@ -196,12 +220,17 @@ export class DialogOverlay extends OverlayElement {
     const openedChanged = this._oldOpenedFooterHeader !== opened;
     this._oldOpenedFooterHeader = opened;
 
+    // Set attributes here to update styles before detecting content overflow
+    this.toggleAttribute('has-header', !!headerRenderer);
+    this.toggleAttribute('has-footer', !!footerRenderer);
+
     if (headerRendererChanged) {
       if (headerRenderer) {
         this.headerContainer = this.__initContainer(this.headerContainer, 'header-content');
       } else if (this.headerContainer) {
         this.headerContainer.remove();
         this.headerContainer = null;
+        this.__updateOverflow();
       }
     }
 
@@ -211,6 +240,7 @@ export class DialogOverlay extends OverlayElement {
       } else if (this.footerContainer) {
         this.footerContainer.remove();
         this.footerContainer = null;
+        this.__updateOverflow();
       }
     }
 
@@ -222,18 +252,16 @@ export class DialogOverlay extends OverlayElement {
         this.requestContentUpdate();
       }
     }
-
-    this.toggleAttribute('has-header', !!headerRenderer);
-    this.toggleAttribute('has-footer', !!footerRenderer);
   }
 
   /** @private */
   _headerTitleChanged(headerTitle, opened) {
+    this.toggleAttribute('has-title', !!headerTitle);
+
     if (opened && (headerTitle || this._oldHeaderTitle)) {
       this.requestContentUpdate();
     }
     this._oldHeaderTitle = headerTitle;
-    this.toggleAttribute('has-title', !!headerTitle);
   }
 
   /** @private */
@@ -259,24 +287,33 @@ export class DialogOverlay extends OverlayElement {
   requestContentUpdate() {
     super.requestContentUpdate();
 
-    // If a new renderer has been set, make sure to reattach the header/footer roots
-    if (this.headerContainer && !this.headerContainer.parentElement) {
-      this.appendChild(this.headerContainer);
-    }
+    if (this.headerContainer) {
+      // If a new renderer has been set, make sure to reattach the container
+      if (!this.headerContainer.parentElement) {
+        this.appendChild(this.headerContainer);
+      }
 
-    if (this.footerContainer && !this.footerContainer.parentElement) {
-      this.appendChild(this.footerContainer);
+      if (this.headerRenderer) {
+        // Only call header renderer after the container has been initialized
+        this.headerRenderer.call(this.owner, this.headerContainer, this.owner);
+      }
     }
 
-    if (this.headerRenderer) {
-      this.headerRenderer.call(this.owner, this.headerContainer, this.owner);
-    }
+    if (this.footerContainer) {
+      // If a new renderer has been set, make sure to reattach the container
+      if (!this.footerContainer.parentElement) {
+        this.appendChild(this.footerContainer);
+      }
 
-    if (this.footerRenderer) {
-      this.footerRenderer.call(this.owner, this.footerContainer, this.owner);
+      if (this.footerRenderer) {
+        // Only call header renderer after the container has been initialized
+        this.footerRenderer.call(this.owner, this.footerContainer, this.owner);
+      }
     }
 
     this._headerTitleRenderer();
+
+    this.__updateOverflow();
   }
 
   /**
@@ -331,6 +368,32 @@ export class DialogOverlay extends OverlayElement {
       this.$.resizerContainer.scrollTop = scrollPosition;
     });
   }
+
+  /** @private */
+  __updateOverflow() {
+    let overflow = '';
+
+    // Only set "overflow" attribute if the dialog has a header, title or footer.
+    // Check for state attributes as extending components might not use renderers.
+    if (this.hasAttribute('has-header') || this.hasAttribute('has-footer') || this.headerTitle) {
+      const content = this.$.content;
+
+      if (content.scrollTop > 0) {
+        overflow += ' top';
+      }
+
+      if (content.scrollTop < content.scrollHeight - content.clientHeight) {
+        overflow += ' bottom';
+      }
+    }
+
+    const value = overflow.trim();
+    if (value.length > 0 && this.getAttribute('overflow') !== value) {
+      this.setAttribute('overflow', value);
+    } else if (value.length === 0 && this.hasAttribute('overflow')) {
+      this.removeAttribute('overflow');
+    }
+  }
 }
 
 customElements.define(DialogOverlay.is, DialogOverlay);
@@ -386,6 +449,7 @@ customElements.define(DialogOverlay.is, DialogOverlay);
  * `has-title`      | Set when the element has a title
  * `has-header`     | Set when the element has header renderer
  * `has-footer`     | Set when the element has footer renderer
+ * `overflow`       | Set to `top`, `bottom`, none or both
  *
  * Note: the `theme` attribute value set on `<vaadin-dialog>` is
  * propagated to the internal `<vaadin-dialog-overlay>` component.
@@ -566,9 +630,20 @@ class Dialog extends ThemePropertyMixin(ElementMixin(DialogDraggableMixin(Dialog
     this.$.overlay.setProperties({ owner: this, renderer, headerRenderer, footerRenderer });
   }
 
+  /** @protected */
+  connectedCallback() {
+    super.connectedCallback();
+    // Restore opened state if overlay was opened when disconnecting
+    if (this.__restoreOpened) {
+      this.opened = true;
+    }
+  }
+
   /** @protected */
   disconnectedCallback() {
     super.disconnectedCallback();
+    // Close overlay and memorize opened state
+    this.__restoreOpened = this.opened;
     this.opened = false;
   }
 

package/theme/lumo/vaadin-dialog-styles.js

@@ -27,19 +27,38 @@ const dialogOverlay = css`
     padding: var(--lumo-space-l);
   }
 
-  [part='header'] {
-    gap: var(--lumo-space-s);
+  :host(:is([has-header], [has-title])) [part='header'] + [part='content'] {
+    padding-top: 0;
   }
 
-  :host([has-header]) [part='header'],
-  :host([has-title]) [part='header'] {
-    padding: var(--lumo-space-m) var(--lumo-space-l);
-    border-bottom: 1px solid var(--lumo-contrast-10pct);
+  :host(:is([has-header], [has-title])) [part='header'],
+  :host([has-header]) [part='header-content'],
+  :host([has-footer]) [part='footer'] {
+    gap: var(--lumo-space-xs) var(--lumo-space-s);
+    line-height: var(--lumo-line-height-s);
+  }
+
+  :host(:is([has-header], [has-title])) [part='header'] {
+    padding: var(--lumo-space-s) var(--lumo-space-m);
+    min-height: var(--lumo-size-xl);
+    box-sizing: border-box;
+    background-color: var(--lumo-base-color);
+    border-radius: var(--lumo-border-radius-l) var(--lumo-border-radius-l) 0 0; /* Needed for Safari */
   }
 
   :host([has-footer]) [part='footer'] {
     padding: var(--lumo-space-s) var(--lumo-space-m);
-    border-top: 1px solid var(--lumo-contrast-10pct);
+    min-height: var(--lumo-size-l);
+    box-sizing: border-box;
+    background-color: var(--lumo-contrast-5pct);
+    border-radius: 0 0 var(--lumo-border-radius-l) var(--lumo-border-radius-l); /* Needed for Safari */
+  }
+
+  [part='title'] {
+    font-size: var(--lumo-font-size-xl);
+    font-weight: 600;
+    color: var(--lumo-header-text-color);
+    margin-inline-start: calc(var(--lumo-space-l) - var(--lumo-space-m));
   }
 
   /* No padding */
@@ -47,8 +66,7 @@ const dialogOverlay = css`
     padding: 0;
   }
 
-  :host([theme~='no-padding'][has-header]) [part='header'],
-  :host([theme~='no-padding'][has-title]) [part='header'] {
+  :host([theme~='no-padding']:is([has-header], [has-title])) [part='header'] {
     padding: 0;
   }
 
@@ -56,6 +74,12 @@ const dialogOverlay = css`
     padding: 0;
   }
 
+  @media (min-height: 320px) {
+    :host(:is([has-header], [has-title])[overflow~='top']) [part='header'] {
+      box-shadow: 0 1px 0 0 var(--lumo-contrast-10pct);
+    }
+  }
+
   /* Animations */
 
   :host([opening]),

package/theme/material/vaadin-dialog-styles.js

@@ -16,17 +16,39 @@ const dialogOverlay = css`
     padding: 24px;
   }
 
-  :host([has-header]) [part='header'],
-  :host([has-title]) [part='header'] {
-    padding: 9px 24px;
-    font-weight: 500;
+  :host(:is([has-header], [has-title])) [part='header'] {
+    padding: 16px;
+  }
+
+  :host(:is([has-header], [has-title])) [part='header'] + [part='content'] {
+    padding-top: 0;
+  }
+
+  :host(:is([has-header], [has-title])) [part='header'],
+  :host([has-header]) [part='header-content'],
+  :host([has-footer]) [part='footer'] {
     gap: 8px;
-    border-bottom: 1px solid var(--material-divider-color);
+    line-height: 1.2;
+  }
+
+  [part='title'] {
+    font-size: var(--material-h5-font-size);
+    font-weight: 500;
+    margin-inline-start: 8px;
   }
 
   :host([has-footer]) [part='footer'] {
     padding: 8px;
-    border-top: 1px solid var(--material-divider-color);
+  }
+
+  @media (min-height: 320px) {
+    :host(:is([has-header], [has-title])[overflow~='top']) [part='header'] {
+      box-shadow: 0 1px 0 0 var(--material-divider-color);
+    }
+
+    :host([has-footer][overflow~='bottom']) [part='footer'] {
+      box-shadow: 0 -1px 0 0 var(--material-divider-color);
+    }
   }
 
   /* No padding */