@aurodesignsystem-dev/auro-formkit 0.0.0-pr1498.0 → 0.0.0-pr1499.1

package/components/combobox/dist/index.js

@@ -555,7 +555,7 @@ let AuroFormValidation$1 = class AuroFormValidation {
       } else if (this.runtimeUtils.elementMatch(elem, 'auro-input') && elem.errorMessage === '') {
         const input = elem.renderRoot.querySelector('input');
 
-        if (input && input.validationMessage.length > 0) {
+        if (input.validationMessage.length > 0) {
           elem.errorMessage = input.validationMessage;
         }
       } else if (this.runtimeUtils.elementMatch(elem, 'auro-combobox') && elem.errorMessage === '') {
@@ -797,21 +797,6 @@ function isClearBtnFocused(ctx, clearBtn = getClearBtn(ctx)) {
   return isFocused;
 }
 
-/**
- * Reconcile the menu `_index` from `optionActive` so subsequent `makeSelection` calls find the correct option after async clearSelection has reset it.
- * @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;
-    }
-  }
-}
-
 const comboboxKeyboardStrategy = {
   ArrowDown(component, evt, ctx) {
     // If the clear button has focus, let the browser handle ArrowDown normally.
@@ -875,7 +860,6 @@ const comboboxKeyboardStrategy = {
       // block the browser's built-in "Enter activates focused button" behavior.
       evt.stopPropagation();
     } else if (ctx.isExpanded && component.menu.optionActive) {
-      reconcileMenuIndex(component.menu);
       component.menu.makeSelection();
 
       if (ctx.isModal) {
@@ -923,7 +907,6 @@ const comboboxKeyboardStrategy = {
       // When the clear button is focused, Tab events do not bubble out of
       // its shadow DOM, so this handler only fires when the clear button
       // is NOT focused. In that case, select the active option and close.
-      reconcileMenuIndex(component.menu);
       component.menu.makeSelection();
       component.hideBib();
 
@@ -4806,7 +4789,7 @@ let AuroHelpText$2 = class AuroHelpText extends LitElement {
   }
 };
 
-var formkitVersion$2 = '202606100232';
+var formkitVersion$2 = '202606101934';
 
 let AuroElement$2 = class AuroElement extends LitElement {
   static get properties() {
@@ -5664,18 +5647,27 @@ class AuroDropdown extends AuroElement$2 {
       this.focusTrap = undefined;
     }
 
-    // Restore any focus-loss suppression we installed for a prior trap state.
-    // The desktopModal trap moves focus into the bib via RAF, which would
-    // otherwise trip AuroFloatingUI.handleFocusLoss (a popover-top-layer
-    // timing issue makes its :focus-within guard miss the focused button).
-    if (this._priorNoHideOnFocusLoss !== undefined) {
-      this.noHideOnThisFocusLoss = this._priorNoHideOnFocusLoss;
-      this._priorNoHideOnFocusLoss = undefined;
+    // Restore the user-set noHideOnThisFocusLoss value, if we overrode it.
+    if (this._noHideOverridden) {
+      this.noHideOnThisFocusLoss = this._priorNoHide;
+      this._noHideOverridden = false;
+      this._priorNoHide = undefined;
     }
 
     if (this.isPopoverVisible) {
       if (!this.isBibFullscreen) {
         if (this.desktopModal) {
+          // The floater's focus-loss check uses :focus-within, which does not
+          // match the host when focus is on a slotted element projected through
+          // multiple shadow roots. Without this override, focusing a button
+          // inside the bib would be misread as focus leaving the dropdown and
+          // close the bib immediately. desktopModal traps focus inside the
+          // bib and inerts siblings, so suppressing focus-loss dismissal here
+          // is safe — Escape and outside-click still close the bib.
+          this._priorNoHide = this.noHideOnThisFocusLoss;
+          this._noHideOverridden = true;
+          this.noHideOnThisFocusLoss = true;
+
           // Desktop modal: trap focus only within the bib content.
           // Can't use FocusTrap on the bib element because keydown events
           // from slotted content bubble through the dropdown host (light DOM),
@@ -5748,14 +5740,6 @@ class AuroDropdown extends AuroElement$2 {
           };
           this.addEventListener('keydown', this._bibTabHandler);
 
-          // Suppress AuroFloatingUI's auto-hide-on-focus-loss while the
-          // desktopModal trap owns focus management. Without this, the very
-          // first focus move into the bib (from the RAF below) triggers
-          // handleFocusLoss → hideBib, tearing down the trap before the
-          // user can press Tab.
-          this._priorNoHideOnFocusLoss = this.noHideOnThisFocusLoss;
-          this.noHideOnThisFocusLoss = true;
-
           // Move initial focus into the bib content, matching FocusTrap behavior
           requestAnimationFrame(() => {
             const focusables = getFocusableElements(this.bibContent);
@@ -10678,7 +10662,7 @@ class AuroFormValidation {
       } else if (this.runtimeUtils.elementMatch(elem, 'auro-input') && elem.errorMessage === '') {
         const input = elem.renderRoot.querySelector('input');
 
-        if (input && input.validationMessage.length > 0) {
+        if (input.validationMessage.length > 0) {
           elem.errorMessage = input.validationMessage;
         }
       } else if (this.runtimeUtils.elementMatch(elem, 'auro-combobox') && elem.errorMessage === '') {
@@ -16350,7 +16334,11 @@ class AuroInputUtilities {
             return part.value;
         }
       })
-      .join("");
+      .join("")
+      // Remove whitespace and leading/trailing special characters for IMask compatibility
+      // for example, ko-KR's format is `YYYY. MM. DD.` which causes issues with IMask if we don't remove the trailing period.
+      .replace(/\s/gu, '')
+      .replace(/^[^A-Z0-9]+|[^A-Z0-9]+$/gu, '');
   }
 
   /**
@@ -16515,6 +16503,7 @@ 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;
     }
 
@@ -17217,7 +17206,7 @@ class BaseInput extends AuroElement$1 {
    * @returns {Date|undefined}
    */
   get valueObject() {
-    return this._valueObject || this._computeDateObjectFallback(this.value);
+    return this._valueObject;
   }
 
   /**
@@ -17225,7 +17214,7 @@ class BaseInput extends AuroElement$1 {
    * @returns {Date|undefined}
    */
   get minObject() {
-    return this._minObject || this._computeDateObjectFallback(this.min);
+    return this._minObject;
   }
 
   /**
@@ -17233,31 +17222,7 @@ class BaseInput extends AuroElement$1 {
    * @returns {Date|undefined}
    */
   get maxObject() {
-    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);
+    return this._maxObject;
   }
 
   /**
@@ -17282,30 +17247,8 @@ class BaseInput extends AuroElement$1 {
   connectedCallback() {
     super.connectedCallback();
 
-    // Mark for query selectors when registered under a versioned tag (e.g. inside
-    // a datepicker/combobox). Must run before parent components call validate() on
-    // their inner inputs — the validation framework matches via tag-or-attribute,
-    // and parents trigger validation during their own updated() cycle, which can
-    // precede this input's firstUpdated().
-    if (this.tagName.toLowerCase() !== 'auro-input' && !this.hasAttribute('auro-input')) {
-      this.setAttribute('auro-input', '');
-    }
-
     this.locale = this.domHandler.getLocale(this);
     notifyOnLangChange(this);
-
-    // Pre-compute lengthForType and date-object fields so a parent (e.g. datepicker)
-    // calling our validate() synchronously during its own updated() cycle sees
-    // populated values. Without this, range validation silently no-ops because
-    // `max.length === lengthForType` fails when lengthForType is still undefined.
-    // Rebuild util here (constructor seeded with en-US default) so configureDataForType's
-    // locale-derived format lookup uses the actual locale just resolved above.
-    this.util = new AuroInputUtilities({
-      locale: this.locale,
-      format: this.format
-    });
-    this.configureDataForType();
-    this.syncDateValues();
   }
 
   disconnectedCallback() {
@@ -17326,8 +17269,8 @@ class BaseInput extends AuroElement$1 {
     }
 
     // add attribute for query selectors when auro-input is registered under a custom name
-    if (this.tagName.toLowerCase() !== 'auro-input' && !this.hasAttribute('auro-input')) {
-      this.setAttribute('auro-input', '');
+    if (this.tagName.toLowerCase() !== 'auro-input') {
+      this.setAttribute('auro-input', true);
     }
     this.inputId = this.id ? `${this.id}-input` : window.crypto.randomUUID();
 
@@ -17375,12 +17318,6 @@ class BaseInput extends AuroElement$1 {
             return;
           }
 
-          // While configureAutoFormatting is running, imask's internal updateControl
-          // writes el.value to align display with the masked value. A synthetic input
-          // event from that write would re-enter handleInput → processCreditCard mid-setup
-          // and clobber a Lit value that was just pushed by the parent combobox.
-          if (component._configuringMask) return;
-
           // If all guard clauses are passed, dispatch the event
           const inputEvent = new InputEvent('input', {
             bubbles: true,
@@ -17499,16 +17436,7 @@ class BaseInput extends AuroElement$1 {
 
       if (formattedValue !== this.inputElement.value) {
         this.skipNextProgrammaticInputEvent = true;
-        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. 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) {
+        if (formattedValue) {
           this.inputElement.value = formattedValue;
         } else {
           this.inputElement.value = '';
@@ -17617,73 +17545,58 @@ class BaseInput extends AuroElement$1 {
    * @returns {void}
    */
   configureAutoFormatting() {
-    // 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 {
-      if (this.maskInstance) {
-        this.maskInstance.destroy();
-      }
+    if (this.maskInstance) {
+      this.maskInstance.destroy();
+    }
 
-      // Pass new format to util
-      this.util.updateFormat(this.format);
+    // Pass new format to util
+    this.util.updateFormat(this.format);
 
-      const maskOptions = this.util.getMaskOptions(this.type, this.format);
+    const maskOptions = this.util.getMaskOptions(this.type, this.format);
 
-      if (this.inputElement && maskOptions.mask) {
+    if (this.inputElement && maskOptions.mask) {
 
-        // 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 &&
-          dateFormatter.isValidDate(this.value) &&
-          this.valueObject instanceof Date &&
-          !Number.isNaN(this.valueObject.getTime()) &&
-          typeof maskOptions.format === 'function'
-        ) {
-          existingValue = maskOptions.format(this.valueObject);
-        }
+      // 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 &&
+        dateFormatter.isValidDate(this.value) &&
+        this.valueObject instanceof Date &&
+        !Number.isNaN(this.valueObject.getTime()) &&
+        typeof maskOptions.format === 'function'
+      ) {
+        existingValue = maskOptions.format(this.valueObject);
+      }
 
-        this.skipNextProgrammaticInputEvent = true;
-        this.inputElement.value = '';
-
-        this.maskInstance = IMask(this.inputElement, maskOptions);
-
-        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") {
-            this._rawMaskValue = this.maskInstance.value;
-          }
-        });
+      this.skipNextProgrammaticInputEvent = true;
+      this.inputElement.value = '';
 
