@aurodesignsystem-dev/auro-formkit 0.0.0-pr1554.9 → 0.0.0-pr1555.1

package/components/checkbox/demo/customize.min.js

@@ -1275,7 +1275,7 @@ class AuroHelpText extends i$2 {
   }
 }
 
-var formkitVersion = '202607160654';
+var formkitVersion = '202607162024';
 
 // Copyright (c) 2026 Alaska Airlines. All rights reserved. Licensed under the Apache-2.0 license
 // See LICENSE in the project root for license information.

package/components/checkbox/demo/getting-started.min.js

@@ -1275,7 +1275,7 @@ class AuroHelpText extends i$2 {
   }
 }
 
-var formkitVersion = '202607160654';
+var formkitVersion = '202607162024';
 
 // Copyright (c) 2026 Alaska Airlines. All rights reserved. Licensed under the Apache-2.0 license
 // See LICENSE in the project root for license information.

package/components/checkbox/demo/index.min.js

@@ -1275,7 +1275,7 @@ class AuroHelpText extends i$2 {
   }
 }
 
-var formkitVersion = '202607160654';
+var formkitVersion = '202607162024';
 
 // Copyright (c) 2026 Alaska Airlines. All rights reserved. Licensed under the Apache-2.0 license
 // See LICENSE in the project root for license information.

package/components/checkbox/dist/index.js

@@ -1228,7 +1228,7 @@ class AuroHelpText extends LitElement {
   }
 }
 
-var formkitVersion = '202607160654';
+var formkitVersion = '202607162024';
 
 // Copyright (c) 2026 Alaska Airlines. All rights reserved. Licensed under the Apache-2.0 license
 // See LICENSE in the project root for license information.

package/components/checkbox/dist/registered.js

@@ -1228,7 +1228,7 @@ class AuroHelpText extends LitElement {
   }
 }
 
-var formkitVersion = '202607160654';
+var formkitVersion = '202607162024';
 
 // Copyright (c) 2026 Alaska Airlines. All rights reserved. Licensed under the Apache-2.0 license
 // See LICENSE in the project root for license information.

package/components/combobox/demo/customize.min.js

@@ -4971,7 +4971,7 @@ let AuroHelpText$2 = class AuroHelpText extends i$3 {
   }
 };
 
