@vaadin/date-picker 23.1.0-beta4 → 23.1.0-rc3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/date-picker",
-  "version": "23.1.0-beta4",
+  "version": "23.1.0-rc3",
   "publishConfig": {
     "access": "public"
   },
@@ -34,21 +34,19 @@
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
     "@polymer/polymer": "^3.2.0",
-    "@vaadin/button": "23.1.0-beta4",
-    "@vaadin/component-base": "23.1.0-beta4",
-    "@vaadin/field-base": "23.1.0-beta4",
-    "@vaadin/input-container": "23.1.0-beta4",
-    "@vaadin/vaadin-lumo-styles": "23.1.0-beta4",
-    "@vaadin/vaadin-material-styles": "23.1.0-beta4",
-    "@vaadin/vaadin-overlay": "23.1.0-beta4",
-    "@vaadin/vaadin-themable-mixin": "23.1.0-beta4"
+    "@vaadin/button": "23.1.0-rc3",
+    "@vaadin/component-base": "23.1.0-rc3",
+    "@vaadin/field-base": "23.1.0-rc3",
+    "@vaadin/input-container": "23.1.0-rc3",
+    "@vaadin/vaadin-lumo-styles": "23.1.0-rc3",
+    "@vaadin/vaadin-material-styles": "23.1.0-rc3",
+    "@vaadin/vaadin-overlay": "23.1.0-rc3",
+    "@vaadin/vaadin-themable-mixin": "23.1.0-rc3"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/dialog": "23.1.0-beta4",
-    "@vaadin/polymer-legacy-adapter": "23.1.0-beta4",
     "@vaadin/testing-helpers": "^0.3.2",
     "sinon": "^13.0.2"
   },
-  "gitHead": "06e283473964ecb3085aacf3eddb5333d052a045"
+  "gitHead": "49c312fbe0228adb559296d45655bbfd4eac6235"
 }

package/src/vaadin-date-picker-light.js

@@ -84,13 +84,10 @@ class DatePickerLight extends ThemableMixin(DatePickerMixin(PolymerElement)) {
             fullscreen$="[[_fullscreen]]"
             label="[[label]]"
             selected-date="[[_selectedDate]]"
-            slot="dropdown-content"
             focused-date="{{_focusedDate}}"
             show-week-numbers="[[showWeekNumbers]]"
             min-date="[[_minDate]]"
             max-date="[[_maxDate]]"
-            on-date-tap="_close"
-            role="dialog"
             part="overlay-content"
             theme$="[[__getOverlayTheme(_theme, _overlayInitialized)]]"
           >
@@ -128,6 +125,13 @@ class DatePickerLight extends ThemableMixin(DatePickerMixin(PolymerElement)) {
     };
   }
 
+  /** @protected */
+  ready() {
+    super.ready();
+
+    this._initOverlay();
+  }
+
   /** @protected */
   connectedCallback() {
     super.connectedCallback();

package/src/vaadin-date-picker-mixin.js

@@ -336,7 +336,7 @@ export const DatePickerMixin = (subclass) =>
     }
 
     /**
-     * Override a getter from `ClearButtonMixin` to make it optional
+     * Override a getter from `InputControlMixin` to make it optional
      * and to prevent warning when a clear button is missing,
      * for example when using <vaadin-date-picker-light>.
      * @protected
@@ -370,6 +370,7 @@ export const DatePickerMixin = (subclass) =>
     constructor() {
       super();
 
+      this._boundOnClick = this._onClick.bind(this);
       this._boundOnScroll = this._onScroll.bind(this);
     }
 
@@ -414,11 +415,7 @@ export const DatePickerMixin = (subclass) =>
     ready() {
       super.ready();
 
-      this.addEventListener('click', (e) => {
-        if (!this._isClearButton(e) && (!this.autoOpenDisabled || this._noInput)) {
-          this.open();
-        }
-      });
+      this.addEventListener('click', this._boundOnClick);
 
       this.addController(
         new MediaQueryController(this._fullscreenMediaQuery, (matches) => {
@@ -473,13 +470,18 @@ export const DatePickerMixin = (subclass) =>
       }
     }
 
-    /** @private */
+    /** @protected */
     _initOverlay() {
       this.$.overlay.removeAttribute('disable-upgrade');
       this._overlayInitialized = true;
 
       this.$.overlay.addEventListener('opened-changed', (e) => (this.opened = e.detail.value));
 
+      this.$.overlay.addEventListener('vaadin-overlay-escape-press', () => {
+        this._focusedDate = this._selectedDate;
+        this._close();
+      });
+
       this._overlayContent.addEventListener('close', this._close.bind(this));
       this._overlayContent.addEventListener('focus-input', this._focusAndSelect.bind(this));
 
@@ -488,6 +490,8 @@ export const DatePickerMixin = (subclass) =>
         this.__userConfirmedDate = true;
 
         this._selectDate(e.detail.date);
+
+        this._close(e);
       });
 
       // User confirmed selected date by pressing Enter or Today.
