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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/date-time-picker",
-  "version": "23.0.0-alpha4",
+  "version": "23.0.0-alpha5",
   "publishConfig": {
     "access": "public"
   },
@@ -34,19 +34,19 @@
   ],
   "dependencies": {
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/component-base": "23.0.0-alpha4",
-    "@vaadin/custom-field": "23.0.0-alpha4",
-    "@vaadin/date-picker": "23.0.0-alpha4",
-    "@vaadin/field-base": "23.0.0-alpha4",
-    "@vaadin/time-picker": "23.0.0-alpha4",
-    "@vaadin/vaadin-lumo-styles": "23.0.0-alpha4",
-    "@vaadin/vaadin-material-styles": "23.0.0-alpha4",
-    "@vaadin/vaadin-themable-mixin": "23.0.0-alpha4"
+    "@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": "81e2deee5147bb7c1f4884760f4598613306f1fb"
+  "gitHead": "74f9294964eb8552d96578c14af6ad214f5257bc"
 }

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

@@ -5,6 +5,7 @@
  */
 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

@@ -9,6 +9,7 @@ import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nod
 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';
@@ -71,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
@@ -98,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>
@@ -434,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);