fis-component 0.0.88 → 0.0.90

package/dist/cjs/types/src/components/Select/types.d.ts

@@ -1,13 +1,14 @@
 import { InputLabelProps } from "../Input/InputLabel";
 import { MenuProps } from "../MenuSelect/types";
 import { SelectFieldProps } from "../SelectItem";
+export interface SelectOptionItem<T = string | number> {
+    label: string;
+    description?: string;
+    value: T;
+}
 export interface SelectOption<T = string | number> {
     groupLabel?: string;
-    items: {
-        label: string;
-        description?: string;
-        value: T;
-    }[];
+    items: SelectOptionItem<T>[];
 }
 type BaseSelectProps<T extends string | number> = Partial<InputLabelProps> & Omit<MenuProps, "groups" | "multi" | "selectedValues" | "onChangeSelected" | "onClickMenu" | "size" | "placeholder"> & Omit<SelectFieldProps, "value" | "onChange"> & {
     options: SelectOption<T>[];
@@ -25,13 +26,13 @@ export type SingleSelectProps<T extends string | number> = BaseSelectProps<T> &
     multi?: false;
     value: T;
     onChange: (value: T) => void;
-    displayValue?: (value: SelectOption<T>) => string;
+    displayValue?: (item: SelectOptionItem<T>) => string;
 };
 export type MultiSelectProps<T extends string | number> = BaseSelectProps<T> & {
     multi: true;
     value: T[];
     onChange: (value: T[]) => void;
-    displayValue?: (value: SelectOption<T>[]) => string;
+    displayValue?: (items: SelectOptionItem<T>[]) => string;
 };
 export type SelectProps<T extends string | number> = SingleSelectProps<T> | MultiSelectProps<T>;
 export {};

package/dist/esm/index.js

@@ -73642,45 +73642,21 @@ const FISSelect = forwardRef(({ className, style, size = "md", options, value, d
         strategy: "fixed",
     }), []);
     const { styles, attributes } = usePopper(referenceElement, popperElement, popperOptions);
-    const originalOptionsRef = useRef(options);
-    useEffect(() => {
-        // Keep track of all items including selected ones
-        const allItems = new Map();
-        // Add items from current options
-        options.forEach((group) => {
-            group.items.forEach((item) => {
-                allItems.set(item.value, item);
-            });
-        });
-        // Add selected items that might not be in current options
-        if (multi && Array.isArray(value)) {
-            const selectedItems = originalOptionsRef.current
-                .flatMap((group) => group.items)
-                .filter((item) => value.includes(item.value));
-            selectedItems.forEach((item) => {
-                allItems.set(item.value, item);
-            });
-        }
-        // Update originalOptionsRef with all items
-        originalOptionsRef.current = [
-            {
-                items: Array.from(allItems.values()),
-            },
-        ];
-    }, [options, value, multi]);
     const selectedItems = useMemo$1(() => {
         const allItems = options.flatMap((group) => group.items);
         if (multi) {
-            return allItems.filter((item) => value.includes(item.value));
+            const selectedArray = Array.isArray(value) ? value : [];
+            return allItems.filter((item) => selectedArray.includes(item.value));
         }
         else {
             const found = allItems.find((item) => item.value === value);
             return found ? [found] : [];
         }
     }, [value, multi, options]);
