npm - @oliasoft-open-source/react-ui-library - Versions diffs - 4.2.0-beta-1 → 4.2.0-beta-3 - Mend

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

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 (63) hide show

package/dist/assets/{index-9914ac27.js → index-26f804a8.js} RENAMED Viewed

@@ -77535,6 +77535,7 @@ const styles$3 = {
   placeholderContainer,
   placeholder
 };
+requireUnits();
 const predefinedMenuActive = "_predefinedMenuActive_1yvt4_1";
 const styles$2 = {
   predefinedMenuActive

package/dist/index.d.ts CHANGED Viewed

@@ -1017,7 +1017,7 @@ export declare interface IPortalProps {
 declare interface IPredefinedOption {
     value: string;
     label: string;
-    valueKey: string;
+    valueKey?: string;
 }
 export declare interface IPrintHeaderProps {
@@ -1492,7 +1492,7 @@ export declare interface IUnitInputProps {
     placeholder?: string;
     disabled?: boolean;
     disabledUnit?: boolean;
-    error?: string | null;
+    error?: string | null | boolean;
     left?: boolean;
     small?: boolean;
     width?: string | number;
@@ -1518,7 +1518,7 @@ export declare interface IUnitInputProps {
     onSwitchUnit?: (unit: string) => void;
     onClick?: MouseEventHandler<HTMLInputElement>;
     onFocus?: FocusEventHandler<HTMLInputElement>;
-    unitTemplate: Record<string, any>;
+    unitTemplate?: Record<string, any>;
 }
 export declare const Label: ({ label, width, helpText, helpTextMaxWidth, onClickHelp, lock, info, libraryIcon, labelLeft, }: ILabelProps) => JSX_2.Element;

package/dist/index.html CHANGED Viewed

	@@ -1 +1 @@
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-~~9914ac27~~.js"></script><link rel="stylesheet" href="/react-ui-library/assets/index-0d78a198.css"></head><body><div id="content"></div></body>
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-26f804a8.js"></script><link rel="stylesheet" href="/react-ui-library/assets/index-0d78a198.css"></head><body><div id="content"></div></body>

package/dist/index.js CHANGED Viewed

@@ -11,7 +11,8 @@ import * as PropTypes from "prop-types";
 import PropTypes__default from "prop-types";
 import ReactDOM, { createPortal, unstable_batchedUpdates, render } from "react-dom";
 import _$1, { 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, isObjectLike, has as has$1 } from "lodash";
-import { validateNumber, cleanNumStr, unitFromQuantity, isValueWithUnit, convertSamePrecision, withUnit, getValue as getValue$1, split as split$1, getUnit, checkAndCleanDecimalComma, label as label$b, altUnitsList, isNumeric, isValidNum } from "@oliasoft-open-source/units";
+import { validateNumber, cleanNumStr, unitFromQuantity, isValueWithUnit, convertSamePrecision, withUnit, getValue as getValue$1, split as split$1, getUnit, checkAndCleanDecimalComma, label as label$b, altUnitsList } from "@oliasoft-open-source/units";
+import { isValueWithUnit as isValueWithUnit$1 } from "@oliasoft-open-source/units/dist/units";
 const global$2 = "";
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 function getDefaultExportFromCjs(x2) {
@@ -70122,7 +70123,7 @@ const getPreferredUnit = (unitkey, unitTemplate) => {
   const preferredUnit = unitTemplate == null ? void 0 : unitTemplate[unitkey];
   if (!preferredUnit) {
     console.log(
-      `Warning: unitTemplate is ${unitTemplate}, unitkey is ${unitkey}`
+      `Warning: 'unitTemplate' does not define a preferred unit for '${unitkey}'. Defaulting to standard unit.`
     );
     return unitFromQuantity(unitkey) ?? "";
   }
@@ -70168,6 +70169,35 @@ const getErrorMessage = (error2) => {
     return null;
   }
 };
+const hasLeadingZeroes = (value) => {
+  return value.search(RegExp(/(^0{2}\.)|(^0+[1-9])/g)) === 0;
+};
+const validate = (value, options) => {
+  var _a;
+  const {
+    allowEmpty = false,
+    autoValue,
+    placeholder: placeholder3,
+    disabledValidation = false
+  } = options || {};
+  const stringValue = String(value);
+  if (disabledValidation || autoValue || placeholder3) {
+    return null;
+  }
+  const cleanValue = isValueWithUnit$1(stringValue) ? getValue$1(stringValue) : stringValue;
+  if (allowEmpty && cleanValue === "") {
+    return null;
+  }
+  if (hasLeadingZeroes(cleanValue)) {
+    return "Invalid number format due to leading zeroes";
+  }
+  const validationErrors = validateNumber(cleanValue);
+  if (!validationErrors.valid) {
+    const firstError = ((_a = validationErrors == null ? void 0 : validationErrors.errors) == null ? void 0 : _a[0]) ?? null;
+    return getErrorMessage(firstError);
+  }
+  return null;
+};
 const predefinedMenuActive = "_predefinedMenuActive_1yvt4_1";
 const styles = {
   predefinedMenuActive
@@ -70212,7 +70242,10 @@ const UnitInput = ({
   const runAfterUpdate = useRunAfterUpdate();
   const [propValue = "", propUnit = ""] = value !== void 0 ? split$1(value) : [];
   const propAutoUnit = autoValue ? getUnit(autoValue) : "";
-  const defaultUnit = getPreferredUnit(unitkey, unitTemplate);
+  const defaultUnit = useMemo$1(
+    () => getPreferredUnit(unitkey, unitTemplate),
+    [unitkey, unitTemplate]
+  );
   const initDisplayUnit = initUnit || defaultUnit || propUnit;
   const previousInitUnit = usePrevious(initDisplayUnit);
   const convertedValue = safeConvertValue(
@@ -70259,7 +70292,6 @@ const UnitInput = ({
     }
   };
   const onSetValue = (evt) => {
-    var _a;
     const stringName2 = getStringName(name2);
     const input2 = evt.target;
     const { value: inputValue, selectionStart: currentCursorPosition } = input2;
@@ -70268,16 +70300,13 @@ const UnitInput = ({
     );
     const newValue = withUnit(cleanInputValue, (displayLayer == null ? void 0 : displayLayer.unit) || "");
     const rawValue = getValue$1(newValue);
-    let validation = validateNumber(rawValue);
-    const isLeadingZeroes = rawValue.search(RegExp(/(^0{2}\.)|(^0+[1-9])/g)) === 0;
-    if (!(allowEmpty && rawValue === "" || autoValue) && !isNumeric(rawValue) || !isValidNum(rawValue) || isLeadingZeroes) {
-      validation = {
-        ...validation,
-        valid: false,
-        errors: ["Invalid number format"]
-      };
-    }
-    if (validation.valid || rawValue === "" && autoValue || allowEmpty && rawValue === "") {
+    const validationResult = validate(rawValue, {
+      allowEmpty,
+      autoValue,
+      placeholder: placeholder3,
+      disabledValidation
+    });
+    if (validationResult === null) {
       onChange({
         target: {
           value: newValue,
@@ -70289,11 +70318,9 @@ const UnitInput = ({
       setValidationError(null);
       validationCallback(stringName2, null);
     } else {
-      const firstError = ((_a = validation == null ? void 0 : validation.errors) == null ? void 0 : _a[0]) ?? null;
-      const errorMessage = getErrorMessage(firstError);
       setDisplayLayer({ value: cleanInputValue, unit: displayLayer.unit });
-      setValidationError(errorMessage);
-      validationCallback(getStringName(name2), errorMessage);
+      setValidationError(validationResult);
+      validationCallback(stringName2, validationResult);
     }
     runAfterUpdate(() => {
       input2.selectionStart = currentCursorPosition;
@@ -70310,7 +70337,6 @@ const UnitInput = ({
     }
   };
   useEffect(() => {
-    var _a;
     if (initDisplayUnit) {
       let newValue, newUnit = "";
       if (previousInitUnit !== initDisplayUnit) {
@@ -70345,14 +70371,13 @@ const UnitInput = ({
       checkAndCleanDecimalComma(propValue),
       (displayLayer == null ? void 0 : displayLayer.unit) || ""
     );
-    const validation = validateNumber(getValue$1(cleanValue));
-    if (!validation.valid && !disabledValidation) {
-      const firstError = ((_a = validation == null ? void 0 : validation.errors) == null ? void 0 : _a[0]) ?? null;
-      const errorMessage = getErrorMessage(firstError);
-      setValidationError(errorMessage);
-    } else {
-      setValidationError(null);
-    }
+    const errorMessage = validate(cleanValue, {
+      allowEmpty,
+      autoValue,
+      placeholder: placeholder3,
+      disabledValidation
+    });
+    setValidationError(errorMessage);
   }, [initDisplayUnit, value, error2, shouldLinkAutomaticly]);
   const alternativeUnits = getAlternativeUnits();
   const displayUnitLabel = label$b(displayLayer.unit) || displayLayer.unit || "";