@aurodesignsystem-dev/auro-formkit 0.0.0-pr1422.2 → 0.0.0-pr1424.0

package/components/dropdown/dist/index.js

@@ -1840,19 +1840,11 @@ class AuroFloatingUI {
    * This ensures that the bib content has the same dimensions as the sizer element.
    */
   mirrorSize() {
-    const element = this.element;
-    if (!element) {
-      return;
-    }
-
     // mirror the boxsize from bibSizer
-    if (element.bibSizer && element.matchWidth && element.bib?.shadowRoot) {
-      const sizerStyle = window.getComputedStyle(element.bibSizer);
-      const bibContent = element.bib.shadowRoot.querySelector(".container");
-      if (!bibContent) {
-        return;
-      }
-
+    if (this.element.bibSizer && this.element.matchWidth) {
+      const sizerStyle = window.getComputedStyle(this.element.bibSizer);
+      const bibContent =
+        this.element.bib.shadowRoot.querySelector(".container");
       if (sizerStyle.width !== "0px") {
         bibContent.style.width = sizerStyle.width;
       }
@@ -1874,14 +1866,9 @@ class AuroFloatingUI {
    * @returns {String} The positioning strategy, one of 'fullscreen', 'floating', 'cover'.
    */
   getPositioningStrategy() {
-    const element = this.element;
-    if (!element) {
-      return "floating";
-    }
-
     const breakpoint =
-      element.bib?.mobileFullscreenBreakpoint ||
-      element.floaterConfig?.fullscreenBreakpoint;
+      this.element.bib.mobileFullscreenBreakpoint ||
+      this.element.floaterConfig?.fullscreenBreakpoint;
     switch (this.behavior) {
       case "tooltip":
         return "floating";
@@ -1892,9 +1879,9 @@ class AuroFloatingUI {
             `(max-width: ${breakpoint})`,
           ).matches;
 
-          element.expanded = smallerThanBreakpoint;
+          this.element.expanded = smallerThanBreakpoint;
         }
-        if (element.nested) {
+        if (this.element.nested) {
           return "cover";
         }
         return "fullscreen";
@@ -1924,65 +1911,42 @@ class AuroFloatingUI {
    * and applies the calculated position to the bib's style.
    */
   position() {
-    const element = this.element;
-    if (!element) {
-      return;
-    }
-
     const strategy = this.getPositioningStrategy();
     this.configureBibStrategy(strategy);
 
     if (strategy === "floating") {
-      if (!element.trigger || !element.bib) {
-        return;
-      }
-
       this.mirrorSize();
       // Define the middlware for the floater configuration
       const middleware = [
-        offset(element.floaterConfig?.offset || 0),
-        ...(element.floaterConfig?.shift ? [shift()] : []), // Add shift middleware if shift is enabled.
-        ...(element.floaterConfig?.flip ? [flip()] : []), // Add flip middleware if flip is enabled.
-        ...(element.floaterConfig?.autoPlacement ? [autoPlacement()] : []), // Add autoPlacement middleware if autoPlacement is enabled.
+        offset(this.element.floaterConfig?.offset || 0),
+        ...(this.element.floaterConfig?.shift ? [shift()] : []), // Add shift middleware if shift is enabled.
+        ...(this.element.floaterConfig?.flip ? [flip()] : []), // Add flip middleware if flip is enabled.
+        ...(this.element.floaterConfig?.autoPlacement ? [autoPlacement()] : []), // Add autoPlacement middleware if autoPlacement is enabled.
       ];
 
       // Compute the position of the bib
-      computePosition(element.trigger, element.bib, {
-        strategy: element.floaterConfig?.strategy || "fixed",
-        placement: element.floaterConfig?.placement,
+      computePosition(this.element.trigger, this.element.bib, {
+        strategy: this.element.floaterConfig?.strategy || "fixed",
+        placement: this.element.floaterConfig?.placement,
         middleware: middleware || [],
       }).then(({ x, y }) => {
         // eslint-disable-line id-length
-        const currentElement = this.element;
-        if (!currentElement?.bib) {
-          return;
-        }
-
-        Object.assign(currentElement.bib.style, {
+        Object.assign(this.element.bib.style, {
           left: `${x}px`,
           top: `${y}px`,
         });
       });
     } else if (strategy === "cover") {
-      if (!element.parentNode || !element.bib) {
-        return;
-      }
-
       // Compute the position of the bib
-      computePosition(element.parentNode, element.bib, {
+      computePosition(this.element.parentNode, this.element.bib, {
         placement: "bottom-start",
       }).then(({ x, y }) => {
         // eslint-disable-line id-length
-        const currentElement = this.element;
-        if (!currentElement?.bib || !currentElement.parentNode) {
-          return;
-        }
-
-        Object.assign(currentElement.bib.style, {
+        Object.assign(this.element.bib.style, {
           left: `${x}px`,
-          top: `${y - currentElement.parentNode.offsetHeight}px`,
-          width: `${currentElement.parentNode.offsetWidth}px`,
-          height: `${currentElement.parentNode.offsetHeight}px`,
+          top: `${y - this.element.parentNode.offsetHeight}px`,
+          width: `${this.element.parentNode.offsetWidth}px`,
+          height: `${this.element.parentNode.offsetHeight}px`,
         });
       });
     }
@@ -1994,17 +1958,11 @@ class AuroFloatingUI {
    * @param {Boolean} lock - If true, locks the body's scrolling functionlity; otherwise, unlock.
    */
   lockScroll(lock = true) {
-    const element = this.element;
-
     if (lock) {
-      if (!element?.bib) {
-        return;
-      }
-
       document.body.style.overflow = "hidden"; // hide body's scrollbar
 
       // Move `bib` by the amount the viewport is shifted to stay aligned in fullscreen.
-      element.bib.style.transform = `translateY(${window?.visualViewport?.offsetTop}px)`;
+      this.element.bib.style.transform = `translateY(${window?.visualViewport?.offsetTop}px)`;
     } else {
       document.body.style.overflow = "";
     }
@@ -2020,24 +1978,20 @@ class AuroFloatingUI {
    * @param {string} strategy - The positioning strategy ('fullscreen' or 'floating').
    */
   configureBibStrategy(value) {
-    const element = this.element;
-    if (!element?.bib) {
-      return;
-    }
-
     if (value === "fullscreen") {
-      element.isBibFullscreen = true;
+      this.element.isBibFullscreen = true;
       // reset the prev position
-      element.bib.setAttribute("isfullscreen", "");
-      element.bib.style.position = "fixed";
-      element.bib.style.top = "0px";
-      element.bib.style.left = "0px";
-      element.bib.style.width = "";
-      element.bib.style.height = "";
-      element.style.contain = "";
+      this.element.bib.setAttribute("isfullscreen", "");
+      this.element.bib.style.position = "fixed";
+      this.element.bib.style.top = "0px";
+      this.element.bib.style.left = "0px";
+      this.element.bib.style.width = "";
+      this.element.bib.style.height = "";
+      this.element.style.contain = "";
 
       // reset the size that was mirroring `size` css-part
-      const bibContent = element.bib.shadowRoot?.querySelector(".container");
+      const bibContent =
+        this.element.bib.shadowRoot.querySelector(".container");
       if (bibContent) {
         bibContent.style.width = "";
         bibContent.style.height = "";
@@ -2052,14 +2006,14 @@ class AuroFloatingUI {
         }, 0);
       }
 
-      if (element.isPopoverVisible) {
+      if (this.element.isPopoverVisible) {
         this.lockScroll(true);
       }
     } else {
-      element.bib.style.position = "";
-      element.bib.removeAttribute("isfullscreen");
-      element.isBibFullscreen = false;
-      element.style.contain = "layout";
+      this.element.bib.style.position = "";
+      this.element.bib.removeAttribute("isfullscreen");
+      this.element.isBibFullscreen = false;
+      this.element.style.contain = "layout";
     }
 
     const isChanged = this.strategy && this.strategy !== value;
@@ -2077,21 +2031,16 @@ class AuroFloatingUI {
         },
       );
 
-      element.dispatchEvent(event);
+      this.element.dispatchEvent(event);
     }
   }
 
   updateState() {
-    const element = this.element;
-    if (!element) {
-      return;
-    }
-
-    const isVisible = element.isPopoverVisible;
+    const isVisible = this.element.isPopoverVisible;
     if (!isVisible) {
       this.cleanupHideHandlers();
       try {
-        element.cleanup?.();
+        this.element.cleanup?.();
       } catch (error) {
         // Do nothing
       }
@@ -2107,30 +2056,28 @@ class AuroFloatingUI {
    * If not, and if the bib isn't in fullscreen mode with focus lost, it hides the bib.
    */
   handleFocusLoss() {
-    const element = this.element;
-    if (!element?.bib) {
-      return;
-    }
-
     // if mouse is being pressed, skip and let click event to handle the action
     if (AuroFloatingUI.isMousePressed) {
       return;
     }
 
     if (
-      element.noHideOnThisFocusLoss ||
-      element.hasAttribute("noHideOnThisFocusLoss")
+      this.element.noHideOnThisFocusLoss ||
+      this.element.hasAttribute("noHideOnThisFocusLoss")
     ) {
       return;
     }
 
     // if focus is still inside of trigger or bib, do not close
-    if (element.matches(":focus") || element.matches(":focus-within")) {
+    if (
+      this.element.matches(":focus") ||
+      this.element.matches(":focus-within")
+    ) {
       return;
     }
 
     // if fullscreen bib is in fullscreen mode, do not close
-    if (element.bib.hasAttribute("isfullscreen")) {
+    if (this.element.bib.hasAttribute("isfullscreen")) {
       return;
     }
 
@@ -2138,33 +2085,23 @@ class AuroFloatingUI {
   }
 
   setupHideHandlers() {
-    const element = this.element;
-    if (!element) {
-      return;
-    }
-
     // Define handlers & store references
     this.focusHandler = () => this.handleFocusLoss();
 
     this.clickHandler = (evt) => {
-      const element = this.element;
-      if (!element?.bib) {
-        return;
-      }
-
       // When the bib is fullscreen (modal dialog), don't close on outside
       // clicks. VoiceOver's synthetic click events inside a top-layer modal
       // <dialog> may not include the bib in composedPath(), causing false
       // positives. This mirrors the fullscreen guard in handleFocusLoss().
-      if (element.bib.hasAttribute("isfullscreen")) {
+      if (this.element.bib && this.element.bib.hasAttribute("isfullscreen")) {
         return;
       }
 
       if (
-        (!evt.composedPath().includes(element.trigger) &&
-          !evt.composedPath().includes(element.bib)) ||
-        (element.bib.backdrop &&
-          evt.composedPath().includes(element.bib.backdrop))
+        (!evt.composedPath().includes(this.element.trigger) &&
+          !evt.composedPath().includes(this.element.bib)) ||
+        (this.element.bib.backdrop &&
+          evt.composedPath().includes(this.element.bib.backdrop))
       ) {
         const existedVisibleFloatingUI =
           document.expandedAuroFormkitDropdown || document.expandedAuroFloater;
@@ -2185,12 +2122,7 @@ class AuroFloatingUI {
 
     // ESC key handler
     this.keyDownHandler = (evt) => {
-      const element = this.element;
-      if (!element) {
-        return;
-      }
-
-      if (evt.key === "Escape" && element.isPopoverVisible) {
+      if (evt.key === "Escape" && this.element.isPopoverVisible) {
         const existedVisibleFloatingUI =
           document.expandedAuroFormkitDropdown || document.expandedAuroFloater;
         if (
@@ -2247,10 +2179,6 @@ class AuroFloatingUI {
   }
 
   updateCurrentExpandedDropdown() {
-    if (!this.element) {
-      return;
-    }
-
     // Close any other dropdown that is already open
     const existedVisibleFloatingUI =
       document.expandedAuroFormkitDropdown || document.expandedAuroFloater;
@@ -2267,34 +2195,25 @@ class AuroFloatingUI {
   }
 
   showBib() {
-    const element = this.element;
-    if (!element) {
-      return;
-    }
-
-    if (!element.bib || (!element.trigger && !element.parentNode)) {
-      return;
-    }
-
-    if (!element.disabled && !this.showing) {
+    if (!this.element.disabled && !this.showing) {
       this.updateCurrentExpandedDropdown();
-      element.triggerChevron?.setAttribute("data-expanded", true);
+      this.element.triggerChevron?.setAttribute("data-expanded", true);
 
       // prevent double showing: isPopovervisible gets first and showBib gets called later
       if (!this.showing) {
-        if (!element.modal) {
+        if (!this.element.modal) {
           this.setupHideHandlers();
         }
         this.showing = true;
-        element.isPopoverVisible = true;
+        this.element.isPopoverVisible = true;
         this.position();
         this.dispatchEventDropdownToggle();
       }
 
       // Setup auto update to handle resize and scroll
-      element.cleanup = autoUpdate(
-        element.trigger || element.parentNode,
-        element.bib,
+      this.element.cleanup = autoUpdate(
+        this.element.trigger || this.element.parentNode,
+        this.element.bib,
         () => {
           this.position();
         },
@@ -2307,27 +2226,22 @@ class AuroFloatingUI {
    * @param {String} eventType - The event type that triggered the hiding action.
    */
   hideBib(eventType = "unknown") {
-    const element = this.element;
-    if (!element) {
-      return;
-    }
-
-    if (element.disabled) {
+    if (this.element.disabled) {
       return;
     }
 
     // noToggle dropdowns should not close when the trigger is clicked (the
     // "toggle" behavior), but they CAN still close via other interactions like
     // Escape key or focus loss.
-    if (element.noToggle && eventType === "click") {
+    if (this.element.noToggle && eventType === "click") {
       return;
     }
 
     this.lockScroll(false);
-    element.triggerChevron?.removeAttribute("data-expanded");
+    this.element.triggerChevron?.removeAttribute("data-expanded");
 
-    if (element.isPopoverVisible) {
-      element.isPopoverVisible = false;
+    if (this.element.isPopoverVisible) {
+      this.element.isPopoverVisible = false;
     }
     if (this.showing) {
       this.cleanupHideHandlers();
@@ -2347,11 +2261,6 @@ class AuroFloatingUI {
    * @param {String} eventType - The event type that triggered the toggle action.
    */
   dispatchEventDropdownToggle(eventType) {
-    const element = this.element;
-    if (!element) {
-      return;
-    }
-
     const event = new CustomEvent(
       this.eventPrefix ? `${this.eventPrefix}-toggled` : "toggled",
       {
@@ -2363,16 +2272,11 @@ class AuroFloatingUI {
       },
     );
 
-    element.dispatchEvent(event);
+    this.element.dispatchEvent(event);
   }
 
   handleClick() {
-    const element = this.element;
-    if (!element) {
-      return;
-    }
-
-    if (element.isPopoverVisible) {
+    if (this.element.isPopoverVisible) {
       this.hideBib("click");
     } else {
       this.showBib();
@@ -2383,66 +2287,63 @@ class AuroFloatingUI {
       {
         composed: true,
         detail: {
-          expanded: element.isPopoverVisible,
+          expanded: this.element.isPopoverVisible,
         },
       },
     );
 
-    element.dispatchEvent(event);
+    this.element.dispatchEvent(event);
   }
 
   handleEvent(event) {
-    const element = this.element;
-    if (!element || element.disableEventShow) {
-      return;
-    }
-
-    switch (event.type) {
-      case "keydown": {
-        // Support both Enter and Space keys for accessibility
-        // Space is included as it's expected behavior for interactive elements
-
-        const origin = event.composedPath()[0];
-        if (
-          event.key === "Enter" ||
-          (event.key === " " && (!origin || origin.tagName !== "INPUT"))
-        ) {
-          event.preventDefault();
-          this.handleClick();
+    if (!this.element.disableEventShow) {
+      switch (event.type) {
+        case "keydown": {
+          // Support both Enter and Space keys for accessibility
+          // Space is included as it's expected behavior for interactive elements
+
+          const origin = event.composedPath()[0];
+          if (
+            event.key === "Enter" ||
+            (event.key === " " && (!origin || origin.tagName !== "INPUT"))
+          ) {
+            event.preventDefault();
+            this.handleClick();
+          }
+          break;
         }
-        break;
+        case "mouseenter":
+          if (this.element.hoverToggle) {
+            this.showBib();
+          }
+          break;
+        case "mouseleave":
+          if (this.element.hoverToggle) {
+            this.hideBib("mouseleave");
+          }
+          break;
+        case "focus":
+          if (this.element.focusShow) {
+            /*
+              This needs to better handle clicking that gives focus -
+              currently it shows and then immediately hides the bib
+            */
+            this.showBib();
+          }
+          break;
+        case "blur":
+          // send this task 100ms later queue to
+          // wait a frame in case focus moves within the floating element/bib
+          setTimeout(() => this.handleFocusLoss(), 0);
+          break;
+        case "click":
+          if (document.activeElement === document.body) {
+            event.currentTarget.focus();
+          }
+          this.handleClick();
+          break;
+        // Do nothing
       }
-      case "mouseenter":
-        if (element.hoverToggle) {
-          this.showBib();
-        }
-        break;
-      case "mouseleave":
-        if (element.hoverToggle) {
-          this.hideBib("mouseleave");
-        }
-        break;
-      case "focus":
-        if (element.focusShow) {
-          /*
-            This needs to better handle clicking that gives focus -
-            currently it shows and then immediately hides the bib
-          */
-          this.showBib();
-        }
-        break;
-      case "blur":
-        // send this task 100ms later queue to
-        // wait a frame in case focus moves within the floating element/bib
-        setTimeout(() => this.handleFocusLoss(), 0);
-        break;
-      case "click":
-        if (document.activeElement === document.body) {
-          event.currentTarget.focus();
-        }
-        this.handleClick();
-        break;
-      // Do nothing
     }
   }
 
@@ -2453,11 +2354,6 @@ class AuroFloatingUI {
    * This prevents the component itself from being focusable when the trigger element already handles focus.
    */
   handleTriggerTabIndex() {
-    const element = this.element;
-    if (!element) {
-      return;
-    }
-
     const focusableElementSelectors = [
       "a",
       "button",
@@ -2470,7 +2366,7 @@ class AuroFloatingUI {
       "auro-hyperlink",
     ];
 
-    const triggerNode = element.querySelectorAll('[slot="trigger"]')[0];
+    const triggerNode = this.element.querySelectorAll('[slot="trigger"]')[0];
     if (!triggerNode) {
       return;
     }
@@ -2479,13 +2375,13 @@ class AuroFloatingUI {
     focusableElementSelectors.forEach((selector) => {
       // Check if the trigger node element is focusable
       if (triggerNodeTagName === selector) {
-        element.tabIndex = -1;
+        this.element.tabIndex = -1;
         return;
       }
 
       // Check if any child is focusable
       if (triggerNode.querySelector(selector)) {
-        element.tabIndex = -1;
+        this.element.tabIndex = -1;
       }
     });
   }
@@ -2495,18 +2391,13 @@ class AuroFloatingUI {
    * @param {*} eventPrefix
    */
   regenerateBibId() {
-    const element = this.element;
-    if (!element) {
-      return;
-    }
-
-    this.id = element.getAttribute("id");
+    this.id = this.element.getAttribute("id");
     if (!this.id) {
       this.id = window.crypto.randomUUID();
-      element.setAttribute("id", this.id);
+      this.element.setAttribute("id", this.id);
     }
 
-    element.bib?.setAttribute("id", `${this.id}-floater-bib`);
+    this.element.bib.setAttribute("id", `${this.id}-floater-bib`);
   }
 
   configure(elem, eventPrefix, enableKeyboardHandling = true) {
@@ -2518,69 +2409,67 @@ class AuroFloatingUI {
       this.element = elem;
     }
 
-    const element = this.element;
-    if (!element) {
-      return;
+    if (this.behavior !== this.element.behavior) {
+      this.behavior = this.element.behavior;
     }
 
-    if (this.behavior !== element.behavior) {
-      this.behavior = element.behavior;
-    }
-
-    if (element.trigger) {
+    if (this.element.trigger) {
       this.disconnect();
     }
-    element.trigger =
-      element.triggerElement ||
-      element.shadowRoot?.querySelector("#trigger") ||
-      element.trigger;
-    element.bib = element.shadowRoot?.querySelector("#bib") || element.bib;
-    element.bibSizer = element.shadowRoot?.querySelector("#bibSizer");
-    element.triggerChevron =
-      element.shadowRoot?.querySelector("#showStateIcon");
-
-    if (element.floaterConfig) {
-      element.hoverToggle = element.floaterConfig.hoverToggle;
+    this.element.trigger =
+      this.element.triggerElement ||
+      this.element.shadowRoot.querySelector("#trigger") ||
+      this.element.trigger;
+    this.element.bib =
+      this.element.shadowRoot.querySelector("#bib") || this.element.bib;
+    this.element.bibSizer = this.element.shadowRoot.querySelector("#bibSizer");
+    this.element.triggerChevron =
+      this.element.shadowRoot.querySelector("#showStateIcon");
+
+    if (this.element.floaterConfig) {
+      this.element.hoverToggle = this.element.floaterConfig.hoverToggle;
     }
 
     this.regenerateBibId();
     this.handleTriggerTabIndex();
 
     this.handleEvent = this.handleEvent.bind(this);
-    if (element.trigger) {
+    if (this.element.trigger) {
       if (this.enableKeyboardHandling) {
-        element.trigger.addEventListener("keydown", this.handleEvent);
+        this.element.trigger.addEventListener("keydown", this.handleEvent);
       }
-      element.trigger.addEventListener("click", this.handleEvent);
-      element.trigger.addEventListener("mouseenter", this.handleEvent);
-      element.trigger.addEventListener("mouseleave", this.handleEvent);
-      element.trigger.addEventListener("focus", this.handleEvent);
-      element.trigger.addEventListener("blur", this.handleEvent);
+      this.element.trigger.addEventListener("click", this.handleEvent);
+      this.element.trigger.addEventListener("mouseenter", this.handleEvent);
+      this.element.trigger.addEventListener("mouseleave", this.handleEvent);
+      this.element.trigger.addEventListener("focus", this.handleEvent);
+      this.element.trigger.addEventListener("blur", this.handleEvent);
     }
   }
 
   disconnect() {
     this.cleanupHideHandlers();
+    if (this.element) {
+      this.element.cleanup?.();
 
-    const element = this.element;
-    if (!element) {
-      return;
-    }
-
-    element.cleanup?.();
-
-    if (element.bib && element.shadowRoot) {
-      element.shadowRoot.append(element.bib);
-    }
+      if (this.element.bib) {
+        this.element.shadowRoot.append(this.element.bib);
+      }
 
-    // Remove event & keyboard listeners
-    if (element.trigger) {
-      element.trigger.removeEventListener("keydown", this.handleEvent);
-      element.trigger.removeEventListener("click", this.handleEvent);
-      element.trigger.removeEventListener("mouseenter", this.handleEvent);
-      element.trigger.removeEventListener("mouseleave", this.handleEvent);
-      element.trigger.removeEventListener("focus", this.handleEvent);
-      element.trigger.removeEventListener("blur", this.handleEvent);
+      // Remove event & keyboard listeners
+      if (this.element?.trigger) {
+        this.element.trigger.removeEventListener("keydown", this.handleEvent);
+        this.element.trigger.removeEventListener("click", this.handleEvent);
+        this.element.trigger.removeEventListener(
+          "mouseenter",
+          this.handleEvent,
+        );
+        this.element.trigger.removeEventListener(
+          "mouseleave",
+          this.handleEvent,
+        );
+        this.element.trigger.removeEventListener("focus", this.handleEvent);
+        this.element.trigger.removeEventListener("blur", this.handleEvent);
+      }
     }
   }
 }
@@ -3708,7 +3597,7 @@ class AuroHelpText extends LitElement {
   }
 }
 
-var formkitVersion = '202604071818';
+var formkitVersion = '202604072118';
 
 class AuroElement extends LitElement {
   static get properties() {