@helpwave/hightide 0.1.37 → 0.1.39

package/dist/components/user-action/select/index.js

@@ -871,7 +871,7 @@ function useFloatingElement({
 var import_react_dom = require("react-dom");
 var import_jsx_runtime5 = require("react/jsx-runtime");
 var defaultToggleOpenOptions = {
-  highlightStartPosition: "first"
+  highlightStartPositionBehavior: "first"
 };
 var SelectContext = (0, import_react9.createContext)(null);
 function useSelectContext() {
@@ -894,47 +894,62 @@ var SelectRoot = ({
   isMultiSelect = false,
   iconAppearance = "left"
 }) => {
-  const [options, setOptions] = (0, import_react9.useState)([]);
   const triggerRef = (0, import_react9.useRef)(null);
   const generatedId = (0, import_react9.useId)();
   const usedId = id ?? generatedId;
   const [internalState, setInternalState] = (0, import_react9.useState)({
-    isOpen
+    isOpen,
+    options: []
   });
-  const selectedValues = isMultiSelect ? values ?? [] : [value].filter(Boolean);
+  const selectedValues = (0, import_react9.useMemo)(
+    () => isMultiSelect ? values ?? [] : [value].filter(Boolean),
+    [isMultiSelect, value, values]
+  );
+  const selectedOptions = (0, import_react9.useMemo)(
+    () => selectedValues.map((value2) => internalState.options.find((option) => value2 === option.value)).filter(Boolean),
+    [selectedValues, internalState.options]
+  );
   const state = {
     ...internalState,
     id: usedId,
     disabled,
     invalid,
     value: selectedValues,
-    options,
-    selectedOptions: selectedValues.map((value2) => options.find((option) => value2 === option.value)).filter(Boolean)
+    selectedOptions
   };
   const config = {
     isMultiSelect,
     iconAppearance
   };
   const registerItem = (0, import_react9.useCallback)((item) => {
-    setOptions((prev) => {
-      const updated = [...prev, item];
-      updated.sort((a, b) => {
+    setInternalState((prev) => {
+      const updatedOptions = [...prev.options, item];
+      updatedOptions.sort((a, b) => {
         const aEl = a.ref.current;
         const bEl = b.ref.current;
         if (!aEl || !bEl) return 0;
         return aEl.compareDocumentPosition(bEl) & Node.DOCUMENT_POSITION_FOLLOWING ? -1 : 1;
       });
-      return updated;
+      return {
+        ...prev,
+        options: updatedOptions
+      };
     });
   }, []);
   const unregisterItem = (0, import_react9.useCallback)((value2) => {
-    setOptions((prev) => prev.filter((i) => i.value !== value2));
+    setInternalState((prev) => {
+      const updatedOptions = prev.options.filter((i) => i.value !== value2);
+      return {
+        ...prev,
+        options: updatedOptions
+      };
+    });
   }, []);
   const toggleSelection = (value2, isSelected) => {
     if (disabled) {
       return;
     }
-    const option = options.find((i) => i.value === value2);
+    const option = state.options.find((i) => i.value === value2);
     if (!option) {
       console.error(`SelectOption with value: ${value2} not found`);
       return;
@@ -977,35 +992,40 @@ var SelectRoot = ({
     triggerRef.current = null;
   }, []);
   const toggleOpen = (isOpen2, toggleOpenOptions) => {
-    const { highlightStartPosition } = { ...defaultToggleOpenOptions, ...toggleOpenOptions };
-    let highlightedIndex;
-    if (highlightStartPosition === "first") {
-      highlightedIndex = options.findIndex((option) => !option.disabled);
-    } else {
-      highlightedIndex = options.length - 1 - [...options].reverse().findIndex((option) => !option.disabled);
-    }
-    if (highlightedIndex === -1 || highlightedIndex === options.length) {
-      highlightedIndex = 0;
+    const { highlightStartPositionBehavior } = { ...defaultToggleOpenOptions, ...toggleOpenOptions };
+    let firstSelectedValue;
+    let firstEnabledValue;
+    for (let i = 0; i < state.options.length; i++) {
+      const currentOption = state.options[highlightStartPositionBehavior === "first" ? i : state.options.length - i - 1];
+      if (!currentOption.disabled) {
+        if (!firstEnabledValue) {
+          firstEnabledValue = currentOption.value;
+        }
+        if (selectedValues.includes(currentOption.value)) {
+          firstSelectedValue = currentOption.value;
+          break;
+        }
+      }
     }
     setInternalState((prevState) => ({
       ...prevState,
       isOpen: isOpen2 ?? !prevState.isOpen,
-      highlightedValue: options[highlightedIndex].value
+      highlightedValue: firstSelectedValue ?? firstEnabledValue
     }));
   };
   const moveHighlightedIndex = (delta) => {
-    let highlightedIndex = options.findIndex((value2) => value2.value === internalState.highlightedValue);
+    let highlightedIndex = state.options.findIndex((value2) => value2.value === internalState.highlightedValue);
     if (highlightedIndex === -1) {
       highlightedIndex = 0;
     }
-    const optionLength = options.length;
+    const optionLength = state.options.length;
     const startIndex = (highlightedIndex + delta % optionLength + optionLength) % optionLength;
     const isForward = delta >= 0;
-    let highlightedValue = options[startIndex].value;
-    for (let i = 0; i < options.length; i++) {
+    let highlightedValue = state.options[startIndex].value;
+    for (let i = 0; i < state.options.length; i++) {
       const index = (startIndex + (isForward ? i : -i) + optionLength) % optionLength;
-      if (!options[index].disabled) {
-        highlightedValue = options[index].value;
+      if (!state.options[index].disabled) {
+        highlightedValue = state.options[index].value;
         break;
       }
     }
@@ -1016,9 +1036,9 @@ var SelectRoot = ({
   };
   (0, import_react9.useEffect)(() => {
     if (!internalState.highlightedValue) return;
-    const highlighted = options.find((value2) => value2.value === internalState.highlightedValue);
+    const highlighted = internalState.options.find((value2) => value2.value === internalState.highlightedValue);
     if (highlighted) {
-      highlighted.ref.current.scrollIntoView({ behavior: "instant", block: "nearest" });
+      highlighted.ref.current?.scrollIntoView({ behavior: "instant", block: "nearest" });
     } else {
       console.error(`SelectRoot: Could not find highlighted value (${internalState.highlightedValue})`);
     }
@@ -1155,12 +1175,12 @@ var SelectButton = (0, import_react9.forwardRef)(function SelectButton2({ placeh
         props.onKeyDown?.(event);
         switch (event.key) {
           case "ArrowDown":
-            toggleOpen(true, { highlightStartPosition: "first" });
+            toggleOpen(true, { highlightStartPositionBehavior: "first" });
             event.preventDefault();
             event.stopPropagation();
             break;
           case "ArrowUp":
-            toggleOpen(true, { highlightStartPosition: "last" });
+            toggleOpen(true, { highlightStartPositionBehavior: "last" });
             event.preventDefault();
             event.stopPropagation();
             break;
@@ -1254,10 +1274,10 @@ var SelectChipDisplay = (0, import_react9.forwardRef)(function SelectChipDisplay
             onKeyDown: (event) => {
               switch (event.key) {
                 case "ArrowDown":
-                  toggleOpen(true, { highlightStartPosition: "first" });
+                  toggleOpen(true, { highlightStartPositionBehavior: "first" });
                   break;
                 case "ArrowUp":
-                  toggleOpen(true, { highlightStartPosition: "last" });
+                  toggleOpen(true, { highlightStartPositionBehavior: "last" });
               }
             },
             size: "small",
@@ -1278,6 +1298,7 @@ var SelectContent = (0, import_react9.forwardRef)(
   function SelectContent2({
     alignment,
     orientation = "vertical",
+    containerClassName,
     ...props
   }, ref) {
     const innerRef = (0, import_react9.useRef)(null);
@@ -1294,76 +1315,83 @@ var SelectContent = (0, import_react9.forwardRef)(
       active: state.isOpen && !!position
     });
     return (0, import_react_dom.createPortal)(
-      /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)(import_jsx_runtime5.Fragment, { children: [
-        /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
-          "div",
-          {
-            hidden: !state.isOpen,
-            onClick: () => trigger.toggleOpen(false),
-            className: (0, import_clsx4.default)("fixed w-screen h-screen inset-0")
-          }
-        ),
-        /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
-          "ul",
-          {
-            ...props,
-            id: `${state.id}-listbox`,
-            ref: innerRef,
-            hidden: !state.isOpen,
-            onKeyDown: (event) => {
-              switch (event.key) {
-                case "Escape":
-                  trigger.toggleOpen(false);
-                  event.preventDefault();
-                  event.stopPropagation();
-                  break;
-                case match(orientation, {
-                  vertical: "ArrowDown",
-                  horizontal: "ArrowUp"
-                }):
-                  item.moveHighlightedIndex(1);
-                  event.preventDefault();
-                  break;
-                case match(orientation, {
-                  vertical: "ArrowUp",
-                  horizontal: "ArrowDown"
-                }):
-                  item.moveHighlightedIndex(-1);
-                  event.preventDefault();
-                  break;
-                case "Home":
-                  event.preventDefault();
-                  break;
-                case "End":
-                  event.preventDefault();
-                  break;
-                case "Enter":
-                // Fall through
-                case " ":
-                  if (state.highlightedValue) {
-                    item.toggleSelection(state.highlightedValue);
-                    if (!config.isMultiSelect) {
+      /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)(
+        "div",
+        {
+          id: `select-container-${state.id}`,
+          className: (0, import_clsx4.default)("fixed inset-0 w-screen h-screen", containerClassName),
+          hidden: !state.isOpen,
+          children: [
+            /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
+              "div",
+              {
+                id: `select-background-${state.id}`,
+                onClick: () => trigger.toggleOpen(false),
+                className: (0, import_clsx4.default)("fixed inset-0 w-screen h-screen")
+              }
+            ),
+            /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
+              "ul",
+              {
+                ...props,
+                id: `${state.id}-listbox`,
+                ref: innerRef,
+                onKeyDown: (event) => {
+                  switch (event.key) {
+                    case "Escape":
                       trigger.toggleOpen(false);
-                    }
-                    event.preventDefault();
+                      event.preventDefault();
+                      event.stopPropagation();
+                      break;
+                    case match(orientation, {
+                      vertical: "ArrowDown",
+                      horizontal: "ArrowUp"
+                    }):
+                      item.moveHighlightedIndex(1);
+                      event.preventDefault();
+                      break;
+                    case match(orientation, {
+                      vertical: "ArrowUp",
+                      horizontal: "ArrowDown"
+                    }):
+                      item.moveHighlightedIndex(-1);
+                      event.preventDefault();
+                      break;
+                    case "Home":
+                      event.preventDefault();
+                      break;
+                    case "End":
+                      event.preventDefault();
+                      break;
+                    case "Enter":
+                    // Fall through
+                    case " ":
+                      if (state.highlightedValue) {
+                        item.toggleSelection(state.highlightedValue);
+                        if (!config.isMultiSelect) {
+                          trigger.toggleOpen(false);
+                        }
+                        event.preventDefault();
+                      }
+                      break;
                   }
-                  break;
+                },
+                className: (0, import_clsx4.default)("flex-col-0 p-2 bg-menu-background text-menu-text rounded-md shadow-hw-bottom focus-style-within overflow-auto", props.className),
+                style: {
+                  opacity: position ? void 0 : 0,
+                  position: "fixed",
+                  ...position
+                },
+                role: "listbox",
+                "aria-multiselectable": config.isMultiSelect,
+                "aria-orientation": orientation,
+                tabIndex: position ? 0 : void 0,
+                children: props.children
               }
-            },
-            className: (0, import_clsx4.default)("flex-col-0 p-2 bg-menu-background text-menu-text rounded-md shadow-hw-bottom focus-style-within overflow-auto", props.className),
-            style: {
-              opacity: position ? void 0 : 0,
-              position: "fixed",
-              ...position
-            },
-            role: "listbox",
-            "aria-multiselectable": config.isMultiSelect,
-            "aria-orientation": orientation,
-            tabIndex: position ? 0 : void 0,
-            children: props.children
-          }
-        )
-      ] }),
+            )
+          ]
+        }
+      ),
       document.body
     );
   }