npm - @oliasoft-open-source/react-ui-library - Versions diffs - 4.11.0-beta-2 → 4.11.0 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (91) hide show

package/dist/404.html ADDED Viewed

@@ -0,0 +1 @@

+ <!doctype html><head><title>React UI Library</title><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1" user-scalable="no"><meta name="apple-mobile-web-app-capable" content="yes"><script type="module" crossorigin src="/react-ui-library/assets/index-DoFa61ar.js"></script><link rel="stylesheet" crossorigin href="/react-ui-library/assets/index-BpSdrNXy.css"></head><body><div id="content"></div></body>

package/dist/index.js CHANGED Viewed

@@ -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, 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";
+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";
 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;
@@ -55688,6 +55688,10 @@ const NumberInput = ({
 }) => {
   const validateInputValue = (value2) => {
     const validation = validateNumber(value2);
+    const isPlaceholder = placeholder3 && isEmptyNullOrUndefined(value2);
+    if (isPlaceholder) {
+      return { valid: true, errors: [] };
+    }
     if (allowEmpty && value2 === "" || validation.valid) {
       return { ...validation, valid: true, errors: void 0 };
     } else {
@@ -55733,7 +55737,7 @@ const NumberInput = ({
       value2.replaceAll(" ", "").replaceAll("|", "")
     );
     setDisplayValue(inputValue);
-    if ((_b = validateInputValue(inputValue)) == null ? void 0 : _b.valid) {
+    if (((_b = validateInputValue(inputValue)) == null ? void 0 : _b.valid) || placeholder3 && isEmptyNullOrUndefined(value2)) {
       const event = {
         ...evt,
         target: {
@@ -55762,7 +55766,6 @@ const NumberInput = ({
   };
   const onInputBlur = (evt) => {
     setFocus(false);
-    onChangeValue(evt);
     onBlur(evt);
   };
   const shouldDisplayRound = enableDisplayRounding && !focus2 && valid;
@@ -70172,6 +70175,10 @@ var PredefinedOptionsMenuState = /* @__PURE__ */ ((PredefinedOptionsMenuState2)
 const isWrongValue = (val) => {
   return val === "undefined" || val === void 0 || val === "" || val === "null" || val === null || val === "NaN" || isNaN(val);
 };
+const isValueWithUnknownUnit = (value) => {
+  if (!value) return false;
+  return Boolean(getUnit(value));
+};
 const checkConversion = ({
   value,
   unitkey,
@@ -70190,31 +70197,43 @@ const checkConversion = ({
   }
   return true;
 };
-const convertUnit = (stringValue = "", toUnit, unitkey, defaultFromUnit = "", doNotConvertValue = false) => {
+const convertUnit = ({
+  value: inputValue,
+  unitkey,
+  toUnit,
+  fromUnit,
+  doNotConvertValue = false,
+  exactPrecision = 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 shouldConvert = checkConversion({
-        value: valueWithUnit,
-        toUnit,
-        unitkey
-      });
-      if (shouldConvert) {
-        const result = convertSamePrecision(valueWithUnit, toUnit);
-        return getValue$1(result);
-      }
-      return getValue$1(valueWithUnit);
-    } catch (e2) {
+  const value = isValueWithUnit(inputValue) ? getValue$1(inputValue) : inputValue;
+  if (doNotConvertValue) {
+    return { value, error: null };
+  }
+  const defaultFromUnit = fromUnit || (isValueWithUnit(inputValue) ? getUnit(inputValue) : unitFromQuantity(unitkey));
+  if (!((_a2 = validateNumber(value)) == null ? void 0 : _a2.valid)) {
+    return { value: void 0, error: "Invalid number format" };
+  }
+  if (!toUnit) {
+    return { value: void 0, error: "Target unit is missing" };
+  }
+  if (!defaultFromUnit) {
+    return { value: void 0, error: "Source unit is missing" };
+  }
+  if (isWrongValue(value)) {
+    return { value: void 0, error: "Value is invalid for conversion" };
+  }
+  try {
+    const valueWithUnit = withUnit(value, defaultFromUnit);
+    if (checkConversion({ value: valueWithUnit, toUnit, unitkey })) {
+      const result = exactPrecision ? convertSamePrecision(valueWithUnit, toUnit) : convertAndGetValue(valueWithUnit, toUnit);
+      return { value: getValue$1(safeToString(result)), error: null };
     }
+    return { value: getValue$1(valueWithUnit), error: null };
+  } catch (e2) {
+    return { value: void 0, error: "Conversion not possible" };
   }
 };
-const isValueWithUnknownUnit = (value) => {
-  if (!value) return false;
-  return Boolean(getUnit(value));
-};
 const safeConvertValue = ({
   value = "",
   toUnit,
@@ -70226,18 +70245,19 @@ const safeConvertValue = ({
   const rawValue = getValue$1(value);
   const isInvalidInput = isWrongValue(rawValue);
   if (isInvalidInput) {
-    return rawValue;
+    return { value: rawValue };
   }
   if (!isWithUnit) {
-    return value;
+    return { value };
   }
-  return convertUnit(
-    rawValue,
-    toUnit,
+  return convertUnit({
+    value,
     unitkey,
-    defaultFromUnit,
-    doNotConvertValue
-  );
+    toUnit,
+    fromUnit: defaultFromUnit,
+    doNotConvertValue,
+    exactPrecision: true
+  });
 };
 const getStringName = (name2) => {
   if (isObject$5(name2) && !isArray$1(name2) && !isFunction$3(name2)) {
@@ -70317,14 +70337,14 @@ const UnitInput = ({
   const knownUnit = isKnownUnit(value, preferredUnit);
   const initDisplayUnit = initUnit || preferredUnit || propUnit;
   const previousInitUnit = usePrevious(initDisplayUnit);
-  const convertedValue = safeConvertValue({
+  const { value: convertedValue } = safeConvertValue({
     value,
     toUnit: initDisplayUnit,
     unitkey,
     defaultFromUnit: propUnit,
     doNotConvertValue
   });
-  const convertedAutoValue = safeConvertValue({
+  const { value: convertedAutoValue } = safeConvertValue({
     value: autoValue,
     toUnit: initDisplayUnit,
     unitkey,
@@ -70333,22 +70353,24 @@ const UnitInput = ({
   });
   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;
+  const derivedAllowEmpty = allowEmpty || (displayLayer == null ? void 0 : displayLayer.value) === void 0;
   const [predefinedOptionsMenuState, setPredefinedOptionsMenuState] = useState(
     initialPredefinedOption ? PredefinedOptionsMenuState.PREDEFINED : PredefinedOptionsMenuState.CUSTOM
   );
   const isAutoValue = propValue === "" && autoValue;
-  const disableInternalErrorValidationMessages = !!(disabledValidation || autoValue || placeholder3 && isEmptyNullOrUndefined(value));
+  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) : "";
-    return withUnit(
-      convertUnit(value, predefinedMenuItemUnit, unitkey),
-      predefinedMenuItemUnit
-    ) === el2.value;
+    const { value: resultValue = value } = convertUnit({
+      value: String(value),
+      unitkey,
+      toUnit: predefinedMenuItemUnit
+    });
+    return withUnit(resultValue, predefinedMenuItemUnit) === el2.value;
   });
   const getAlternativeUnits = () => {
     const valueToList = isAutoValue ? autoValue : value ?? "";
@@ -70405,22 +70427,24 @@ const UnitInput = ({
     if (initDisplayUnit) {
       let newValue, newUnit = "";
       if (previousInitUnit !== initDisplayUnit) {
-        newValue = safeConvertValue({
+        const { value: resultValue } = safeConvertValue({
           value,
           toUnit: initDisplayUnit,
           unitkey,
           defaultFromUnit: propUnit,
           doNotConvertValue
         });
+        newValue = resultValue;
         newUnit = initDisplayUnit;
       } else if (withUnit(displayLayer.value, displayLayer.unit) !== value) {
-        newValue = safeConvertValue({
+        const { value: resultValue } = safeConvertValue({
           value,
           toUnit: displayLayer.unit,
           unitkey,
           defaultFromUnit: propUnit,
           doNotConvertValue
         });
+        newValue = resultValue;
         newUnit = displayLayer.unit;
       }
       if (newValue !== void 0) {
@@ -70490,6 +70514,29 @@ const UnitInput = ({
     const dynamicOptions = predefinedOptions.map(createPredefinedOption);
     sectionsPredefinedMenu = [...sectionsPredefinedMenu, ...dynamicOptions];
   }
+  const getPlaceholder = (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
+      });
+      return resultValue;
+    }
+    return placeholder22;
+  };
   return /* @__PURE__ */ jsx(
     "div",
     {
@@ -70530,13 +70577,7 @@ const UnitInput = ({
             name: stringName,
             testId,
             disabled: disabled2,
-            placeholder: isAutoValue ? safeConvertValue({
-              value: autoValue,
-              toUnit: displayLayer.unit,
-              unitkey,
-              defaultFromUnit: propAutoUnit,
-              doNotConvertValue
-            }) : placeholder3,
+            placeholder: getPlaceholder(placeholder3),
             value: displayLayer.value,
             onChange: onSetValue,
             onFocus,
@@ -70591,29 +70632,12 @@ const UnitInput = ({
 const normalizeUnits = (unitConfig) => unitConfig.reduce(
   ({ preferredUnits, storageUnits }, { unitKey, preferredUnit, storageUnit }) => {
     const { unitTemplate = null } = useUnitContext() ?? {};
-    console.log("unitTemplate", unitTemplate);
-    console.log("unitTemplate?.[unitKey]", unitTemplate == null ? void 0 : unitTemplate[unitKey]);
-    preferredUnits[unitKey] = preferredUnit ?? (unitTemplate == null ? void 0 : unitTemplate[unitKey]);
+    preferredUnits[unitKey] = preferredUnit ?? getPreferredUnit(unitKey, unitTemplate);
     storageUnits[unitKey] = storageUnit;
-    console.log("preferredUnits", preferredUnits);
     return { preferredUnits, storageUnits };
   },
   { preferredUnits: {}, storageUnits: {} }
 );
-const tryConvertValue = (value, unitKey, selectedUnit, storageUnit) => {
-  if (checkConversion({
-    value,
-    unitkey: unitKey,
-    toUnit: selectedUnit
-  })) {
-    try {
-      return convertAndGetValue(value, selectedUnit, storageUnit);
-    } catch {
-      return value;
-    }
-  }
-  return value;
-};
 const convertVisibleRows = ({
   headers,
   rows,
@@ -70655,7 +70679,13 @@ const convertVisibleRows = ({
         const selectedUnit = selectedUnits[unitKey];
         const storageUnit = storageUnits[unitKey];
         const unitChanged = selectedUnit !== storageUnit;
-        const convertedValue = unitChanged ? tryConvertValue(value, unitKey, selectedUnit, storageUnit) : cell2.value;
+        const { value: resultValue = value } = convertUnit({
+          value: safeToString(value),
+          unitkey: unitKey,
+          toUnit: selectedUnit,
+          fromUnit: storageUnit
+        });
+        const convertedValue = unitChanged ? resultValue : cell2.value;
         const formattedDisplayValue = formatDisplayValue ? formatDisplayValue(convertedValue) : convertedValue;
         return {
           ...cell2,
@@ -70670,7 +70700,13 @@ const convertVisibleRows = ({
             const selectedUnit2 = selectedUnits[unitKey];
             const unitChanged2 = selectedUnit2 !== storageUnit2;
             const nextUnit = convertBackToStorageUnit ? storageUnit2 : selectedUnit2;
-            const nextValueConverted = unitChanged2 ? tryConvertValue(value2, unitKey, nextUnit, selectedUnit2) : value2;
+            const { value: resultValue2 = value2 } = convertUnit({
+              value: String(value2),
+              unitkey: unitKey,
+              toUnit: nextUnit,
+              fromUnit: selectedUnit2
+            });
+            const nextValueConverted = unitChanged2 ? resultValue2 : value2;
             if ("onChange" in cell2) {
               const { onChange } = cell2;
               const event = {