@aurodesignsystem/auro-formkit 6.0.0 → 6.0.1

package/components/combobox/dist/index.js

@@ -4904,7 +4904,7 @@ let AuroHelpText$2 = class AuroHelpText extends LitElement {
   }
 };
 
-var formkitVersion$2 = '202607102309';
+var formkitVersion$2 = '202607161943';
 
 let AuroElement$2 = class AuroElement extends LitElement {
   static get properties() {
@@ -5033,7 +5033,6 @@ class AuroDropdown extends AuroElement$2 {
   static get shadowRootOptions() {
     return {
       ...AuroElement$2.shadowRootOptions,
-      delegatesFocus: true,
     };
   }
 
@@ -5045,6 +5044,15 @@ class AuroDropdown extends AuroElement$2 {
     this.matchWidth = false;
     this.noHideOnThisFocusLoss = false;
 
+    /**
+     * When true, the dropdown skips its generic focus restoration on close.
+     * Set by consumers (e.g. combobox) that manage their own focus routing
+     * via setClearBtnFocus / setInputFocus / keyboard strategy.
+     * Separate from noHideOnThisFocusLoss (which controls auto-close behavior).
+     * @private
+     */
+    this.noFocusRestoreOnClose = false;
+
     this.errorMessage = undefined; // TODO - check with Doug if there is still more to do here
 
     // Layout Config
@@ -5200,7 +5208,49 @@ class AuroDropdown extends AuroElement$2 {
         focusables[0].focus();
       }
     } else {
+      this.focusTrigger();
+    }
+  }
+
+  /**
+   * Focus the trigger content. When the trigger wrapper itself is focusable
+   * (has tabindex), focus it directly. Otherwise, focus the first focusable
+   * element slotted into the trigger slot (e.g. the auro-input).
+   * @private
+   */
+  focusTrigger() {
+    if (this.trigger.hasAttribute('tabindex')) {
       this.trigger.focus();
+    } else {
+      // Slotted content isn't a DOM child of the trigger div, so
+      // getFocusableElements can't find it. Query assigned nodes directly.
+      const slot = this.trigger.querySelector('slot[name="trigger"]');
+      if (slot) {
+        const assigned = slot.assignedElements();
+        for (const el of assigned) {
+          if (el.hasAttribute('disabled')) {
+            continue;
+          }
+          // Try finding a focusable descendant first (handles non-focusable
+          // wrappers like <div> containing a <button>). If none found, try
+          // focusing the element directly (works for custom elements like
+          // auro-input that have delegatesFocus or a custom focus() method).
+          const descendants = getFocusableElements(el);
+          if (descendants.length > 0) {
+            descendants[0].focus();
+            return;
+          }
+          el.focus();
+          if (document.activeElement === el) {
+            return;
+          }
+        }
+      }
+      // Fallback: try DOM children (non-slotted content)
+      const focusables = getFocusableElements(this.trigger);
+      if (focusables.length > 0) {
+        focusables[0].focus();
+      }
     }
   }
 
@@ -5653,15 +5703,17 @@ class AuroDropdown extends AuroElement$2 {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown") {
-      this.trigger.focus();
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
+      this.focusTrigger();
     }
 
 
     // On Tab-driven close (eventType "focusloss"), let focus advance naturally
     // — restoring to the trigger would trap the user on this dropdown, forcing
     // an extra Tab to move on. Escape and outside-click still restore.
-    if (!this.isPopoverVisible && eventType !== "focusloss") {
+    // When noFocusRestoreOnClose is true, the consumer (e.g. combobox) manages
+    // its own focus restoration — skip the generic trigger focus to avoid races.
+    if (!this.isPopoverVisible && eventType !== "focusloss" && !this.noFocusRestoreOnClose) {
       // wait til the bib gets fully closed and rendered
       setTimeout(() => {
         // Skip if the bib re-opened, or if focus moved intentionally outside the dropdown (not to body).
@@ -5673,7 +5725,7 @@ class AuroDropdown extends AuroElement$2 {
           return;
         }
         // Restore focus to the trigger.
-        this.trigger.focus();
+        this.focusTrigger();
       });
     }
   }
@@ -16847,9 +16899,10 @@ class DomHandler {
 class BaseInput extends AuroElement$1 {
 
   // Delegate focus to the native <input> inside the shadow root so that
-  // showModal()'s dialog focusing steps reach the input element.
-  // This keeps the mobile virtual keyboard open when the fullscreen dialog
-  // opens, because the browser sees an input-to-input focus transfer.
+  // clicking anywhere on the input wrapper focuses the native input, and
+  // programmatic .focus() calls on elements in the shadow DOM work correctly.
+  // The initial-load focus theft was caused by the static `autofocus`
+  // attribute on the bib input (now conditional), not by delegatesFocus.
   static get shadowRootOptions() {
     return {
       ...AuroElement$1.shadowRootOptions,
@@ -18526,7 +18579,7 @@ let AuroHelpText$1 = class AuroHelpText extends LitElement {
   }
 };
 
-var formkitVersion$1 = '202607102309';
+var formkitVersion$1 = '202607161943';
 
 // Copyright (c) 2025 Alaska Airlines. All right reserved. Licensed under the Apache-2.0 license
 // See LICENSE in the project root for license information.
@@ -18812,15 +18865,50 @@ class AuroInput extends BaseInput {
    * @returns {void}
    */
   checkDisplayValueSlotChange() {
-    // flatten:true resolves through auro-combobox's forwarding slot
-    // (<slot name="displayValue" slot="displayValue">) so a clone appended
-    // directly to auro-input's light DOM alongside the forwarder still
-    // counts as content. The prior nodes[0].tagName === 'SLOT' recursion
-    // discarded any siblings past the forwarder.
-    const slot = this.shadowRoot.querySelector('slot[name="displayValue"]');
+    const slot = this.shadowRoot?.querySelector('slot[name="displayValue"]');
+    if (!slot) {
+      // Shadow slot not yet rendered — fall back to checking light-DOM
+      // children so hasDisplayValueContent isn't stuck false when called
+      // before firstUpdated (e.g. from auro-combobox during mount).
+      // Check for any element (including custom elements like <auro-icon>
+      // that render via shadow DOM with no text content).
+      const lightDomNodes = Array.from(this.querySelectorAll('[slot="displayValue"]:not(slot)'));
+      const hasContent = lightDomNodes.some((node) => (
+        node.textContent.trim().length > 0 ||
+        node.children.length > 0 ||
+        node.shadowRoot !== null
+      ));
+      if (this.hasDisplayValueContent !== hasContent) {
+        this.hasDisplayValueContent = hasContent;
+        this.requestUpdate();
+      }
+      return;
+    }
     const nodes = slot.assignedNodes({ flatten: true });
 
-    this.hasDisplayValueContent = nodes.length > 0;
+    // Check for actual visible content, not just node existence.
+    // An empty <span slot="displayValue"></span> forwarded from the
+    // consumer should not be treated as "has content" — it causes the
+    // displayValue wrapper to render (with hasContent class) but show
+    // nothing, blocking the combobox's synthetic displayValue from
+    // being visible on preset/deeplink load.
+    // Custom elements (e.g. <auro-icon>) that render via shadow DOM are
+    // treated as content even when they have no text or light-DOM children.
+    const hasContent = nodes.some((node) => {
+      if (node.nodeType === Node.TEXT_NODE) {
+        return node.textContent.trim().length > 0;
+      }
+      if (node.nodeType === Node.ELEMENT_NODE) {
+        return node.textContent.trim().length > 0 ||
+          node.children.length > 0 ||
+          node.shadowRoot !== null;
+      }
+      return false;
+    });
+    if (this.hasDisplayValueContent !== hasContent) {
+      this.hasDisplayValueContent = hasContent;
+      this.requestUpdate();
+    }
   }
 
   firstUpdated() {
@@ -19647,7 +19735,7 @@ class AuroBibtemplate extends LitElement {
   }
 }
 
-var formkitVersion = '202607102309';
+var formkitVersion = '202607161943';
 
 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}`;
 
@@ -20684,14 +20772,34 @@ 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();
-        }
+      }
+
+      // 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();
+      }
+    } else if (this.value) {
+      // No optionSelected yet (e.g. setMenuValue was called but the menu's
+      // auroMenu-selectedOption event hasn't fired yet, or we're on remount
+      // with no options loaded). Synthesize a displayValue from the value so
+      // the overlay isn't blank.
+      //
+      // NOTE: This renders the raw machine value (e.g. "SEA"), not the
+      // human-readable label (e.g. "Seattle, WA"). For consumers where
+      // value ≠ label, this produces a brief flash of the raw value until
+      // the option elements load and updateTriggerTextDisplay re-runs with
+      // the correct label. This is intentionally preferred over a blank
+      // state — the displayValueInTrigger.remove() cleanup above ensures
+      // this placeholder is replaced once the real option is available.
+      const syntheticDV = document.createElement('span');
+      syntheticDV.setAttribute('slot', 'displayValue');
+      syntheticDV.textContent = this.value;
+      this.input.appendChild(syntheticDV);
+      if (typeof this.input.checkDisplayValueSlotChange === 'function') {
+        this.input.checkDisplayValueSlotChange();
       }
     }
 
@@ -20864,6 +20972,10 @@ class AuroCombobox extends AuroElement {
     // from combobox's light DOM and won't be detected by dropdown's contains() check.
     this.dropdown.noHideOnThisFocusLoss = true;
 
+    // Suppress the dropdown's generic focus restoration on close — the combobox
+    // manages its own focus via setClearBtnFocus / setInputFocus / keyboard strategy.
+    this.dropdown.noFocusRestoreOnClose = true;
+
     // Listen for the ID to be added to the dropdown so we can capture it and use it for accessibility.
     this.dropdown.addEventListener('auroDropdown-idAdded', (event) => {
       this.dropdownId = event.detail.id;
@@ -20937,7 +21049,11 @@ class AuroCombobox extends AuroElement {
         // after the dropdown layout settles.
 
         doubleRaf(() => {
-          this.setInputFocus();
+          // Guard: skip if the dropdown closed before this rAF fired
+          // (e.g. user selected an option immediately after the bib opened).
+          if (this.dropdownOpen) {
+            this.setInputFocus();
+          }
           if (this._inFullscreenTransition) {
             this._inFullscreenTransition = false;
           }
@@ -20984,7 +21100,9 @@ class AuroCombobox extends AuroElement {
       }
 
       this._scheduleTimer(() => {
-        this.setInputFocus();
+        if (this.dropdown.isPopoverVisible) {
+          this.setInputFocus();
+        }
       }, 0);
     });
   }
@@ -20993,14 +21111,19 @@ class AuroCombobox extends AuroElement {
    * @private
    */
   setClearBtnFocus() {
-    const clearBtn = this.input.shadowRoot.querySelector('.clearBtn');
-    if (clearBtn) {
-      // Wait for the element to fully render across
-      // multiple Lit update cycles before moving focus
-      doubleRaf(() => {
+    doubleRaf(() => {
+      // First establish focus inside the input's shadow root.
+      // Without this, clearBtn.focus() silently fails when focus is on
+      // document.body (e.g. after a click selection closes the bib dialog).
+      // delegatesFocus on BaseInput routes this to the native <input>.
+      this.input.focus();
+
+      // Now move focus to the clear button within the same shadow root.
+      const clearBtn = this.input.shadowRoot.querySelector('.clearBtn');
+      if (clearBtn) {
         clearBtn.focus();
-      });
-    }
+      }
+    });
   }
 
   /**
@@ -21211,6 +21334,9 @@ class AuroCombobox extends AuroElement {
       // only — fresh user selections take the existing hideBib path.
       if (isEcho && this.menu.optionSelected) {
         this._programmaticFilterRefresh = true;
+        this.updateComplete.then(() => {
+          this._programmaticFilterRefresh = false;
+        });
       }
     });
 
@@ -21463,10 +21589,6 @@ class AuroCombobox extends AuroElement {
     if (this.dropdown.isBibFullscreen && this.input.value && this.input.value.length > 0 && this.dropdown.isPopoverVisible) {
       this.setInputFocus();
     }
-
-    if (this._programmaticFilterRefresh) {
-      this._programmaticFilterRefresh = false;
-    }
   }
 
   /**
@@ -21480,10 +21602,12 @@ class AuroCombobox extends AuroElement {
       inputResolver: (comp, ctx) => (ctx.isModal && comp.inputInBib ? comp.inputInBib : comp.input),
     });
 
-    this.addEventListener('focusin', () => {
+    this.addEventListener('focusin', (event) => {
       this.touched = true;
 
-      this.focus();
+      if (event.composedPath()[0] === this) {
+        this.focus();
+      }
     });
 
     this.addEventListener('auroFormElement-validated', (evt) => {
@@ -21663,6 +21787,12 @@ class AuroCombobox extends AuroElement {
       // setting the flag unconditionally here masks the user-typed open path.
       if (!this._userTyped) {
         this._programmaticFilterRefresh = true;
+        // Self-clear after this update cycle completes. This collapses
+        // the previous scattered clear-points into one and prevents the
+        // flag from surviving into the next user interaction.
+        this.updateComplete.then(() => {
+          this._programmaticFilterRefresh = false;
+        });
       }
 
       if (this.input.value !== this.value) {
@@ -21752,10 +21882,6 @@ class AuroCombobox extends AuroElement {
       } else if (!this.dropdown.isBibFullscreen) {
         this.hideBib();
       }
-
-      if (this._programmaticFilterRefresh) {
-        this._programmaticFilterRefresh = false;
-      }
     }
 
     if (changedProperties.has('error')) {
@@ -21937,7 +22063,7 @@ class AuroCombobox extends AuroElement {
             <slot @slotchange="${this.handleSlotChange}"></slot>
             <${this.inputTag}
               id="inputInBib"
-              autofocus
+              ?autofocus="${this.dropdownOpen && this.dropdown?.isBibFullscreen}"
               @input="${this.handleInputValueChange}"
               .a11yActivedescendant="${this.dropdownOpen && this.optionActive ? this.optionActive.id : undefined}"
               .a11yControls=${`${this.dropdownId}-floater-bib`}