@@ -498,12 +502,10 @@ export const DatePickerMixin = (subclass) =>
       });
 
       // Keep focus attribute in focusElement for styling
-      this._overlayContent.addEventListener('focus', () => {
+      this._overlayContent.addEventListener('focusin', () => {
         this._setFocused(true);
       });
 
-      this.$.overlay.addEventListener('vaadin-overlay-close', this._onVaadinOverlayClose.bind(this));
-
       this.addEventListener('mousedown', () => this.__bringToFront());
       this.addEventListener('touchstart', () => this.__bringToFront());
     }
@@ -767,6 +769,7 @@ export const DatePickerMixin = (subclass) =>
 
       if (this._noInput && this.focusElement) {
         this.focusElement.blur();
+        this._overlayContent.focusDateElement();
       }
     }
 
@@ -853,11 +856,7 @@ export const DatePickerMixin = (subclass) =>
 
     /** @protected */
     _focus() {
-      if (this._noInput) {
-        if (this._overlayInitialized) {
-          this._overlayContent.focus();
-        }
-      } else {
+      if (!this._noInput) {
         this.inputElement.focus();
       }
     }
@@ -909,7 +908,30 @@ export const DatePickerMixin = (subclass) =>
     }
 
     /**
-     * Override an event listener from `ClearButtonMixin`
+     * @param {Event} event
+     * @private
+     */
+    _onClick(event) {
+      // Clear button click is handled in separate listener
+      // but bubbles to the host, so we need to ignore it.
+      if (!this._isClearButton(event)) {
+        this._onHostClick(event);
+      }
+    }
+
+    /**
+     * @param {Event} event
+     * @private
+     */
+    _onHostClick(event) {
+      if (!this.autoOpenDisabled || this._noInput) {
+        event.preventDefault();
+        this.open();
+      }
+    }
+
+    /**
+     * Override an event listener from `InputControlMixin`
      * to validate and dispatch change on clear.
      * @protected
      */
