@aurodesignsystem-dev/auro-formkit 0.0.0-pr1554.13 → 0.0.0-pr1554.14

package/components/combobox/dist/index.js

@@ -4904,7 +4904,7 @@ let AuroHelpText$2 = class AuroHelpText extends LitElement {
   }
 };
 
-var formkitVersion$2 = '202607160738';
+var formkitVersion$2 = '202607160755';
 
 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
@@ -5217,25 +5226,22 @@ class AuroDropdown extends AuroElement$2 {
       // getFocusableElements can't find it. Query assigned nodes directly.
       const slot = this.trigger.querySelector('slot[name="trigger"]');
       if (slot) {
-        const assigned = slot.assignedElements({ flatten: true });
+        const assigned = slot.assignedElements();
         for (const el of assigned) {
           if (el.hasAttribute('disabled')) {
             continue;
           }
-
-          // Try focusing a focusable descendant first (handles non-focusable wrappers).
+          // 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;
           }
-
-          // Otherwise, try focusing the assigned element itself. Only stop if focus moved.
-          const prevActive = document.activeElement;
           el.focus();
-          if (document.activeElement !== prevActive) {
-            return;
-          }
+          return;
         }
       }
       // Fallback: try DOM children (non-slotted content)
@@ -5695,7 +5701,7 @@ class AuroDropdown extends AuroElement$2 {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noHideOnThisFocusLoss) {
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
       this.focusTrigger();
     }
 
@@ -5703,9 +5709,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).
@@ -18571,7 +18577,7 @@ let AuroHelpText$1 = class AuroHelpText extends LitElement {
   }
 };
 
-var formkitVersion$1 = '202607160738';
+var formkitVersion$1 = '202607160755';
 
 // Copyright (c) 2025 Alaska Airlines. All right reserved. Licensed under the Apache-2.0 license
 // See LICENSE in the project root for license information.
@@ -18865,15 +18871,11 @@ class AuroInput extends BaseInput {
       // 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)');
-      const nextHasDisplayValueContent = Boolean(lightDomContent && (
+      this.hasDisplayValueContent = Boolean(lightDomContent && (
         lightDomContent.textContent.trim().length > 0 ||
         lightDomContent.children.length > 0 ||
         lightDomContent.shadowRoot !== null
       ));
-      if (nextHasDisplayValueContent !== this.hasDisplayValueContent) {
-        this.hasDisplayValueContent = nextHasDisplayValueContent;
-        this.requestUpdate();
-      }
       return;
     }
     const nodes = slot.assignedNodes({ flatten: true });
@@ -19723,7 +19725,7 @@ class AuroBibtemplate extends LitElement {
   }
 }
 
-var formkitVersion = '202607160738';
+var formkitVersion = '202607160755';
 
 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}`;
 
@@ -20780,30 +20782,13 @@ class AuroCombobox extends AuroElement {
       // 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.
-
-      // Avoid adding synthetic content when a consumer already provides
-      // displayValue content via the forwarded slot.
-      const forwarderSlot = this.input.querySelector('slot[name="displayValue"][slot="displayValue"]');
-      const hasSlottedDisplayValue = Boolean(forwarderSlot?.assignedNodes({ flatten: true }).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 (!hasSlottedDisplayValue) {
-        const syntheticDV = document.createElement('span');
-        syntheticDV.setAttribute('slot', 'displayValue');
-        syntheticDV.textContent = this.value;
-        this.input.appendChild(syntheticDV);
-      }
-
+      // 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();
         this.input.requestUpdate();
@@ -20979,6 +20964,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/registered.js

@@ -4904,7 +4904,7 @@ let AuroHelpText$2 = class AuroHelpText extends LitElement {
   }
 };
 
-var formkitVersion$2 = '202607160738';
+var formkitVersion$2 = '202607160755';
 
 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
@@ -5217,25 +5226,22 @@ class AuroDropdown extends AuroElement$2 {
       // getFocusableElements can't find it. Query assigned nodes directly.
       const slot = this.trigger.querySelector('slot[name="trigger"]');
       if (slot) {
-        const assigned = slot.assignedElements({ flatten: true });
+        const assigned = slot.assignedElements();
         for (const el of assigned) {
           if (el.hasAttribute('disabled')) {
             continue;
           }
-
-          // Try focusing a focusable descendant first (handles non-focusable wrappers).
+          // 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;
           }
-
-          // Otherwise, try focusing the assigned element itself. Only stop if focus moved.
-          const prevActive = document.activeElement;
           el.focus();
-          if (document.activeElement !== prevActive) {
-            return;
-          }
+          return;
         }
       }
       // Fallback: try DOM children (non-slotted content)
@@ -5695,7 +5701,7 @@ class AuroDropdown extends AuroElement$2 {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noHideOnThisFocusLoss) {
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
       this.focusTrigger();
     }
 
@@ -5703,9 +5709,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).
@@ -18571,7 +18577,7 @@ let AuroHelpText$1 = class AuroHelpText extends LitElement {
   }
 };
 
-var formkitVersion$1 = '202607160738';
+var formkitVersion$1 = '202607160755';
 
 // Copyright (c) 2025 Alaska Airlines. All right reserved. Licensed under the Apache-2.0 license
 // See LICENSE in the project root for license information.
@@ -18865,15 +18871,11 @@ class AuroInput extends BaseInput {
       // 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)');
-      const nextHasDisplayValueContent = Boolean(lightDomContent && (
+      this.hasDisplayValueContent = Boolean(lightDomContent && (
         lightDomContent.textContent.trim().length > 0 ||
         lightDomContent.children.length > 0 ||
         lightDomContent.shadowRoot !== null
       ));
-      if (nextHasDisplayValueContent !== this.hasDisplayValueContent) {
-        this.hasDisplayValueContent = nextHasDisplayValueContent;
-        this.requestUpdate();
-      }
       return;
     }
     const nodes = slot.assignedNodes({ flatten: true });
@@ -19723,7 +19725,7 @@ class AuroBibtemplate extends LitElement {
   }
 }
 
-var formkitVersion = '202607160738';
+var formkitVersion = '202607160755';
 
 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}`;
 
