@vaadin/date-time-picker 23.0.0-alpha1 → 23.0.0-alpha5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/date-time-picker",
-  "version": "23.0.0-alpha1",
+  "version": "23.0.0-alpha5",
   "publishConfig": {
     "access": "public"
   },
@@ -18,6 +18,7 @@
   },
   "main": "vaadin-date-time-picker.js",
   "module": "vaadin-date-time-picker.js",
+  "type": "module",
   "files": [
     "src",
     "theme",
@@ -33,19 +34,19 @@
   ],
   "dependencies": {
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/component-base": "23.0.0-alpha1",
-    "@vaadin/custom-field": "23.0.0-alpha1",
-    "@vaadin/date-picker": "23.0.0-alpha1",
-    "@vaadin/field-base": "23.0.0-alpha1",
-    "@vaadin/time-picker": "23.0.0-alpha1",
-    "@vaadin/vaadin-lumo-styles": "23.0.0-alpha1",
-    "@vaadin/vaadin-material-styles": "23.0.0-alpha1",
-    "@vaadin/vaadin-themable-mixin": "23.0.0-alpha1"
+    "@vaadin/component-base": "23.0.0-alpha5",
+    "@vaadin/custom-field": "23.0.0-alpha5",
+    "@vaadin/date-picker": "23.0.0-alpha5",
+    "@vaadin/field-base": "23.0.0-alpha5",
+    "@vaadin/time-picker": "23.0.0-alpha5",
+    "@vaadin/vaadin-lumo-styles": "23.0.0-alpha5",
+    "@vaadin/vaadin-material-styles": "23.0.0-alpha5",
+    "@vaadin/vaadin-themable-mixin": "23.0.0-alpha5"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
     "@vaadin/testing-helpers": "^0.3.2",
     "sinon": "^9.2.1"
   },
-  "gitHead": "fbcb07328fdf88260e3b461088d207426b21c710"
+  "gitHead": "74f9294964eb8552d96578c14af6ad214f5257bc"
 }

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

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2021 Vaadin Ltd.
+ * Copyright (c) 2019 - 2022 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
 import { DatePicker } from '@vaadin/date-picker/src/vaadin-date-picker.js';

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

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2021 Vaadin Ltd.
+ * Copyright (c) 2019 - 2022 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
 import { TimePicker } from '@vaadin/time-picker/src/vaadin-time-picker.js';

package/src/vaadin-date-time-picker.d.ts

@@ -1,10 +1,11 @@
 /**
  * @license
- * Copyright (c) 2021 Vaadin Ltd.
+ * Copyright (c) 2019 - 2022 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
 import { DisabledMixin } from '@vaadin/component-base/src/disabled-mixin.js';
 import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
+import { FocusMixin } from '@vaadin/component-base/src/focus-mixin.js';
 import { SlotMixin } from '@vaadin/component-base/src/slot-mixin.js';
 import { DatePickerI18n } from '@vaadin/date-picker/src/vaadin-date-picker.js';
 import { FieldMixin } from '@vaadin/field-base/src/field-mixin.js';
@@ -69,6 +70,8 @@ export interface DateTimePickerEventMap extends DateTimePickerCustomEventMap, HT
  * Attribute           | Description                               | Part name
  * --------------------|-------------------------------------------|------------
  * `disabled`          | Set when the element is disabled          | :host
+ * `focused`           | Set when the element is focused           | :host
+ * `focus-ring`        | Set when the element is keyboard focused  | :host
  * `readonly`          | Set when the element is readonly          | :host
  * `invalid`           | Set when the element is invalid           | :host
  * `has-label`         | Set when the element has a label          | :host
@@ -93,7 +96,9 @@ export interface DateTimePickerEventMap extends DateTimePickerCustomEventMap, HT
  * @fires {CustomEvent} invalid-changed - Fired when the `invalid` property changes.
  * @fires {CustomEvent} value-changed - Fired when the `value` property changes.
  */
