@sustaina/shared-ui 1.65.0 → 1.65.1

package/dist/index.mjs

@@ -7161,6 +7161,10 @@ var ComboboxInner = ({
   ...props
 }, ref) => {
   const { getLabelField, getValueField } = useFieldNames_default({ fieldNames });
+  const isFocusedRef = React.useRef(false);
+  const isPopoverOpenRef = React.useRef(false);
+  const suppressNextFocusRef = React.useRef(false);
+  const lastFocusEventRef = React.useRef(null);
   const { value: openPopover, setValue: setOpenPopover } = useControllableState_default({
     defaultValue: false,
     value: open
@@ -7188,18 +7192,27 @@ var ComboboxInner = ({
     }
     return null;
   }, [
-    currentSelectedOption,
-    getLabelField,
-    placeholder2,
+    isLoading,
     selectedValue,
+    placeholder2,
+    currentSelectedOption,
     showValueWhenNoMatch,
-    isLoading,
-    loadingContent
+    loadingContent,
+    valueRender,
+    getLabelField
   ]);
+  const signalBlur = React.useCallback(() => {
+    if (!isFocusedRef.current || !lastFocusEventRef.current) return;
+    isFocusedRef.current = false;
+    suppressNextFocusRef.current = true;
+    onBlur?.(lastFocusEventRef.current);
+  }, [onBlur]);
   const handleSelect = React.useCallback(
     (selected, option) => {
       setSelectedValue(selected);
       setOpenPopover(false);
+      isPopoverOpenRef.current = false;
+      signalBlur();
       if (typeof onSelect === "function") {
         onSelect(selected, option);
       }
@@ -7207,17 +7220,43 @@ var ComboboxInner = ({
         onOpenChange(false);
       }
     },
-    [onOpenChange, onSelect, setOpenPopover, setSelectedValue]
+    [onOpenChange, onSelect, setOpenPopover, setSelectedValue, signalBlur]
   );
   const handleOpenPopover = React.useCallback(
     (isOpen) => {
       if (disabled || isLoading) return;
+      isPopoverOpenRef.current = isOpen;
       setOpenPopover(isOpen);
+      if (!isOpen) {
+        signalBlur();
+      }
       if (typeof onOpenChange === "function") {
         onOpenChange(isOpen);
       }
     },
-    [disabled, isLoading, onOpenChange, setOpenPopover]
+    [disabled, isLoading, onOpenChange, setOpenPopover, signalBlur]
+  );
+  const handleFocus = React.useCallback(
+    (event) => {
+      lastFocusEventRef.current = event;
+      if (suppressNextFocusRef.current) {
+        suppressNextFocusRef.current = false;
+        return;
+      }
+      if (isFocusedRef.current) return;
+      isFocusedRef.current = true;
+      onFocus?.(event);
+    },
+    [onFocus]
+  );
+  const handleBlur = React.useCallback(
+    (event) => {
+      if (isPopoverOpenRef.current) return;
+      if (!isFocusedRef.current) return;
+      isFocusedRef.current = false;
+      onBlur?.(event);
+    },
+    [onBlur]
   );
   const handleClear = React.useCallback(
     (event) => {
@@ -7250,8 +7289,8 @@ var ComboboxInner = ({
         "data-state": openPopover ? "open" : "closed",
         "data-loading": isLoading,
         disabled: disabled || isLoading,
-        onFocus,
-        onBlur,
+        onFocus: handleFocus,
+        onBlur: handleBlur,
         "data-testid": `combobox-trigger-${name}`,
         ...props,
         children: [
@@ -7287,6 +7326,11 @@ var ComboboxInner = ({
         align: "start",
         sideOffset: 4,
         ...popoverContentProps,
+        onCloseAutoFocus: (event) => {
+          event.preventDefault();
+          suppressNextFocusRef.current = false;
+          popoverContentProps?.onCloseAutoFocus?.(event);
+        },
         onWheel: (e) => {
           e.stopPropagation();
           popoverContentProps?.onWheel?.(e);
@@ -7295,6 +7339,9 @@ var ComboboxInner = ({
           "p-0 w-(--radix-popper-anchor-width) min-w-(--radix-popper-anchor-width) max-w-(--radix-popper-available-width) rounded-md",
           popoverContentProps?.className
         ),
+        onInteractOutside: (event) => {
+          popoverContentProps?.onInteractOutside?.(event);
+        },
         children: virtual ? /* @__PURE__ */ jsx(
           VirtualizedCommand_default,
           {