-        this.maskInstance.on('complete', () => {
-          if (this._configuringMask) return;
-          this.value = this.util.toModelValue(this.maskInstance.value, this.format);
-          if (this.type === "date") {
-            this._rawMaskValue = this.maskInstance.value;
-          }
-        });
+      this.maskInstance = IMask(this.inputElement, maskOptions);
 
-        // Restore the stashed value through IMask so it's properly masked
-        if (existingValue) {
-          this.maskInstance.value = existingValue;
+      this.maskInstance.on('accept', () => {
+        this.value = this.util.toModelValue(this.maskInstance.value, this.format);
+        if (this.type === "date") {
+          this._rawMaskValue = this.maskInstance.value;
         }
+      });
+
+      this.maskInstance.on('complete', () => {
+        this.value = this.util.toModelValue(this.maskInstance.value, this.format);
+        if (this.type === "date") {
+          this._rawMaskValue = this.maskInstance.value;
+        }
+      });
+
+      // Restore the stashed value through IMask so it's properly masked
+      if (existingValue) {
+        this.maskInstance.value = existingValue;
       }
-    } finally {
-      this._configuringMask = false;
     }
   }
 
@@ -17970,10 +17883,10 @@ class BaseInput extends AuroElement$1 {
       },
       {
         name: 'Diners club',
-        regex: /^(?<num>30[0-5]|36|38)\d{0}/u,
+        regex: /^(?<num>36|38)\d{0}/u,
         formatLength: 16,
         errorMessage: CreditCardValidationMessage,
-        cardIcon: 'cc-dinersclub',
+        cardIcon: 'credit-card',
         maskFormat: "0000 000000 0000"
       },
       {
@@ -18383,7 +18296,7 @@ let AuroHelpText$1 = class AuroHelpText extends LitElement {
   }
 };
 
