@oliasoft-open-source/react-ui-library 4.10.5 → 4.10.6-beta-2

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, isValueWithUnit, withUnit, convertSamePrecision, getValue as getValue$1, getUnit, KNOWN_UNITS, split as split$1, label as label$b, isValidNum, altUnitsList, convertAndGetValue, getUnitsForQuantity, roundByMagnitudeToFixed } from "@oliasoft-open-source/units";
+import { toString as toString$1, isScientificStringNum, roundToPrecision, toNum, roundToFixed, validateNumber, cleanNumStr, stripLeadingZeros, unitFromQuantity, ALT_UNITS, isValueWithUnit, withUnit, convertSamePrecision, getValue as getValue$1, getUnit, KNOWN_UNITS, split as split$1, label as label$b, isValidNum, getAltUnitsListByQuantity, altUnitsList, convertAndGetValue, 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;
@@ -70172,13 +70172,41 @@ var PredefinedOptionsMenuState = /* @__PURE__ */ ((PredefinedOptionsMenuState2)
 const isWrongValue = (val) => {
   return val === "undefined" || val === void 0 || val === "" || val === "null" || val === null || val === "NaN" || isNaN(val);
 };
-const convertUnit = (stringValue = "", toUnit, defaultFromUnit = "", doNotConvertValue = false) => {
+const checkConversion = ({
+  value,
+  unitkey,
+  toUnit
+}) => {
+  var _a2;
+  const availableUnits = ALT_UNITS[unitkey];
+  if (!availableUnits || availableUnits.length === 0) {
+    return false;
+  }
+  if (!((_a2 = validateNumber(value)) == null ? void 0 : _a2.valid)) {
+    return false;
+  }
+  if (!availableUnits.includes(toUnit)) {
+    return false;
+  }
+  return true;
+};
+const convertUnit = (stringValue = "", toUnit, unitkey, defaultFromUnit = "", doNotConvertValue = false) => {
+  var _a2;
   if (doNotConvertValue) return stringValue;
+  if (!((_a2 = validateNumber(stringValue)) == null ? void 0 : _a2.valid)) return;
   if (toUnit && !isWrongValue(stringValue)) {
     try {
       const valueWithUnit = isValueWithUnit(stringValue) ? stringValue : withUnit(stringValue, defaultFromUnit);
-      const result = convertSamePrecision(valueWithUnit, toUnit);
-      return getValue$1(result);
+      const shouldConvert = checkConversion({
+        value: valueWithUnit,
+        toUnit,
+        unitkey
+      });
+      if (shouldConvert) {
+        const result = convertSamePrecision(valueWithUnit, toUnit);
+        return getValue$1(result);
+      }
+      return getValue$1(valueWithUnit);
     } catch (e2) {
     }
   }
@@ -70187,7 +70215,13 @@ const isValueWithUnknownUnit = (value) => {
   if (!value) return false;
   return Boolean(getUnit(value));
 };
-const safeConvertValue = (value = "", toUnit, defaultFromUnit, doNotConvertValue) => {
+const safeConvertValue = ({
+  value = "",
+  toUnit,
+  unitkey,
+  defaultFromUnit,
+  doNotConvertValue
+}) => {
   const isWithUnit = isValueWithUnknownUnit(value) || isValueWithUnit(value);
   const rawValue = getValue$1(value);
   const isInvalidInput = isWrongValue(rawValue);
@@ -70197,7 +70231,13 @@ const safeConvertValue = (value = "", toUnit, defaultFromUnit, doNotConvertValue
   if (!isWithUnit) {
     return value;
   }
-  return convertUnit(rawValue, toUnit, defaultFromUnit, doNotConvertValue);
+  return convertUnit(
+    rawValue,
+    toUnit,
+    unitkey,
+    defaultFromUnit,
+    doNotConvertValue
+  );
 };
 const getStringName = (name2) => {
   if (isObject$5(name2) && !isArray$1(name2) && !isFunction$3(name2)) {
@@ -70277,18 +70317,20 @@ const UnitInput = ({
   const knownUnit = isKnownUnit(value, preferredUnit);
   const initDisplayUnit = initUnit || preferredUnit || propUnit;
   const previousInitUnit = usePrevious(initDisplayUnit);
-  const convertedValue = safeConvertValue(
+  const convertedValue = safeConvertValue({
     value,
-    initDisplayUnit,
-    propUnit,
+    toUnit: initDisplayUnit,
+    unitkey,
+    defaultFromUnit: propUnit,
     doNotConvertValue
-  );
-  const convertedAutoValue = safeConvertValue(
-    autoValue,
-    initDisplayUnit,
-    propAutoUnit,
+  });
+  const 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 = (displayLayer == null ? void 0 : displayLayer.value) === void 0;
@@ -70304,14 +70346,23 @@ const UnitInput = ({
     }
     const predefinedMenuItemUnit = isValueWithUnit(el2.value) ? getUnit(el2.value) : "";
     return withUnit(
-      convertUnit(value, predefinedMenuItemUnit),
+      convertUnit(value, predefinedMenuItemUnit, unitkey),
       predefinedMenuItemUnit
     ) === el2.value;
   });
   const getAlternativeUnits = () => {
-    if (unitkey) {
+    const valueToList = isAutoValue ? autoValue : value ?? "";
+    const initToUnit = displayLayer.unit;
+    const shouldConvert = checkConversion({
+      value: valueToList,
+      unitkey,
+      toUnit: initToUnit
+    });
+    if (!shouldConvert) {
+      let alternativeUnits2 = getAltUnitsListByQuantity(unitkey);
+      return alternativeUnits2 == null ? void 0 : alternativeUnits2.map((unitRow) => ["", unitRow == null ? void 0 : unitRow.unit]);
+    } else if (unitkey) {
       try {
-        const valueToList = isAutoValue ? autoValue : value ?? "";
         let alternativeUnits2 = altUnitsList(valueToList, unitkey);
         if (getValue$1(valueToList) === "") {
           return alternativeUnits2.map((unitRow) => ["", unitRow[1]]);
@@ -70354,20 +70405,22 @@ const UnitInput = ({
     if (initDisplayUnit) {
       let newValue, newUnit = "";
       if (previousInitUnit !== initDisplayUnit) {
-        newValue = safeConvertValue(
+        newValue = safeConvertValue({
           value,
-          initDisplayUnit,
-          propUnit,
+          toUnit: initDisplayUnit,
+          unitkey,
+          defaultFromUnit: propUnit,
           doNotConvertValue
-        );
+        });
         newUnit = initDisplayUnit;
       } else if (withUnit(displayLayer.value, displayLayer.unit) !== value) {
-        newValue = safeConvertValue(
+        newValue = safeConvertValue({
           value,
-          displayLayer.unit,
-          propUnit,
+          toUnit: displayLayer.unit,
+          unitkey,
+          defaultFromUnit: propUnit,
           doNotConvertValue
-        );
+        });
         newUnit = displayLayer.unit;
       }
       if (newValue !== void 0) {
@@ -70477,12 +70530,13 @@ const UnitInput = ({
             name: stringName,
             testId,
             disabled: disabled2,
-            placeholder: isAutoValue ? safeConvertValue(
-              autoValue,
-              displayLayer.unit,
-              propAutoUnit,
+            placeholder: isAutoValue ? safeConvertValue({
+              value: autoValue,
+              toUnit: displayLayer.unit,
+              unitkey,
+              defaultFromUnit: propAutoUnit,
               doNotConvertValue
-            ) : placeholder3,
+            }) : placeholder3,
             value: displayLayer.value,
             onChange: onSetValue,
             onFocus,