@aurodesignsystem-dev/auro-formkit 0.0.0-pr1554.27 → 0.0.0-pr1554.4

package/components/combobox/dist/index.js

@@ -4904,7 +4904,7 @@ let AuroHelpText$2 = class AuroHelpText extends LitElement {
   }
 };
 
-var formkitVersion$2 = '202607161850';
+var formkitVersion$2 = '202607160557';
 
 let AuroElement$2 = class AuroElement extends LitElement {
   static get properties() {
@@ -5044,15 +5044,6 @@ 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
@@ -5231,19 +5222,18 @@ class AuroDropdown extends AuroElement$2 {
           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();
+          // Try focusing the assigned element directly (works for focusable
+          // components like auro-input that have delegatesFocus or a custom
+          // focus() method). If it's a non-focusable wrapper (e.g. <div>
+          // containing a <button>), find the first focusable descendant.
+          const focusables = getFocusableElements(el);
+          if (focusables.length > 0) {
+            focusables[0].focus();
             return;
           }
+          // Element itself might be focusable (custom element with focus())
           el.focus();
-          if (document.activeElement === el) {
-            return;
-          }
+          return;
         }
       }
       // Fallback: try DOM children (non-slotted content)
@@ -5703,7 +5693,7 @@ class AuroDropdown extends AuroElement$2 {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown") {
       this.focusTrigger();
     }
 
@@ -5711,9 +5701,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 noFocusRestoreOnClose is true, the consumer (e.g. combobox) manages
+    // When noHideOnThisFocusLoss 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) {
+    if (!this.isPopoverVisible && eventType !== "focusloss" && !this.noHideOnThisFocusLoss) {
       // 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).
@@ -18579,7 +18569,7 @@ let AuroHelpText$1 = class AuroHelpText extends LitElement {
   }
 };
 
-var formkitVersion$1 = '202607161850';
+var formkitVersion$1 = '202607160557';
 
 // Copyright (c) 2025 Alaska Airlines. All right reserved. Licensed under the Apache-2.0 license
 // See LICENSE in the project root for license information.
@@ -18872,16 +18862,12 @@ 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 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
+      const lightDomContent = this.querySelector('[slot="displayValue"]:not(slot)');
+      this.hasDisplayValueContent = Boolean(lightDomContent && (
+        lightDomContent.textContent.trim().length > 0 ||
+        lightDomContent.children.length > 0 ||
+        lightDomContent.shadowRoot !== null
       ));
-      if (this.hasDisplayValueContent !== hasContent) {
-        this.hasDisplayValueContent = hasContent;
-        this.requestUpdate();
-      }
       return;
     }
     const nodes = slot.assignedNodes({ flatten: true });
