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

package/components/dropdown/dist/index.js

@@ -3709,7 +3709,7 @@ class AuroHelpText extends LitElement {
   }
 }
 
-var formkitVersion = '202607160725';
+var formkitVersion = '202607160755';
 
 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
@@ -4022,25 +4031,22 @@ class AuroDropdown extends AuroElement {
       // 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)
@@ -4500,7 +4506,7 @@ class AuroDropdown extends AuroElement {
     }
 
     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();
     }
 
@@ -4508,9 +4514,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 = '202607160725';
+var formkitVersion = '202607160755';
 
 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
@@ -4022,25 +4031,22 @@ class AuroDropdown extends AuroElement {
       // 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)
@@ -4500,7 +4506,7 @@ class AuroDropdown extends AuroElement {
     }
 
     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();
     }
 
@@ -4508,9 +4514,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).