@oliasoft-open-source/react-ui-library 4.2.0-beta-3 → 4.2.1-beta-1

package/dist/index.d.ts

@@ -1496,7 +1496,7 @@ export declare interface IUnitInputProps {
     left?: boolean;
     small?: boolean;
     width?: string | number;
-    value?: string | number;
+    value?: string;
     unitkey?: string;
     initUnit?: string;
     noConversion?: boolean;

package/dist/index.js

@@ -11,7 +11,7 @@ import * as PropTypes from "prop-types";
 import PropTypes__default from "prop-types";
 import ReactDOM, { createPortal, unstable_batchedUpdates, render } from "react-dom";
 import _$1, { 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, isObjectLike, has as has$1 } from "lodash";
-import { validateNumber, cleanNumStr, unitFromQuantity, isValueWithUnit, convertSamePrecision, withUnit, getValue as getValue$1, split as split$1, getUnit, checkAndCleanDecimalComma, label as label$b, altUnitsList } from "@oliasoft-open-source/units";
+import { validateNumber, cleanNumStr, unitFromQuantity, isValueWithUnit, withUnit, convertSamePrecision, getValue as getValue$1, getUnit, KNOWN_UNITS, split as split$1, checkAndCleanDecimalComma, label as label$b, altUnitsList } from "@oliasoft-open-source/units";
 import { isValueWithUnit as isValueWithUnit$1 } from "@oliasoft-open-source/units/dist/units";
 const global$2 = "";
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
@@ -70138,20 +70138,29 @@ 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) => {
-  if (toUnit && !doNotConvertValue) {
+  if (doNotConvertValue)
+    return stringValue;
+  if (toUnit && !isWrongValue(stringValue)) {
     try {
-      const result = isWrongValue(stringValue) ? stringValue : isValueWithUnit(stringValue) ? convertSamePrecision(stringValue, toUnit) : convertSamePrecision(withUnit(stringValue, defaultFromUnit), toUnit);
+      const valueWithUnit = isValueWithUnit(stringValue) ? stringValue : withUnit(stringValue, defaultFromUnit);
+      const result = convertSamePrecision(valueWithUnit, toUnit);
       return getValue$1(result);
     } catch (e2) {
     }
   }
-  return "";
+  return stringValue;
 };
 const safeConvertValue = (value = "", toUnit, defaultFromUnit, doNotConvertValue) => {
+  if (doNotConvertValue)
+    return value;
   const isWithUnit = isValueWithUnit(value);
-  const isNullEmptyUndefined = isWithUnit && isWrongValue(getValue$1(value)) || !isWithUnit && isWrongValue(value);
-  const convertedValue = isWithUnit ? !isNullEmptyUndefined ? convertUnit(getValue$1(value), toUnit, defaultFromUnit, doNotConvertValue) : "" : !isNullEmptyUndefined ? value : "";
-  return convertedValue;
+  const rawValue = getValue$1(value);
+  const isInvalidInput = isWrongValue(rawValue);
+  if (isInvalidInput)
+    return rawValue;
+  if (!isWithUnit)
+    return value;
+  return convertUnit(rawValue, toUnit, defaultFromUnit, doNotConvertValue);
 };
 const getStringName = (name2) => {
   if (isObject$5(name2) && !isArray$1(name2) && !isFunction$3(name2)) {
@@ -70198,6 +70207,14 @@ const validate = (value, options) => {
   }
   return null;
 };
+const isUnitKnown = (unit2 = "") => {
+  var _a;
+  return (_a = KNOWN_UNITS) == null ? void 0 : _a.includes(unit2);
+};
+const isKnownUnit = (valueWithUnit, defaultUnit) => {
+  const unitFromValue = getUnit(valueWithUnit || "");
+  return isUnitKnown(defaultUnit) && isUnitKnown(unitFromValue);
+};
 const predefinedMenuActive = "_predefinedMenuActive_1yvt4_1";
 const styles = {
   predefinedMenuActive
@@ -70246,6 +70263,7 @@ const UnitInput = ({
     () => getPreferredUnit(unitkey, unitTemplate),
     [unitkey, unitTemplate]
   );
+  const knownUnit = isKnownUnit(value, defaultUnit);
   const initDisplayUnit = initUnit || defaultUnit || propUnit;
   const previousInitUnit = usePrevious(initDisplayUnit);
   const convertedValue = safeConvertValue(
@@ -70273,14 +70291,14 @@ const UnitInput = ({
     }
     const predefinedMenuItemUnit = isValueWithUnit(el2.value) ? getUnit(el2.value) : "";
     return withUnit(
-      convertUnit(String(value), predefinedMenuItemUnit),
+      convertUnit(value, predefinedMenuItemUnit),
       predefinedMenuItemUnit
     ) === el2.value;
   });
   const getAlternativeUnits = () => {
     if (unitkey) {
       try {
-        const valueToList = String(isAutoValue ? autoValue : value ?? "");
+        const valueToList = isAutoValue ? autoValue : value ?? "";
         let alternativeUnits2 = altUnitsList(valueToList, unitkey);
         if (getValue$1(valueToList) === "") {
           return alternativeUnits2.map((unitRow) => ["", unitRow[1]]);
@@ -70339,22 +70357,25 @@ const UnitInput = ({
   useEffect(() => {
     if (initDisplayUnit) {
       let newValue, newUnit = "";
-      if (previousInitUnit !== initDisplayUnit) {
+      if (previousInitUnit !== initDisplayUnit && knownUnit) {
         newValue = safeConvertValue(
-          String(value),
+          value,
           initDisplayUnit,
           propUnit,
           doNotConvertValue
         );
         newUnit = initDisplayUnit;
-      } else if (withUnit(displayLayer.value, displayLayer.unit) !== value) {
+      } else if (withUnit(displayLayer.value, displayLayer.unit) !== value && knownUnit) {
         newValue = safeConvertValue(
-          String(value),
+          value,
           displayLayer.unit,
           propUnit,
           doNotConvertValue
         );
         newUnit = displayLayer.unit;
+      } else if (!knownUnit) {
+        newValue = getValue$1(value ?? "");
+        newUnit = initDisplayUnit;
       }
       if (newValue !== void 0) {
         setDisplayLayer({ value: newValue, unit: newUnit });
@@ -70367,10 +70388,7 @@ const UnitInput = ({
         }
       }
     }
-    const cleanValue = withUnit(
-      checkAndCleanDecimalComma(propValue),
-      (displayLayer == null ? void 0 : displayLayer.unit) || ""
-    );
+    const cleanValue = checkAndCleanDecimalComma(propValue);
     const errorMessage = validate(cleanValue, {
       allowEmpty,
       autoValue,