@oliasoft-open-source/react-ui-library 4.12.0-beta-2 → 4.12.0-beta-4

package/dist/index.d.ts

@@ -1569,13 +1569,17 @@ export declare interface IUnitInputProps {
     unitkey?: string;
     initUnit?: string;
     noConversion?: boolean;
+    doNotConvertValue?: boolean;
     testId?: string;
     warning?: string | boolean | null;
     predefinedOptions?: IPredefinedOption[] | null;
-    initialPredefinedOption?: string;
+    initialPredefinedOption?: boolean;
+    shouldLinkAutomaticly?: boolean;
+    selectedPredefinedOptionKey?: string;
     validationCallback?: (name: string, error: string | null) => any;
     disabledValidation?: boolean;
     allowEmpty?: boolean;
+    autoValue?: string;
     onChange?: (event: TChangeEvent | ICustomChangeEvent) => void;
     onSwitchUnit?: (unit: string) => void;
     onClick?: MouseEventHandler<HTMLInputElement>;
@@ -1861,7 +1865,7 @@ declare type TUnitTableCellShape = TCellShape | IUnitTableStaticCell | IUnitTabl
 
 declare type UnitContextType = any;
 
-export declare const UnitInput: ({ name, placeholder, disabled, disabledUnit, error, left, small, width, value, unitkey, initUnit, noConversion, onChange, onClick, onFocus, onSwitchUnit, unitTemplate, testId, warning, predefinedOptions, initialPredefinedOption, validationCallback, disabledValidation, allowEmpty, convertBackToStorageUnit, enableCosmeticRounding, enableDisplayRounding, }: IUnitInputProps) => JSX_2.Element;
+export declare const UnitInput: ({ name, placeholder, disabled, disabledUnit, error, left, small, width, value, unitkey, initUnit, noConversion, onChange, onClick, onFocus, onSwitchUnit, unitTemplate, doNotConvertValue, testId, warning, predefinedOptions, initialPredefinedOption, shouldLinkAutomaticly, selectedPredefinedOptionKey, validationCallback, disabledValidation, allowEmpty, autoValue, convertBackToStorageUnit, enableCosmeticRounding, enableDisplayRounding, }: IUnitInputProps) => JSX_2.Element;
 
 export declare const UnitTable: ({ table, unitConfig, convertBackToStorageUnit, enableCosmeticRounding, enableDisplayRounding, }: IUnitTableProps) => JSX_2.Element;
 

package/dist/index.js

@@ -16,7 +16,7 @@ import * as PropTypes from "prop-types";
 import PropTypes__default from "prop-types";
 import ReactDOM, { createPortal, unstable_batchedUpdates, render } from "react-dom";
 import { noop as noop$3, set, get as get$2, isString as isString$3, isNumber as isNumber$1, isBoolean as isBoolean$2, isFunction as isFunction$3, isEmpty, isArray as isArray$1, toNumber, debounce as debounce$2, isObject as isObject$5, isEqual as isEqual$4 } from "lodash";
-import { toString as toString$1, isScientificStringNum, roundToPrecision, toNum, roundToFixed, validateNumber, cleanNumStr, stripLeadingZeros, unitFromQuantity, getUnit, ALT_UNITS, isValueWithUnit, getValue as getValue$1, withUnit, convertSamePrecision, convertAndGetValue, KNOWN_UNITS, split as split$1, label as label$b, isValidNum, getAltUnitsListByQuantity, altUnitsList, getUnitsForQuantity, roundByMagnitudeToFixed } from "@oliasoft-open-source/units";
+import { toString as toString$1, isScientificStringNum, roundToPrecision, toNum, roundToFixed, validateNumber, cleanNumStr, stripLeadingZeros, unitFromQuantity, getUnit, KNOWN_UNITS, ALT_UNITS, isValueWithUnit, getValue as getValue$1, withUnit, convertSamePrecision, convertAndGetValue, split as split$1, label as label$b, isValidNum, getAltUnitsListByQuantity, altUnitsList, getUnitsForQuantity, roundByMagnitudeToFixed } from "@oliasoft-open-source/units";
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 function getDefaultExportFromCjs(x2) {
   return x2 && x2.__esModule && Object.prototype.hasOwnProperty.call(x2, "default") ? x2["default"] : x2;
@@ -55652,6 +55652,10 @@ const NumberInput = ({
   const validateInputValue = (value2) => {
     const validation = validateNumber(value2);
     const isPlaceholder = placeholder3 && isEmptyNullOrUndefined(value2);
+    const isInfinity = [Infinity, -Infinity].includes(Number(value2));
+    if (isInfinity) {
+      return { valid: true, errors: [] };
+    }
     if (isPlaceholder) {
       return { valid: true, errors: [] };
     }
@@ -70138,7 +70142,8 @@ const isWrongValue = (val) => {
 };
 const isValueWithUnknownUnit = (value) => {
   if (!value) return false;
-  return Boolean(getUnit(value));
+  const unit2 = getUnit(value);
+  return !KNOWN_UNITS.includes(unit2);
 };
 const checkConversion = ({
   value,
@@ -70202,13 +70207,15 @@ const safeConvertValue = ({
   defaultFromUnit,
   doNotConvertValue
 }) => {
-  const isWithUnit = isValueWithUnknownUnit(value) || isValueWithUnit(value);
   const rawValue = getValue$1(value);
   const isInvalidInput = isWrongValue(rawValue);
+  if (isValueWithUnknownUnit(value)) {
+    return { value: rawValue };
+  }
   if (isInvalidInput) {
     return { value: rawValue };
   }
-  if (!isWithUnit) {
+  if (!isValueWithUnit(value)) {
     return { value };
   }
   return convertUnit({
@@ -70245,109 +70252,6 @@ const initializeContext = (context2) => {
     UnitContext = context2;
   }
 };
-const PredefinedOptionsMenu = ({
-  predefinedOptions,
-  value = "",
-  onPredefinedOptionSelect,
-  disabled: disabled2,
-  initialPredefinedOption,
-  predefinedOptionsMenuState,
-  setPredefinedOptionsMenuState,
-  testId
-}) => {
-  const extractedValue = isValueWithUnit(value) ? getValue$1(value) : value;
-  const [foundPredefinedMenuOption, setFoundPredefinedMenuOption] = useState(void 0);
-  const createPredefinedOption = (el2) => {
-    const elementValue = (el2 == null ? void 0 : el2.value) ? el2.value : "";
-    const [inputValue = "", unit2 = ""] = isValueWithUnit(elementValue) ? split$1(elementValue) : [elementValue];
-    return {
-      type: MenuType.OPTION,
-      inline: true,
-      onClick: () => {
-        const validation = validateNumber(inputValue);
-        if (validation.valid && !disabled2) {
-          setPredefinedOptionsMenuState(PredefinedOptionsMenuState.PREDEFINED);
-          onPredefinedOptionSelect(elementValue);
-          setFoundPredefinedMenuOption(el2);
-        }
-      },
-      label: /* @__PURE__ */ jsxs(Fragment$1, { children: [
-        /* @__PURE__ */ jsx(Text, { children: el2.label }),
-        /* @__PURE__ */ jsx(Spacer, { width: "20px", height: "0" })
-      ] }),
-      description: isValueWithUnit(elementValue) ? `${inputValue} ${unit2}` : elementValue,
-      selected: extractedValue === elementValue && predefinedOptionsMenuState === PredefinedOptionsMenuState.PREDEFINED
-    };
-  };
-  const initialPredefinedOptionObject = useMemo$1(() => {
-    return predefinedOptions.find(
-      (option2) => option2.value === initialPredefinedOption || option2.label === initialPredefinedOption || option2.valueKey === initialPredefinedOption
-    );
-  }, [initialPredefinedOption, predefinedOptions]);
-  useEffect(() => {
-    if (initialPredefinedOptionObject) {
-      setPredefinedOptionsMenuState(PredefinedOptionsMenuState.PREDEFINED);
-      setFoundPredefinedMenuOption(initialPredefinedOptionObject);
-      onPredefinedOptionSelect(initialPredefinedOptionObject.value);
-    }
-  }, [initialPredefinedOptionObject]);
-  useEffect(() => {
-    const foundOption = predefinedOptions.find((option2) => {
-      const currentValue = isValueWithUnit((option2 == null ? void 0 : option2.value) ?? "") ? getValue$1((option2 == null ? void 0 : option2.value) ?? "") : option2.value;
-      return currentValue === extractedValue;
-    });
-    if (foundOption) {
-      setPredefinedOptionsMenuState(PredefinedOptionsMenuState.PREDEFINED);
-      setFoundPredefinedMenuOption(foundOption);
-    } else {
-      setPredefinedOptionsMenuState(PredefinedOptionsMenuState.CUSTOM);
-      setFoundPredefinedMenuOption(void 0);
-    }
-  }, [extractedValue, predefinedOptions]);
-  const sectionsPredefinedMenu = [
-    {
-      type: MenuType.OPTION,
-      inline: true,
-      onClick: () => {
-        if (!disabled2) {
-          setPredefinedOptionsMenuState(PredefinedOptionsMenuState.CUSTOM);
-        }
-      },
-      label: "Custom",
-      selected: predefinedOptionsMenuState === PredefinedOptionsMenuState.CUSTOM
-    },
-    ...predefinedOptions.map(createPredefinedOption)
-  ];
-  return /* @__PURE__ */ jsx(
-    Tooltip,
-    {
-      text: predefinedOptionsMenuState === PredefinedOptionsMenuState.PREDEFINED ? foundPredefinedMenuOption == null ? void 0 : foundPredefinedMenuOption.label : "",
-      children: /* @__PURE__ */ jsx(
-        Menu,
-        {
-          testId: testId && `${testId}-predefined-menu`,
-          maxHeight: 380,
-          groupOrder: "first",
-          disabled: disabled2,
-          menu: {
-            colored: true,
-            trigger: "Component",
-            component: /* @__PURE__ */ jsx(
-              Button$1,
-              {
-                groupOrder: "first",
-                active: predefinedOptionsMenuState === PredefinedOptionsMenuState.PREDEFINED,
-                icon: predefinedOptionsMenuState === PredefinedOptionsMenuState.PREDEFINED ? "link" : "unlink"
-              }
-            ),
-            small: true,
-            sections: sectionsPredefinedMenu
-          }
-        }
-      )
-    }
-  );
-};
 const predefinedMenuActive = "_predefinedMenuActive_ye9w9_1";
 const inputWrapper = "_inputWrapper_ye9w9_4";
 const styles = {
@@ -70372,24 +70276,28 @@ const UnitInput = ({
   onFocus = noop$3,
   onSwitchUnit = noop$3,
   unitTemplate,
+  doNotConvertValue = false,
   testId,
   warning: warning2 = null,
   predefinedOptions,
-  initialPredefinedOption = "",
+  initialPredefinedOption = false,
+  shouldLinkAutomaticly = true,
+  selectedPredefinedOptionKey,
   validationCallback = () => ({ name: "", error: null }),
   disabledValidation = false,
   allowEmpty = false,
+  autoValue,
   convertBackToStorageUnit = false,
   enableCosmeticRounding = true,
   enableDisplayRounding = false
 }) => {
   const context2 = useUnitContext();
   const runAfterUpdate = useRunAfterUpdate();
-  const [predefinedOptionsMenuState, setPredefinedOptionsMenuState] = useState(PredefinedOptionsMenuState.CUSTOM);
   if (typeof value === "number") {
     value = `${value}`;
   }
   const [propValue = "", propUnit = ""] = value !== void 0 ? split$1(value) : [];
+  const propAutoUnit = autoValue ? getUnit(autoValue) : "";
   const preferredUnit = useMemo$1(
     () => getPreferredUnit(unitkey, unitTemplate || (context2 == null ? void 0 : context2.unitTemplate)),
     [unitkey, unitTemplate, context2 == null ? void 0 : context2.unitTemplate]
@@ -70402,14 +70310,38 @@ const UnitInput = ({
     toUnit: initDisplayUnit,
     unitkey,
     defaultFromUnit: propUnit,
-    doNotConvertValue: noConversion
+    doNotConvertValue
   });
-  const initDisplayLayer = convertedValue !== "" ? { value: convertedValue, unit: initDisplayUnit } : { value: propValue, unit: propUnit };
+  const { value: convertedAutoValue } = safeConvertValue({
+    value: autoValue,
+    toUnit: initDisplayUnit,
+    unitkey,
+    defaultFromUnit: propAutoUnit,
+    doNotConvertValue
+  });
+  const initDisplayLayer = convertedValue !== "" ? { value: convertedValue, unit: initDisplayUnit } : convertedAutoValue !== "" ? { value: convertedAutoValue, unit: initDisplayUnit } : { value: propValue, unit: propUnit };
   const [displayLayer, setDisplayLayer] = useState(initDisplayLayer);
   const derivedAllowEmpty = allowEmpty || (displayLayer == null ? void 0 : displayLayer.value) === void 0;
-  const disableInternalErrorValidationMessages = !!disabledValidation;
+  const [predefinedOptionsMenuState, setPredefinedOptionsMenuState] = useState(
+    initialPredefinedOption ? PredefinedOptionsMenuState.PREDEFINED : PredefinedOptionsMenuState.CUSTOM
+  );
+  const isAutoValue = propValue === "" && autoValue;
+  const disableInternalErrorValidationMessages = !!(disabledValidation || autoValue);
+  const foundPredefinedMenuOption = predefinedOptions && predefinedOptions.find((el2) => {
+    if (!(el2 == null ? void 0 : el2.value)) return;
+    if (selectedPredefinedOptionKey) {
+      return selectedPredefinedOptionKey === el2.valueKey;
+    }
+    const predefinedMenuItemUnit = isValueWithUnit(el2.value) ? getUnit(el2.value) : "";
+    const { value: resultValue = value } = convertUnit({
+      value: String(value),
+      unitkey,
+      toUnit: predefinedMenuItemUnit
+    });
+    return withUnit(resultValue, predefinedMenuItemUnit) === el2.value;
+  });
   const getAlternativeUnits = () => {
-    const valueToList = value ?? "";
+    const valueToList = isAutoValue ? autoValue : value ?? "";
     const initToUnit = displayLayer.unit;
     const shouldConvert = checkConversion({
       value: valueToList,
@@ -70468,7 +70400,7 @@ const UnitInput = ({
           toUnit: initDisplayUnit,
           unitkey,
           defaultFromUnit: propUnit,
-          doNotConvertValue: noConversion
+          doNotConvertValue
         });
         newValue = resultValue;
         newUnit = initDisplayUnit;
@@ -70478,29 +70410,96 @@ const UnitInput = ({
           toUnit: displayLayer.unit,
           unitkey,
           defaultFromUnit: propUnit,
-          doNotConvertValue: noConversion
+          doNotConvertValue
         });
         newValue = resultValue;
         newUnit = displayLayer.unit;
       }
-      if (newValue !== void 0 && !initialPredefinedOption) {
+      if (newValue !== void 0) {
         setDisplayLayer({ value: newValue, unit: newUnit });
       }
+      if (predefinedOptions) {
+        if (foundPredefinedMenuOption && shouldLinkAutomaticly) {
+          setPredefinedOptionsMenuState(PredefinedOptionsMenuState.PREDEFINED);
+        } else {
+          setPredefinedOptionsMenuState(PredefinedOptionsMenuState.CUSTOM);
+        }
+      }
     }
-  }, [initDisplayUnit, value, error2]);
+  }, [initDisplayUnit, value, error2, shouldLinkAutomaticly]);
   const alternativeUnits = getAlternativeUnits();
   const displayUnitLabel = label$b(displayLayer.unit) || displayLayer.unit || "";
   const noConvert = noConversion || !alternativeUnits || alternativeUnits && alternativeUnits.length === 1;
   const stringName = getStringName(name2);
+  let sectionsPredefinedMenu;
+  const createPredefinedOption = (el2) => {
+    const elementValue = (el2 == null ? void 0 : el2.value) ? el2.value : "";
+    const [value2 = "", unit2 = ""] = isValueWithUnit(elementValue) ? split$1(elementValue) : [elementValue];
+    return {
+      type: MenuType.OPTION,
+      inline: true,
+      onClick: () => {
+        const validation = validateNumber(value2);
+        if (validation.valid && !disabled2) {
+          setPredefinedOptionsMenuState(PredefinedOptionsMenuState.PREDEFINED);
+          onChange({
+            target: {
+              value: elementValue,
+              name: typeof name2 === "string" ? name2 : (name2 == null ? void 0 : name2.fieldName) || "",
+              predefinedSelected: true,
+              predefinedOption: el2
+            }
+          });
+        }
+      },
+      label: /* @__PURE__ */ jsxs(Fragment$1, { children: [
+        /* @__PURE__ */ jsx(Text, { children: el2.label }),
+        /* @__PURE__ */ jsx(Spacer, { width: "20px", height: "0" })
+      ] }),
+      description: isValueWithUnit(elementValue) ? `${value2} ${unit2}` : elementValue,
+      selected: foundPredefinedMenuOption === el2 && predefinedOptionsMenuState === PredefinedOptionsMenuState.PREDEFINED
+    };
+  };
+  sectionsPredefinedMenu = [
+    {
+      type: MenuType.OPTION,
+      inline: true,
+      onClick: () => {
+        if (predefinedOptionsMenuState !== PredefinedOptionsMenuState.CUSTOM && !disabled2) {
+          onChange({
+            target: {
+              value: withUnit(displayLayer.value, displayLayer.unit),
+              name: typeof name2 === "string" ? name2 : (name2 == null ? void 0 : name2.fieldName) || ""
+            }
+          });
+        }
+      },
+      label: "Custom",
+      selected: predefinedOptionsMenuState === PredefinedOptionsMenuState.CUSTOM
+    }
+  ];
+  if (predefinedOptions == null ? void 0 : predefinedOptions.length) {
+    const dynamicOptions = predefinedOptions.map(createPredefinedOption);
+    sectionsPredefinedMenu = [...sectionsPredefinedMenu, ...dynamicOptions];
+  }
   const getPlaceholder = (placeholder22) => {
-    if (isValueWithUnit(placeholder22)) {
+    if (isAutoValue) {
+      const { value: resultValue } = safeConvertValue({
+        value: autoValue,
+        toUnit: displayLayer.unit,
+        unitkey,
+        defaultFromUnit: propAutoUnit,
+        doNotConvertValue
+      });
+      return resultValue;
+    } else if (isValueWithUnit(placeholder22)) {
       const placeholderUnit = getUnit(placeholder22);
       const { value: resultValue } = safeConvertValue({
         value: placeholder22,
         toUnit: displayLayer.unit,
         unitkey,
         defaultFromUnit: placeholderUnit,
-        doNotConvertValue: noConversion
+        doNotConvertValue
       });
       return resultValue;
     }
@@ -70512,27 +70511,32 @@ const UnitInput = ({
       className: predefinedOptionsMenuState === PredefinedOptionsMenuState.PREDEFINED ? cx$2(styles.predefinedMenuActive) : "",
       children: /* @__PURE__ */ jsxs(InputGroup, { small: small2, width: width2, children: [
         predefinedOptions && /* @__PURE__ */ jsx(
-          PredefinedOptionsMenu,
+          Tooltip,
           {
-            testId,
-            predefinedOptions,
-            value: displayLayer.value,
-            onPredefinedOptionSelect: (newValue) => {
-              onChange({
-                target: {
-                  value: newValue,
-                  name: stringName
+            text: predefinedOptionsMenuState === PredefinedOptionsMenuState.PREDEFINED ? foundPredefinedMenuOption == null ? void 0 : foundPredefinedMenuOption.label : "",
+            children: /* @__PURE__ */ jsx(
+              Menu,
+              {
+                maxHeight: 380,
+                groupOrder: "first",
+                testId: testId && `${testId}-predefined-menu`,
+                disabled: disabled2,
+                menu: {
+                  colored: true,
+                  trigger: "Component",
+                  component: /* @__PURE__ */ jsx(
+                    Button$1,
+                    {
+                      groupOrder: "first",
+                      active: predefinedOptionsMenuState === PredefinedOptionsMenuState.PREDEFINED,
+                      icon: predefinedOptionsMenuState === PredefinedOptionsMenuState.PREDEFINED ? "link" : "unlink"
+                    }
+                  ),
+                  small: small2,
+                  sections: sectionsPredefinedMenu
                 }
-              });
-              setDisplayLayer({
-                value: newValue,
-                unit: getUnit(newValue) || displayLayer.unit
-              });
-            },
-            disabled: disabled2,
-            initialPredefinedOption,
-            predefinedOptionsMenuState,
-            setPredefinedOptionsMenuState
+              }
+            )
           }
         ),
         /* @__PURE__ */ jsx("div", { className: styles.inputWrapper, children: /* @__PURE__ */ jsx(
@@ -70579,7 +70583,7 @@ const UnitInput = ({
                   inline: true,
                   onClick: (evt) => {
                     evt.stopPropagation();
-                    onClickUnit(value2, altUnit);
+                    onClickUnit(isAutoValue ? "" : value2, altUnit);
                   },
                   description: displayUnit,
                   selected: displayUnit === displayUnitLabel,