@oliasoft-open-source/react-ui-library 4.17.0-beta-3 → 4.18.0-beta-1

package/dist/index.js

@@ -16,7 +16,7 @@ import * as PropTypes from "prop-types";
 import PropTypes__default from "prop-types";
 import ReactDOM, { createPortal, flushSync as flushSync$1, unstable_batchedUpdates, render } from "react-dom";
 import { noop as noop$2, set, get as get$2, isString as isString$3, isNumber as isNumber$1, isBoolean as isBoolean$1, isFunction as isFunction$3, isEmpty, isArray as isArray$1, toNumber, debounce as debounce$3, isObject as isObject$5, isEqual as isEqual$3 } from "lodash";
-import { toString as toString$1, isScientificStringNum, roundToPrecision, toNum, validateNumber, cleanNumStr, stripLeadingZeros, roundToFixed, roundByMagnitude, unitFromQuantity, getUnit, KNOWN_UNITS, ALT_UNITS, isValueWithUnit, getValue, withUnit, convertSamePrecision, convertAndGetValue, 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, validateNumber, cleanNumStr, stripLeadingZeros, roundToFixed, roundByMagnitude, unitFromQuantity, getUnit, KNOWN_UNITS, ALT_UNITS, isValueWithUnit, getValue, withUnit, convertSamePrecision, convertAndGetValue, split as split$1, label as label$b, isValidNum, getAltUnitsListByQuantity, altUnitsList, withPrettyUnitLabel, 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;
@@ -14730,6 +14730,7 @@ const List = ({
       ),
       "data-testid": testId,
       style: { height: height2, marginBottom },
+      id: "scrollableDiv",
       children: [
         !noHeader && /* @__PURE__ */ jsx(
           ListHeading,
@@ -66179,6 +66180,10 @@ const checkConversion = ({
   if (!availableUnits.includes(toUnit)) {
     return false;
   }
+  const valueUnit = getUnit(String(value));
+  if (valueUnit && !availableUnits.includes(valueUnit)) {
+    return false;
+  }
   return true;
 };
 const convertUnit = ({
@@ -66231,6 +66236,14 @@ const safeConvertValue = ({
 }) => {
   const rawValue = getValue(value);
   const isInvalidInput = isWrongValue(rawValue);
+  const shouldConvert = checkConversion({
+    value,
+    unitkey,
+    toUnit
+  });
+  if (!shouldConvert) {
+    return { value: rawValue };
+  }
   if (isValueWithUnknownUnit(value)) {
     return { value: rawValue };
   }
@@ -66452,6 +66465,22 @@ const UnitInput = ({
   const createPredefinedOption = (el2) => {
     const elementValue = (el2 == null ? void 0 : el2.value) ? el2.value : "";
     const [value2 = "", unit2 = ""] = isValueWithUnit(elementValue) ? split$1(elementValue) : [elementValue];
+    let description2 = withPrettyUnitLabel(elementValue);
+    const shouldConvert = checkConversion({
+      value: elementValue,
+      unitkey,
+      toUnit: unit2
+    });
+    if (shouldConvert) {
+      const { value: value3 = "" } = safeConvertValue({
+        value: elementValue,
+        toUnit: preferredUnit,
+        unitkey,
+        defaultFromUnit: unit2,
+        doNotConvertValue: noConversion
+      });
+      description2 = withPrettyUnitLabel(withUnit(value3, preferredUnit));
+    }
     return {
       type: MenuType.OPTION,
       inline: true,
@@ -66473,7 +66502,7 @@ const UnitInput = ({
         /* @__PURE__ */ jsx(Text, { children: el2.label }),
         /* @__PURE__ */ jsx(Spacer, { width: "20px", height: "0" })
       ] }),
-      description: isValueWithUnit(elementValue) ? `${value2} ${unit2}` : elementValue,
+      description: description2,
       selected: foundPredefinedMenuOption === el2 && predefinedOptionsMenuState === PredefinedOptionsMenuState.PREDEFINED
     };
   };