@lumx/react 4.18.0-next.1 → 4.18.0-next.2

package/index.js

@@ -6460,6 +6460,12 @@ function setupCombobox(callbacks, options, onTriggerAttach) {
   /** Last notified input value, to re-fire `optionsChange` when the user keeps typing while empty. */
   let lastInputValue = '';
 
+  /** Last notified loading state, used to replay current state to late subscribers. */
+  let lastLoadingState = false;
+
+  /** Number of currently mounted skeleton placeholders. */
+  let skeletonCount = 0;
+
   /** Event subscribers managed by the handle. */
   const subscribers = {
     open: new Set(),
@@ -6474,6 +6480,20 @@ function setupCombobox(callbacks, options, onTriggerAttach) {
     subscribers[event].forEach(cb => cb(value));
   }
 
+  /** Count visible (non-filtered) options. */
+  function getVisibleOptionCount() {
+    let count = 0;
+    for (const reg of optionRegistrations.values()) {
+      if (!reg.lastFiltered) count += 1;
+    }
+    return count;
+  }
+
+  /** True when the popup has visible content (options or skeletons). */
+  function hasVisibleContent() {
+    return getVisibleOptionCount() > 0 || skeletonCount > 0;
+  }
+
   /**
    * Notify all registered sections and fire `optionsChange` if the visible option count changed
    * or if the input value changed while the list is empty (so `emptyMessage` callbacks get
@@ -6484,10 +6504,7 @@ function setupCombobox(callbacks, options, onTriggerAttach) {
     for (const [sectionElement] of sectionRegistrations) {
       notifySection(sectionElement, sectionRegistrations, optionRegistrations);
     }
-    let visibleCount = 0;
-    for (const reg of optionRegistrations.values()) {
-      if (!reg.lastFiltered) visibleCount += 1;
-    }
+    const visibleCount = getVisibleOptionCount();
     const inputValue = trigger?.value ?? '';
     const isEmpty = visibleCount === 0;
     if (visibleCount !== lastOptionsLength || isEmpty && inputValue !== lastInputValue) {
@@ -6498,6 +6515,12 @@ function setupCombobox(callbacks, options, onTriggerAttach) {
         inputValue
       });
     }
+
+    // Re-evaluate aria-expanded when the combobox is open — visible content may have
+    // changed due to filtering, option register/unregister, or skeleton transitions.
+    if (isOpenState) {
+      trigger?.setAttribute('aria-expanded', String(hasVisibleContent()));
+    }
   }
 
   // ── Skeleton loading tracking ──────────────────────────────
@@ -6505,9 +6528,6 @@ function setupCombobox(callbacks, options, onTriggerAttach) {
   /** Delay before announcing loading in the live region (ms). */
   const LOADING_ANNOUNCEMENT_DELAY = 500;
 
-  /** Number of currently mounted skeleton placeholders. */
-  let skeletonCount = 0;
-
   /** Timer for debounced loading announcement. */
   let loadingTimer;
 
@@ -6533,6 +6553,7 @@ function setupCombobox(callbacks, options, onTriggerAttach) {
    */
   function onSkeletonCountChange() {
     const isLoading = skeletonCount > 0;
+    lastLoadingState = isLoading;
     notify('loadingChange', isLoading);
     if (isLoading) {
       startLoadingAnnouncementTimer();
@@ -6735,8 +6756,8 @@ function setupCombobox(callbacks, options, onTriggerAttach) {
         startLoadingAnnouncementTimer();
       }
 
-      // Update aria-expanded on trigger
-      trigger?.setAttribute('aria-expanded', String(isOpen));
+      // Update aria-expanded on trigger (false when no visible options or skeletons)
+      trigger?.setAttribute('aria-expanded', String(isOpen && hasVisibleContent()));
       notify('open', isOpen);
     },
     select(option) {
@@ -6871,6 +6892,17 @@ function setupCombobox(callbacks, options, onTriggerAttach) {
     },
     subscribe(event, callback) {
       subscribers[event].add(callback);
+      // Replay current loading state to late subscribers so that framework wrappers
+      // that subscribe after initial mount (e.g. async Vue watchers) don't miss the
+      // initial events fired during mount.
+      if (event === 'open' && isOpenState) {
+        callback(true);
+      }
+      if (event === 'loadingChange' && lastLoadingState) {
+        callback(true);
+      }
+
+      // Cleanup function
       return () => {
         subscribers[event].delete(callback);
       };
@@ -6882,6 +6914,7 @@ function setupCombobox(callbacks, options, onTriggerAttach) {
       filterValue = '';
       lastOptionsLength = 0;
       lastInputValue = '';
+      lastLoadingState = false;
       optionRegistrations.clear();
       sectionRegistrations.clear();
       skeletonCount = 0;
@@ -7278,6 +7311,10 @@ const ComboboxButton = Object.assign(forwardRefPolymorphic((props, ref) => {
     setHandle
   } = useComboboxContext();
   const [isOpen] = useComboboxOpen();
+  const state = useComboboxEvent('optionsChange', {
+    optionsLength: 0
+  });
+  const isLoading = useComboboxEvent('loadingChange', false);
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const {
     as,
@@ -7319,7 +7356,7 @@ const ComboboxButton = Object.assign(forwardRefPolymorphic((props, ref) => {
     value,
     labelDisplayMode,
     listboxId,
-    isOpen,
+    isOpen: isOpen && (!!state?.optionsLength || isLoading),
     ref: mergedRef
   }, {
     Button: ButtonComp,
@@ -8112,6 +8149,10 @@ const ComboboxInput = forwardRef((props, ref) => {
     setHandle
   } = useComboboxContext();
   const [isOpen, setIsOpen] = useComboboxOpen();
+  const state = useComboboxEvent('optionsChange', {
+    optionsLength: 0
+  });
+  const isLoading = useComboboxEvent('loadingChange', false);
   const {
     inputRef: externalInputRef,
     toggleButtonProps,
@@ -8160,7 +8201,7 @@ const ComboboxInput = forwardRef((props, ref) => {
     ...otherProps,
     ref,
     listboxId,
-    isOpen,
+    isOpen: isOpen && (!!state?.optionsLength || isLoading),
     filter,
     inputRef: mergedInputRef,
     textFieldRef: anchorRef,