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

package/dist/index.d.ts

@@ -1551,7 +1551,7 @@ declare interface IUnitConfigItem {
     }) => void;
     unitKey: string;
     storageUnit: string;
-    preferredUnit: string;
+    preferredUnit?: string;
 }
 
 export declare interface IUnitInputProps {

package/dist/index.js

@@ -55688,10 +55688,6 @@ 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 {
@@ -55737,7 +55733,7 @@ const NumberInput = ({
       value2.replaceAll(" ", "").replaceAll("|", "")
     );
     setDisplayValue(inputValue);
-    if (((_b = validateInputValue(inputValue)) == null ? void 0 : _b.valid) || placeholder3 && isEmptyNullOrUndefined(value2)) {
+    if ((_b = validateInputValue(inputValue)) == null ? void 0 : _b.valid) {
       const event = {
         ...evt,
         target: {
@@ -70342,7 +70338,7 @@ const UnitInput = ({
     initialPredefinedOption ? PredefinedOptionsMenuState.PREDEFINED : PredefinedOptionsMenuState.CUSTOM
   );
   const isAutoValue = propValue === "" && autoValue;
-  const disableInternalErrorValidationMessages = !!(disabledValidation || autoValue);
+  const disableInternalErrorValidationMessages = !!(disabledValidation || autoValue || placeholder3 && isEmptyNullOrUndefined(value));
   const foundPredefinedMenuOption = predefinedOptions && predefinedOptions.find((el2) => {
     if (!(el2 == null ? void 0 : el2.value)) return;
     if (selectedPredefinedOptionKey) {
@@ -70494,27 +70490,6 @@ const UnitInput = ({
     const dynamicOptions = predefinedOptions.map(createPredefinedOption);
     sectionsPredefinedMenu = [...sectionsPredefinedMenu, ...dynamicOptions];
   }
-  const getPlaceholder = (placeholder22) => {
-    if (isAutoValue) {
-      return safeConvertValue({
-        value: autoValue,
-        toUnit: displayLayer.unit,
-        unitkey,
-        defaultFromUnit: propAutoUnit,
-        doNotConvertValue
-      });
-    } else if (isValueWithUnit(placeholder22)) {
-      const placeholderUnit = getUnit(placeholder22);
-      return safeConvertValue({
-        value: placeholder22,
-        toUnit: displayLayer.unit,
-        unitkey,
-        defaultFromUnit: placeholderUnit,
-        doNotConvertValue
-      });
-    }
-    return placeholder22;
-  };
   return /* @__PURE__ */ jsx(
     "div",
     {
@@ -70555,7 +70530,13 @@ const UnitInput = ({
             name: stringName,
             testId,
             disabled: disabled2,
-            placeholder: getPlaceholder(placeholder3),
+            placeholder: isAutoValue ? safeConvertValue({
+              value: autoValue,
+              toUnit: displayLayer.unit,
+              unitkey,
+              defaultFromUnit: propAutoUnit,
+              doNotConvertValue
+            }) : placeholder3,
             value: displayLayer.value,
             onChange: onSetValue,
             onFocus,
@@ -70609,12 +70590,30 @@ const UnitInput = ({
 };
 const normalizeUnits = (unitConfig) => unitConfig.reduce(
   ({ preferredUnits, storageUnits }, { unitKey, preferredUnit, storageUnit }) => {
-    preferredUnits[unitKey] = preferredUnit;
+    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]);
     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,
@@ -70656,7 +70655,7 @@ const convertVisibleRows = ({
         const selectedUnit = selectedUnits[unitKey];
         const storageUnit = storageUnits[unitKey];
         const unitChanged = selectedUnit !== storageUnit;
-        const convertedValue = unitChanged ? convertAndGetValue(value, selectedUnit, storageUnit) : cell2.value;
+        const convertedValue = unitChanged ? tryConvertValue(value, unitKey, selectedUnit, storageUnit) : cell2.value;
         const formattedDisplayValue = formatDisplayValue ? formatDisplayValue(convertedValue) : convertedValue;
         return {
           ...cell2,
@@ -70671,7 +70670,7 @@ const convertVisibleRows = ({
             const selectedUnit2 = selectedUnits[unitKey];
             const unitChanged2 = selectedUnit2 !== storageUnit2;
             const nextUnit = convertBackToStorageUnit ? storageUnit2 : selectedUnit2;
-            const nextValueConverted = unitChanged2 ? convertAndGetValue(value2, nextUnit, selectedUnit2) : value2;
+            const nextValueConverted = unitChanged2 ? tryConvertValue(value2, unitKey, nextUnit, selectedUnit2) : value2;
             if ("onChange" in cell2) {
               const { onChange } = cell2;
               const event = {