@aurodesignsystem-dev/auro-formkit 0.0.0-pr1554.8 → 0.0.0-pr1555.0

package/components/dropdown/dist/index.js

@@ -3709,7 +3709,7 @@ class AuroHelpText extends LitElement {
   }
 }
 
-var formkitVersion = '202607160645';
+var formkitVersion = '202607152222';
 
 class AuroElement extends LitElement {
   static get properties() {
@@ -3838,6 +3838,7 @@ class AuroDropdown extends AuroElement {
   static get shadowRootOptions() {
     return {
       ...AuroElement.shadowRootOptions,
+      delegatesFocus: true,
     };
   }
 
@@ -4004,47 +4005,7 @@ class AuroDropdown extends AuroElement {
         focusables[0].focus();
       }
     } else {
-      this.focusTrigger();
-    }
-  }
-
-  /**
-   * Focus the trigger content. When the trigger wrapper itself is focusable
-   * (has tabindex), focus it directly. Otherwise, focus the first focusable
-   * element slotted into the trigger slot (e.g. the auro-input).
-   * @private
-   */
-  focusTrigger() {
-    if (this.trigger.hasAttribute('tabindex')) {
       this.trigger.focus();
-    } else {
-      // Slotted content isn't a DOM child of the trigger div, so
-      // getFocusableElements can't find it. Query assigned nodes directly.
-      const slot = this.trigger.querySelector('slot[name="trigger"]');
-      if (slot) {
-        const assigned = slot.assignedElements();
-        for (const el of assigned) {
-          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();
-            return;
-          }
-          el.focus();
-          return;
-        }
-      }
-      // Fallback: try DOM children (non-slotted content)
-      const focusables = getFocusableElements(this.trigger);
-      if (focusables.length > 0) {
-        focusables[0].focus();
-      }
     }
   }
 
@@ -4498,16 +4459,14 @@ class AuroDropdown extends AuroElement {
 
     const eventType = event.detail.eventType || "unknown";
     if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown") {
-      this.focusTrigger();
+      this.trigger.focus();
     }
 
 
     // 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
-    // its own focus restoration — skip the generic trigger focus to avoid races.
-    if (!this.isPopoverVisible && eventType !== "focusloss" && !this.noHideOnThisFocusLoss) {
+    if (!this.isPopoverVisible && eventType !== "focusloss") {
       // 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).
@@ -4519,7 +4478,7 @@ class AuroDropdown extends AuroElement {
           return;
         }
         // Restore focus to the trigger.
-        this.focusTrigger();
+        this.trigger.focus();
       });
     }
   }

package/components/dropdown/dist/registered.js

@@ -3709,7 +3709,7 @@ class AuroHelpText extends LitElement {
   }
 }
 
-var formkitVersion = '202607160645';
+var formkitVersion = '202607152222';
 
 class AuroElement extends LitElement {
   static get properties() {
@@ -3838,6 +3838,7 @@ class AuroDropdown extends AuroElement {
   static get shadowRootOptions() {
     return {
       ...AuroElement.shadowRootOptions,
+      delegatesFocus: true,
     };
   }
 
@@ -4004,47 +4005,7 @@ class AuroDropdown extends AuroElement {
         focusables[0].focus();
       }
     } else {
-      this.focusTrigger();
-    }
-  }
-
-  /**
-   * Focus the trigger content. When the trigger wrapper itself is focusable
-   * (has tabindex), focus it directly. Otherwise, focus the first focusable
-   * element slotted into the trigger slot (e.g. the auro-input).
-   * @private
-   */
-  focusTrigger() {
-    if (this.trigger.hasAttribute('tabindex')) {
       this.trigger.focus();
-    } else {
-      // Slotted content isn't a DOM child of the trigger div, so
-      // getFocusableElements can't find it. Query assigned nodes directly.
-      const slot = this.trigger.querySelector('slot[name="trigger"]');
-      if (slot) {
-        const assigned = slot.assignedElements();
-        for (const el of assigned) {
-          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();
-            return;
-          }
-          el.focus();
-          return;
-        }
-      }
-      // Fallback: try DOM children (non-slotted content)
-      const focusables = getFocusableElements(this.trigger);
-      if (focusables.length > 0) {
-        focusables[0].focus();
-      }
     }
   }
 
@@ -4498,16 +4459,14 @@ class AuroDropdown extends AuroElement {
 
     const eventType = event.detail.eventType || "unknown";
     if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown") {
-      this.focusTrigger();
+      this.trigger.focus();
     }
 
 
     // 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
-    // its own focus restoration — skip the generic trigger focus to avoid races.
-    if (!this.isPopoverVisible && eventType !== "focusloss" && !this.noHideOnThisFocusLoss) {
+    if (!this.isPopoverVisible && eventType !== "focusloss") {
       // 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).
@@ -4519,7 +4478,7 @@ class AuroDropdown extends AuroElement {
           return;
         }
         // Restore focus to the trigger.
-        this.focusTrigger();
+        this.trigger.focus();
       });
     }
   }