@vaadin/date-picker 23.0.0-alpha1 → 23.0.0-alpha2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/date-picker",
-  "version": "23.0.0-alpha1",
+  "version": "23.0.0-alpha2",
   "publishConfig": {
     "access": "public"
   },
@@ -35,21 +35,21 @@
     "@polymer/iron-a11y-announcer": "^3.0.0",
     "@polymer/iron-media-query": "^3.0.0",
     "@polymer/polymer": "^3.2.0",
-    "@vaadin/button": "23.0.0-alpha1",
-    "@vaadin/component-base": "23.0.0-alpha1",
-    "@vaadin/field-base": "23.0.0-alpha1",
-    "@vaadin/input-container": "23.0.0-alpha1",
-    "@vaadin/vaadin-lumo-styles": "23.0.0-alpha1",
-    "@vaadin/vaadin-material-styles": "23.0.0-alpha1",
-    "@vaadin/vaadin-overlay": "23.0.0-alpha1",
-    "@vaadin/vaadin-themable-mixin": "23.0.0-alpha1"
+    "@vaadin/button": "23.0.0-alpha2",
+    "@vaadin/component-base": "23.0.0-alpha2",
+    "@vaadin/field-base": "23.0.0-alpha2",
+    "@vaadin/input-container": "23.0.0-alpha2",
+    "@vaadin/vaadin-lumo-styles": "23.0.0-alpha2",
+    "@vaadin/vaadin-material-styles": "23.0.0-alpha2",
+    "@vaadin/vaadin-overlay": "23.0.0-alpha2",
+    "@vaadin/vaadin-themable-mixin": "23.0.0-alpha2"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/dialog": "23.0.0-alpha1",
-    "@vaadin/polymer-legacy-adapter": "23.0.0-alpha1",
+    "@vaadin/dialog": "23.0.0-alpha2",
+    "@vaadin/polymer-legacy-adapter": "23.0.0-alpha2",
     "@vaadin/testing-helpers": "^0.3.2",
     "sinon": "^9.2.0"
   },
-  "gitHead": "fbcb07328fdf88260e3b461088d207426b21c710"
+  "gitHead": "070f586dead02ca41b66717820c647f48bf1665f"
 }

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