@@ -922,11 +944,13 @@ export const DatePickerMixin = (subclass) =>
 
     /**
      * Override an event listener from `KeyboardMixin`.
-     * Do not call `super` to also override `ClearButtonMixin`.
+     * @param {KeyboardEvent} e
      * @protected
      * @override
      */
     _onKeyDown(e) {
+      super._onKeyDown(e);
+
       if (this._noInput) {
         // The input element cannot be readonly as it would conflict with
         // the required attribute. Both are not allowed on an input element.
@@ -953,45 +977,10 @@ export const DatePickerMixin = (subclass) =>
             this.open();
           }
           break;
-        case 'Enter': {
-          const parsedDate = this._getParsedDate();
-          const isValidDate = this._isValidDate(parsedDate);
-          if (this.opened) {
-            if (this._overlayInitialized && this._overlayContent.focusedDate && isValidDate) {
-              this._selectDate(this._overlayContent.focusedDate);
-            }
-            this.close();
-          } else if (!isValidDate && this.inputElement.value !== '') {
-            this.validate();
-          } else {
-            const oldValue = this.value;
-            this._selectParsedOrFocusedDate();
-            if (oldValue === this.value) {
-              this.validate();
-            }
-          }
-          break;
-        }
-        case 'Escape':
-          if (this.opened) {
-            this._focusedDate = this._selectedDate;
-            this._close();
-          } else if (this.clearButtonVisible) {
-            this._onClearButtonClick();
-          } else if (this.autoOpenDisabled) {
-            // Do not restore selected date if Esc was pressed after clearing input field
-            if (this.inputElement.value === '') {
-              this._selectDate(null);
-            }
-            this._applyInputValue(this._selectedDate);
-          } else {
-            this._focusedDate = this._selectedDate;
-            this._selectParsedOrFocusedDate();
-          }
-          break;
         case 'Tab':
           if (this.opened) {
             e.preventDefault();
+            e.stopPropagation();
             // Clear the selection range (remains visible on IE)
             this._setSelectionRange(0, 0);
             if (e.shiftKey) {
@@ -1006,6 +995,61 @@ export const DatePickerMixin = (subclass) =>
       }
     }
 
+    /**
+     * Override an event listener from `KeyboardMixin`.
+     *
+     * @param {!KeyboardEvent} _event
+     * @protected
+     * @override
+     */
+    _onEnter(_event) {
+      const parsedDate = this._getParsedDate();
+      const isValidDate = this._isValidDate(parsedDate);
+      if (this.opened) {
+        if (this._overlayInitialized && this._overlayContent.focusedDate && isValidDate) {
+          this._selectDate(this._overlayContent.focusedDate);
+        }
+        this.close();
+      } else if (!isValidDate && this.inputElement.value !== '') {
+        this.validate();
+      } else {
+        const oldValue = this.value;
+        this._selectParsedOrFocusedDate();
+        if (oldValue === this.value) {
+          this.validate();
+        }
+      }
+    }
+
+    /**
+     * Override an event listener from `KeyboardMixin`.
+     * Do not call `super` in order to override clear
+     * button logic defined in `InputControlMixin`.
+     *
+     * @param {!KeyboardEvent} _event
+     * @protected
+     * @override
+     */
+    _onEscape(_event) {
+      // Closing overlay is handled in vaadin-overlay-escape-press event listener.
+      if (this.opened) {
+        return;
+      }
+
+      if (this.clearButtonVisible) {
+        this._onClearButtonClick();
+      } else if (this.autoOpenDisabled) {
+        // Do not restore selected date if Esc was pressed after clearing input field
+        if (this.inputElement.value === '') {
+          this._selectDate(null);
+        }
+        this._applyInputValue(this._selectedDate);
+      } else {
+        this._focusedDate = this._selectedDate;
+        this._selectParsedOrFocusedDate();
+      }
+    }
+
     /** @private */
     _getParsedDate(inputValue = this._inputValue) {
       const dateObject = this.i18n.parseDate && this.i18n.parseDate(inputValue);

package/src/vaadin-date-picker-overlay-content.js

@@ -326,6 +326,9 @@ class DatePickerOverlayContent extends ControllerMixin(ThemableMixin(DirMixin(Po
 
   ready() {
     super.ready();
+
+    this.setAttribute('role', 'dialog');
+
     addListener(this, 'tap', this._stopPropagation);
     addListener(this.$.scrollers, 'track', this._track.bind(this));
     addListener(this.shadowRoot.querySelector('[part="clear-button"]'), 'tap', this._clear.bind(this));
@@ -686,12 +689,6 @@ class DatePickerOverlayContent extends ControllerMixin(ThemableMixin(DirMixin(Po
   }
 
   _close() {
-    const overlayContent = this.getRootNode().host;
-    const overlay = overlayContent ? overlayContent.getRootNode().host : null;
-    if (overlay) {
-      overlay.opened = false;
-    }
-
     this.dispatchEvent(new CustomEvent('close', { bubbles: true, composed: true }));
   }
 
@@ -758,9 +755,8 @@ class DatePickerOverlayContent extends ControllerMixin(ThemableMixin(DirMixin(Po
         this._moveFocusByMonths(event.shiftKey ? -12 : -1);
         handled = true;
         break;
-      case 'Escape':
-        this._cancel();
-        handled = true;
+      case 'Tab':
+        this._onTabKeyDown(event, 'calendar');
         break;
       default:
         break;
@@ -772,45 +768,68 @@ class DatePickerOverlayContent extends ControllerMixin(ThemableMixin(DirMixin(Po
     }
   }
 
+  _onTabKeyDown(event, section) {
+    // Stop propagation to avoid focus-trap
+    // listener when used in a modal dialog.
+    event.stopPropagation();
+
+    switch (section) {
+      case 'calendar':
+        if (event.shiftKey) {
+          // Return focus back to the input field.
+          event.preventDefault();
+          this.__focusInput();
+        }
+        break;
+      case 'today':
+        if (event.shiftKey) {
+          // Browser returns focus back to the calendar.
+          // We need to move the scroll to focused date.
+          setTimeout(() => this.revealDate(this.focusedDate), 1);
+        }
+        break;
+      case 'cancel':
+        if (!event.shiftKey) {
+          // Return focus back to the input field.
+          event.preventDefault();
+          this.__focusInput();
+        }
+        break;
+      default:
+        break;
+    }
+  }
+
   __onTodayButtonKeyDown(event) {
     if (this.hasAttribute('fullscreen')) {
-      event.stopPropagation();
+      // Do not prevent closing on Esc
+      if (event.key !== 'Escape') {
+        event.stopPropagation();
+      }
       return;
     }
 
-    if (event.key === 'Tab' && event.shiftKey) {
-      event.stopPropagation();
-
-      // Browser returns focus back to the calendar.
-      // We need to move the scroll to focused date.
-      setTimeout(() => this.revealDate(this.focusedDate), 1);
-    }
-
-    if (event.key === 'Escape') {
-      this._cancel();
-      event.preventDefault();
-      event.stopPropagation();
+    if (event.key === 'Tab') {
+      this._onTabKeyDown(event, 'today');
     }
   }
 
   __onCancelButtonKeyDown(event) {
     if (this.hasAttribute('fullscreen')) {
-      event.stopPropagation();
+      // Do not prevent closing on Esc
+      if (event.key !== 'Escape') {
+        event.stopPropagation();
+      }
       return;
     }
 
-    if (event.key === 'Tab' && !event.shiftKey) {
-      // Return focus back to the input field
-      event.preventDefault();
-      event.stopPropagation();
-      this.dispatchEvent(new CustomEvent('focus-input', { bubbles: true, composed: true }));
+    if (event.key === 'Tab') {
+      this._onTabKeyDown(event, 'cancel');
     }
+  }
 
-    if (event.key === 'Escape') {
-      this._cancel();
-      event.preventDefault();
-      event.stopPropagation();
-    }
+  __focusInput() {
+    this.dispatchEvent(new CustomEvent('focus-input', { bubbles: true, composed: true }));
   }
 
   __tryFocusDate() {

package/src/vaadin-date-picker.js

@@ -173,13 +173,10 @@ class DatePicker extends DatePickerMixin(InputControlMixin(ThemableMixin(Element
             fullscreen$="[[_fullscreen]]"
             label="[[label]]"
             selected-date="[[_selectedDate]]"
-            slot="dropdown-content"
             focused-date="{{_focusedDate}}"
             show-week-numbers="[[showWeekNumbers]]"
             min-date="[[_minDate]]"
             max-date="[[_maxDate]]"
-            role="dialog"
-            on-date-tap="_close"
             part="overlay-content"
             theme$="[[__getOverlayTheme(_theme, _overlayInitialized)]]"
           ></vaadin-date-picker-overlay-content>
@@ -189,7 +186,7 @@ class DatePicker extends DatePickerMixin(InputControlMixin(ThemableMixin(Element
   }
 
   /**
-   * Used by `ClearButtonMixin` as a reference to the clear button element.
+   * Used by `InputControlMixin` as a reference to the clear button element.
    * @protected
    * @return {!HTMLElement}
    */
@@ -215,6 +212,13 @@ class DatePicker extends DatePickerMixin(InputControlMixin(ThemableMixin(Element
     toggleButton.addEventListener('mousedown', (e) => e.preventDefault());
   }
 
+  /** @protected */
+  _initOverlay() {
+    super._initOverlay();
+
+    this.$.overlay.addEventListener('vaadin-overlay-close', this._onVaadinOverlayClose.bind(this));
+  }
+
   /** @private */
   _onVaadinOverlayClose(e) {
     if (this._openedWithFocusRing && this.hasAttribute('focused')) {

package/theme/lumo/vaadin-date-picker-overlay-styles.js

@@ -1,5 +1,6 @@
 import '@vaadin/vaadin-lumo-styles/sizing.js';
 import '@vaadin/vaadin-lumo-styles/spacing.js';
+import '@vaadin/vaadin-overlay/theme/lumo/vaadin-overlay.js';
 import { menuOverlay } from '@vaadin/vaadin-lumo-styles/mixins/menu-overlay.js';
 import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 

package/theme/material/vaadin-date-picker-overlay-styles.js

@@ -1,3 +1,4 @@
+import '@vaadin/vaadin-overlay/theme/material/vaadin-overlay.js';
 import { overlay } from '@vaadin/vaadin-material-styles/mixins/overlay.js';
 import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';