@@ -20780,30 +20782,13 @@ class AuroCombobox extends AuroElement {
       // 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.
-
-      // Avoid adding synthetic content when a consumer already provides
-      // displayValue content via the forwarded slot.
-      const forwarderSlot = this.input.querySelector('slot[name="displayValue"][slot="displayValue"]');
-      const hasSlottedDisplayValue = Boolean(forwarderSlot?.assignedNodes({ flatten: true }).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 (!hasSlottedDisplayValue) {
-        const syntheticDV = document.createElement('span');
-        syntheticDV.setAttribute('slot', 'displayValue');
-        syntheticDV.textContent = this.value;
-        this.input.appendChild(syntheticDV);
-      }
-
+      // 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();
         this.input.requestUpdate();
@@ -20979,6 +20964,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/counter/demo/customize.min.js

@@ -1114,7 +1114,7 @@ let AuroHelpText$1 = class AuroHelpText extends i$2 {
   }
 };
 
-var formkitVersion$1 = '202607160738';
+var formkitVersion$1 = '202607160755';
 
 // Copyright (c) 2026 Alaska Airlines. All rights reserved. Licensed under the Apache-2.0 license
 // See LICENSE in the project root for license information.
@@ -5280,7 +5280,7 @@ class AuroHelpText extends i$2 {
   }
 }
 
