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

package/dist/index.d.ts

@@ -1577,6 +1577,7 @@ export declare interface IUnitInputProps {
     convertBackToStorageUnit?: boolean;
     enableCosmeticRounding?: boolean;
     enableDisplayRounding?: boolean;
+    roundDisplayValue?: (args: TStringOrNumber) => TStringOrNumber;
 }
 
 declare interface IUnitTable extends Omit<ITableProps['table'], 'rows'> {
@@ -1870,7 +1871,7 @@ declare type TUnitTableCellShape = TCellShape | IUnitTableStaticCell | IUnitTabl
 
 declare type UnitContextType = any;
 
-export declare const UnitInput: ({ name, placeholder, disabled, disabledUnit, error, left, small, width, value, unitkey, initUnit, noConversion, onChange, onClick, onFocus, onSwitchUnit, unitTemplate, testId, warning, predefinedOptions, initialPredefinedOption, validationCallback, disabledValidation, allowEmpty, convertBackToStorageUnit, enableCosmeticRounding, enableDisplayRounding, }: IUnitInputProps) => JSX_2.Element;
+export declare const UnitInput: ({ name, placeholder, disabled, disabledUnit, error, left, small, width, value, unitkey, initUnit, noConversion, onChange, onClick, onFocus, onSwitchUnit, unitTemplate, testId, warning, predefinedOptions, initialPredefinedOption, validationCallback, disabledValidation, allowEmpty, convertBackToStorageUnit, enableCosmeticRounding, enableDisplayRounding, roundDisplayValue, }: IUnitInputProps) => JSX_2.Element;
 
 export declare const UnitTable: ({ table, unitConfig, convertBackToStorageUnit, enableCosmeticRounding, enableDisplayRounding, }: IUnitTableProps) => JSX_2.Element;
 

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, isNil, isEqual as isEqual$4 } from "lodash";
-import { toString as toString$1, isScientificStringNum, roundToPrecision, toNum, roundToFixed, validateNumber, cleanNumStr, stripLeadingZeros, unitFromQuantity, getUnit, KNOWN_UNITS, ALT_UNITS, isValueWithUnit, getValue as getValue$1, 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 as getValue$1, withUnit, convertSamePrecision, convertAndGetValue, 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;
@@ -55742,8 +55742,9 @@ const NumberInput = ({
     setFocus(false);
     onBlur(evt);
   };
+  const defaultDisplayRound = (value2) => isInTable2 ? roundToFixed(value2, 2) : roundByMagnitude(value2, 4);
   const shouldDisplayRound = enableDisplayRounding && !focus2 && valid;
-  const valueWithDisplayRounding = shouldDisplayRound ? roundDisplayValue ? safeToString(roundDisplayValue(displayValue)) : roundToFixed(displayValue, 2) : displayValue;
+  const valueWithDisplayRounding = shouldDisplayRound ? roundDisplayValue ? safeToString(roundDisplayValue(displayValue)) : defaultDisplayRound(value) : displayValue;
   return /* @__PURE__ */ jsx(
     KeyboardEventHandler,
     {
@@ -55777,7 +55778,11 @@ const NumberInput = ({
     }
   );
 };
-const NumberInputCell = ({ cell: cell2, testId }) => {
+const NumberInputCell = ({
+  cell: cell2,
+  columnAlignment,
+  testId
+}) => {
   return /* @__PURE__ */ jsx(
     NumberInput,
     {
@@ -55794,7 +55799,7 @@ const NumberInputCell = ({ cell: cell2, testId }) => {
       warning: cell2.warning,
       disabled: cell2.disabled,
       isInTable: true,
-      left: cell2.left,
+      left: cell2.left ?? columnAlignment === Align.LEFT,
       tabIndex: cell2.disabled ? -1 : 0,
       testId,
       tooltip: cell2.tooltip,
@@ -55861,7 +55866,14 @@ const InputCellWrapper = ({
           columnAlignment,
           testId
         }
-      ) : cell2.type === "NumberInput" ? /* @__PURE__ */ jsx(NumberInputCell, { cell: cell2, testId }) : cell2.type === "DateInput" ? /* @__PURE__ */ jsx(InputCell, { cell: cell2, testId, type: "date" }) : cell2.type === "Select" ? /* @__PURE__ */ jsx(
+      ) : cell2.type === "NumberInput" ? /* @__PURE__ */ jsx(
+        NumberInputCell,
+        {
+          cell: cell2,
+          columnAlignment,
+          testId
+        }
+      ) : cell2.type === "DateInput" ? /* @__PURE__ */ jsx(InputCell, { cell: cell2, testId, type: "date" }) : cell2.type === "Select" ? /* @__PURE__ */ jsx(
         SelectCell,
         {
           cell: cell2,
@@ -70296,6 +70308,7 @@ const PredefinedOptionsMenu = ({
   const createPredefinedOption = (el2) => {
     const convertedValue = convertPredefinedOptions(el2);
     const [inputValue = "", unit2 = ""] = split$1(convertedValue);
+    console.log(foundPredefinedMenuOption);
     return {
       type: MenuType.OPTION,
       inline: true,
@@ -70312,7 +70325,7 @@ const PredefinedOptionsMenu = ({
         /* @__PURE__ */ jsx(Spacer, { width: "20px", height: "0" })
       ] }),
       description: `${inputValue} ${unit2}`,
-      selected: withUnit(displayLayer == null ? void 0 : displayLayer.value, (displayLayer == null ? void 0 : displayLayer.unit) ?? "") === convertedValue && predefinedOptionsMenuState === PredefinedOptionsMenuState.PREDEFINED
+      selected: isEqual$4(foundPredefinedMenuOption, el2) && predefinedOptionsMenuState === PredefinedOptionsMenuState.PREDEFINED
     };
   };
   const initialPredefinedOptionObject = useMemo$1(() => {
@@ -70420,7 +70433,8 @@ const UnitInput = ({
   allowEmpty = false,
   convertBackToStorageUnit = false,
   enableCosmeticRounding = true,
-  enableDisplayRounding = false
+  enableDisplayRounding = false,
+  roundDisplayValue
 }) => {
   const context2 = useUnitContext();
   const runAfterUpdate = useRunAfterUpdate();
@@ -70595,6 +70609,7 @@ const UnitInput = ({
             validationCallback: (_name, error22) => validationCallback(stringName, error22),
             enableCosmeticRounding,
             enableDisplayRounding,
+            roundDisplayValue,
             groupOrder: predefinedOptions ? "middle" : "first",
             disableInternalErrorValidationMessages,
             small: small2
@@ -70697,8 +70712,7 @@ const convertVisibleRows = ({
         return {
           ...cell2,
           value: formattedDisplayValue,
-          enableCosmeticRounding: enableCosmeticRounding && unitChanged,
-          //comment on unitChanged rationale would be good
+          enableCosmeticRounding,
           enableDisplayRounding,
           roundDisplayValue,
           onChange: (evt) => {