@aurodesignsystem-dev/auro-formkit 0.0.0-pr1508.0 → 0.0.0-pr1509.0

package/components/combobox/dist/registered.js

@@ -767,8 +767,6 @@ function navigateArrow(component, direction, options = {}) {
   }
 }
 
-/* eslint-disable no-underscore-dangle */
-
 /**
  * Returns the clear button element from the active input's shadow
  * DOM, if available.
@@ -804,9 +802,11 @@ function isClearBtnFocused(ctx, clearBtn = getClearBtn(ctx)) {
  * @param {Object} menu - The menu component.
  */
 function reconcileMenuIndex(menu) {
+  // eslint-disable-next-line no-underscore-dangle
   if (menu._index < 0 && menu.optionActive && menu.items) {
     const idx = menu.items.indexOf(menu.optionActive);
     if (idx >= 0) {
+      // eslint-disable-next-line no-underscore-dangle
       menu._index = idx;
     }
   }
@@ -4806,7 +4806,7 @@ let AuroHelpText$2 = class AuroHelpText extends LitElement {
   }
 };
 
-var formkitVersion$2 = '202606231948';
+var formkitVersion$2 = '202606232113';
 
 let AuroElement$2 = class AuroElement extends LitElement {
   static get properties() {
@@ -16528,7 +16528,6 @@ class AuroInputUtilities {
     const maskOptions = this.getMaskOptions('date', normalizedFormat);
 
     if (!(valueObject instanceof Date) || Number.isNaN(valueObject.getTime()) || !maskOptions || typeof maskOptions.format !== 'function') {
-      console.debug('Invalid date object or mask options for formatting', { valueObject, maskOptions }); // eslint-disable-line no-console
       return undefined;
     }
 
@@ -16680,8 +16679,10 @@ class BaseInput extends AuroElement$1 {
     this.layout = 'classic';
     this.locale = 'en-US';
     this.max = undefined;
+    this._maxObject = undefined;
     this.maxLength = undefined;
     this.min = undefined;
+    this._minObject = undefined;
     this.minLength = undefined;
     this.required = false;
     this.onDark = false;
@@ -16689,6 +16690,7 @@ class BaseInput extends AuroElement$1 {
     this.size = 'lg';
     this.shape = 'classic';
     this.value = undefined;
+    this._valueObject = undefined;
 
     this._initializePrivateDefaults();
   }
@@ -17228,7 +17230,7 @@ class BaseInput extends AuroElement$1 {
    * @returns {Date|undefined}
    */
   get valueObject() {
-    return this.value && dateFormatter.isValidDate(this.value) ? dateFormatter.stringToDateInstance(this.value) : undefined;
+    return this._valueObject || this._computeDateObjectFallback(this.value);
   }
 
   /**
@@ -17236,7 +17238,7 @@ class BaseInput extends AuroElement$1 {
    * @returns {Date|undefined}
    */
   get minObject() {
-    return this.min && dateFormatter.isValidDate(this.min) ? dateFormatter.stringToDateInstance(this.min) : undefined;
+    return this._minObject || this._computeDateObjectFallback(this.min);
   }
 
   /**
@@ -17244,7 +17246,50 @@ class BaseInput extends AuroElement$1 {
    * @returns {Date|undefined}
    */
   get maxObject() {
-    return this.max && dateFormatter.isValidDate(this.max) ? dateFormatter.stringToDateInstance(this.max) : undefined;
+    return this._maxObject || this._computeDateObjectFallback(this.max);
+  }
+
+  /**
+   * Parses a date string into a Date object when the corresponding `_*Object`
+   * field hasn't been synced yet by `updated()`. Returns undefined when the
+   * input type/format isn't a full date or the string is not a valid date.
+   *
+   * Why this exists: a parent (datepicker) can call `inputN.validate()` from
+   * inside its own `updated()` before this input's `updated()` has run
+   * `syncDateValues()` — so `_valueObject`/`_maxObject` are still `undefined`
+   * and range checks would otherwise silently no-op (flipping the result to
+   * `valid` or `patternMismatch`).
+   * @private
+   * @param {string|undefined} dateStr - ISO date string from `value`/`min`/`max`.
+   * @returns {Date|undefined}
+   */
+  _computeDateObjectFallback(dateStr) {
+    if (!dateStr || !this.util || !this.util.isFullDateFormat(this.type, this.format)) {
+      return undefined;
+    }
+    if (!dateFormatter.isValidDate(dateStr)) {
+      return undefined;
+    }
+    return dateFormatter.stringToDateInstance(dateStr);
+  }
+
+  /**
+   * Internal setter for readonly date object properties.
+   * @private
+   * @param {'valueObject'|'minObject'|'maxObject'} propertyName - Public object property name.
+   * @param {Date|undefined} propertyValue - Value to assign.
+   * @returns {void}
+   */
+  setDateObjectProperty(propertyName, propertyValue) {
+    const internalPropertyName = `_${propertyName}`;
+    const previousValue = this[internalPropertyName];
+
+    if (previousValue === propertyValue) {
+      return;
+    }
+
+    this[internalPropertyName] = propertyValue;
+    this.requestUpdate(propertyName, previousValue);
   }
 
   connectedCallback() {
@@ -17273,6 +17318,7 @@ class BaseInput extends AuroElement$1 {
       format: this.format
     });
     this.configureDataForType();
+    this.syncDateValues();
   }
 
   disconnectedCallback() {
@@ -17292,6 +17338,15 @@ class BaseInput extends AuroElement$1 {
       this.wrapperElement.addEventListener('click', this.handleClick);
     }
 
+    // add attribute for query selectors when auro-input is registered under a custom name
+    // COVERAGE: the body of this branch is unreachable in WTR — connectedCallback
+    // performs the same `setAttribute('auro-input', '')` earlier (see L665-667),
+    // so by the time firstUpdated runs the attribute is already present and the
+    // `!hasAttribute('auro-input')` guard is false. Retained as a defensive
+    // safety net in case connectedCallback is ever short-circuited.
+    if (this.tagName.toLowerCase() !== 'auro-input' && !this.hasAttribute('auro-input')) {
+      this.setAttribute('auro-input', '');
+    }
     this.inputId = this.id ? `${this.id}-input` : window.crypto.randomUUID();
 
     // use validity message override if declared when initializing the component
@@ -17302,6 +17357,7 @@ class BaseInput extends AuroElement$1 {
     this.setCustomHelpTextMessage();
     this.configureAutoFormatting();
     this.configureDataForType();
+    this.syncDateValues();
   }
 
   /**
@@ -17377,6 +17433,13 @@ class BaseInput extends AuroElement$1 {
 
     if (typeToI18n.includes(this.type)) {
       this.setCustomValidityForType = i18n(this.lang, this.type);
+    // COVERAGE: this `else if` branch is unreachable in WTR. connectedCallback
+    // (L682) calls configureDataForType, which at L1266-1268 assigns
+    // `this.format = this.util.getDateMaskFromLocale().toLowerCase()` for any
+    // type=date input whose `format` attribute is unset. That runs before
+    // firstUpdated invokes setCustomHelpTextMessage, so `!this.format` is
+    // always false here. Retained as a defensive fallback; the whole function
+    // is @deprecated per AB#1557296 and slated for removal.
     } else if (!this.format && this.type === 'date') {
       this.setCustomValidityForType = i18n(this.lang, 'dateMMDDYYYY');
     } else if (this.dateFormatMap[this.format]) {
@@ -17438,6 +17501,8 @@ class BaseInput extends AuroElement$1 {
       this.configureDataForType();
     }
 
+    this.syncDateValues(changedProperties);
+
     if (changedProperties.has('value')) {
       if (this.value && this.value.length > 0) {
         this.hasValue = true;
@@ -17459,14 +17524,14 @@ class BaseInput extends AuroElement$1 {
 
       if (formattedValue !== this.inputElement.value) {
         this.skipNextProgrammaticInputEvent = true;
-        if (this.maskInstance && this.type !== 'date') {
+        if (this.maskInstance && this.type === 'credit-card') {
           // Route through the mask so its _value and el.value stay in lock-step
           // (set value calls updateControl which writes el.value = displayValue).
           // Writing el.value directly leaves the mask thinking displayValue is
-          // stale; _saveSelection on the next focus/click then warns. Date is
-          // excluded because its formattedValue can be raw ISO when the calendar
-          // is invalid, and re-masking through mm/dd/yyyy would truncate it and
-          // flip validity from patternMismatch to tooShort.
+          // stale; _saveSelection on the next focus/click then warns. Scoped to
+          // credit-card so date's own formattedValue (raw ISO when calendar-invalid)
+          // isn't re-masked through the mm/dd/yyyy mask, which would truncate it
+          // and flip validity from patternMismatch to tooShort.
           this.maskInstance.value = formattedValue || '';
         } else if (formattedValue) {
           this.inputElement.value = formattedValue;
@@ -17508,65 +17573,120 @@ class BaseInput extends AuroElement$1 {
     }));
   }
 
+
+  /**
+   * Synchronizes the ISO string values and Date object representations for date-related properties.
+   * This keeps the model and display values aligned when either side changes.
+   *
+   * When a full date format is in use, this method updates `value`, `min`, and `max` from their corresponding
+   * Date objects or vice versa, based on which properties have changed. It only runs when the current configuration
+   * represents a full year/month/day date format.
+   *
+   * @param {Map<string, unknown>|undefined} [changedProperties=undefined] - Optional map of changed properties used to limit which values are synchronized.
+   * @returns {void}
+   * @private
+   */
+  syncDateValues(changedProperties = undefined) {
+    if (!this.util.isFullDateFormat(this.type, this.format)) {
+      return;
+    }
+
+    this.syncSingleDateValue(changedProperties, 'valueObject', 'value');
+    this.syncSingleDateValue(changedProperties, 'minObject', 'min');
+    this.syncSingleDateValue(changedProperties, 'maxObject', 'max');
+  }
+
+  /**
+   * Synchronizes one date object/string property pair.
+   * @private
+   * @param {Map<string, unknown>|undefined} changedProperties - Map of changed properties from Lit.
+   * @param {string} objectProperty - Date object property name.
+   * @param {string} valueProperty - ISO string property name.
+   * @returns {void}
+   */
+  syncSingleDateValue(changedProperties, objectProperty, valueProperty) {
+    const objectPropertyChanged = !changedProperties || changedProperties.has(objectProperty);
+
+    // objectProperty wins over valueProperty when both changed
+    if (objectPropertyChanged && this[objectProperty]) {
+      this[valueProperty] = dateFormatter.toISOFormatString(this[objectProperty]);
+      return;
+    }
+
+    const valuePropertyChanged = !changedProperties || changedProperties.has(valueProperty);
+    if (!valuePropertyChanged) {
+      return;
+    }
+
+    // when value is newly set to the same ISO string that corresponds to the existing Date object, do not clear the Date object (avoid unnecessary updates)
+    if (
+      changedProperties &&
+      valueProperty === 'value' &&
+      changedProperties.get('value') === undefined &&
+      this[objectProperty] instanceof Date &&
+      this[valueProperty] === dateFormatter.toISOFormatString(this[objectProperty])
+    ) {
+      return;
+    }
+
+    if (dateFormatter.isValidDate(this[valueProperty])) {
+      this.setDateObjectProperty(objectProperty, dateFormatter.stringToDateInstance(this[valueProperty]));
+    } else {
+      this.setDateObjectProperty(objectProperty, undefined);
+    }
+  }
+
   /**
    * Sets up IMasks and logic based on auto-formatting requirements.
    * @private
    * @returns {void}
    */
   configureAutoFormatting() {
-    // _configuringMask gates two things: external re-entry into this method
-    // while setup is mid-flight (from property changes that call back here),
-    // and the accept/complete listeners below — both need to ignore the mask
-    // events fired by our own value-restore step.
+    // Re-entrancy guard. The patched-setter's synthetic input event (suppressed
+    // by _configuringMask above) could otherwise trigger handleInput →
+    // processCreditCard → configureAutoFormatting before the outer call's
+    // set value has finished its alignCursor pass.
     if (this._configuringMask) return;
     this._configuringMask = true;
     try {
-      // Destroy any prior mask so IMask can attach fresh under the new format.
-      // Null the reference too — if the new maskOptions.mask is falsy (e.g.
-      // type switched from credit-card to text) the IMask() reassignment
-      // below is skipped, and downstream writes at line ~823 would otherwise
-      // route through the destroyed instance.
       if (this.maskInstance) {
         this.maskInstance.destroy();
-        this.maskInstance = null;
       }
 
+      // Pass new format to util
       this.util.updateFormat(this.format);
 
       const maskOptions = this.util.getMaskOptions(this.type, this.format);
 
       if (this.inputElement && maskOptions.mask) {
-        // Capture the current display so it can be re-applied after IMask
-        // attaches. The restore at the bottom goes through maskInstance.value
-        // (not inputElement.value directly) so the mask's internal state and
-        // the input's displayed text stay in lock-step.
-        let existingValue = this.inputElement.value;
 
-        // Format-change case (e.g. locale switch): existingValue is the OLD
-        // mask's display string and may not parse under the new mask. When
-        // we have a valid date model, rebuild the display from valueObject
-        // (the canonical source) using the new mask's format function.
+        // Stash and clear any existing value before IMask init.
+        // IMask's constructor processes the current input value which requires
+        // selection state — clearing first avoids that scenario entirely.
+        // When the format changes (e.g. locale switch) and we have a valid ISO
+        // model value, compute the display string for the NEW format instead of
+        // re-using the old display string, which may be invalid in the new mask.
+        let existingValue = this.inputElement.value;
         if (
           this.util.isFullDateFormat(this.type, this.format) &&
           this.value &&
-          this.valueObject &&
+          dateFormatter.isValidDate(this.value) &&
+          this.valueObject instanceof Date &&
+          !Number.isNaN(this.valueObject.getTime()) &&
           typeof maskOptions.format === 'function'
         ) {
           existingValue = maskOptions.format(this.valueObject);
         }
 
-        // Clear before IMask attaches so the constructor seeds an empty
-        // internal value. Otherwise IMask reads the stale unmasked string
-        // and emits a spurious 'accept' before the restore below runs.
         this.skipNextProgrammaticInputEvent = true;
         this.inputElement.value = '';
 
         this.maskInstance = IMask(this.inputElement, maskOptions);
 
-        // Mask fires 'accept' on every value change, including the restore
-        // step below. Skip events fired during configureAutoFormatting so
-        // we don't overwrite a value the parent just pushed.
         this.maskInstance.on('accept', () => {
+          // Suppress propagation during configureAutoFormatting's own value-restoration
+          // (line below) — the mask emits 'accept' on every value-set, including ours,
+          // and we don't want to overwrite a value the parent just pushed.
           if (this._configuringMask) return;
           this.value = this.util.toModelValue(this.maskInstance.value, this.format);
           if (this.type === "date") {
@@ -17574,8 +17694,6 @@ class BaseInput extends AuroElement$1 {
           }
         });
 
-        // Mask fires 'complete' on the restore step below for any value that
-        // happens to be a complete match. Same setup-suppression as 'accept'.
         this.maskInstance.on('complete', () => {
           if (this._configuringMask) return;
           this.value = this.util.toModelValue(this.maskInstance.value, this.format);
@@ -17584,9 +17702,7 @@ class BaseInput extends AuroElement$1 {
           }
         });
 
-        // Write existingValue through the mask (not the input directly) so
-        // the mask reformats it under the new rules and keeps its internal
-        // _value aligned with the input's displayed text.
+        // Restore the stashed value through IMask so it's properly masked
         if (existingValue) {
           this.maskInstance.value = existingValue;
         }
@@ -17754,6 +17870,7 @@ class BaseInput extends AuroElement$1 {
    */
   reset() {
     this.value = undefined;
+    this.setDateObjectProperty('valueObject', undefined);
     this.validation.reset(this);
   }
 
@@ -17762,6 +17879,7 @@ class BaseInput extends AuroElement$1 {
    */
   clear() {
     this.value = undefined;
+    this.setDateObjectProperty('valueObject', undefined);
   }
 
   /**
@@ -17799,6 +17917,12 @@ class BaseInput extends AuroElement$1 {
    */
   get placeholderStr() {
     if (!this.placeholder && this.type === 'date') {
+      // COVERAGE: the `'MM/DD/YYYY'` literal fallback is unreachable in WTR.
+      // connectedCallback (L682) calls configureDataForType, which at L1266-1268
+      // assigns `this.format = this.util.getDateMaskFromLocale().toLowerCase()`
+      // when type=date and format is unset. That runs before the first render
+      // reads this getter, so the ternary's truthy arm always wins. Retained
+      // as a defensive fallback for direct getter calls before connection.
       return this.format ? this.format.toUpperCase() : 'MM/DD/YYYY';
     }
     return this.placeholder || "";
@@ -18290,7 +18414,7 @@ let AuroHelpText$1 = class AuroHelpText extends LitElement {
   }
 };
 
-var formkitVersion$1 = '202606231948';
+var formkitVersion$1 = '202606232113';
 
 // Copyright (c) 2025 Alaska Airlines. All right reserved. Licensed under the Apache-2.0 license
 // See LICENSE in the project root for license information.
@@ -19411,7 +19535,7 @@ class AuroBibtemplate extends LitElement {
   }
 }
 
-var formkitVersion = '202606231948';
+var formkitVersion = '202606232113';
 
 var styleCss$1 = css`.util_displayInline{display:inline}.util_displayInlineBlock{display:inline-block}.util_displayBlock{display:block}.util_displayFlex{display:flex}.util_displayHidden{display:none}.util_displayHiddenVisually{position:absolute;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;padding:0;border:0}:host{display:block;text-align:left}:host [auro-dropdown]{--ds-auro-dropdown-trigger-background-color: transparent}:host #inputInBib::part(wrapper){box-shadow:none}:host #inputInBib::part(accent-left){display:none}:host([layout*=classic]) [auro-input]{width:100%}:host([layout*=classic]) [auro-input]::part(helpText){display:none}:host([layout*=classic]) #slotHolder{display:none}`;
 
@@ -20398,7 +20522,7 @@ class AuroCombobox extends AuroElement {
     if (this.menu) {
       this.menu.matchWord = normalizeFilterValue(this.input.value);
     }
-    const label = getOptionLabel(this.menu.optionSelected);
+    const label = getOptionLabel(this.menu.optionSelected) || this.menu.currentLabel;
     this.updateTriggerTextDisplay(label || this.value);
   }
 
@@ -20412,9 +20536,40 @@ class AuroCombobox extends AuroElement {
     // in suggestion mode, do not override input value if no selection has been made and the input currently has focus
     const isInputFocusedWithNoSelection = !this.menu.value && (this.input.matches(':focus-within') || (this.inputInBib && this.inputInBib.matches(':focus-within')));
 
-    const suppressed = this.persistInput || (this.behavior === 'suggestion' && isInputFocusedWithNoSelection);
-    if (!suppressed) {
-      this.syncInputValuesAcrossTriggerAndBib(label || this.value);
+    if (!this.persistInput && !(this.behavior === 'suggestion' && isInputFocusedWithNoSelection)) {
+      const nextValue = label || this.value;
+      // Only set the flag when there's an actual write to suppress —
+      // syncValuesAndStates re-enters here during typing when both inputs
+      // already match, and a no-op flag flip would make the bib branch's
+      // bail eat legitimate user-input events.
+      const triggerNeedsSync = this.input.value !== nextValue;
+      const bibNeedsSync = Boolean(this.inputInBib && this.inputInBib !== this.input && this.inputInBib.value !== nextValue);
+      if (triggerNeedsSync || bibNeedsSync) {
+        this._syncingDisplayValue = true;
+        if (triggerNeedsSync) {
+          this.input.value = nextValue;
+        }
+        if (bibNeedsSync) {
+          this.inputInBib.value = nextValue;
+        }
+        const pending = [];
+        if (triggerNeedsSync) {
+          pending.push(this.input.updateComplete);
+        }
+        if (bibNeedsSync) {
+          pending.push(this.inputInBib.updateComplete);
+        }
+        Promise.all(pending).then(() => {
+          // imask reasserts otherwise, and handleBlur reverts to its stale value.
+          if (triggerNeedsSync && this.input.maskInstance && typeof this.input.maskInstance.updateValue === 'function') {
+            this.input.maskInstance.updateValue();
+          }
+          if (bibNeedsSync && this.inputInBib && this.inputInBib.maskInstance && typeof this.inputInBib.maskInstance.updateValue === 'function') {
+            this.inputInBib.maskInstance.updateValue();
+          }
+          this._syncingDisplayValue = false;
+        });
+      }
     }
 
     // update the displayValue in the trigger if displayValue slot content is present
@@ -20442,48 +20597,6 @@ class AuroCombobox extends AuroElement {
     this.requestUpdate();
   }
 
-  /**
-   * Writes nextValue to the trigger input and the bib input when their current
-   * value differs, then re-asserts imask after Lit's update flushes.
-   * @param {string} nextValue - The value to write to both inputs.
-   * @returns {Promise<void> | null} Promise that resolves after the inputs flush,
-   *   or null when no sync was needed (so callers can skip post-flush work).
-   * @private
-   */
-  syncInputValuesAcrossTriggerAndBib(nextValue) {
-    // Only set the flag when there's an actual write to suppress —
-    // syncValuesAndStates re-enters here during typing when both inputs
-    // already match, and a no-op flag flip would make the bib branch's
-    // bail eat legitimate user-input events.
-    const triggerNeedsSync = this.input.value !== nextValue;
-    const bibNeedsSync = this.inputInBib.value !== nextValue;
-    if (!triggerNeedsSync && !bibNeedsSync) {
-      return null;
-    }
-
-    this._syncingDisplayValue = true;
-
-    const pending = [];
-    if (triggerNeedsSync) {
-      this.input.value = nextValue;
-      pending.push(this.input.updateComplete);
-    }
-    if (bibNeedsSync) {
-      this.inputInBib.value = nextValue;
-      pending.push(this.inputInBib.updateComplete);
-    }
-    return Promise.all(pending).then(() => {
-      // imask reasserts otherwise, and handleBlur reverts to its stale value.
-      if (triggerNeedsSync && this.input.maskInstance && typeof this.input.maskInstance.updateValue === 'function') {
-        this.input.maskInstance.updateValue();
-      }
-      if (bibNeedsSync && this.inputInBib && this.inputInBib.maskInstance && typeof this.inputInBib.maskInstance.updateValue === 'function') {
-        this.inputInBib.maskInstance.updateValue();
-      }
-      this._syncingDisplayValue = false;
-    });
-  }
-
   /**
    * Processes hidden state of all menu options and determines if there are any available options not hidden.
    * @private
@@ -20511,9 +20624,9 @@ class AuroCombobox extends AuroElement {
       this.syncValuesAndStates();
     }
 
-    // Re-activate when optionActive is not in the current scrollable viewport,
-    // or when _index has been reset (e.g. by clearSelection in an async update)
-    // so that makeSelection() can find the correct option.
+    // Re-activate when optionActive is no longer visible, or when _index has
+    // been reset (e.g. by clearSelection in an async update) so that
+    // makeSelection() can find the correct option.
     if (!this.availableOptions.includes(this.menu.optionActive) || this.menu._index < 0) {
       this.activateFirstEnabledAvailableOption();
     }
@@ -20647,25 +20760,28 @@ class AuroCombobox extends AuroElement {
 
           guardTouchPassthrough(this.menu);
 
-          // showModal() takes focus away from the trigger. Early focus once
-          // the dialog has painted; the shared doubleRaf below is the fallback
-          // for when the dialog needs an extra frame and also clears the
-          // validation guard.
+          // The dialog's showModal() steals focus from the trigger.
+          // A single rAF is enough for the dialog DOM to be painted and
+          // focusable, then doubleRaf finalizes the transition.
           requestAnimationFrame(() => {
             this.setInputFocus();
           });
-        }
-        // else (desktop popover-open): Chrome resets the trigger caret to
-        // [0, 0] when its floating <label for="…"> overlay receives focus.
-        // The shared doubleRaf below parks the caret back at end-of-text
-        // after the dropdown layout settles.
-
-        doubleRaf(() => {
-          this.setInputFocus();
-          if (this._inFullscreenTransition) {
+
+          doubleRaf(() => {
+            this.setInputFocus();
             this._inFullscreenTransition = false;
-          }
-        });
+          });
+        } else {
+          // Desktop popover-open: restore the trigger caret to end-of-text.
+          // Clicking the trigger lands on auro-input's floating <label for="…">
+          // overlay; Chrome resets the native input's selection to [0, 0] on
+          // label-focus before any JS runs. setInputFocus()'s non-fullscreen
+          // branch parks the caret at end. doubleRaf lets the dropdown layout
+          // settle first, matching the fullscreen branch timing.
+          doubleRaf(() => {
+            this.setInputFocus();
+          });
+        }
       }
     });
 
@@ -20876,7 +20992,7 @@ class AuroCombobox extends AuroElement {
       if (this.menu.optionSelected) {
         const selected = this.menu.optionSelected;
 
-        if (this.optionSelected !== selected) {
+        if (!this.optionSelected || this.optionSelected !== selected) {
           this.optionSelected = selected;
         }
 
@@ -20889,7 +21005,7 @@ class AuroCombobox extends AuroElement {
         }
 
         // Update display
-        this.updateTriggerTextDisplay(getOptionLabel(this.optionSelected));
+        this.updateTriggerTextDisplay(getOptionLabel(this.optionSelected) || this.menu.value);
 
         // Update match word for filtering
         const trimmedInput = normalizeFilterValue(this.input.value);
@@ -20905,22 +21021,13 @@ class AuroCombobox extends AuroElement {
           this.hideBib();
         }
 
-        // Move focus to the clear button when the user makes a selection.
-        if (!isEcho && this.menu.value !== undefined) {
-          this.setClearBtnFocus();
-        }
-
         // Announce the selection after the dropdown closes so it isn't
         // overridden by VoiceOver's "collapsed" announcement from aria-expanded.
-        // Skip when there's no selected value (e.g. menu.clearSelection() from
-        // the unmatched-value path), otherwise VoiceOver reads "undefined".
         const selectedValue = this.menu.value;
-        if (selectedValue) {
-          const announcementDelay = 300;
-          setTimeout(() => {
-            announceToScreenReader(this._getAnnouncementRoot(), `${selectedValue}, selected`);
-          }, announcementDelay);
-        }
+        const announcementDelay = 300;
+        setTimeout(() => {
+          announceToScreenReader(this._getAnnouncementRoot(), `${selectedValue}, selected`);
+        }, announcementDelay);
       }
 
       // Programmatic value syncs leave availableOptions stale because
@@ -20934,6 +21041,18 @@ class AuroCombobox extends AuroElement {
           this._programmaticFilterRefresh = false;
         }, 0);
       }
+
+      // base-input skips auto-validate when focus is inside its own shadow,
+      // which it is after setTriggerInputFocus — re-run so prior tooShort
+      // clears. processCreditCard reasserts errorMessage on every render.
+      if (!isEcho && this.menu.optionSelected && this.input.validate) {
+        this.input.updateComplete.then(() => {
+          this.input.validate(true);
+          if (this.input.validity === 'valid') {
+            this.input.errorMessage = '';
+          }
+        });
+      }
     });
 
     this.menu.addEventListener('auroMenu-customEventFired', () => {
@@ -21268,7 +21387,15 @@ class AuroCombobox extends AuroElement {
     this.menu.value = undefined;
     this.validation.reset(this);
     this.touched = false;
+    // Force validity back to the cleared state. validation.reset() calls
+    // validate() at the end, and (post-credit-card-fix) the trigger input's
+    // residual validity may still be copied into the combobox by the
+    // auroInputElements loop. Explicitly clear here so reset() actually
+    // leaves the component in a "no validity" state.
     this.validity = undefined;
+    this.errorMessage = '';
+    this.input.validity = undefined;
+    this.input.errorMessage = '';
   }
 
   /**
@@ -21321,27 +21448,52 @@ class AuroCombobox extends AuroElement {
         this.input.value = this.value;
       }
 
-      // Sync menu.value only when an option actually matches, or when filter
-      // mode needs setMenuValue to dispatch auroMenu-selectValueFailure (the
-      // listener at line 1206 clears combobox.value, mirroring select's
-      // pattern). Otherwise sync the input display for freeform values.
+      // Sync menu.value only when an option actually matches; otherwise clear it.
       if (this.menu.options && this.menu.options.length > 0) {
-        if (this.menu.options.some((opt) => opt.value === this.value) || this.behavior === 'filter') {
+        if (this.menu.options.some((opt) => opt.value === this.value)) {
+          this.setMenuValue(this.value);
+        } else if (this.behavior === 'filter') {
+          // In filter mode, freeform values aren't allowed. Push the unmatched
+          // value through setMenuValue so menu dispatches auroMenu-selectValueFailure
+          // and the listener at line 1206 clears combobox.value (mirrors select's
+          // pattern). Bypassing setMenuValue here would skip the failure cascade.
           this.setMenuValue(this.value);
         } else {
-          // Clear menu.value AND menu.optionSelected together. Clearing only
-          // menu.value leaves the previously-selected option element pinned
-          // as menu.optionSelected; a later auroMenu-selectedOption event
-          // would then write its stale .value back into combobox.value.
-          if (this.menu.value || this.menu.optionSelected) {
-            this.menu.clearSelection();
+          if (this.menu.value) {
+            this.menu.value = undefined;
           }
-          // Suggestion-mode freeform value: sync the trigger + bib to show it,
-          // then refresh the filter once the inputs flush (handleInputValueChange
-          // bailed on _syncingDisplayValue).
-          const syncPromise = this.syncInputValuesAcrossTriggerAndBib(this.value || '');
-          if (syncPromise) {
-            syncPromise.then(() => {
+          // Sync the display for programmatic freeform value changes (e.g. the
+          // swap-values pattern). Guard with _syncingDisplayValue so that the
+          // re-entrant input event from base-input.notifyValueChanged() is
+          // ignored by handleInputValueChange. Skip the sync when input already
+          // matches to avoid spurious events during the normal typing path.
+          const nextValue = this.value || '';
+          const triggerNeedsSync = this.input.value !== nextValue;
+          const bibNeedsSync = Boolean(this.inputInBib && this.inputInBib !== this.input && this.inputInBib.value !== nextValue);
+          if (triggerNeedsSync || bibNeedsSync) {
+            this._syncingDisplayValue = true;
+            if (triggerNeedsSync) {
+              this.input.value = nextValue;
+            }
+            if (bibNeedsSync) {
+              this.inputInBib.value = nextValue;
+            }
+            const pending = [];
+            if (triggerNeedsSync) {
+              pending.push(this.input.updateComplete);
+            }
+            if (bibNeedsSync) {
+              pending.push(this.inputInBib.updateComplete);
+            }
+            Promise.all(pending).then(() => {
+              if (triggerNeedsSync && this.input.maskInstance && typeof this.input.maskInstance.updateValue === 'function') {
+                this.input.maskInstance.updateValue();
+              }
+              if (bibNeedsSync && this.inputInBib && this.inputInBib.maskInstance && typeof this.inputInBib.maskInstance.updateValue === 'function') {
+                this.inputInBib.maskInstance.updateValue();
+              }
+              this._syncingDisplayValue = false;
+              // handleInputValueChange bailed on the flag — refresh the filter.
               this._programmaticFilterRefresh = true;
               this.handleMenuOptions();
               setTimeout(() => {