@northlight/ui 2.32.2 → 2.32.4

package/dist/es/northlight.js

@@ -14335,7 +14335,7 @@ const ComboPicker = (_a) => {
   var _a2;
   const { isOpen, onToggle, onClose } = useDisclosure();
   const [inputValueState, setInputValueState] = useState(valueProp == null ? void 0 : valueProp.input);
-  const [selectOptionState, setselectOptionState] = useState((_a2 = valueProp == null ? void 0 : valueProp.option) != null ? _a2 : options[0]);
+  const [selectOptionState, setselectOptionState] = useState(valueProp == null ? void 0 : valueProp.option);
   const [enableSelectInput, setEnableSelectInput] = useState(false);
   const isInputValueControlled = typeof (valueProp == null ? void 0 : valueProp.input) !== "undefined";
   const inputValue = isInputValueControlled ? valueProp.input : inputValueState;
@@ -14343,7 +14343,10 @@ const ComboPicker = (_a) => {
   const selectOption = isOptionControlled ? valueProp.option : selectOptionState;
   const buttonRef = useRef();
   const selectRef = useRef();
-  const getNewValue = (option, input) => is(Number, input) ? { input: Number(input), option } : { option };
+  const getNewValue = (option, input) => {
+    const newValueOption = option != null ? option : options[0];
+    return is(Number, input) ? { input: Number(input), option: newValueOption } : { option: newValueOption };
+  };
   const handleInputChange = (newInputvalue) => {
     const newValue = getNewValue(selectOption, newInputvalue);
     setInputValueState(newValue.input);
@@ -14377,10 +14380,20 @@ const ComboPicker = (_a) => {
     }
   }, [enableSelectInput]);
   useEffect(() => {
-    if (!is(Number, inputValue) && defaultToZeroIfEmpty) {
-      handleInputChange(clamp(min, max, 0));
+    const needsToCorrectOption = !selectOption;
+    const needsToCorrectInput = !is(Number, inputValue) && defaultToZeroIfEmpty;
+    const option = needsToCorrectOption ? options[0] : selectOption;
+    const input = needsToCorrectInput ? clamp(min, max, 0) : inputValue;
+    if (needsToCorrectOption) {
+      setselectOptionState(option);
+    }
+    if (needsToCorrectInput) {
+      setInputValueState(input);
+    }
+    if (needsToCorrectOption || needsToCorrectInput) {
+      onChange == null ? void 0 : onChange(getNewValue(option, input));
     }
-  }, [valueProp == null ? void 0 : valueProp.input, defaultToZeroIfEmpty]);
+  }, [inputValue, defaultToZeroIfEmpty]);
   return /* @__PURE__ */ React.createElement(InputGroup, null, /* @__PURE__ */ React.createElement(
     FormattedNumberInput,
     __spreadValues$1({
@@ -14413,7 +14426,7 @@ const ComboPicker = (_a) => {
         flexShrink: "0",
         height: "100%"
       },
-      selectOption.label
+      (_a2 = selectOption == null ? void 0 : selectOption.label) != null ? _a2 : ""
     )
   ), /* @__PURE__ */ React.createElement(Box, { position: "absolute", width: "100%" }, /* @__PURE__ */ React.createElement(
     Select,