-declare class DateTimePicker extends FieldMixin(SlotMixin(DisabledMixin(ThemableMixin(ElementMixin(HTMLElement))))) {
+declare class DateTimePicker extends FieldMixin(
+  SlotMixin(DisabledMixin(FocusMixin(ThemableMixin(ElementMixin(HTMLElement)))))
+) {
   /**
    * The name of the control, which is submitted with the form data.
    */

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

@@ -1,13 +1,15 @@
 /**
  * @license
- * Copyright (c) 2021 Vaadin Ltd.
+ * Copyright (c) 2019 - 2022 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
 import './vaadin-date-time-picker-date-picker.js';
 import './vaadin-date-time-picker-time-picker.js';
+import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js';
 import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
 import { DisabledMixin } from '@vaadin/component-base/src/disabled-mixin.js';
 import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
+import { FocusMixin } from '@vaadin/component-base/src/focus-mixin.js';
 import { SlotMixin } from '@vaadin/component-base/src/slot-mixin.js';
 import { dateEquals } from '@vaadin/date-picker/src/vaadin-date-picker-helper.js';
 import { FieldMixin } from '@vaadin/field-base/src/field-mixin.js';
@@ -25,14 +27,14 @@ registerStyles('vaadin-date-time-picker', inputFieldShared, { moduleId: 'vaadin-
  */
 
 // Find a property definition from the prototype chain of a Polymer element class
-const getPropertyFromPrototype = function (clazz, prop) {
+function getPropertyFromPrototype(clazz, prop) {
   while (clazz) {
     if (clazz.properties && clazz.properties[prop]) {
       return clazz.properties[prop];
     }
-    clazz = clazz.__proto__;
+    clazz = Object.getPrototypeOf(clazz);
   }
-};
+}
 
 const datePickerClass = customElements.get('vaadin-date-time-picker-date-picker');
 const timePickerClass = customElements.get('vaadin-date-time-picker-time-picker');
@@ -70,6 +72,8 @@ const timePickerI18nProps = Object.keys(timePickerI18nDefaults);
  * Attribute           | Description                               | Part name
  * --------------------|-------------------------------------------|------------
  * `disabled`          | Set when the element is disabled          | :host
+ * `focused`           | Set when the element is focused           | :host
+ * `focus-ring`        | Set when the element is keyboard focused  | :host
  * `readonly`          | Set when the element is readonly          | :host
  * `invalid`           | Set when the element is invalid           | :host
  * `has-label`         | Set when the element has a label          | :host
@@ -97,11 +101,14 @@ const timePickerI18nProps = Object.keys(timePickerI18nDefaults);
  * @extends HTMLElement
  * @mixes ElementMixin
  * @mixes ThemableMixin
+ * @mixes FocusMixin
  * @mixes DisabledMixin
  * @mixes SlotMixin
  * @mixes FieldMixin
  */
-class DateTimePicker extends FieldMixin(SlotMixin(DisabledMixin(ThemableMixin(ElementMixin(PolymerElement))))) {
+class DateTimePicker extends FieldMixin(
+  SlotMixin(DisabledMixin(FocusMixin(ThemableMixin(ElementMixin(PolymerElement)))))
+) {
   static get template() {
     return html`
       <style>
@@ -326,7 +333,25 @@ class DateTimePicker extends FieldMixin(SlotMixin(DisabledMixin(ThemableMixin(El
        */
       i18n: {
         type: Object,
-        value: () => Object.assign({}, datePickerI18nDefaults, timePickerI18nDefaults)
+        value: () => ({ ...datePickerI18nDefaults, ...timePickerI18nDefaults })
+      },
+
+      /**
+       * The current slotted date picker.
+       * @private
+       */
+      __datePicker: {
+        type: HTMLElement,
+        observer: '__datePickerChanged'
+      },
+
+      /**
+       * The current slotted time picker.
+       * @private
+       */
+      __timePicker: {
+        type: HTMLElement,
+        observer: '__timePickerChanged'
       }
     };
   }
@@ -378,6 +403,10 @@ class DateTimePicker extends FieldMixin(SlotMixin(DisabledMixin(ThemableMixin(El
 
     this.__changeEventHandler = this.__changeEventHandler.bind(this);
     this.__valueChangedEventHandler = this.__valueChangedEventHandler.bind(this);
+
+    this._observer = new FlattenedNodesObserver(this, (info) => {
+      this.__onDomChange(info.addedNodes);
+    });
   }
 
   /** @protected */
@@ -390,11 +419,8 @@ class DateTimePicker extends FieldMixin(SlotMixin(DisabledMixin(ThemableMixin(El
       }
     });
 
-    this.__datePickerChanged();
-    this.__timePickerChanged();
-
-    this.$.dateSlot.addEventListener('slotchange', this.__datePickerChanged.bind(this));
-    this.$.timeSlot.addEventListener('slotchange', this.__timePickerChanged.bind(this));
+    this.__datePicker = this._getDirectSlotChild('date-picker');
+    this.__timePicker = this._getDirectSlotChild('time-picker');
 
     if (this.autofocus && !this.disabled) {
       window.requestAnimationFrame(() => this.focus());
@@ -414,6 +440,28 @@ class DateTimePicker extends FieldMixin(SlotMixin(DisabledMixin(ThemableMixin(El
     this.__datePicker.focus();
   }
 
+  /**
+   * Override method inherited from `FocusMixin` to not remove focused
+   * state when focus moves between pickers or to the overlay.
+   * @param {FocusEvent} event
+   * @return {boolean}
+   * @protected
+   * @override
+   */
+  _shouldRemoveFocus(event) {
+    const target = event.relatedTarget;
+
+    if (
+      this.__datePicker.contains(target) ||
+      this.__timePicker.contains(target) ||
+      target === this.__datePicker.$.overlay
+    ) {
+      return false;
+    }
+
+    return true;
+  }
+
   /** @private */
   __syncI18n(target, source, props) {
     props = props || Object.keys(source.i18n);
@@ -449,87 +497,98 @@ class DateTimePicker extends FieldMixin(SlotMixin(DisabledMixin(ThemableMixin(El
   }
 
   /** @private */
-  __datePickerChanged() {
-    const datePicker = this._getDirectSlotChild('date-picker');
-    if (this.__datePicker === datePicker || !datePicker) {
+  __onDomChange(addedNodes) {
+    addedNodes
+      .filter((node) => node.nodeType === Node.ELEMENT_NODE)
+      .forEach((node) => {
+        const slotAttributeValue = node.getAttribute('slot');
+
+        if (slotAttributeValue === 'date-picker') {
+          this.__datePicker = node;
+        } else if (slotAttributeValue === 'time-picker') {
+          this.__timePicker = node;
+        }
+      });
+  }
+
+  /** @private */
+  __datePickerChanged(newDatePicker, existingDatePicker) {
+    if (!newDatePicker) {
       return;
     }
-    if (this.__datePicker) {
+    if (existingDatePicker) {
       // Remove an existing date picker
-      this.__removeInputListeners(this.__datePicker);
-      this.__datePicker.remove();
+      this.__removeInputListeners(existingDatePicker);
+      existingDatePicker.remove();
     }
 
-    this.__addInputListeners(datePicker);
-    this.__datePicker = datePicker;
+    this.__addInputListeners(newDatePicker);
 
-    if (datePicker.__defaultPicker) {
+    if (newDatePicker.__defaultPicker) {
       // Synchronize properties to default date picker
-      datePicker.placeholder = this.datePlaceholder;
-      datePicker.invalid = this.invalid;
-      datePicker.initialPosition = this.initialPosition;
-      datePicker.showWeekNumbers = this.showWeekNumbers;
-      this.__syncI18n(datePicker, this, datePickerI18nProps);
+      newDatePicker.placeholder = this.datePlaceholder;
+      newDatePicker.invalid = this.invalid;
+      newDatePicker.initialPosition = this.initialPosition;
+      newDatePicker.showWeekNumbers = this.showWeekNumbers;
+      this.__syncI18n(newDatePicker, this, datePickerI18nProps);
     } else {
       // Synchronize properties from slotted date picker
-      this.datePlaceholder = datePicker.placeholder;
-      this.initialPosition = datePicker.initialPosition;
-      this.showWeekNumbers = datePicker.showWeekNumbers;
-      this.__syncI18n(this, datePicker, datePickerI18nProps);
+      this.datePlaceholder = newDatePicker.placeholder;
+      this.initialPosition = newDatePicker.initialPosition;
+      this.showWeekNumbers = newDatePicker.showWeekNumbers;
+      this.__syncI18n(this, newDatePicker, datePickerI18nProps);
     }
 
     // min and max are always synchronized from date time picker (host) to inner fields because time picker
     // min and max need to be dynamically set depending on currently selected date instead of simple propagation
-    datePicker.min = this.__formatDateISO(this.__minDateTime, this.__defaultDateMinMaxValue);
-    datePicker.max = this.__formatDateISO(this.__maxDateTime, this.__defaultDateMinMaxValue);
-    datePicker.required = this.required;
-    datePicker.disabled = this.disabled;
-    datePicker.readonly = this.readonly;
-    datePicker.autoOpenDisabled = this.autoOpenDisabled;
+    newDatePicker.min = this.__formatDateISO(this.__minDateTime, this.__defaultDateMinMaxValue);
+    newDatePicker.max = this.__formatDateISO(this.__maxDateTime, this.__defaultDateMinMaxValue);
+    newDatePicker.required = this.required;
+    newDatePicker.disabled = this.disabled;
+    newDatePicker.readonly = this.readonly;
+    newDatePicker.autoOpenDisabled = this.autoOpenDisabled;
 
     // Disable default internal validation for the component
-    datePicker.validate = () => {};
-    datePicker._validateInput = () => {};
+    newDatePicker.validate = () => {};
+    newDatePicker._validateInput = () => {};
   }
 
   /** @private */
-  __timePickerChanged() {
-    const timePicker = this._getDirectSlotChild('time-picker');
-    if (this.__timePicker === timePicker || !timePicker) {
+  __timePickerChanged(newTimePicker, existingTimePicker) {
+    if (!newTimePicker) {
       return;
     }
-    if (this.__timePicker) {
+    if (existingTimePicker) {
       // Remove an existing time picker
-      this.__removeInputListeners(this.__timePicker);
-      this.__timePicker.remove();
+      this.__removeInputListeners(existingTimePicker);
+      existingTimePicker.remove();
     }
 
-    this.__addInputListeners(timePicker);
-    this.__timePicker = timePicker;
+    this.__addInputListeners(newTimePicker);
 
-    if (timePicker.__defaultPicker) {
+    if (newTimePicker.__defaultPicker) {
       // Synchronize properties to default time picker
-      timePicker.placeholder = this.timePlaceholder;
-      timePicker.step = this.step;
-      timePicker.invalid = this.invalid;
-      this.__syncI18n(timePicker, this, timePickerI18nProps);
+      newTimePicker.placeholder = this.timePlaceholder;
+      newTimePicker.step = this.step;
+      newTimePicker.invalid = this.invalid;
+      this.__syncI18n(newTimePicker, this, timePickerI18nProps);
     } else {
       // Synchronize properties from slotted time picker
-      this.timePlaceholder = timePicker.placeholder;
-      this.step = timePicker.step;
-      this.__syncI18n(this, timePicker, timePickerI18nProps);
+      this.timePlaceholder = newTimePicker.placeholder;
+      this.step = newTimePicker.step;
+      this.__syncI18n(this, newTimePicker, timePickerI18nProps);
     }
 
     // min and max are always synchronized from parent to slotted because time picker min and max
     // need to be dynamically set depending on currently selected date instead of simple propagation
     this.__updateTimePickerMinMax();
-    timePicker.required = this.required;
-    timePicker.disabled = this.disabled;
-    timePicker.readonly = this.readonly;
-    timePicker.autoOpenDisabled = this.autoOpenDisabled;
+    newTimePicker.required = this.required;
+    newTimePicker.disabled = this.disabled;
+    newTimePicker.readonly = this.readonly;
+    newTimePicker.autoOpenDisabled = this.autoOpenDisabled;
 
     // Disable default internal validation for the component
-    timePicker.validate = () => {};
+    newTimePicker.validate = () => {};
   }
 
   /** @private */
@@ -561,12 +620,10 @@ class DateTimePicker extends FieldMixin(SlotMixin(DisabledMixin(ThemableMixin(El
 
   /** @private */
   __i18nChanged(changeRecord) {
-    this.__datePickerChanged();
     if (this.__datePicker) {
       this.__datePicker.set(changeRecord.path, changeRecord.value);
     }
 
-    this.__timePickerChanged();
     if (this.__timePicker) {
       this.__timePicker.set(changeRecord.path, changeRecord.value);
     }