-var formkitVersion = '202607160738';
+var formkitVersion = '202607160755';
 
 let AuroElement$1 = class AuroElement extends i$2 {
   static get properties() {
@@ -5420,6 +5420,15 @@ class AuroDropdown extends AuroElement$1 {
     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
@@ -5593,25 +5602,22 @@ class AuroDropdown extends AuroElement$1 {
       // getFocusableElements can't find it. Query assigned nodes directly.
       const slot = this.trigger.querySelector('slot[name="trigger"]');
       if (slot) {
-        const assigned = slot.assignedElements({ flatten: true });
+        const assigned = slot.assignedElements();
         for (const el of assigned) {
           if (el.hasAttribute('disabled')) {
             continue;
           }
-
-          // Try focusing a focusable descendant first (handles non-focusable wrappers).
+          // 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;
           }
-
-          // Otherwise, try focusing the assigned element itself. Only stop if focus moved.
-          const prevActive = document.activeElement;
           el.focus();
-          if (document.activeElement !== prevActive) {
-            return;
-          }
+          return;
         }
       }
       // Fallback: try DOM children (non-slotted content)
@@ -6071,7 +6077,7 @@ class AuroDropdown extends AuroElement$1 {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noHideOnThisFocusLoss) {
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
       this.focusTrigger();
     }
 
@@ -6079,9 +6085,9 @@ class AuroDropdown extends AuroElement$1 {
     // 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).

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

@@ -1114,7 +1114,7 @@ let AuroHelpText$1 = class AuroHelpText extends i$2 {
   }
 };
 
-var formkitVersion$1 = '202607160738';
+var formkitVersion$1 = '202607160755';
 
 // Copyright (c) 2026 Alaska Airlines. All rights reserved. Licensed under the Apache-2.0 license
 // See LICENSE in the project root for license information.
@@ -5280,7 +5280,7 @@ class AuroHelpText extends i$2 {
   }
 }
 
-var formkitVersion = '202607160738';
+var formkitVersion = '202607160755';
 
 let AuroElement$1 = class AuroElement extends i$2 {
   static get properties() {
@@ -5420,6 +5420,15 @@ class AuroDropdown extends AuroElement$1 {
     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
@@ -5593,25 +5602,22 @@ class AuroDropdown extends AuroElement$1 {
       // getFocusableElements can't find it. Query assigned nodes directly.
       const slot = this.trigger.querySelector('slot[name="trigger"]');
       if (slot) {
-        const assigned = slot.assignedElements({ flatten: true });
+        const assigned = slot.assignedElements();
         for (const el of assigned) {
           if (el.hasAttribute('disabled')) {
             continue;
           }
-
-          // Try focusing a focusable descendant first (handles non-focusable wrappers).
+          // 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;
           }
-
-          // Otherwise, try focusing the assigned element itself. Only stop if focus moved.
-          const prevActive = document.activeElement;
           el.focus();
-          if (document.activeElement !== prevActive) {
-            return;
-          }
+          return;
         }
       }
       // Fallback: try DOM children (non-slotted content)
@@ -6071,7 +6077,7 @@ class AuroDropdown extends AuroElement$1 {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noHideOnThisFocusLoss) {
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
       this.focusTrigger();
     }
 
@@ -6079,9 +6085,9 @@ class AuroDropdown extends AuroElement$1 {
     // 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).

package/components/counter/dist/index.js

@@ -1064,7 +1064,7 @@ let AuroHelpText$1 = class AuroHelpText extends LitElement {
   }
 };
 
-var formkitVersion$1 = '202607160738';
+var formkitVersion$1 = '202607160755';
 
 // Copyright (c) 2026 Alaska Airlines. All rights reserved. Licensed under the Apache-2.0 license
 // See LICENSE in the project root for license information.
@@ -5212,7 +5212,7 @@ class AuroHelpText extends LitElement {
   }
 }
 
-var formkitVersion = '202607160738';
+var formkitVersion = '202607160755';
 
 let AuroElement$1 = class AuroElement extends LitElement {
   static get properties() {
@@ -5352,6 +5352,15 @@ class AuroDropdown extends AuroElement$1 {
     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
@@ -5525,25 +5534,22 @@ class AuroDropdown extends AuroElement$1 {
       // getFocusableElements can't find it. Query assigned nodes directly.
       const slot = this.trigger.querySelector('slot[name="trigger"]');
       if (slot) {
-        const assigned = slot.assignedElements({ flatten: true });
+        const assigned = slot.assignedElements();
         for (const el of assigned) {
           if (el.hasAttribute('disabled')) {
             continue;
           }
-
-          // Try focusing a focusable descendant first (handles non-focusable wrappers).
+          // 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;
           }
-
-          // Otherwise, try focusing the assigned element itself. Only stop if focus moved.
-          const prevActive = document.activeElement;
           el.focus();
-          if (document.activeElement !== prevActive) {
-            return;
-          }
+          return;
         }
       }
       // Fallback: try DOM children (non-slotted content)
@@ -6003,7 +6009,7 @@ class AuroDropdown extends AuroElement$1 {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noHideOnThisFocusLoss) {
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
       this.focusTrigger();
     }
 
@@ -6011,9 +6017,9 @@ class AuroDropdown extends AuroElement$1 {
     // 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).