-var formkitVersion$2 = '202607160654';
+var formkitVersion$2 = '202607162024';
 
 let AuroElement$2 = class AuroElement extends i$3 {
   static get properties() {
@@ -5111,6 +5111,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
@@ -5287,7 +5296,7 @@ class AuroDropdown extends AuroElement$2 {
         const assigned = slot.assignedElements();
         for (const el of assigned) {
           if (el.hasAttribute('disabled')) {
-            continue;
+            continue; // eslint-disable-line no-continue
           }
           // Try finding a focusable descendant first (handles non-focusable
           // wrappers like <div> containing a <button>). If none found, try
@@ -5299,7 +5308,9 @@ class AuroDropdown extends AuroElement$2 {
             return;
           }
           el.focus();
-          return;
+          if (document.activeElement === el) {
+            return;
+          }
         }
       }
       // Fallback: try DOM children (non-slotted content)
@@ -5759,7 +5770,7 @@ class AuroDropdown extends AuroElement$2 {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown") {
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
       this.focusTrigger();
     }
 
@@ -5767,9 +5778,9 @@ class AuroDropdown extends AuroElement$2 {
     // 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.
-    // When noHideOnThisFocusLoss is true, the consumer (e.g. combobox) manages
+    // 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.noHideOnThisFocusLoss) {
+    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).
@@ -18642,7 +18653,7 @@ let AuroHelpText$1 = class AuroHelpText extends i$3 {
   }
 };
 
-var formkitVersion$1 = '202607160654';
+var formkitVersion$1 = '202607162024';
 
 // Copyright (c) 2025 Alaska Airlines. All right reserved. Licensed under the Apache-2.0 license
 // See LICENSE in the project root for license information.
@@ -18935,12 +18946,16 @@ class AuroInput extends BaseInput {
       // 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 lightDomContent = this.querySelector('[slot="displayValue"]:not(slot)');
-      this.hasDisplayValueContent = Boolean(lightDomContent && (
-        lightDomContent.textContent.trim().length > 0 ||
-        lightDomContent.children.length > 0 ||
-        lightDomContent.shadowRoot !== null
+      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 });
@@ -18953,7 +18968,7 @@ class AuroInput extends BaseInput {
     // 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.
-    this.hasDisplayValueContent = nodes.some((node) => {
+    const hasContent = nodes.some((node) => {
       if (node.nodeType === Node.TEXT_NODE) {
         return node.textContent.trim().length > 0;
       }
@@ -18964,6 +18979,10 @@ class AuroInput extends BaseInput {
       }
       return false;
     });
+    if (this.hasDisplayValueContent !== hasContent) {
+      this.hasDisplayValueContent = hasContent;
+      this.requestUpdate();
+    }
   }
 
   firstUpdated() {
@@ -19790,7 +19809,7 @@ class AuroBibtemplate extends i$3 {
   }
 }
 
-var formkitVersion = '202607160654';
+var formkitVersion = '202607162024';
 
 var styleCss$3 = i$6`.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}`;
 
@@ -20835,7 +20854,6 @@ class AuroCombobox extends AuroElement {
       // 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();
       }
     } else if (this.value) {
       // No optionSelected yet (e.g. setMenuValue was called but the menu's
@@ -20856,7 +20874,6 @@ class AuroCombobox extends AuroElement {
       this.input.appendChild(syntheticDV);
       if (typeof this.input.checkDisplayValueSlotChange === 'function') {
         this.input.checkDisplayValueSlotChange();
-        this.input.requestUpdate();
       }
     }
 
@@ -21029,6 +21046,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;

package/components/combobox/demo/getting-started.min.js

@@ -4971,7 +4971,7 @@ let AuroHelpText$2 = class AuroHelpText extends i$3 {
   }
 };
 
-var formkitVersion$2 = '202607160654';
+var formkitVersion$2 = '202607162024';
 
 let AuroElement$2 = class AuroElement extends i$3 {
   static get properties() {
@@ -5111,6 +5111,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
@@ -5287,7 +5296,7 @@ class AuroDropdown extends AuroElement$2 {
         const assigned = slot.assignedElements();
         for (const el of assigned) {
           if (el.hasAttribute('disabled')) {
-            continue;
+            continue; // eslint-disable-line no-continue
           }
           // Try finding a focusable descendant first (handles non-focusable
           // wrappers like <div> containing a <button>). If none found, try
@@ -5299,7 +5308,9 @@ class AuroDropdown extends AuroElement$2 {
             return;
           }
           el.focus();
-          return;
+          if (document.activeElement === el) {
+            return;
+          }
         }
       }
       // Fallback: try DOM children (non-slotted content)
@@ -5759,7 +5770,7 @@ class AuroDropdown extends AuroElement$2 {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown") {
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
       this.focusTrigger();
     }
 
@@ -5767,9 +5778,9 @@ class AuroDropdown extends AuroElement$2 {
     // 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.
-    // When noHideOnThisFocusLoss is true, the consumer (e.g. combobox) manages
+    // 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.noHideOnThisFocusLoss) {
+    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).
@@ -18642,7 +18653,7 @@ let AuroHelpText$1 = class AuroHelpText extends i$3 {
   }
 };
 
-var formkitVersion$1 = '202607160654';
+var formkitVersion$1 = '202607162024';
 
 // Copyright (c) 2025 Alaska Airlines. All right reserved. Licensed under the Apache-2.0 license
 // See LICENSE in the project root for license information.
@@ -18935,12 +18946,16 @@ class AuroInput extends BaseInput {
       // 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 lightDomContent = this.querySelector('[slot="displayValue"]:not(slot)');
-      this.hasDisplayValueContent = Boolean(lightDomContent && (
-        lightDomContent.textContent.trim().length > 0 ||
-        lightDomContent.children.length > 0 ||
-        lightDomContent.shadowRoot !== null
+      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 });
@@ -18953,7 +18968,7 @@ class AuroInput extends BaseInput {
     // 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.
-    this.hasDisplayValueContent = nodes.some((node) => {
+    const hasContent = nodes.some((node) => {
       if (node.nodeType === Node.TEXT_NODE) {
         return node.textContent.trim().length > 0;
       }
@@ -18964,6 +18979,10 @@ class AuroInput extends BaseInput {
       }
       return false;
     });
+    if (this.hasDisplayValueContent !== hasContent) {
+      this.hasDisplayValueContent = hasContent;
+      this.requestUpdate();
+    }
   }
 
   firstUpdated() {
@@ -19790,7 +19809,7 @@ class AuroBibtemplate extends i$3 {
   }
 }
 
-var formkitVersion = '202607160654';
+var formkitVersion = '202607162024';
 
 var styleCss$3 = i$6`.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}`;
 
@@ -20835,7 +20854,6 @@ class AuroCombobox extends AuroElement {
       // 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();
       }
     } else if (this.value) {
       // No optionSelected yet (e.g. setMenuValue was called but the menu's
@@ -20856,7 +20874,6 @@ class AuroCombobox extends AuroElement {
       this.input.appendChild(syntheticDV);
       if (typeof this.input.checkDisplayValueSlotChange === 'function') {
         this.input.checkDisplayValueSlotChange();
-        this.input.requestUpdate();
       }
     }
 
@@ -21029,6 +21046,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;

package/components/combobox/demo/index.min.js

@@ -4986,7 +4986,7 @@ let AuroHelpText$2 = class AuroHelpText extends i$3 {
   }
 };
 
-var formkitVersion$2 = '202607160654';
+var formkitVersion$2 = '202607162024';
 
 let AuroElement$2 = class AuroElement extends i$3 {
   static get properties() {
@@ -5126,6 +5126,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
@@ -5302,7 +5311,7 @@ class AuroDropdown extends AuroElement$2 {
         const assigned = slot.assignedElements();
         for (const el of assigned) {
           if (el.hasAttribute('disabled')) {
-            continue;
+            continue; // eslint-disable-line no-continue
           }
           // Try finding a focusable descendant first (handles non-focusable
           // wrappers like <div> containing a <button>). If none found, try
@@ -5314,7 +5323,9 @@ class AuroDropdown extends AuroElement$2 {
             return;
           }
           el.focus();
-          return;
+          if (document.activeElement === el) {
+            return;
+          }
         }
       }
       // Fallback: try DOM children (non-slotted content)
@@ -5774,7 +5785,7 @@ class AuroDropdown extends AuroElement$2 {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown") {
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
       this.focusTrigger();
     }
 
@@ -5782,9 +5793,9 @@ class AuroDropdown extends AuroElement$2 {
     // 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.
-    // When noHideOnThisFocusLoss is true, the consumer (e.g. combobox) manages
+    // 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.noHideOnThisFocusLoss) {
+    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).
@@ -18657,7 +18668,7 @@ let AuroHelpText$1 = class AuroHelpText extends i$3 {
   }
 };
 
-var formkitVersion$1 = '202607160654';
+var formkitVersion$1 = '202607162024';
 
 // Copyright (c) 2025 Alaska Airlines. All right reserved. Licensed under the Apache-2.0 license
 // See LICENSE in the project root for license information.
@@ -18950,12 +18961,16 @@ class AuroInput extends BaseInput {
       // 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 lightDomContent = this.querySelector('[slot="displayValue"]:not(slot)');
-      this.hasDisplayValueContent = Boolean(lightDomContent && (
-        lightDomContent.textContent.trim().length > 0 ||
-        lightDomContent.children.length > 0 ||
-        lightDomContent.shadowRoot !== null
+      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 });
@@ -18968,7 +18983,7 @@ class AuroInput extends BaseInput {
     // 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.
-    this.hasDisplayValueContent = nodes.some((node) => {
+    const hasContent = nodes.some((node) => {
       if (node.nodeType === Node.TEXT_NODE) {
         return node.textContent.trim().length > 0;
       }
@@ -18979,6 +18994,10 @@ class AuroInput extends BaseInput {
       }
       return false;
     });
+    if (this.hasDisplayValueContent !== hasContent) {
+      this.hasDisplayValueContent = hasContent;
+      this.requestUpdate();
+    }
   }
 
   firstUpdated() {
@@ -19805,7 +19824,7 @@ class AuroBibtemplate extends i$3 {
   }
 }
 
-var formkitVersion = '202607160654';
+var formkitVersion = '202607162024';
 
 var styleCss$3 = i$6`.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}`;
 
@@ -20850,7 +20869,6 @@ class AuroCombobox extends AuroElement {
       // 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();
       }
     } else if (this.value) {
       // No optionSelected yet (e.g. setMenuValue was called but the menu's
@@ -20871,7 +20889,6 @@ class AuroCombobox extends AuroElement {
       this.input.appendChild(syntheticDV);
       if (typeof this.input.checkDisplayValueSlotChange === 'function') {
         this.input.checkDisplayValueSlotChange();
-        this.input.requestUpdate();
       }
     }
 
@@ -21044,6 +21061,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;

package/components/combobox/dist/index.js

@@ -4904,7 +4904,7 @@ let AuroHelpText$2 = class AuroHelpText extends LitElement {
   }
 };
 
-var formkitVersion$2 = '202607160654';
+var formkitVersion$2 = '202607162024';
 
 let AuroElement$2 = class AuroElement extends LitElement {
   static get properties() {
@@ -5044,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
@@ -5220,7 +5229,7 @@ class AuroDropdown extends AuroElement$2 {
         const assigned = slot.assignedElements();
         for (const el of assigned) {
           if (el.hasAttribute('disabled')) {
-            continue;
+            continue; // eslint-disable-line no-continue
           }
           // Try finding a focusable descendant first (handles non-focusable
           // wrappers like <div> containing a <button>). If none found, try
@@ -5232,7 +5241,9 @@ class AuroDropdown extends AuroElement$2 {
             return;
           }
           el.focus();
-          return;
+          if (document.activeElement === el) {
+            return;
+          }
         }
       }
       // Fallback: try DOM children (non-slotted content)
@@ -5692,7 +5703,7 @@ class AuroDropdown extends AuroElement$2 {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown") {
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
       this.focusTrigger();
     }
 
@@ -5700,9 +5711,9 @@ class AuroDropdown extends AuroElement$2 {
     // 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.
-    // When noHideOnThisFocusLoss is true, the consumer (e.g. combobox) manages
+    // 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.noHideOnThisFocusLoss) {
+    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).
@@ -18568,7 +18579,7 @@ let AuroHelpText$1 = class AuroHelpText extends LitElement {
   }
 };
 
-var formkitVersion$1 = '202607160654';
+var formkitVersion$1 = '202607162024';
 
 // Copyright (c) 2025 Alaska Airlines. All right reserved. Licensed under the Apache-2.0 license
 // See LICENSE in the project root for license information.
@@ -18861,12 +18872,16 @@ class AuroInput extends BaseInput {
       // 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 lightDomContent = this.querySelector('[slot="displayValue"]:not(slot)');
-      this.hasDisplayValueContent = Boolean(lightDomContent && (
-        lightDomContent.textContent.trim().length > 0 ||
-        lightDomContent.children.length > 0 ||
-        lightDomContent.shadowRoot !== null
+      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 });
@@ -18879,7 +18894,7 @@ class AuroInput extends BaseInput {
     // 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.
-    this.hasDisplayValueContent = nodes.some((node) => {
+    const hasContent = nodes.some((node) => {
       if (node.nodeType === Node.TEXT_NODE) {
         return node.textContent.trim().length > 0;
       }
@@ -18890,6 +18905,10 @@ class AuroInput extends BaseInput {
       }
       return false;
     });
+    if (this.hasDisplayValueContent !== hasContent) {
+      this.hasDisplayValueContent = hasContent;
+      this.requestUpdate();
+    }
   }
 
   firstUpdated() {
@@ -19716,7 +19735,7 @@ class AuroBibtemplate extends LitElement {
   }
 }
 
-var formkitVersion = '202607160654';
+var formkitVersion = '202607162024';
 
 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}`;
 
@@ -20761,7 +20780,6 @@ class AuroCombobox extends AuroElement {
       // 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();
       }
     } else if (this.value) {
       // No optionSelected yet (e.g. setMenuValue was called but the menu's
@@ -20782,7 +20800,6 @@ class AuroCombobox extends AuroElement {
       this.input.appendChild(syntheticDV);
       if (typeof this.input.checkDisplayValueSlotChange === 'function') {
         this.input.checkDisplayValueSlotChange();
-        this.input.requestUpdate();
       }
     }
 
@@ -20955,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;