@aurodesignsystem-dev/auro-formkit 0.0.0-pr1554.18 → 0.0.0-pr1554.2

package/components/dropdown/demo/getting-started.min.js

@@ -3777,7 +3777,7 @@ class AuroHelpText extends i {
   }
 }
 
-var formkitVersion = '202607160828';
+var formkitVersion = '202607160501';
 
 class AuroElement extends i {
   static get properties() {
@@ -3917,15 +3917,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).
-     * @public
-     */
-    this.noFocusRestoreOnClose = false;
-
     this.errorMessage = undefined; // TODO - check with Doug if there is still more to do here
 
     // Layout Config
@@ -4100,23 +4091,10 @@ class AuroDropdown extends AuroElement {
       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();
-          if (document.activeElement === el) {
-            return;
-          }
+        const focusable = assigned.find((el) => !el.hasAttribute('disabled'));
+        if (focusable) {
+          focusable.focus();
+          return;
         }
       }
       // Fallback: try DOM children (non-slotted content)
@@ -4576,7 +4554,7 @@ class AuroDropdown extends AuroElement {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown") {
       this.focusTrigger();
     }
 
@@ -4584,9 +4562,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 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/dropdown/demo/index.min.js

@@ -3804,7 +3804,7 @@ class AuroHelpText extends i {
   }
 }
 
-var formkitVersion = '202607160828';
+var formkitVersion = '202607160501';
 
 class AuroElement extends i {
   static get properties() {
@@ -3944,15 +3944,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).
-     * @public
-     */
-    this.noFocusRestoreOnClose = false;
-
     this.errorMessage = undefined; // TODO - check with Doug if there is still more to do here
 
     // Layout Config
@@ -4127,23 +4118,10 @@ class AuroDropdown extends AuroElement {
       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();
-          if (document.activeElement === el) {
-            return;
-          }
+        const focusable = assigned.find((el) => !el.hasAttribute('disabled'));
+        if (focusable) {
+          focusable.focus();
+          return;
         }
       }
       // Fallback: try DOM children (non-slotted content)
@@ -4603,7 +4581,7 @@ class AuroDropdown extends AuroElement {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown") {
       this.focusTrigger();
     }
 
@@ -4611,9 +4589,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 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/dropdown/dist/auro-dropdown.d.ts

@@ -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).
-     * @public
-     */
-    public noFocusRestoreOnClose: boolean;
     errorMessage: any;
     layout: any;
     shape: any;

package/components/dropdown/dist/index.js

@@ -3709,7 +3709,7 @@ class AuroHelpText extends LitElement {
   }
 }
 
-var formkitVersion = '202607160828';
+var formkitVersion = '202607160501';
 
 class AuroElement extends LitElement {
   static get properties() {
@@ -3849,15 +3849,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).
-     * @public
-     */
-    this.noFocusRestoreOnClose = false;
-
     this.errorMessage = undefined; // TODO - check with Doug if there is still more to do here
 
     // Layout Config
@@ -4032,23 +4023,10 @@ class AuroDropdown extends AuroElement {
       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();
-          if (document.activeElement === el) {
-            return;
-          }
+        const focusable = assigned.find((el) => !el.hasAttribute('disabled'));
+        if (focusable) {
+          focusable.focus();
+          return;
         }
       }
       // Fallback: try DOM children (non-slotted content)
@@ -4508,7 +4486,7 @@ class AuroDropdown extends AuroElement {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown") {
       this.focusTrigger();
     }
 
@@ -4516,9 +4494,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 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/dropdown/dist/registered.js

@@ -3709,7 +3709,7 @@ class AuroHelpText extends LitElement {
   }
 }
 
-var formkitVersion = '202607160828';
+var formkitVersion = '202607160501';
 
 class AuroElement extends LitElement {
   static get properties() {
@@ -3849,15 +3849,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).
-     * @public
-     */
-    this.noFocusRestoreOnClose = false;
-
     this.errorMessage = undefined; // TODO - check with Doug if there is still more to do here
 
     // Layout Config
@@ -4032,23 +4023,10 @@ class AuroDropdown extends AuroElement {
       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();
-          if (document.activeElement === el) {
-            return;
-          }
+        const focusable = assigned.find((el) => !el.hasAttribute('disabled'));
+        if (focusable) {
+          focusable.focus();
+          return;
         }
       }
       // Fallback: try DOM children (non-slotted content)
@@ -4508,7 +4486,7 @@ class AuroDropdown extends AuroElement {
     }
 
     const eventType = event.detail.eventType || "unknown";
-    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown" && !this.noFocusRestoreOnClose) {
+    if (!this.isPopoverVisible && this.hasFocus && eventType === "keydown") {
       this.focusTrigger();
     }
 
@@ -4516,9 +4494,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 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).