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

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

@@ -3804,7 +3804,7 @@ class AuroHelpText extends i {
   }
 }
 
-var formkitVersion = '202607160654';
+var formkitVersion = '202607162024';
 
 class AuroElement extends i {
   static get properties() {
@@ -3944,6 +3944,15 @@ class AuroDropdown extends AuroElement {
     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
@@ -4120,7 +4129,7 @@ class AuroDropdown extends AuroElement {
         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
@@ -4132,7 +4141,9 @@ class AuroDropdown extends AuroElement {
             return;
           }
           el.focus();
-          return;
+          if (document.activeElement === el) {
+            return;
+          }
         }
       }
       // Fallback: try DOM children (non-slotted content)
@@ -4592,7 +4603,7 @@ class AuroDropdown extends AuroElement {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown") {
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
       this.focusTrigger();
     }
 
@@ -4600,9 +4611,9 @@ class AuroDropdown extends AuroElement {
     // 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/dropdown/dist/auro-dropdown.d.ts

@@ -267,6 +267,14 @@ export class AuroDropdown extends AuroElement {
     isBibFullscreen: boolean;
     matchWidth: boolean;
     noHideOnThisFocusLoss: boolean;
+    /**
+     * 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
+     */
+    private noFocusRestoreOnClose;
     errorMessage: any;
     layout: any;
     shape: any;

package/components/dropdown/dist/index.js

@@ -3709,7 +3709,7 @@ class AuroHelpText extends LitElement {
   }
 }
 
-var formkitVersion = '202607160654';
+var formkitVersion = '202607162024';
 
 class AuroElement extends LitElement {
   static get properties() {
@@ -3849,6 +3849,15 @@ class AuroDropdown extends AuroElement {
     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
@@ -4025,7 +4034,7 @@ class AuroDropdown extends AuroElement {
         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
@@ -4037,7 +4046,9 @@ class AuroDropdown extends AuroElement {
             return;
           }
           el.focus();
-          return;
+          if (document.activeElement === el) {
+            return;
+          }
         }
       }
       // Fallback: try DOM children (non-slotted content)
@@ -4497,7 +4508,7 @@ class AuroDropdown extends AuroElement {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown") {
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
       this.focusTrigger();
     }
 
@@ -4505,9 +4516,9 @@ class AuroDropdown extends AuroElement {
     // 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/dropdown/dist/registered.js

@@ -3709,7 +3709,7 @@ class AuroHelpText extends LitElement {
   }
 }
 
-var formkitVersion = '202607160654';
+var formkitVersion = '202607162024';
 
 class AuroElement extends LitElement {
   static get properties() {
@@ -3849,6 +3849,15 @@ class AuroDropdown extends AuroElement {
     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
@@ -4025,7 +4034,7 @@ class AuroDropdown extends AuroElement {
         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
@@ -4037,7 +4046,9 @@ class AuroDropdown extends AuroElement {
             return;
           }
           el.focus();
-          return;
+          if (document.activeElement === el) {
+            return;
+          }
         }
       }
       // Fallback: try DOM children (non-slotted content)
@@ -4497,7 +4508,7 @@ class AuroDropdown extends AuroElement {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown") {
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
       this.focusTrigger();
     }
 
@@ -4505,9 +4516,9 @@ class AuroDropdown extends AuroElement {
     // 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).