@aurodesignsystem-dev/auro-formkit 0.0.0-pr1555.1 → 0.0.0-pr1556.0

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

@@ -3804,7 +3804,7 @@ class AuroHelpText extends i {
   }
 }
 
-var formkitVersion = '202607162024';
+var formkitVersion = '202607152340';
 
 class AuroElement extends i {
   static get properties() {
@@ -3933,6 +3933,7 @@ class AuroDropdown extends AuroElement {
   static get shadowRootOptions() {
     return {
       ...AuroElement.shadowRootOptions,
+      delegatesFocus: true,
     };
   }
 
@@ -3944,15 +3945,6 @@ 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
@@ -4108,49 +4100,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; // eslint-disable-line no-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();
-          if (document.activeElement === el) {
-            return;
-          }
-        }
-      }
-      // Fallback: try DOM children (non-slotted content)
-      const focusables = getFocusableElements(this.trigger);
-      if (focusables.length > 0) {
-        focusables[0].focus();
-      }
     }
   }
 
@@ -4603,17 +4553,15 @@ class AuroDropdown extends AuroElement {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
-      this.focusTrigger();
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown") {
+      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 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.noFocusRestoreOnClose) {
+    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).
@@ -4625,7 +4573,7 @@ class AuroDropdown extends AuroElement {
           return;
         }
         // Restore focus to the trigger.
-        this.focusTrigger();
+        this.trigger.focus();
       });
     }
   }

package/components/dropdown/dist/auro-dropdown.d.ts

@@ -15,9 +15,9 @@
  */
 export class AuroDropdown extends AuroElement {
     static get shadowRootOptions(): {
+        delegatesFocus: boolean;
         clonable?: boolean;
         customElementRegistry?: CustomElementRegistry | null;
-        delegatesFocus?: boolean;
         mode: ShadowRootMode;
         serializable?: boolean;
         slotAssignment?: SlotAssignmentMode;
@@ -267,14 +267,6 @@ 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;
@@ -374,13 +366,6 @@ export class AuroDropdown extends AuroElement {
      * If not, trigger element will get focus.
      */
     focus(): void;
-    /**
-     * 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
-     */
-    private focusTrigger;
     /**
      * Sets the active descendant element for accessibility.
      * Uses ariaActiveDescendantElement to cross shadow DOM boundaries.

package/components/dropdown/dist/index.js

@@ -3709,7 +3709,7 @@ class AuroHelpText extends LitElement {
   }
 }
 
-var formkitVersion = '202607162024';
+var formkitVersion = '202607152340';
 
 class AuroElement extends LitElement {
   static get properties() {
@@ -3838,6 +3838,7 @@ class AuroDropdown extends AuroElement {
   static get shadowRootOptions() {
     return {
       ...AuroElement.shadowRootOptions,
+      delegatesFocus: true,
     };
   }
 
@@ -3849,15 +3850,6 @@ 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
@@ -4013,49 +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; // eslint-disable-line no-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();
-          if (document.activeElement === el) {
-            return;
-          }
-        }
-      }
-      // Fallback: try DOM children (non-slotted content)
-      const focusables = getFocusableElements(this.trigger);
-      if (focusables.length > 0) {
-        focusables[0].focus();
-      }
     }
   }
 
@@ -4508,17 +4458,15 @@ class AuroDropdown extends AuroElement {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
-      this.focusTrigger();
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown") {
+      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 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.noFocusRestoreOnClose) {
+    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).
@@ -4530,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 = '202607162024';
+var formkitVersion = '202607152340';
 
 class AuroElement extends LitElement {
   static get properties() {
@@ -3838,6 +3838,7 @@ class AuroDropdown extends AuroElement {
   static get shadowRootOptions() {
     return {
       ...AuroElement.shadowRootOptions,
+      delegatesFocus: true,
     };
   }
 
@@ -3849,15 +3850,6 @@ 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
@@ -4013,49 +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; // eslint-disable-line no-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();
-          if (document.activeElement === el) {
-            return;
-          }
-        }
-      }
-      // Fallback: try DOM children (non-slotted content)
-      const focusables = getFocusableElements(this.trigger);
-      if (focusables.length > 0) {
-        focusables[0].focus();
-      }
     }
   }
 
@@ -4508,17 +4458,15 @@ class AuroDropdown extends AuroElement {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
-      this.focusTrigger();
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown") {
+      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 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.noFocusRestoreOnClose) {
+    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).
@@ -4530,7 +4478,7 @@ class AuroDropdown extends AuroElement {
           return;
         }
         // Restore focus to the trigger.
-        this.focusTrigger();
+        this.trigger.focus();
       });
     }
   }