-var formkitVersion$1 = '202606100232';
+var formkitVersion$1 = '202606101934';
 
 // Copyright (c) 2025 Alaska Airlines. All right reserved. Licensed under the Apache-2.0 license
 // See LICENSE in the project root for license information.
@@ -18721,10 +18634,6 @@ class AuroInput extends BaseInput {
       return i18n(this.lang, this.type);
     }
 
-    if (this.type === 'date') {
-      return i18n(this.lang, this.dateFormatMap[this.format] || 'dateMMDDYYYY');
-    }
-
     return '';
   }
 
@@ -19508,7 +19417,7 @@ class AuroBibtemplate extends LitElement {
   }
 }
 
-var formkitVersion = '202606100232';
+var formkitVersion = '202606101934';
 
 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}`;
 
@@ -19865,25 +19774,6 @@ function normalizeFilterValue(value) {
   return raw.trim() ? raw.trimEnd() : raw;
 }
 
-/**
- * Returns the option's plain-text label suitable for input.value, with
- * HTML-indentation whitespace collapsed and the displayValue slot text
- * removed (the slot renders separately in the trigger).
- * @param {HTMLElement} option - An auro-menuoption element.
- * @returns {string} Normalized label.
- */
-function getOptionLabel(option) {
-  if (!option) {
-    return '';
-  }
-  const clone = option.cloneNode(true);
-  const displayValueEl = clone.querySelector('[slot="displayValue"]');
-  if (displayValueEl) {
-    displayValueEl.remove();
-  }
-  return (clone.textContent || '').replace(/\s+/gu, ' ').trim();
-}
-
 // See https://git.io/JJ6SJ for "How to document your components using JSDoc"
 /**
  * The `auro-combobox` element provides users with a way to select an option from a list of filtered or suggested options based on user input.
@@ -20011,19 +19901,7 @@ class AuroCombobox extends AuroElement {
       availableOptions: {
         state: true,
         type: Array,
-        reflect: false,
-        hasChanged(newVal, oldVal) {
-          if (!oldVal && !newVal) {
-            return false;
-          }
-          if (!oldVal || !newVal) {
-            return true;
-          }
-          if (newVal.length !== oldVal.length) {
-            return true;
-          }
-          return newVal.some((opt, idx) => opt !== oldVal[idx]);
-        }
+        reflect: false
       },
 
       /**
@@ -20454,15 +20332,18 @@ class AuroCombobox extends AuroElement {
         matchString = `${matchString} ${option.getAttribute('suggest')}`.toLowerCase();
       }
 
-      if (!filterValue && option.hasAttribute('static')) {
-        // Static options are shown when the input is empty so consumers can
-        // surface headers / "add new" rows when no filter is active.
-        option.removeAttribute('hidden');
-        this.availableOptions.push(option);
-      } else if (filterValue && matchString.includes(filterValue) && !option.hasAttribute('static')) {
+      // If input is empty, show all options (except static ones)
+      if (!filterValue) {
+        if (!option.hasAttribute('static')) {
+          option.removeAttribute('hidden');
+          this.availableOptions.push(option);
+        }
+      } else if (matchString.includes(filterValue) && !option.hasAttribute('static')) {
+        // only count options that match the typed input value AND are not static
         option.removeAttribute('hidden');
         this.availableOptions.push(option);
       } else if (!option.hasAttribute('persistent')) {
+        // Hide all other non-persistent options
         option.setAttribute('hidden', '');
         option.removeAttribute('aria-setsize');
         option.removeAttribute('aria-posinset');
@@ -20470,9 +20351,7 @@ class AuroCombobox extends AuroElement {
     });
 
     if (this.availableOptions.length === 0) {
-      // Only surface the nomatch option once the user has actually typed
-      // something. Empty input is handled by the bib being closed.
-      if (this.noMatchOption && filterValue) {
+      if (this.noMatchOption) {
         this.noMatchOption.removeAttribute('hidden');
       } else if (!this.menu.loading || this.isHiddenWhileLoading) {
         this.hideBib();
@@ -20488,14 +20367,11 @@ class AuroCombobox extends AuroElement {
    * @returns {void}
    */
   syncValuesAndStates() {
-    // Do NOT call setMenuValue here — the caller (handleMenuOptions) already
-    // guards setMenuValue with an option-match check. Calling it unconditionally
-    // sets free-form values on the menu, triggering clearSelection which resets
-    // _index and breaks subsequent makeSelection calls.
+    // Only sync matchWord, don't set menu.value here since setMenuValue should handle that
     if (this.menu) {
       this.menu.matchWord = normalizeFilterValue(this.input.value);
     }
-    const label = getOptionLabel(this.menu.optionSelected) || this.menu.currentLabel;
+    const label = this.menu.currentLabel;
     this.updateTriggerTextDisplay(label || this.value);
   }
 
@@ -20510,39 +20386,7 @@ class AuroCombobox extends AuroElement {
     const isInputFocusedWithNoSelection = !this.menu.value && (this.input.matches(':focus-within') || (this.inputInBib && this.inputInBib.matches(':focus-within')));
 
     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;
-        });
-      }
+      this.input.value = label || this.value;
     }
 
     // update the displayValue in the trigger if displayValue slot content is present
@@ -20556,14 +20400,6 @@ class AuroCombobox extends AuroElement {
       const displayValueEl = this.menu.optionSelected.querySelector("[slot='displayValue']");
       if (displayValueEl) {
         this.input.appendChild(displayValueEl.cloneNode(true));
-        // auro-input's hasDisplayValueContent is non-reactive; nudge it to
-        // re-evaluate the slot and re-render so the displayValue wrapper
-        // gets its hasContent class. Without this, the apple/icon stays
-        // hidden when input.value is set in the same tick as the append.
-        if (typeof this.input.checkDisplayValueSlotChange === 'function') {
-          this.input.checkDisplayValueSlotChange();
-          this.input.requestUpdate();
-        }
       }
     }
 
@@ -20597,10 +20433,7 @@ class AuroCombobox extends AuroElement {
       this.syncValuesAndStates();
     }
 
-    // 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) {
+    if (!this.availableOptions.includes(this.menu.optionActive)) {
       this.activateFirstEnabledAvailableOption();
     }
   }
@@ -20725,13 +20558,8 @@ class AuroCombobox extends AuroElement {
 
           guardTouchPassthrough(this.menu);
 
-          // 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();
-          });
-
+          // Wait for the bibtemplate to fully render across
+          // multiple Lit update cycles before moving focus into the bib
           doubleRaf(() => {
             this.setInputFocus();
             this._inFullscreenTransition = false;
@@ -20812,42 +20640,16 @@ class AuroCombobox extends AuroElement {
    */
   setInputFocus() {
     if (this.dropdown.isBibFullscreen && this.dropdown.isPopoverVisible) {
-      // Sync the native input value synchronously before focusing.
-      // Lit's property-to-attribute sync is async (microtask), so the
-      // native <input> inside inputInBib may still hold a stale value
-      // when focus moves here during the fullscreen transition. Without
-      // this, keystrokes (e.g. Backspace) operate on the wrong content.
-      const nativeInput = this.inputInBib.inputElement;
-      const triggerNativeInput = this.input.inputElement;
-      if (nativeInput && triggerNativeInput && nativeInput.value !== triggerNativeInput.value) {
-        this.inputInBib.skipNextProgrammaticInputEvent = true;
-        nativeInput.value = triggerNativeInput.value || '';
-      }
-
-      // Focus the native input directly to ensure it receives keystrokes
-      // after the fullscreen dialog opens. The dialog's showModal() may
-      // have moved focus to the dialog element itself; focusing the
-      // auro-input custom element doesn't always reach the native input
-      // when the dialog DOM isn't fully painted.
-      if (nativeInput) {
-        nativeInput.focus();
-      } else {
-        this.inputInBib.focus();
-      }
+      this.inputInBib.focus();
 
       // Place cursor at end of existing text so the user can continue editing
+      const nativeInput = this.inputInBib.inputElement;
       if (nativeInput && nativeInput.value) {
         const len = nativeInput.value.length;
         nativeInput.setSelectionRange(len, len);
       }
-    } else if (!this.input.componentHasFocus) {
-      const focusedEl = this.querySelector(":focus");
+    } else {
       this.input.focus();
-      // current focus is on a menuoption, after clicking on it.
-      if (this.persistInput && focusedEl && (focusedEl.tagName.toLowerCase() === 'auro-menuoption' || focusedEl.hasAttribute('auro-menuoption'))) {
-        this.setClearBtnFocus();
-        this.validate(true);
-      }
     }
   }
 
@@ -20943,92 +20745,53 @@ class AuroCombobox extends AuroElement {
       this.menu.setAttribute('nocheckmark', '');
     }
 
-    // Handle menu option selection
-    this.menu.addEventListener('auroMenu-selectedOption', (evt) => {
-      // Capture before the consumption below — true means this event is the
-      // echo of our own setMenuValue (programmatic value sync), false means
-      // a fresh user selection.
-      const isEcho = this._pendingMenuValueSync === true;
-
-      if (this.menu.optionSelected) {
-        const selected = this.menu.optionSelected;
+    this.menu.addEventListener("auroMenu-deselectPrevented", () => {
+      this.hideBib();
+    });
 
-        if (!this.optionSelected || this.optionSelected !== selected) {
-          this.optionSelected = selected;
-        }
+    // Handle menu option selection like select does
+    this.menu.addEventListener('auroMenu-selectedOption', (event) => {
+      // Update the optionSelected from the event details, not manually
+      [this.optionSelected] = event.detail.options;
 
-        // Skip writeback when this event is the echo of our own setMenuValue —
-        // otherwise it cascades against handleInputValueChange in suggestion mode.
-        if (this._pendingMenuValueSync) {
-          this._pendingMenuValueSync = false;
-        } else if (!this.value || this.value !== this.optionSelected.value) {
-          this.value = this.optionSelected.value;
-        }
+      // Update the internal value to match the menu's value
+      this.value = event.detail.stringValue;
 
-        // Update display
-        this.updateTriggerTextDisplay(getOptionLabel(this.optionSelected) || this.menu.value);
+      // Update display
+      this.updateTriggerTextDisplay(event.detail.label || event.detail.value);
 
-        // Update match word for filtering
-        const trimmedInput = normalizeFilterValue(this.input.value);
-        if (this.menu.matchWord !== trimmedInput) {
-          this.menu.matchWord = trimmedInput;
-        }
+      // Update match word for filtering
+      const trimmedInput = normalizeFilterValue(this.input.value);
+      if (this.menu.matchWord !== trimmedInput) {
+        this.menu.matchWord = trimmedInput;
       }
 
+      // Update available options based on selection
+      this.handleMenuOptions();
+
       // Hide dropdown on selection (except during slot changes)
-      if (evt.detail && evt.detail.source !== 'slotchange') {
-        // do not close while typing in suggestion mode with no value selected, to allow freeform input
-        if (this.menu.value || this.behavior !== 'suggestion') {
-          this.hideBib();
-        }
+      if (event.detail && event.detail.source !== 'slotchange') {
+        setTimeout(() => {
+          // do not close while typing in suggestion mode with no value selected, to allow freeform input
+          if (this.menu.value || this.behavior !== 'suggestion') {
+            this.hideBib();
+          }
+        }, 0);
 
         // Announce the selection after the dropdown closes so it isn't
         // overridden by VoiceOver's "collapsed" announcement from aria-expanded.
-        const selectedValue = this.menu.value;
+        const selectedValue = event.detail.stringValue;
         const announcementDelay = 300;
         setTimeout(() => {
           announceToScreenReader(this._getAnnouncementRoot(), `${selectedValue}, selected`);
         }, announcementDelay);
       }
-
-      // Programmatic value syncs leave availableOptions stale because
-      // updateTriggerTextDisplay sets input.value with _syncingDisplayValue
-      // and handleInputValueChange bails. Refresh the filter on echo events
-      // only — fresh user selections take the existing hideBib path.
-      if (isEcho && this.menu.optionSelected) {
-        this._programmaticFilterRefresh = true;
-        this.handleMenuOptions();
-        setTimeout(() => {
-          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', () => {
       this.hideBib();
     });
 
-    // When the menu cannot match a programmatic value to any option,
-    // clear the combobox selection state so it doesn't reference a
-    // stale option. Safe from re-entrancy because any resulting
-    // input.value changes dispatch isProgrammatic events.
-    this.menu.addEventListener('auroMenu-selectValueFailure', () => {
-      this.value = undefined;
-      this.optionSelected = undefined;
-    });
-
     this.menu.addEventListener('auroMenu-activatedOption', (evt) => {
       this.optionActive = evt.detail;
 
@@ -21129,12 +20892,11 @@ class AuroCombobox extends AuroElement {
     // event from the trigger. The _syncingBibValue guard persists across the
     // async boundary and prevents that re-entrant event from running the
     // non-fullscreen path (which would call clear() → hideBib()).
+    // When the event comes from the fullscreen bib input, sync the value to
+    // the trigger and run filtering, but suppress the re-entrant input event
+    // that the trigger fires (via Lit updated() → notifyValueChanged()) so
+    // the non-fullscreen hide/clear logic doesn't close the dialog.
     if (event.target === this.inputInBib) {
-      // Mirror the trigger-branch bail below — programmatic inputInBib writes
-      // notify back into this branch via Lit's notifyValueChanged.
-      if (this._syncingDisplayValue) {
-        return;
-      }
       this._syncingBibValue = true;
       this.input.value = this.inputInBib.value;
       this.input.updateComplete.then(() => {
@@ -21144,37 +20906,18 @@ class AuroCombobox extends AuroElement {
       // Run filtering inline — the re-entrant event won't reach this code.
       this.menu.matchWord = normalizeFilterValue(this.inputInBib.value);
       this.optionActive = null;
-
-      // In suggestion mode, keep the combobox value in sync with the typed
-      // text so that freeform values are captured (mirroring the non-fullscreen
-      // path). Clear the selection when the input is emptied.
-      if (this.behavior === 'suggestion') {
-        this.value = this.inputInBib.value || undefined;
-      }
-
       this.handleMenuOptions();
       this.dispatchEvent(new CustomEvent('inputValue', { detail: { value: this.inputValue } }));
       return;
     }
 
-    // Ignore re-entrant input events caused by programmatic value sets.
-    if (this._syncingBibValue || this._syncingDisplayValue) {
+    // Ignore re-entrant input events caused by the bib→trigger sync above.
+    if (this._syncingBibValue) {
       return;
     }
 
     this.inputInBib.value = this.input.value;
 
-    // Also sync the native input immediately so keystrokes arriving
-    // before Lit's async update cycle (e.g. rapid Backspaces during a
-    // fullscreen transition) operate on the correct content.
-    // Skip the next programmatic input event to prevent the patched setter
-    // from re-entering handleInputValueChange via the bib path.
-    const bibNativeInput = this.inputInBib.inputElement;
-    if (bibNativeInput && bibNativeInput.value !== this.input.value) {
-      this.inputInBib.skipNextProgrammaticInputEvent = true;
-      bibNativeInput.value = this.input.value || '';
-    }
-
     this.menu.matchWord = normalizeFilterValue(this.input.value);
     this.optionActive = null;
 
@@ -21182,7 +20925,7 @@ class AuroCombobox extends AuroElement {
       this.value = this.input.value;
     }
 
-    if (!this.input.value && !this._clearing) {
+    if (!this.input.value) {
       this.clear();
     }
     this.handleMenuOptions();
@@ -21251,16 +20994,6 @@ class AuroCombobox extends AuroElement {
         return;
       }
 
-      // Ignore dispatches from the bib (fullscreen) input. It's re-validated
-      // inside this.validate()'s auroInputElements loop with its own
-      // (often undefined) validity, and the event is composed/bubbles up to
-      // this listener with `target` retargeted to the combobox. Letting it
-      // through would overwrite the trigger input's correct validity with
-      // the bib input's stale one (e.g. wiping `tooShort` during typing).
-      if (this.inputInBib && evt.composedPath()[0] === this.inputInBib && this.inputInBib !== this.input) {
-        return;
-      }
-
       this.input.validity = evt.detail.validity;
       this.input.errorMessage = evt.detail.message;
       this.validity = evt.detail.validity;
@@ -21322,18 +21055,10 @@ class AuroCombobox extends AuroElement {
    * @returns {void}
    */
   setMenuValue(value) {
-    if (!this.menu || this.menu.value === value) {
+    if (!this.menu) {
       return;
     }
-    // One-shot flag consumed by the auroMenu-selectedOption listener so the
-    // echo of this sync doesn't propagate back to this.value.
-    this._pendingMenuValueSync = true;
     this.menu.value = value;
-    // Backup clear: if menu.value === menu.optionSelected.value already, the
-    // listener won't fire and the flag would swallow the next user click.
-    setTimeout(() => {
-      this._pendingMenuValueSync = false;
-    }, 0);
   }
 
   /**
@@ -21348,15 +21073,6 @@ 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 = '';
   }
 
   /**
@@ -21364,24 +21080,16 @@ class AuroCombobox extends AuroElement {
    * @returns {void}
    */
   clear() {
-    // input.clear() fires an input event that re-enters handleInputValueChange
-    // → which calls clear() again on empty input. Guard against that loop.
-    if (this._clearing) {
-      return;
-    }
-    this._clearing = true;
-    try {
-      this.optionSelected = undefined;
-      this.value = undefined;
+    // Clear combobox state first
+    this.optionSelected = undefined;
+    this.value = undefined;
 
-      if (this.input.value) {
-        this.input.clear();
-      }
-      if (this.menu.value || this.menu.optionSelected) {
-        this.menu.reset();
-      }
-    } finally {
-      this._clearing = false;
+    // Then clear input and menu
+    if (this.input.value) {
+      this.input.clear();
+    }
+    if (this.menu.value || this.menu.optionSelected) {
+      this.menu.reset();
     }
   }
 
@@ -21409,63 +21117,28 @@ class AuroCombobox extends AuroElement {
         this.input.value = this.value;
       }
 
-      // 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.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.
+      if (this.menu && this.hasValue && this.menu.options) {
+        this.menu.options.forEach((opt) => {
+          if (!opt.hasAttribute('static')) {
+            opt.removeAttribute('hidden');
+          }
+        });
+      }
+
+      if (this.behavior === 'suggestion') {
+        if (!this.menu.options || this.menu.options.length === 0) ; else if (this.menu.options.filter((opt) => opt.value === this.value).length > 0) {
           this.setMenuValue(this.value);
         } else {
-          if (this.menu.value) {
-            this.menu.value = undefined;
-          }
-          // 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(() => {
-                this._programmaticFilterRefresh = false;
-              }, 0);
-            });
-          }
+          this.menu.value = undefined;
+          // Sync the input display for freeform values that don't match any option
+          this.input.value = this.value;
+        }
+      } else {
+        // Use setMenuValue like select does instead of direct assignment
+        this.setMenuValue(this.value);
+        if (!this.value) {
+          this.clear();
         }
-      }
-      if (!this.value) {
-        this.clear();
       }
       if (this.value && !this.componentHasFocus) {
         // If the value got set programmatically make sure we hide the bib
@@ -21503,18 +21176,12 @@ class AuroCombobox extends AuroElement {
       // branch from calling hideBib() when the dropdown was just opened but
       // :focus-within hasn't propagated through the top-layer dialog's nested
       // shadow DOM boundaries.
-      // Skip the show/hide side effects when the availableOptions change came
-      // from a programmatic filter refresh after a value swap — the user
-      // didn't interact, so we shouldn't auto-open the bib (especially for
-      // the no-match path where the existing condition unconditionally fires).
-      if (this._programmaticFilterRefresh) {
-        this._programmaticFilterRefresh = false;
-      } else if ((this.availableOptions.length > 0 && (this.componentHasFocus || this.dropdownOpen)) || (this.menu && this.menu.loading) || (this.availableOptions.length === 0 && this.noMatchOption)) {
+      if ((this.availableOptions.length > 0 && (this.componentHasFocus || this.dropdownOpen)) || (this.menu && this.menu.loading) || (this.availableOptions.length === 0 && this.noMatchOption)) {
         this.showBib();
         if (!this.availableOptions.includes(this.menu.optionActive)) {
           this.activateFirstEnabledAvailableOption();
         }
-      } else if (this.dropdown && this.dropdown.isPopoverVisible) {
+      } else {
         this.hideBib();
       }
     }