@@ -18894,7 +18880,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.
-    const hasContent = nodes.some((node) => {
+    this.hasDisplayValueContent = nodes.some((node) => {
       if (node.nodeType === Node.TEXT_NODE) {
         return node.textContent.trim().length > 0;
       }
@@ -18905,10 +18891,6 @@ class AuroInput extends BaseInput {
       }
       return false;
     });
-    if (this.hasDisplayValueContent !== hasContent) {
-      this.hasDisplayValueContent = hasContent;
-      this.requestUpdate();
-    }
   }
 
   firstUpdated() {
@@ -19735,7 +19717,7 @@ class AuroBibtemplate extends LitElement {
   }
 }
 
-var formkitVersion = '202607161850';
+var formkitVersion = '202607160557';
 
 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,6 +20762,7 @@ 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
@@ -20800,6 +20783,7 @@ class AuroCombobox extends AuroElement {
       this.input.appendChild(syntheticDV);
       if (typeof this.input.checkDisplayValueSlotChange === 'function') {
         this.input.checkDisplayValueSlotChange();
+        this.input.requestUpdate();
       }
     }
 
@@ -20972,10 +20956,6 @@ 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 = '202607161850';
+var formkitVersion$2 = '202607160557';
 
 let AuroElement$2 = class AuroElement extends LitElement {
   static get properties() {
@@ -5044,15 +5044,6 @@ 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
@@ -5231,19 +5222,18 @@ class AuroDropdown extends AuroElement$2 {
           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();
+          // Try focusing the assigned element directly (works for focusable
+          // components like auro-input that have delegatesFocus or a custom
+          // focus() method). If it's a non-focusable wrapper (e.g. <div>
+          // containing a <button>), find the first focusable descendant.
+          const focusables = getFocusableElements(el);
+          if (focusables.length > 0) {
+            focusables[0].focus();
             return;
           }
+          // Element itself might be focusable (custom element with focus())
           el.focus();
-          if (document.activeElement === el) {
-            return;
-          }
+          return;
         }
       }
       // Fallback: try DOM children (non-slotted content)
@@ -5703,7 +5693,7 @@ class AuroDropdown extends AuroElement$2 {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown") {
       this.focusTrigger();
     }
 
@@ -5711,9 +5701,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 noFocusRestoreOnClose is true, the consumer (e.g. combobox) manages
+    // When noHideOnThisFocusLoss 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) {
+    if (!this.isPopoverVisible && eventType !== "focusloss" && !this.noHideOnThisFocusLoss) {
       // 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).
@@ -18579,7 +18569,7 @@ let AuroHelpText$1 = class AuroHelpText extends LitElement {
   }
 };
 
-var formkitVersion$1 = '202607161850';
+var formkitVersion$1 = '202607160557';
 
 // Copyright (c) 2025 Alaska Airlines. All right reserved. Licensed under the Apache-2.0 license
 // See LICENSE in the project root for license information.
@@ -18872,16 +18862,12 @@ 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 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
+      const lightDomContent = this.querySelector('[slot="displayValue"]:not(slot)');
+      this.hasDisplayValueContent = Boolean(lightDomContent && (
+        lightDomContent.textContent.trim().length > 0 ||
+        lightDomContent.children.length > 0 ||
+        lightDomContent.shadowRoot !== null
       ));
-      if (this.hasDisplayValueContent !== hasContent) {
-        this.hasDisplayValueContent = hasContent;
-        this.requestUpdate();
-      }
       return;
     }
     const nodes = slot.assignedNodes({ flatten: true });
@@ -18894,7 +18880,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.
-    const hasContent = nodes.some((node) => {
+    this.hasDisplayValueContent = nodes.some((node) => {
       if (node.nodeType === Node.TEXT_NODE) {
         return node.textContent.trim().length > 0;
       }
@@ -18905,10 +18891,6 @@ class AuroInput extends BaseInput {
       }
       return false;
     });
-    if (this.hasDisplayValueContent !== hasContent) {
-      this.hasDisplayValueContent = hasContent;
-      this.requestUpdate();
-    }
   }
 
   firstUpdated() {
@@ -19735,7 +19717,7 @@ class AuroBibtemplate extends LitElement {
   }
 }
 
-var formkitVersion = '202607161850';
+var formkitVersion = '202607160557';
 
 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,6 +20762,7 @@ 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
@@ -20800,6 +20783,7 @@ class AuroCombobox extends AuroElement {
       this.input.appendChild(syntheticDV);
       if (typeof this.input.checkDisplayValueSlotChange === 'function') {
         this.input.checkDisplayValueSlotChange();
+        this.input.requestUpdate();
       }
     }
 
@@ -20972,10 +20956,6 @@ 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 = '202607161850';
+var formkitVersion$1 = '202607160557';
 
 // 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 = '202607161850';
+var formkitVersion = '202607160557';
 
 let AuroElement$1 = class AuroElement extends i$2 {
   static get properties() {
@@ -5420,15 +5420,6 @@ 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
@@ -5607,19 +5598,18 @@ class AuroDropdown extends AuroElement$1 {
           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();
+          // Try focusing the assigned element directly (works for focusable
+          // components like auro-input that have delegatesFocus or a custom
+          // focus() method). If it's a non-focusable wrapper (e.g. <div>
+          // containing a <button>), find the first focusable descendant.
+          const focusables = getFocusableElements(el);
+          if (focusables.length > 0) {
+            focusables[0].focus();
             return;
           }
+          // Element itself might be focusable (custom element with focus())
           el.focus();
-          if (document.activeElement === el) {
-            return;
-          }
+          return;
         }
       }
       // Fallback: try DOM children (non-slotted content)
@@ -6079,7 +6069,7 @@ class AuroDropdown extends AuroElement$1 {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown") {
       this.focusTrigger();
     }
 
@@ -6087,9 +6077,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 noFocusRestoreOnClose is true, the consumer (e.g. combobox) manages
+    // When noHideOnThisFocusLoss 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) {
+    if (!this.isPopoverVisible && eventType !== "focusloss" && !this.noHideOnThisFocusLoss) {
       // 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 = '202607161850';
+var formkitVersion$1 = '202607160557';
 
 // 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 = '202607161850';
+var formkitVersion = '202607160557';
 
 let AuroElement$1 = class AuroElement extends i$2 {
   static get properties() {
@@ -5420,15 +5420,6 @@ 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
@@ -5607,19 +5598,18 @@ class AuroDropdown extends AuroElement$1 {
           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();
+          // Try focusing the assigned element directly (works for focusable
+          // components like auro-input that have delegatesFocus or a custom
+          // focus() method). If it's a non-focusable wrapper (e.g. <div>
+          // containing a <button>), find the first focusable descendant.
+          const focusables = getFocusableElements(el);
+          if (focusables.length > 0) {
+            focusables[0].focus();
             return;
           }
+          // Element itself might be focusable (custom element with focus())
           el.focus();
-          if (document.activeElement === el) {
-            return;
-          }
+          return;
         }
       }
       // Fallback: try DOM children (non-slotted content)
@@ -6079,7 +6069,7 @@ class AuroDropdown extends AuroElement$1 {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown") {
       this.focusTrigger();
     }
 
@@ -6087,9 +6077,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 noFocusRestoreOnClose is true, the consumer (e.g. combobox) manages
+    // When noHideOnThisFocusLoss 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) {
+    if (!this.isPopoverVisible && eventType !== "focusloss" && !this.noHideOnThisFocusLoss) {
       // 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 = '202607161850';
+var formkitVersion$1 = '202607160557';
 
 // 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 = '202607161850';
+var formkitVersion = '202607160557';
 
 let AuroElement$1 = class AuroElement extends LitElement {
   static get properties() {
@@ -5352,15 +5352,6 @@ 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
@@ -5539,19 +5530,18 @@ class AuroDropdown extends AuroElement$1 {
           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();
+          // Try focusing the assigned element directly (works for focusable
+          // components like auro-input that have delegatesFocus or a custom
+          // focus() method). If it's a non-focusable wrapper (e.g. <div>
+          // containing a <button>), find the first focusable descendant.
+          const focusables = getFocusableElements(el);
+          if (focusables.length > 0) {
+            focusables[0].focus();
             return;
           }
+          // Element itself might be focusable (custom element with focus())
           el.focus();
-          if (document.activeElement === el) {
-            return;
-          }
+          return;
         }
       }
       // Fallback: try DOM children (non-slotted content)
@@ -6011,7 +6001,7 @@ class AuroDropdown extends AuroElement$1 {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown") {
       this.focusTrigger();
     }
 
@@ -6019,9 +6009,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 noFocusRestoreOnClose is true, the consumer (e.g. combobox) manages
+    // When noHideOnThisFocusLoss 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) {
+    if (!this.isPopoverVisible && eventType !== "focusloss" && !this.noHideOnThisFocusLoss) {
       // 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/registered.js

@@ -1064,7 +1064,7 @@ let AuroHelpText$1 = class AuroHelpText extends LitElement {
   }
 };
 
-var formkitVersion$1 = '202607161850';
+var formkitVersion$1 = '202607160557';
 
 // 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 = '202607161850';
+var formkitVersion = '202607160557';
 
 let AuroElement$1 = class AuroElement extends LitElement {
   static get properties() {
@@ -5352,15 +5352,6 @@ 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
@@ -5539,19 +5530,18 @@ class AuroDropdown extends AuroElement$1 {
           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();
+          // Try focusing the assigned element directly (works for focusable
+          // components like auro-input that have delegatesFocus or a custom
+          // focus() method). If it's a non-focusable wrapper (e.g. <div>
+          // containing a <button>), find the first focusable descendant.
+          const focusables = getFocusableElements(el);
+          if (focusables.length > 0) {
+            focusables[0].focus();
             return;
           }
+          // Element itself might be focusable (custom element with focus())
           el.focus();
-          if (document.activeElement === el) {
-            return;
-          }
+          return;
         }
       }
       // Fallback: try DOM children (non-slotted content)
@@ -6011,7 +6001,7 @@ class AuroDropdown extends AuroElement$1 {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown") {
       this.focusTrigger();
     }
 
@@ -6019,9 +6009,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 noFocusRestoreOnClose is true, the consumer (e.g. combobox) manages
+    // When noHideOnThisFocusLoss 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) {
+    if (!this.isPopoverVisible && eventType !== "focusloss" && !this.noHideOnThisFocusLoss) {
       // 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).