@lekoala/date-picker 0.5.1 → 0.5.2

package/src/date-field.js

@@ -1,6 +1,15 @@
 import { isDate } from "./date.js";
 import { createDateAdapter } from "./intl.js";
 
+/**
+ * Whether the user may edit this input right now. `:disabled` is the effective
+ * state: the `disabled` property misses a disabled ancestor `<fieldset>`.
+ * @param {HTMLInputElement} input
+ */
+export function isEditable(input) {
+  return !input.matches(":disabled") && !input.readOnly;
+}
+
 /**
  * Owns a single editable form field inside a picker: the visible input, its
  * hidden canonical ISO field, the Intl adapter and the text commit pipeline
@@ -38,11 +47,33 @@ export class DateFieldController {
      * @type {((date: string, options?: {moveDisplay?: boolean}) => Promise<{ok: boolean, message?: string}>) | null}
      */
     this.confirm = null;
+    /** Canonical value behind a `defaultValue` the enhancement generated, or null. @type {string | null} */
+    this._generatedDefault = null;
   }
 
   /** @param {string} locale */
   setLocale(locale) {
+    const generated = this._generatedDefault;
+    const previous = generated ? this.adapter.format(generated) : null;
     this.adapter = createDateAdapter(locale || "");
+    // A generated default is localized text: reformat it so a later form reset
+    // never parses the old locale's text with the new adapter. An app-changed
+    // default no longer matches and stays untouched.
+    if (generated && this.input.defaultValue === previous) {
+      this.input.defaultValue = this.adapter.format(generated);
+    }
+  }
+
+  /**
+   * Make the current text the reset default when the author provided none.
+   * Never redefine an author-provided `input.defaultValue`: the next reset must
+   * use the native default (which the app may change).
+   */
+  adoptDefault() {
+    const input = this.input;
+    if (input.getAttribute("value") != null || input.defaultValue !== "") return;
+    input.defaultValue = input.value;
+    this._generatedDefault = this.canonical && input.value ? this.canonical : null;
   }
 
   /** @param {Record<string, string>} messages */
