@oliasoft-open-source/react-ui-library 4.10.0-beta-1 → 4.10.1-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, 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 { isScientificStringNum, roundToPrecision, roundToFixed, toString as toString$1, validateNumber, stripLeadingZeros, cleanNumStr, unitFromQuantity, isValueWithUnit, withUnit, convertSamePrecision, getValue as getValue$1, getUnit, KNOWN_UNITS, split as split$1, label as label$b, altUnitsList, convertAndGetValue, getUnitsForQuantity, roundByMagnitudeToFixed } from "@oliasoft-open-source/units";
+import { toString as toString$1, isScientificStringNum, roundToPrecision, toNum, roundToFixed, validateNumber, cleanNumStr, stripLeadingZeros, unitFromQuantity, isValueWithUnit, withUnit, convertSamePrecision, getValue as getValue$1, getUnit, KNOWN_UNITS, split as split$1, label as label$b, isValidNum, altUnitsList, convertAndGetValue, 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;
@@ -55697,11 +55697,13 @@ const InputCell = ({
   );
 };
 const COSMETIC_ROUNDING_DEFAULT_PRECISION = 14;
+const safeToString = (value) => String(toString$1(value));
 const roundNumberCosmetic = (value) => {
   const isScientific = isScientificStringNum(value);
-  return !isScientific ? roundToPrecision(value, COSMETIC_ROUNDING_DEFAULT_PRECISION) : value;
+  return !isScientific ? safeToString(
+    roundToPrecision(toNum(value), COSMETIC_ROUNDING_DEFAULT_PRECISION)
+  ) : value;
 };
-const safeToString = (value) => String(toString$1(value));
 const getStringName$1 = (name2) => {
   if (!name2) return "";
   if (typeof name2 === "string") {
@@ -55740,11 +55742,6 @@ const NumberInput = ({
   roundDisplayValue,
   disableInternalErrorValidationMessages = false
 }) => {
-  const inputRef = useRef(null);
-  const [displayValue, setDisplayValue] = useState(safeToString(value));
-  const [focus2, setFocus] = useState(false);
-  const [pristine, setPristine] = useState(true);
-  const stringName = getStringName$1(name2);
   const validateInputValue = (value2) => {
     const validation = validateNumber(value2);
     if (allowEmpty && value2 === "" || validation.valid) {
@@ -55753,11 +55750,26 @@ const NumberInput = ({
       return validation;
     }
   };
+  const cosmeticRound = (value2) => {
+    var _a2;
+    const displayValueEndsWithZero = !!(value2 == null ? void 0 : value2.endsWith("0"));
+    const shouldCosmeticallyRound = enableCosmeticRounding && // only when prop is enabled
+    value2 && // not when empty typed value
+    !displayValueEndsWithZero && // not when intentionally trying to type trailing zeros as interim values (OW-17109)
+    ((_a2 = validateInputValue(value2)) == null ? void 0 : _a2.valid);
+    const valueWithCosmeticRounding = shouldCosmeticallyRound ? roundNumberCosmetic(value2) : value2;
+    return safeToString(valueWithCosmeticRounding);
+  };
+  const inputRef = useRef(null);
+  const [displayValue, setDisplayValue] = useState(
+    cosmeticRound(safeToString(value))
+  );
+  const [focus2, setFocus] = useState(false);
+  const stringName = getStringName$1(name2);
   const { valid, errors: errors2 } = validateInputValue(displayValue);
   const firstError = errors2 && errors2.length && !disableInternalErrorValidationMessages ? errors2[0] : null;
   useEffect(() => {
-    setDisplayValue(safeToString(value));
-    setPristine(true);
+    setDisplayValue(cosmeticRound(safeToString(value)));
   }, [value, enableCosmeticRounding, enableDisplayRounding]);
   useEffect(() => {
     if (!focus2 && !valid) {
@@ -55767,27 +55779,24 @@ const NumberInput = ({
     }
   }, [focus2, valid, error2]);
   const onChangeValue = (evt) => {
-    if (valid && !pristine) {
+    var _a2, _b;
+    const value2 = evt instanceof KeyboardEvent ? displayValue : (_a2 = evt == null ? void 0 : evt.target) == null ? void 0 : _a2.value;
+    const inputValue = cleanNumStr(
+      value2.replaceAll(" ", "").replaceAll("|", "")
+    );
+    setDisplayValue(inputValue);
+    if ((_b = validateInputValue(inputValue)) == null ? void 0 : _b.valid) {
       const event = {
         ...evt,
         target: {
           ...evt.target,
-          value: stripLeadingZeros(safeToString(displayValue)),
+          value: stripLeadingZeros(safeToString(inputValue)),
           name: stringName
         }
       };
       onChange(event);
     }
   };
-  const onSetValue = (evt) => {
-    const input2 = evt.target;
-    const { value: value2 } = input2;
-    const inputValue = cleanNumStr(
-      value2.replaceAll(" ", "").replaceAll("|", "")
-    );
-    setDisplayValue(inputValue);
-    setPristine(false);
-  };
   useEffect(() => {
     if (inputRef && (inputRef == null ? void 0 : inputRef.current) && enableDisplayRounding && focus2) {
       const textInput = inputRef.current;
@@ -55810,12 +55819,6 @@ const NumberInput = ({
   };
   const shouldDisplayRound = enableDisplayRounding && !focus2 && valid;
   const valueWithDisplayRounding = shouldDisplayRound ? roundDisplayValue ? safeToString(roundDisplayValue(displayValue)) : roundToFixed(displayValue, 2) : displayValue;
-  const displayValueEndsWithZero = !!(valueWithDisplayRounding == null ? void 0 : valueWithDisplayRounding.endsWith("0"));
-  const shouldCosmeticallyRound = enableCosmeticRounding && // only when prop is enabled
-  valueWithDisplayRounding && // not when empty typed value
-  !displayValueEndsWithZero && // not when intentionally trying to type trailing zeros as interim values (OW-17109)
-  valid;
-  const valueWithCosmeticRounding = shouldCosmeticallyRound ? roundNumberCosmetic(valueWithDisplayRounding) : valueWithDisplayRounding;
   return /* @__PURE__ */ jsx(
     KeyboardEventHandler,
     {
@@ -55829,11 +55832,11 @@ const NumberInput = ({
           testId,
           disabled: disabled2,
           placeholder: placeholder3,
-          value: valueWithCosmeticRounding,
-          onChange: onSetValue,
+          value: valueWithDisplayRounding,
+          onChange: onChangeValue,
           onFocus: onInputFocus,
           onBlur: onInputBlur,
-          error: !focus2 && (firstError || error2),
+          error: firstError || error2,
           warning: warning2,
           right: !left2,
           small: small2,
@@ -70554,7 +70557,7 @@ const UnitInput = ({
               small: small2,
               sections: alternativeUnits.map(([value2, altUnit, label2]) => {
                 const displayUnit = label2 || altUnit || "";
-                const safeValue = !isNaN(Number(value2)) ? value2 : "";
+                const safeValue = isValidNum(value2) ? value2 : "";
                 const displayValue = enableCosmeticRounding ? roundNumberCosmetic(safeValue) : safeValue;
                 return {
                   type: "Option",