@@ -74,6 +74,8 @@ class DatePickerLight extends ThemableMixin(DatePickerMixin(PolymerElement)) {
         opened="{{opened}}"
         on-vaadin-overlay-open="_onOverlayOpened"
         on-vaadin-overlay-close="_onOverlayClosed"
+        restore-focus-on-close
+        restore-focus-node="[[inputElement]]"
         theme$="[[__getOverlayTheme(theme, _overlayInitialized)]]"
       >
         <template>
@@ -137,17 +139,17 @@ class DatePickerLight extends ThemableMixin(DatePickerMixin(PolymerElement)) {
     this._setFocusElement(this.inputElement);
   }
 
+  /** @return {string | undefined} */
+  get _inputValue() {
+    return this.inputElement && this.inputElement[dashToCamelCase(this.attrForValue)];
+  }
+
   set _inputValue(value) {
     if (this.inputElement) {
       this.inputElement[dashToCamelCase(this.attrForValue)] = value;
     }
   }
 
-  /** @return {string | undefined} */
-  get _inputValue() {
-    return this.inputElement && this.inputElement[dashToCamelCase(this.attrForValue)];
-  }
-
   // Workaround https://github.com/vaadin/web-components/issues/2855
   /** @protected */
   _openedChanged(opened) {

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

@@ -3,7 +3,6 @@
  * Copyright (c) 2021 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { addListener } from '@polymer/polymer/lib/utils/gestures.js';
 import { isIOS } from '@vaadin/component-base/src/browser-utils.js';
 import { KeyboardMixin } from '@vaadin/component-base/src/keyboard-mixin.js';
 import { DelegateFocusMixin } from '@vaadin/field-base/src/delegate-focus-mixin.js';
@@ -302,7 +301,7 @@ export const DatePickerMixin = (subclass) =>
         /** @private */
         _noInput: {
           type: Boolean,
-          computed: '_isNoInput(inputElement, _fullscreen, _ios, i18n, i18n.*)'
+          computed: '_isNoInput(inputElement, _fullscreen, _ios, i18n, opened, autoOpenDisabled)'
         },
 
         /** @private */
@@ -349,6 +348,11 @@ export const DatePickerMixin = (subclass) =>
       return null;
     }
 
+    /** @protected */
+    get _inputValue() {
+      return this.inputElement ? this.inputElement.value : undefined;
+    }
+
     /** @protected */
     set _inputValue(value) {
       if (this.inputElement) {
@@ -356,11 +360,6 @@ export const DatePickerMixin = (subclass) =>
       }
     }
 
-    /** @protected */
-    get _inputValue() {
-      return this.inputElement ? this.inputElement.value : undefined;
-    }
-
     /** @private */
     get _nativeInput() {
       if (this.inputElement) {
@@ -415,17 +414,11 @@ export const DatePickerMixin = (subclass) =>
     ready() {
       super.ready();
 
-      addListener(this, 'tap', (e) => {
+      this.addEventListener('click', (e) => {
         if (!this._isClearButton(e) && (!this.autoOpenDisabled || this._noInput)) {
           this.open();
         }
       });
-
-      this.addEventListener('touchend', (e) => {
-        if (!this._isClearButton(e)) {
-          e.preventDefault();
-        }
-      });
     }
 
     /** @protected */
@@ -541,8 +534,17 @@ export const DatePickerMixin = (subclass) =>
     }
 
     /** @private */
-    _isNoInput(inputElement, fullscreen, ios, i18n) {
-      return !inputElement || fullscreen || ios || !i18n.parseDate;
+    // eslint-disable-next-line max-params
+    _isNoInput(inputElement, fullscreen, ios, i18n, opened, autoOpenDisabled) {
+      // On fullscreen mode, text input is disabled if auto-open isn't disabled or
+      // whenever the dropdown is opened
+      const noInputOnFullscreenMode = fullscreen && (!autoOpenDisabled || opened);
+      // On iOS, text input is disabled whenever the dropdown is opened, because
+      // the virtual keyboard doesn't affect the viewport metrics and thus the
+      // dropdown could get covered by the keyboard.
+      const noInputOnIos = ios && opened;
+
+      return !inputElement || noInputOnFullscreenMode || noInputOnIos || !i18n.parseDate;
     }
 
     /** @private */
@@ -901,15 +903,13 @@ export const DatePickerMixin = (subclass) =>
               this._selectedDate = this._overlayContent.focusedDate;
             }
             this.close();
+          } else if (!isValidDate && this.inputElement.value !== '') {
+            this.validate();
           } else {
-            if (!isValidDate && this.inputElement.value !== '') {
+            const oldValue = this.value;
+            this._selectParsedOrFocusedDate();
+            if (oldValue === this.value) {
               this.validate();
-            } else {
-              const oldValue = this.value;
-              this._selectParsedOrFocusedDate();
-              if (oldValue === this.value) {
-                this.validate();
-              }
             }
           }
           break;
@@ -921,7 +921,7 @@ export const DatePickerMixin = (subclass) =>
           } else if (this.clearButtonVisible) {
             this._onClearButtonClick();
           } else if (this.autoOpenDisabled) {
-            //Do not restore selected date if Esc was pressed after clearing input field
+            // Do not restore selected date if Esc was pressed after clearing input field
             if (this.inputElement.value === '') {
               this._selectedDate = null;
             }
@@ -934,7 +934,7 @@ export const DatePickerMixin = (subclass) =>
         case 'Tab':
           if (this.opened) {
             e.preventDefault();
-            //Clear the selection range (remains visible on IE)
+            // Clear the selection range (remains visible on IE)
             this._setSelectionRange(0, 0);
             if (e.shiftKey) {
               this._overlayContent.focusCancel();
@@ -944,6 +944,8 @@ export const DatePickerMixin = (subclass) =>
             }
           }
           break;
+        default:
+          break;
       }
     }
 

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

@@ -8,12 +8,11 @@ import '@vaadin/button/src/vaadin-button.js';
 import './vaadin-month-calendar.js';
 import './vaadin-infinite-scroller.js';
 import { IronA11yAnnouncer } from '@polymer/iron-a11y-announcer/iron-a11y-announcer.js';
-import { GestureEventListeners } from '@polymer/polymer/lib/mixins/gesture-event-listeners.js';
-import { addListener, setTouchAction } from '@polymer/polymer/lib/utils/gestures.js';
 import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
 import { timeOut } from '@vaadin/component-base/src/async.js';
 import { Debouncer } from '@vaadin/component-base/src/debounce.js';
 import { DirMixin } from '@vaadin/component-base/src/dir-mixin.js';
+import { addListener, setTouchAction } from '@vaadin/component-base/src/gestures.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 import { dateEquals, extractDateParts, getClosestDate, getISOWeekNumber } from './vaadin-date-picker-helper.js';
 
@@ -21,7 +20,7 @@ import { dateEquals, extractDateParts, getClosestDate, getISOWeekNumber } from '
  * @extends HTMLElement
  * @private
  */
-class DatePickerOverlayContent extends ThemableMixin(DirMixin(GestureEventListeners(PolymerElement))) {
+class DatePickerOverlayContent extends ThemableMixin(DirMixin(PolymerElement)) {
   static get template() {
     return html`
       <style>
@@ -164,15 +163,15 @@ class DatePickerOverlayContent extends ThemableMixin(DirMixin(GestureEventListen
 
       <div part="overlay-header" on-touchend="_preventDefault" desktop$="[[_desktopMode]]" aria-hidden="true">
         <div part="label">[[_formatDisplayed(selectedDate, i18n.formatDate, label)]]</div>
-        <div part="clear-button" on-tap="_clear" showclear$="[[_showClear(selectedDate)]]"></div>
-        <div part="toggle-button" on-tap="_cancel"></div>
+        <div part="clear-button" showclear$="[[_showClear(selectedDate)]]"></div>
+        <div part="toggle-button"></div>
 
-        <div part="years-toggle-button" desktop$="[[_desktopMode]]" on-tap="_toggleYearScroller" aria-hidden="true">
+        <div part="years-toggle-button" desktop$="[[_desktopMode]]" aria-hidden="true">
           [[_yearAfterXMonths(_visibleMonthIndex)]]
         </div>
       </div>
 
-      <div id="scrollers" desktop$="[[_desktopMode]]" on-track="_track">
+      <div id="scrollers" desktop$="[[_desktopMode]]">
         <vaadin-infinite-scroller
           id="monthScroller"
           on-custom-scroll="_onMonthScroll"
@@ -200,7 +199,6 @@ class DatePickerOverlayContent extends ThemableMixin(DirMixin(GestureEventListen
         </vaadin-infinite-scroller>
         <vaadin-infinite-scroller
           id="yearScroller"
-          on-tap="_onYearTap"
           on-custom-scroll="_onYearScroll"
           on-touchstart="_onYearScrollTouchStart"
           buffer-size="12"
@@ -227,13 +225,10 @@ class DatePickerOverlayContent extends ThemableMixin(DirMixin(GestureEventListen
           part="today-button"
           theme="tertiary"
           disabled="[[!_isTodayAllowed(minDate, maxDate)]]"
-          on-tap="_onTodayTap"
         >
           [[i18n.today]]
         </vaadin-button>
-        <vaadin-button id="cancelButton" part="cancel-button" theme="tertiary" on-tap="_cancel">
-          [[i18n.cancel]]
-        </vaadin-button>
+        <vaadin-button id="cancelButton" part="cancel-button" theme="tertiary"> [[i18n.cancel]] </vaadin-button>
       </div>
       <iron-media-query query="(min-width: 375px)" query-matches="{{_desktopMode}}"></iron-media-query>
     `;
@@ -330,6 +325,17 @@ class DatePickerOverlayContent extends ThemableMixin(DirMixin(GestureEventListen
     addListener(this, 'tap', this._stopPropagation);
     this.addEventListener('focus', this._onOverlayFocus.bind(this));
     this.addEventListener('blur', this._onOverlayBlur.bind(this));
+    addListener(this.$.scrollers, 'track', this._track.bind(this));
+    addListener(this.shadowRoot.querySelector('[part="clear-button"]'), 'tap', this._clear.bind(this));
+    addListener(this.shadowRoot.querySelector('[part="today-button"]'), 'tap', this._onTodayTap.bind(this));
+    addListener(this.shadowRoot.querySelector('[part="cancel-button"]'), 'tap', this._cancel.bind(this));
+    addListener(this.shadowRoot.querySelector('[part="toggle-button"]'), 'tap', this._cancel.bind(this));
+    addListener(this.shadowRoot.querySelector('[part="years"]'), 'tap', this._onYearTap.bind(this));
+    addListener(
+      this.shadowRoot.querySelector('[part="years-toggle-button"]'),
+      'tap',
+      this._toggleYearScroller.bind(this)
+    );
   }
 
   /**
@@ -372,7 +378,6 @@ class DatePickerOverlayContent extends ThemableMixin(DirMixin(GestureEventListen
         }
       })
     );
-    return;
   }
 
   /**
@@ -473,9 +478,8 @@ class DatePickerOverlayContent extends ThemableMixin(DirMixin(GestureEventListen
   _formatDisplayed(date, formatDate, label) {
     if (date) {
       return formatDate(extractDateParts(date));
-    } else {
-      return label;
     }
+    return label;
   }
 
   _onTodayTap() {
@@ -605,11 +609,9 @@ class DatePickerOverlayContent extends ThemableMixin(DirMixin(GestureEventListen
       case 'start':
         this._toggleAnimateClass(false);
         break;
-
       case 'track':
         this._handleTrack(e);
         break;
-
       case 'end':
         this._toggleAnimateClass(true);
         if (this._translateX >= this._yearScrollerWidth / 2) {
@@ -618,6 +620,8 @@ class DatePickerOverlayContent extends ThemableMixin(DirMixin(GestureEventListen
           this._openYearScroller();
         }
         break;
+      default:
+        break;
     }
   }
 
@@ -811,6 +815,8 @@ class DatePickerOverlayContent extends ThemableMixin(DirMixin(GestureEventListen
         case 'Escape':
           this._cancel();
           break;
+        default:
+          break;
       }
     }
   }
@@ -837,20 +843,18 @@ class DatePickerOverlayContent extends ThemableMixin(DirMixin(GestureEventListen
 
     if (this._dateAllowed(dateToFocus, this.minDate, this.maxDate)) {
       this._focusDate(dateToFocus);
-    } else {
-      if (this._dateAllowed(focus, this.minDate, this.maxDate)) {
-        // Move to min or max date
-        if (days > 0) {
-          // down or right
-          this._focusDate(this.maxDate);
-        } else {
-          // up or left
-          this._focusDate(this.minDate);
-        }
+    } else if (this._dateAllowed(focus, this.minDate, this.maxDate)) {
+      // Move to min or max date
+      if (days > 0) {
+        // down or right
+        this._focusDate(this.maxDate);
       } else {
-        // Move to closest allowed date
-        this._focusClosestDate(focus);
+        // up or left
+        this._focusDate(this.minDate);
       }
+    } else {
+      // Move to closest allowed date
+      this._focusClosestDate(focus);
     }
   }
 
@@ -869,20 +873,18 @@ class DatePickerOverlayContent extends ThemableMixin(DirMixin(GestureEventListen
 
     if (this._dateAllowed(dateToFocus, this.minDate, this.maxDate)) {
       this.focusedDate = dateToFocus;
-    } else {
-      if (this._dateAllowed(focus, this.minDate, this.maxDate)) {
-        // Move to min or max date
-        if (months > 0) {
-          // pagedown
-          this._focusDate(this.maxDate);
-        } else {
-          // pageup
-          this._focusDate(this.minDate);
-        }
+    } else if (this._dateAllowed(focus, this.minDate, this.maxDate)) {
+      // Move to min or max date
+      if (months > 0) {
+        // pagedown
+        this._focusDate(this.maxDate);
       } else {
-        // Move to closest allowed date
-        this._focusClosestDate(focus);
+        // pageup
+        this._focusDate(this.minDate);
       }
+    } else {
+      // Move to closest allowed date
+      this._focusClosestDate(focus);
     }
   }
 
@@ -900,14 +902,12 @@ class DatePickerOverlayContent extends ThemableMixin(DirMixin(GestureEventListen
 
     if (this._dateAllowed(dateToFocus, this.minDate, this.maxDate)) {
       this._focusDate(dateToFocus);
+    } else if (this._dateAllowed(focusedDate, this.minDate, this.maxDate)) {
+      // Move to minDate or maxDate
+      this._focusDate(this[property]);
     } else {
-      if (this._dateAllowed(focusedDate, this.minDate, this.maxDate)) {
-        // Move to minDate or maxDate
-        this._focusDate(this[property]);
-      } else {
-        // Move to closest allowed date
-        this._focusClosestDate(focusedDate);
-      }
+      // Move to closest allowed date
+      this._focusClosestDate(focusedDate);
     }
   }
 

package/src/vaadin-date-picker.js

@@ -7,9 +7,9 @@ import '@polymer/iron-media-query/iron-media-query.js';
 import '@vaadin/input-container/src/vaadin-input-container.js';
 import './vaadin-date-picker-overlay.js';
 import './vaadin-date-picker-overlay-content.js';
-import { GestureEventListeners } from '@polymer/polymer/lib/mixins/gesture-event-listeners.js';
 import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
 import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
+import { addListener } from '@vaadin/component-base/src/gestures.js';
 import { InputControlMixin } from '@vaadin/field-base/src/input-control-mixin.js';
 import { InputController } from '@vaadin/field-base/src/input-controller.js';
 import { LabelledInputController } from '@vaadin/field-base/src/labelled-input-controller.js';
@@ -116,9 +116,7 @@ registerStyles('vaadin-date-picker', [inputFieldShared, datePickerStyles], { mod
  * @mixes ThemableMixin
  * @mixes InputControlMixin
  */
-class DatePicker extends DatePickerMixin(
-  InputControlMixin(GestureEventListeners(ThemableMixin(ElementMixin(PolymerElement))))
-) {
+class DatePicker extends DatePickerMixin(InputControlMixin(ThemableMixin(ElementMixin(PolymerElement)))) {
   static get is() {
     return 'vaadin-date-picker';
   }
@@ -147,7 +145,7 @@ class DatePicker extends DatePickerMixin(
           <slot name="prefix" slot="prefix"></slot>
           <slot name="input"></slot>
           <div id="clearButton" part="clear-button" slot="suffix"></div>
-          <div part="toggle-button" slot="suffix" on-tap="_toggle" role="button"></div>
+          <div part="toggle-button" slot="suffix" role="button"></div>
         </vaadin-input-container>
 
         <div part="helper-text">
@@ -165,6 +163,8 @@ class DatePicker extends DatePickerMixin(
         theme$="[[__getOverlayTheme(theme, _overlayInitialized)]]"
         on-vaadin-overlay-open="_onOverlayOpened"
         on-vaadin-overlay-close="_onOverlayClosed"
+        restore-focus-on-close
+        restore-focus-node="[[inputElement]]"
         disable-upgrade
       >
         <template>
@@ -213,6 +213,7 @@ class DatePicker extends DatePickerMixin(
       })
     );
     this.addController(new LabelledInputController(this.inputElement, this._labelNode));
+    addListener(this.shadowRoot.querySelector('[part="toggle-button"]'), 'tap', this._toggle.bind(this));
   }
 
   /** @private */

package/src/vaadin-infinite-scroller.js

@@ -209,6 +209,13 @@ class InfiniteScroller extends PolymerElement {
     });
   }
 
+  /**
+   * @private
+   */
+  get position() {
+    return (this.$.scroller.scrollTop - this._buffers[0].translateY) / this.itemHeight + this._firstIndex;
+  }
+
   /**
    * Current scroller position as index. Can be a fractional number.
    *
@@ -238,13 +245,6 @@ class InfiniteScroller extends PolymerElement {
     }
   }
 
-  /**
-   * @private
-   */
-  get position() {
-    return (this.$.scroller.scrollTop - this._buffers[0].translateY) / this.itemHeight + this._firstIndex;
-  }
-
   get itemHeight() {
     if (!this._itemHeightVal) {
       const itemHeight = getComputedStyle(this).getPropertyValue('--vaadin-infinite-scroller-item-height');

package/src/vaadin-month-calendar.js

@@ -4,8 +4,8 @@
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
 import '@polymer/polymer/lib/elements/dom-repeat.js';
-import { GestureEventListeners } from '@polymer/polymer/lib/mixins/gesture-event-listeners.js';
 import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
+import { addListener } from '@vaadin/component-base/src/gestures.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 import { dateAllowed, dateEquals, getISOWeekNumber } from './vaadin-date-picker-helper.js';
 
@@ -13,7 +13,7 @@ import { dateAllowed, dateEquals, getISOWeekNumber } from './vaadin-date-picker-
  * @extends HTMLElement
  * @private
  */
-class MonthCalendar extends ThemableMixin(GestureEventListeners(PolymerElement)) {
+class MonthCalendar extends ThemableMixin(PolymerElement) {
   static get template() {
     return html`
       <style>
@@ -59,7 +59,7 @@ class MonthCalendar extends ThemableMixin(GestureEventListeners(PolymerElement))
       </style>
 
       <div part="month-header" role="heading">[[_getTitle(month, i18n.monthNames)]]</div>
-      <div id="monthGrid" on-tap="_handleTap" on-touchend="_preventDefault" on-touchstart="_onMonthGridTouchStart">
+      <div id="monthGrid" on-touchend="_preventDefault" on-touchstart="_onMonthGridTouchStart">
         <div id="weekdays-container">
           <div hidden$="[[!_showWeekSeparator(showWeekNumbers, i18n.firstDayOfWeek)]]" part="weekday"></div>
           <div part="weekdays">
@@ -174,6 +174,12 @@ class MonthCalendar extends ThemableMixin(GestureEventListeners(PolymerElement))
     return ['_showWeekNumbersChanged(showWeekNumbers, i18n.firstDayOfWeek)'];
   }
 
+  /** @protected */
+  ready() {
+    super.ready();
+    addListener(this.$.monthGrid, 'tap', this._handleTap.bind(this));
+  }
+
   _dateEquals(date1, date2) {
     return dateEquals(date1, date2);
   }