-    const computedDisplayValue = () => {
+    const computedDisplayValue = useMemo$1(() => {
         if (multi) {
-            const count = value.length;
+            const selectedArray = Array.isArray(value) ? value : [];
+            const count = selectedArray.length;
             if (count === 0) {
                 return "";
             }
@@ -73689,17 +73665,18 @@ const FISSelect = forwardRef(({ className, style, size = "md", options, value, d
                 : `Selected ${count.toString().padStart(2, "0")} option${count !== 1 ? "s" : ""}`;
         }
         else {
-            if (!selectedItems[0])
+            const firstItem = selectedItems[0];
+            if (!firstItem)
                 return "";
-            return (displayValue?.(selectedItems[0]) || selectedItems[0].label);
+            return displayValue?.(firstItem) || firstItem.label;
         }
-    };
+    }, [multi, value, multiDisplayText, selectedItems, displayValue]);
     const handleToggle = useCallback(() => {
         if (!disabled)
             setIsOpen((prev) => !prev);
     }, [disabled]);
     const handleOptionRemove = useCallback((option) => {
-        if (multi) {
+        if (multi && Array.isArray(value)) {
             const newValues = value.filter((v) => v !== option.value);
             onChange(newValues);
         }
@@ -73711,13 +73688,15 @@ const FISSelect = forwardRef(({ className, style, size = "md", options, value, d
         else {
             if (values.length > 0) {
                 onChange(values[0]);
-                setIsOpen(false);
+                // Delay closing to ensure react-hook-form processes the change first
+                setTimeout(() => setIsOpen(false), 0);
             }
         }
     }, [multi, onChange]);
     const handleMenuClick = useCallback(() => {
         if (!multi) {
-            setIsOpen(false);
+            // Delay closing to ensure react-hook-form processes the change first
+            setTimeout(() => setIsOpen(false), 0);
         }
     }, [multi]);
     const menuProps = useMemo$1(() => ({
@@ -73727,8 +73706,10 @@ const FISSelect = forwardRef(({ className, style, size = "md", options, value, d
         multi,
         size: isMenuSize(size) ? size : "md",
         selectedValues: multi
-            ? value
-            : value
+            ? Array.isArray(value)
+                ? value
+                : []
+            : value !== undefined && value !== null
                 ? [value]
                 : [],
         onChangeSelected: handleMenuChange,
@@ -73752,18 +73733,25 @@ const FISSelect = forwardRef(({ className, style, size = "md", options, value, d
         restProps,
     ]);
     useEffect(() => {
+        if (!isOpen)
+            return;
         const handleClickOutside = (event) => {
+            const target = event.target;
             if (referenceElement &&
-                !referenceElement.contains(event.target) &&
+                !referenceElement.contains(target) &&
                 popperElement &&
-                !popperElement.contains(event.target)) {
+                !popperElement.contains(target)) {
                 setIsOpen(false);
             }
         };
         document.addEventListener("mousedown", handleClickOutside);
         return () => document.removeEventListener("mousedown", handleClickOutside);
-    }, [referenceElement, popperElement]);
-    return (jsxs(DivWrapperSC$1, { className: className, style: style, children: [(textLabel || iconLabel) && (jsx(FISInputLabel, { textLabel: textLabel, required: required, iconLabel: iconLabel, onClickIconLabel: onClickIconLabel })), jsx(DivInputWrapperSC, { ref: setReferenceElement, onClick: handleToggle, "$hasValue": !!value, children: jsx(FISSelectItem, { ...restProps, ref: ref, size: size, placeholder: placeholder, iconSuffix: isOpen ? jsx(ArrowUpIcon, {}) : jsx(ArrowDownIcon, {}), value: computedDisplayValue(), disabled: disabled, activeDropdown: isOpen, negative: negative }) }), message && (jsx(SpanHintSC$3, { className: classNames({ disabled, negative, positive }), children: message })), multi && value.length > 0 && (jsx(SelectedTagsWrapper, { children: jsx(MultipleValue, { options: selectedItems, onRemove: handleOptionRemove }) })), isOpen && (jsx(Portal, { portal: portal, children: jsx(DivDropdownMenuSC, { ref: setPopperElement, style: {
+    }, [isOpen, referenceElement, popperElement]);
+    return (jsxs(DivWrapperSC$1, { className: className, style: style, children: [(textLabel || iconLabel) && (jsx(FISInputLabel, { textLabel: textLabel, required: required, iconLabel: iconLabel, onClickIconLabel: onClickIconLabel })), jsxs(DivInputWrapperSC, { ref: setReferenceElement, onClick: handleToggle, "$hasValue": !!value, children: [jsx("input", { ...restProps, ref: ref, type: "hidden", value: multi
+                            ? Array.isArray(value)
+                                ? value.join(",")
+                                : ""
+                            : (value ?? "") }), jsx(FISSelectItem, { size: size, placeholder: placeholder, iconSuffix: isOpen ? jsx(ArrowUpIcon, {}) : jsx(ArrowDownIcon, {}), value: computedDisplayValue, disabled: disabled, activeDropdown: isOpen, negative: negative, readOnly: true })] }), message && (jsx(SpanHintSC$3, { className: classNames({ disabled, negative, positive }), children: message })), multi && Array.isArray(value) && value.length > 0 && (jsx(SelectedTagsWrapper, { children: jsx(MultipleValue, { options: selectedItems, onRemove: handleOptionRemove }) })), isOpen && (jsx(Portal, { portal: portal, children: jsx(DivDropdownMenuSC, { ref: setPopperElement, style: {
                         ...styles.popper,
                         width: referenceElement?.offsetWidth,
                         zIndex: 9999,