@@ -65,7 +96,7 @@ export class DateFieldController {
   }
 
   get isDisabled() {
-    return this.input.disabled;
+    return this.input.matches(":disabled");
   }
 
   get isReadOnly() {

package/src/date-picker.js

@@ -1,4 +1,5 @@
 import { autoUpdate, reposition } from "@lekoala/floating";
+import { activationIntents } from "./activation-intents.js";
 import {
   getDefaultControlClasses,
   normalizeControlClasses,
@@ -7,7 +8,7 @@ import {
 } from "./control-classes.js";
 import { compareDates, isDate, monthKey, todayISO } from "./date.js";
 import { DateCalendarElement } from "./date-calendar.js";
-import { DateFieldController } from "./date-field.js";
+import { DateFieldController, isEditable } from "./date-field.js";
 import { DateRangeController, normalizeRange } from "./date-range.js";
 import { createDateAdapter, formatLongDate, resolveLocale } from "./intl.js";
 import { getDefaultMessages, setDefaultMessages, subscribeDefaultMessages } from "./messages.js";
@@ -19,6 +20,10 @@ let uid = 0;
 /** Pointer travel, in CSS pixels, that turns a press into an endpoint drag. */
 const DRAG_THRESHOLD = 4;
 
+/** A grid activation intent: the generation at interaction time plus the bound
+ * a drag drop targets, empty for a normal pick.
+ * @typedef {{id: number, endpoint: "" | "start" | "end"}} PickIntent */
+
 export class DatePickerElement extends HTMLElement {
   static observedAttributes = ["value", "locale", "min", "max", "open-on-focus", "month-format"];
 
@@ -62,12 +67,10 @@ export class DatePickerElement extends HTMLElement {
     this._timeOrderOwned = new Set();
     /** @type {"" | "start" | "end"} */
     this._lastFocusEndpoint = "";
-    this._rangeCommitId = 0;
-    /** Grid activation intents, keyed by date: the generation at interaction
-     * time (range mode supersession/stale protection) plus the bound a drag
-     * drop targets, empty for a normal pick.
-     * @type {Map<string, {id: number, endpoint: "" | "start" | "end"}>} */
-    this._pendingIntents = new Map();
+    /** Activation generation. A grid intent records it at interaction time
+     * and travels with its own activation (see `activationIntents`), so a late
+     * response is checked against the generation, never looked up by date. */
+    this._activationId = 0;
     /** Candidate date currently projected onto the calendar band, if any. */
     this._previewDate = "";
     /** Live endpoint drag, or null. @type {{pointerId:number, endpoint:"start"|"end", x:number, y:number, date:string, active:boolean} | null} */
@@ -95,13 +98,13 @@ export class DatePickerElement extends HTMLElement {
     this._controlClasses = null;
     /** @type {(() => void) | null} */
     this._stopDefaultMessages = null;
-    /** @type {any} */
+    /** @type {import("./date-calendar.js").DateSource | null} */
     this._source = null;
-    /** @type {any} */
+    /** @type {import("./date-calendar.js").DateStateResolver | null} */
     this._dateState = null;
-    /** @type {any} */
+    /** @type {import("./date-calendar.js").DayRenderer | null} */
     this._renderDay = null;
-    /** @type {any} */
+    /** @type {import("./date-calendar.js").DateDisabledPredicate | null} */
     this._isDateDisabled = null;
     /** Public picker coordinate-space request. @type {"viewport" | "document"} */
     this._coordinateSpace = "viewport";
@@ -135,6 +138,9 @@ export class DatePickerElement extends HTMLElement {
       this._stopDefaultMessages = subscribeDefaultMessages(() => {
         if (this._messages === null) this._refreshMessages();
       });
+      // Applying the initial value clears custom validity; check it against
+      // min/max/isDateDisabled/source like any later constraint change.
+      void this.validate();
     }
   }
 
@@ -166,15 +172,11 @@ export class DatePickerElement extends HTMLElement {
     else input.setCustomValidity(this.messages.invalidDate);
 
     // Native form reset restores control defaultValues, then _restoreDefault()
-    // recommits the canonical value from them. Never redefine an author-provided
-    // input.defaultValue here: the next reset must use the native default (which
-    // the app may change). Only when enhancement itself supplies the initial
-    // text (picker value attr, no input value attr) does that text become the
-    // default to restore.
+    // recommits the canonical value from them. Only when enhancement itself
+    // supplies the initial text (picker value attr, no input value attr) does
+    // that text become the default to restore.
     if (this._field.hidden) this._field.hidden.defaultValue = this._value;
-    if (input.getAttribute("value") == null && input.defaultValue === "") {
-      input.defaultValue = input.value;
-    }
+    this._field.adoptDefault();
   }
 
   /**
@@ -241,19 +243,22 @@ export class DatePickerElement extends HTMLElement {
     const adapter = this._adapter();
     const initialStart = isDate(startInput.value) ? startInput.value : adapter.parse(startInput.value);
     const initialEnd = isDate(endInput.value) ? endInput.value : adapter.parse(endInput.value);
+    // Read the authored text before _setRange() reformats an unparsable one away.
+    const startText = startInput.value;
+    const endText = endInput.value;
     this._setRange(initialStart || "", initialEnd || "", { emit: false });
-    if (startInput.value.trim() && !isDate(initialStart))
-      startInput.setCustomValidity(this.messages.invalidDate);
-    if (endInput.value.trim() && !isDate(initialEnd)) endInput.setCustomValidity(this.messages.invalidDate);
+    for (const [input, text, initial] of /** @type {const} */ ([
+      [startInput, startText, initialStart],
+      [endInput, endText, initialEnd],
+    ])) {
+      if (!text.trim() || isDate(initial)) continue;
+      input.value = text;
+      input.setCustomValidity(this.messages.invalidDate);
+    }
 
     if (this._fields[0].hidden) this._fields[0].hidden.defaultValue = this._range.start;
     if (this._fields[1].hidden) this._fields[1].hidden.defaultValue = this._range.end;
-    if (startInput.getAttribute("value") == null && startInput.defaultValue === "") {
-      startInput.defaultValue = startInput.value;
-    }
-    if (endInput.getAttribute("value") == null && endInput.defaultValue === "") {
-      endInput.defaultValue = endInput.value;
-    }
+    for (const field of this._fields) field.adoptDefault();
   }
 
   disconnectedCallback() {
@@ -304,8 +309,10 @@ export class DatePickerElement extends HTMLElement {
     if (!this._connected || this._reflecting || oldValue === newValue) return;
     if (name === "value") {
       if (this._rangeMode()) return;
-      if (!newValue || isDate(newValue))
+      if (!newValue || isDate(newValue)) {
+        this._supersedeActivations();
         this._setValue(newValue || "", { emit: false, format: true, reflect: false });
+      }
       return;
     }
     if (name === "locale") this._refreshLocale();
@@ -334,6 +341,7 @@ export class DatePickerElement extends HTMLElement {
       throw new TypeError("value is not available in range mode; use range");
     }
     if (value && !isDate(value)) throw new TypeError(`Invalid date-picker value: ${value}`);
+    this._supersedeActivations();
     this._setValue(value || "", { emit: false, format: true });
   }
 
@@ -345,6 +353,7 @@ export class DatePickerElement extends HTMLElement {
   set range(value) {
     if (!this._rangeMode()) throw new TypeError("range is only available on <date-picker range>");
     const { start, end } = normalizeRange(value);
+    this._supersedeActivations();
     this._setRange(start, end);
   }
 
@@ -444,7 +453,7 @@ export class DatePickerElement extends HTMLElement {
     if (this._connected) void this.validate();
   }
 
-  /** @public @returns {any} */
+  /** @public @returns {import("./date-calendar.js").DateSource | null} */
   get source() {
     return this._source;
   }
@@ -455,7 +464,7 @@ export class DatePickerElement extends HTMLElement {
     if (this._connected) void this.validate();
   }
 
-  /** @public @returns {any} */
+  /** @public @returns {import("./date-calendar.js").DateStateResolver | null} */
   get dateState() {
     return this._dateState;
   }
@@ -466,7 +475,7 @@ export class DatePickerElement extends HTMLElement {
     if (this._connected) void this.validate();
   }
 
-  /** @public @returns {any} */
+  /** @public @returns {import("./date-calendar.js").DayRenderer | null} */
   get renderDay() {
     return this._renderDay;
   }
@@ -476,7 +485,7 @@ export class DatePickerElement extends HTMLElement {
     if (this._calendar) this._calendar.renderDay = this._renderDay;
   }
 
-  /** @public @returns {any} */
+  /** @public @returns {import("./date-calendar.js").DateDisabledPredicate | null} */
   get isDateDisabled() {
     return this._isDateDisabled;
   }
@@ -511,8 +520,10 @@ export class DatePickerElement extends HTMLElement {
     // movement lives in the field controller.
     this._field?.syncInputState();
     const button = this._buttons[0]?.button;
+    // Own state only: a disabled ancestor fieldset already disables the button
+    // natively, and copying it would stick once the fieldset is re-enabled.
     if (button) button.disabled = input.disabled || input.readOnly;
-    if (this._open && (input.disabled || input.readOnly)) this.hide(false);
+    if (this._open && !isEditable(input)) this.hide(false);
   }
 
   _syncRangeFields() {
@@ -527,9 +538,8 @@ export class DatePickerElement extends HTMLElement {
     }
     this._syncDragAffordance();
     const active = this._range?.activeEndpoint === "end" ? 1 : 0;
-    if (this._open && (this._fields[active]?.input.disabled || this._fields[active]?.input.readOnly)) {
-      this.hide(false);
-    }
+    const activeInput = this._fields[active]?.input;
+    if (this._open && activeInput && !isEditable(activeInput)) this.hide(false);
   }
 
   _setRangeAria() {
@@ -721,17 +731,27 @@ export class DatePickerElement extends HTMLElement {
       { signal },
     );
     button.addEventListener("keydown", (event) => this._onTriggerKeyDown("", event), { signal });
+    calendar.addEventListener("click", (event) => this._captureGridIntent(event), { capture: true, signal });
+    calendar.addEventListener("keydown", (event) => this._captureGridIntent(event), {
+      capture: true,
+      signal,
+    });
     calendar.addEventListener(
       "dateactivate",
       (event) => {
         const custom = /** @type {CustomEvent} */ (event);
         const date = custom.detail?.date;
         if (!isDate(date)) return;
+        const intent = /** @type {PickIntent | undefined} */ (activationIntents.get(custom));
         // The app listener on <date-picker> runs after this during bubbling;
         // defer the commit so preventDefault() is actually respected.
         queueMicrotask(() => {
           if (custom.defaultPrevented || !this._connected) return;
-          if (this._input?.disabled || this._input?.readOnly) return;
+          // A grid pick that resolves after the popup closed, after a newer pick
+          // or after a programmatic value must not overwrite it. A programmatic
+          // calendar.activateDate() carries no intent and still commits.
+          if (intent && intent.id !== this._activationId) return;
+          if (!this._input || !isEditable(this._input)) return;
           this._field?.dirty();
           this._setValue(date, { emit: true, format: true });
           this.hide(false);
@@ -755,7 +775,16 @@ export class DatePickerElement extends HTMLElement {
 
     for (const [index, field] of this._fields.entries()) {
       const endpoint = index === 1 ? "end" : "start";
-      field.input.addEventListener("input", () => field.handleInput(), { signal });
+      field.input.addEventListener(
+        "input",
+        () => {
+          // handleInput() rewrites the custom validity: any order error is gone.
+          field.handleInput();
+          this._orderTags.delete(index);
+          if (!field.isDirty) this._revalidateRange(endpoint);
+        },
+        { signal },
+      );
       field.input.addEventListener("change", () => void this._commitFieldText(endpoint), { signal });
       field.input.addEventListener("blur", () => void this._commitFieldText(endpoint), { signal });
       field.input.addEventListener(
@@ -806,11 +835,10 @@ export class DatePickerElement extends HTMLElement {
         if (!isDate(date)) return;
         queueMicrotask(() => {
           if (custom.defaultPrevented || !this._connected || !this._range) return;
-          const intent = this._pendingIntents.get(date);
+          const intent = /** @type {PickIntent | undefined} */ (activationIntents.get(custom));
           // A response is dropped when the active endpoint changed, the popup
           // closed or a newer activation superseded this one.
-          if (intent === undefined || intent.id !== this._rangeCommitId) return;
-          this._pendingIntents.delete(date);
+          if (intent === undefined || intent.id !== this._activationId) return;
           const editable = (/** @type {"start" | "end"} */ bound) => this._boundEditable(bound);
           // Click, keyboard and drop share this one machine; only the entry
           // point differs, a drag naming the handle it grabbed.
@@ -863,8 +891,7 @@ export class DatePickerElement extends HTMLElement {
     const calendar = this._calendar;
     if (!this._range || !calendar) return;
     this._range.focus(endpoint);
-    this._rangeCommitId++;
-    this._pendingIntents.clear();
+    this._activationId++;
     this._lastFocusEndpoint = endpoint;
     const target = this._boundCanonical(endpoint) || todayISO();
     calendar.display = monthKey(target);
@@ -950,8 +977,7 @@ export class DatePickerElement extends HTMLElement {
     if (switched) {
       // A late calendar activation targeting the previous endpoint must not
       // commit after the intent moved to the other bound.
-      this._rangeCommitId++;
-      this._pendingIntents.clear();
+      this._activationId++;
     }
     if (!this.openOnFocus || this._suppressFocusOpen) return;
     const related = event.relatedTarget;
@@ -959,30 +985,49 @@ export class DatePickerElement extends HTMLElement {
     if (!this._open) this.show({ moveFocus: false });
   }
 
-  /** Record range-mode grid activation intent (click or keyboard) so a stale,
+  /** Record grid activation intent (click or keyboard) so a stale,
    * late-confirmed dateactivate can be recognized and dropped. Each new grid
    * activation supersedes every earlier pending one.
    * @param {Event} event */
   _captureGridIntent(event) {
-    if (!this._rangeMode() || !this._range) return;
+    if (this._rangeMode() ? !this._range : !this._field) return;
     if (event.type === "keydown") {
       const key = /** @type {KeyboardEvent} */ (event).key;
       if (key !== "Enter" && key !== " ") return;
     }
+    // The click tail of a drag never activates: it must not supersede the drop.
+    if (event.type === "click" && this._suppressGridClick) return;
     if (!(event.target instanceof Element)) return;
     const cell = event.target.closest(".dp-day[data-date]");
     const date = cell?.getAttribute("data-date") || "";
     if (!isDate(date)) return;
-    // Each activation supersedes every earlier pending one.
-    this._pendingIntents.clear();
-    this._pendingIntents.set(date, { id: ++this._rangeCommitId, endpoint: "" });
+    this._attachIntent(date, "");
+  }
+
+  /**
+   * Hand a new intent to the calendar's next activation of `date`. Taking a
+   * new generation supersedes every earlier pending activation.
+   * @param {string} date @param {"" | "start" | "end"} endpoint
+   */
+  _attachIntent(date, endpoint) {
+    if (!this._calendar) return;
+    this._calendar._hostIntent = { date, intent: { id: ++this._activationId, endpoint } };
+  }
+
+  /**
+   * Invalidate every pending grid activation: each one carries its own intent,
+   * which now fails the generation check. A programmatic
+   * `calendar.activateDate()` carries none.
+   */
+  _supersedeActivations() {
+    this._activationId++;
   }
 
   /** Whether one bound can receive a user pick right now.
    * @param {"start" | "end"} bound */
   _boundEditable(bound) {
     const field = this._fields?.[bound === "end" ? 1 : 0];
-    return field != null && !field.input.disabled && !field.input.readOnly;
+    return field != null && isEditable(field.input);
   }
 
   /**
@@ -1180,8 +1225,7 @@ export class DatePickerElement extends HTMLElement {
     // guard: a late response can never move a bound after the popup closed or
     // after a newer interaction.
     const target = drag.endpoint === "start" ? transition.range.start : transition.range.end;
-    this._pendingIntents.clear();
-    this._pendingIntents.set(target, { id: ++this._rangeCommitId, endpoint: drag.endpoint });
+    this._attachIntent(target, drag.endpoint);
     void this._calendar?.activateDate(target);
   }
 
@@ -1403,7 +1447,7 @@ export class DatePickerElement extends HTMLElement {
     if (!field) return false;
     // User initiated picks must respect disabled/readonly bounds; reset,
     // explicit validation and programmatic assignments keep their own path.
-    if (options.user === true && (field.input.disabled || field.input.readOnly)) return false;
+    if (options.user === true && !isEditable(field.input)) return false;
     const next = value || "";
     // The range model may already hold the target (a calendar activation moved
     // it), so change detection reads the field canonical, not the model.
@@ -1509,8 +1553,8 @@ export class DatePickerElement extends HTMLElement {
     /** @type {["start", "end"]} */
     const bounds = ["start", "end"];
     const inputs = [startInput, endInput];
-    const startValue = startInput && !startInput.disabled ? startInput.value.trim() : "";
-    const endValue = endInput && !endInput.disabled ? endInput.value.trim() : "";
+    const startValue = startInput && !startInput.matches(":disabled") ? startInput.value.trim() : "";
+    const endValue = endInput && !endInput.matches(":disabled") ? endInput.value.trim() : "";
     const inverted =
       Boolean(startInput && endInput && startValue && endValue) &&
       isTime(startValue) &&
@@ -1600,12 +1644,12 @@ export class DatePickerElement extends HTMLElement {
     if (!this._fields) return "";
     const preferred = this._lastFocusEndpoint || "start";
     const preferredIndex = preferred === "end" ? 1 : 0;
-    if (!this._fields[preferredIndex].input.disabled && !this._fields[preferredIndex].input.readOnly) {
+    if (isEditable(this._fields[preferredIndex].input)) {
       return preferred;
     }
     const alternative = preferred === "end" ? "start" : "end";
     const alternativeIndex = alternative === "end" ? 1 : 0;
-    if (!this._fields[alternativeIndex].input.disabled && !this._fields[alternativeIndex].input.readOnly) {
+    if (isEditable(this._fields[alternativeIndex].input)) {
       return alternative;
     }
     return "";
@@ -1621,6 +1665,8 @@ export class DatePickerElement extends HTMLElement {
       // Empty text flows through commit()'s "clear" outcome, not an early exit.
       for (const [index, field] of fields.entries()) {
         const result = await field.commit({ moveDisplay: false });
+        // A parse/source error replaced the order error, which no longer owns it.
+        if (result.status === "invalid") this._orderTags.delete(index);
         if (result.status === "ok" || result.status === "clear") {
           const which = index === 1 ? "end" : "start";
           this._setBound(which, result.value || "", { format: result.status === "ok" });
@@ -1632,11 +1678,9 @@ export class DatePickerElement extends HTMLElement {
     }
     const input = this._field?.input;
     if (!input) return true;
-    if (!input.value.trim()) {
-      input.setCustomValidity("");
-    } else {
-      await this._commitText(false, { force: true, moveDisplay: false });
-    }
+    // Empty text flows through commit()'s "clear" outcome so the canonical
+    // value and hidden ISO are cleared with it.
+    await this._commitText(false, { force: true, moveDisplay: false });
     // Same start-then-end order as the range path, so a from/to inversion
     // ends reported on "end". A programmatic time change resyncs here too.
     this._revalidateTimeOrder("start");
@@ -1656,7 +1700,7 @@ export class DatePickerElement extends HTMLElement {
       this._activateRangeEndpoint(endpoint);
     } else {
       const input = this._input;
-      if (!input || input.disabled || input.readOnly) return;
+      if (!input || !isEditable(input)) return;
       const target = this._value || this._adapter().parse(input.value) || todayISO();
       calendar.display = monthKey(target);
       calendar.focusedDate = target;
@@ -1704,8 +1748,7 @@ export class DatePickerElement extends HTMLElement {
     }
     this._open = false;
     this._setExpanded(false);
-    this._rangeCommitId++;
-    this._pendingIntents.clear();
+    this._supersedeActivations();
     this._suppressGridClick = false;
     if (this._drag) {
       this._releaseDragCapture(this._drag.pointerId);
@@ -1734,7 +1777,7 @@ export class DatePickerElement extends HTMLElement {
     if (active) {
       const index = active === "end" ? 1 : 0;
       const field = this._fields?.[index];
-      if (field && !field.input.disabled && !field.input.readOnly) return active;
+      if (field && isEditable(field.input)) return active;
     }
     return this._resolveRangeEndpoint();
   }