@helpdice/ui 2.6.1-beta.3 → 2.6.1-beta.4

package/dist/auto-complete/index.js

@@ -3203,7 +3203,7 @@ var repositionCursor = function repositionCursor(_ref) {
   };
 };
 
-var _excluded$5 = ["allowDecimals", "allowNegativeValue", "id", "name", "className", "customInput", "decimalsLimit", "defaultValue", "disabled", "maxLength", "value", "fixedDecimalLength", "placeholder", "decimalScale", "prefix", "suffix", "intlConfig", "fullWidth", "step", "min", "max", "disableGroupSeparators", "disableAbbreviations", "decimalSeparator", "groupSeparator", "onChange", "onFocus", "onBlur", "onKeyDown", "onKeyUp", "transformRawValue", "formatValueOnBlur", "children"];
+var _excluded$5 = ["allowDecimals", "allowNegativeValue", "id", "name", "className", "customInput", "decimalsLimit", "defaultValue", "disabled", "maxLength", "value", "onValueChange", "fixedDecimalLength", "placeholder", "decimalScale", "prefix", "suffix", "intlConfig", "fullWidth", "step", "min", "max", "disableGroupSeparators", "disableAbbreviations", "decimalSeparator", "groupSeparator", "onChange", "onFocus", "onBlur", "onKeyDown", "onKeyUp", "transformRawValue", "formatValueOnBlur", "children"];
 var InputCurrency = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var _ref$allowDecimals = _ref.allowDecimals,
     allowDecimals = _ref$allowDecimals === void 0 ? true : _ref$allowDecimals,
@@ -3219,6 +3219,7 @@ var InputCurrency = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
     userMaxLength = _ref.maxLength,
     userValue = _ref.value,
+    onValueChange = _ref.onValueChange,
     fixedDecimalLength = _ref.fixedDecimalLength,
     placeholder = _ref.placeholder,
     decimalScale = _ref.decimalScale,
@@ -3339,7 +3340,7 @@ var InputCurrency = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       return;
     }
     if (stringValue === '' || stringValue === '-' || stringValue === decimalSeparator) {
-      onChange && onChange(undefined, name, {
+      onValueChange && onValueChange(undefined, name, {
         "float": null,
         formatted: '',
         value: ''
@@ -3377,15 +3378,15 @@ var InputCurrency = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     //     });
 
     setStateValue(formattedValue);
-    if (onChange) {
+    if (onValueChange) {
       var values = {
         "float": numberValue,
         formatted: formattedValue,
         value: stringValue
       };
-      onChange(stringValue, name, values);
+      onValueChange(stringValue, name, values);
     }
-    // onChange && onChange(stringValue);
+    // onValueChange && onValueChange(stringValue);
   };
 
   /**
@@ -3396,6 +3397,7 @@ var InputCurrency = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       value = _event$target.value,
       selectionStart = _event$target.selectionStart;
     processChange(value, selectionStart);
+    if (onChange) onChange(event);
   };
 
   /**
@@ -3427,8 +3429,8 @@ var InputCurrency = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     var formattedValue = formatValue(_objectSpread2(_objectSpread2({}, formatValueOptions), {}, {
       value: newValue
     }));
-    if (onChange && formatValueOnBlur) {
-      onChange(newValue, name, {
+    if (onValueChange && formatValueOnBlur) {
+      onValueChange(newValue, name, {
         "float": numberValue,
         formatted: formattedValue,
         value: newValue
@@ -3745,6 +3747,15 @@ var GridContainer = withScale(GridContainerComponent);
 
 Grid.Container = GridContainer;
 
+// function isDefaultValue(value: unknown): value is RangeValue {
+//   return (
+//     value instanceof RangeValue &&
+//     value !== null &&
+//     "min" in value &&
+//     "max" in value
+//   );
+// }
+
 function CurrencyRangeInput(_ref) {
   var prefix = _ref.prefix,
     allowDecimals = _ref.allowDecimals,
@@ -3753,8 +3764,8 @@ function CurrencyRangeInput(_ref) {
     value = _ref.value,
     _ref$defaultValue = _ref.defaultValue,
     defaultValue = _ref$defaultValue === void 0 ? {
-      min: 0,
-      max: 0
+      min: "",
+      max: ""
     } : _ref$defaultValue,
     onChange = _ref.onChange,
     _ref$debounce = _ref.debounce,
@@ -3773,21 +3784,56 @@ function CurrencyRangeInput(_ref) {
     }
   }, [isControlled]);
 
+  // function toNumber(value: string): number {
+  // if (typeof value != "string") {
+  //   throw Error("Invalid default value")
+  // }
+  //   let cleaned = value.trim();
+
+  //   // Remove currency symbols and letters
+  //   cleaned = cleaned.replace(/[^\d.,-]/g, '');
+
+  //   // If both comma and dot exist → detect format
+  //   if (cleaned.includes(',') && cleaned.includes('.')) {
+  //     // If comma appears after dot → European format
+  //     if (cleaned.lastIndexOf(',') > cleaned.lastIndexOf('.')) {
+  //       cleaned = cleaned.replace(/\./g, '').replace(',', '.');
+  //     } else {
+  //       cleaned = cleaned.replace(/,/g, '');
+  //     }
+  //   }
+  //   // If only comma exists → assume European decimal
+  //   else if (cleaned.includes(',')) {
+  //     cleaned = cleaned.replace(',', '.');
+  //   }
+
+  //   return Number(cleaned);
+  // }
+
+  function toNumber(value) {
+    if (typeof value != "string") {
+      throw Error("Invalid default value");
+    }
+    var cleaned = value.replace(/[^\d.-]/g, '');
+    var result = Number(cleaned);
+    return isNaN(result) ? 0 : result;
+  }
+
   // Validation
   var isInvalid = React.useMemo(function () {
     if (!currentValue.min || !currentValue.max) return false;
-    return currentValue.max <= currentValue.min;
+    return toNumber(currentValue.max) <= toNumber(currentValue.min);
   }, [currentValue]);
 
   // Debounced onChange
   React.useEffect(function () {
     if (!onChange || isInvalid) return;
+    // console.log(currentValue, isInvalid);
     var handler = setTimeout(function () {
       if (currentValue.min && currentValue.max) {
         onChange({
           min: currentValue.min,
-          max: currentValue.max,
-          currency: ''
+          max: currentValue.max
         });
       }
     }, debounce);
@@ -3796,7 +3842,7 @@ function CurrencyRangeInput(_ref) {
     };
   }, [isInvalid, debounce, currentValue]);
   var finalError = externalError !== null && externalError !== void 0 ? externalError : isInvalid;
-  var finalHelperText = externalHelperText !== null && externalHelperText !== void 0 ? externalHelperText : isInvalid ? "Max must be greater than min" : undefined;
+  var finalHelperText = isInvalid ? "Max must be greater than min" : externalHelperText;
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
     className: "with-label",
     children: [children && /*#__PURE__*/jsxRuntime.jsx(InputBlockLabel, {
@@ -3805,10 +3851,10 @@ function CurrencyRangeInput(_ref) {
       gap: 2,
       children: [/*#__PURE__*/jsxRuntime.jsx(Grid, {
         children: /*#__PURE__*/jsxRuntime.jsx(Input.Currency, {
-          value: currentValue.min,
-          onChange: function onChange(val) {
+          value: toNumber(currentValue.min),
+          onValueChange: function onValueChange(_, __, values) {
             return setValue(_objectSpread2(_objectSpread2({}, currentValue), {}, {
-              min: Number(val)
+              min: values === null || values === void 0 ? void 0 : values.formatted
             }));
           },
           intlConfig: intlConfig,
@@ -3818,10 +3864,10 @@ function CurrencyRangeInput(_ref) {
         })
       }), /*#__PURE__*/jsxRuntime.jsx(Grid, {
         children: /*#__PURE__*/jsxRuntime.jsx(Input.Currency, {
-          value: currentValue.max,
-          onChange: function onChange(val) {
+          value: toNumber(currentValue.max),
+          onValueChange: function onValueChange(_, __, values) {
             return setValue(_objectSpread2(_objectSpread2({}, currentValue), {}, {
-              max: Number(val)
+              max: values === null || values === void 0 ? void 0 : values.formatted
             }));
           },
           intlConfig: intlConfig,

package/dist/index.js

@@ -3540,7 +3540,7 @@ var repositionCursor = function repositionCursor(_ref) {
   };
 };
 
-var _excluded$1i = ["allowDecimals", "allowNegativeValue", "id", "name", "className", "customInput", "decimalsLimit", "defaultValue", "disabled", "maxLength", "value", "fixedDecimalLength", "placeholder", "decimalScale", "prefix", "suffix", "intlConfig", "fullWidth", "step", "min", "max", "disableGroupSeparators", "disableAbbreviations", "decimalSeparator", "groupSeparator", "onChange", "onFocus", "onBlur", "onKeyDown", "onKeyUp", "transformRawValue", "formatValueOnBlur", "children"];
+var _excluded$1i = ["allowDecimals", "allowNegativeValue", "id", "name", "className", "customInput", "decimalsLimit", "defaultValue", "disabled", "maxLength", "value", "onValueChange", "fixedDecimalLength", "placeholder", "decimalScale", "prefix", "suffix", "intlConfig", "fullWidth", "step", "min", "max", "disableGroupSeparators", "disableAbbreviations", "decimalSeparator", "groupSeparator", "onChange", "onFocus", "onBlur", "onKeyDown", "onKeyUp", "transformRawValue", "formatValueOnBlur", "children"];
 var InputCurrency = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var _ref$allowDecimals = _ref.allowDecimals,
     allowDecimals = _ref$allowDecimals === void 0 ? true : _ref$allowDecimals,
@@ -3556,6 +3556,7 @@ var InputCurrency = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
     userMaxLength = _ref.maxLength,
     userValue = _ref.value,
+    onValueChange = _ref.onValueChange,
     fixedDecimalLength = _ref.fixedDecimalLength,
     placeholder = _ref.placeholder,
     decimalScale = _ref.decimalScale,
@@ -3676,7 +3677,7 @@ var InputCurrency = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       return;
     }
     if (stringValue === '' || stringValue === '-' || stringValue === decimalSeparator) {
-      onChange && onChange(undefined, name, {
+      onValueChange && onValueChange(undefined, name, {
         "float": null,
         formatted: '',
         value: ''
@@ -3714,15 +3715,15 @@ var InputCurrency = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     //     });
 
     setStateValue(formattedValue);
-    if (onChange) {
+    if (onValueChange) {
       var values = {
         "float": numberValue,
         formatted: formattedValue,
         value: stringValue
       };
-      onChange(stringValue, name, values);
+      onValueChange(stringValue, name, values);
     }
-    // onChange && onChange(stringValue);
+    // onValueChange && onValueChange(stringValue);
   };
 
   /**
@@ -3733,6 +3734,7 @@ var InputCurrency = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       value = _event$target.value,
       selectionStart = _event$target.selectionStart;
     processChange(value, selectionStart);
+    if (onChange) onChange(event);
   };
 
   /**
@@ -3764,8 +3766,8 @@ var InputCurrency = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     var formattedValue = formatValue(_objectSpread2(_objectSpread2({}, formatValueOptions), {}, {
       value: newValue
     }));
-    if (onChange && formatValueOnBlur) {
-      onChange(newValue, name, {
+    if (onValueChange && formatValueOnBlur) {
+      onValueChange(newValue, name, {
         "float": numberValue,
         formatted: formattedValue,
         value: newValue
@@ -4082,6 +4084,15 @@ var GridContainer = withScale(GridContainerComponent);
 
 Grid.Container = GridContainer;
 
+// function isDefaultValue(value: unknown): value is RangeValue {
+//   return (
+//     value instanceof RangeValue &&
+//     value !== null &&
+//     "min" in value &&
+//     "max" in value
+//   );
+// }
+
 function CurrencyRangeInput(_ref) {
   var prefix = _ref.prefix,
     allowDecimals = _ref.allowDecimals,
@@ -4090,8 +4101,8 @@ function CurrencyRangeInput(_ref) {
     value = _ref.value,
     _ref$defaultValue = _ref.defaultValue,
     defaultValue = _ref$defaultValue === void 0 ? {
-      min: 0,
-      max: 0
+      min: "",
+      max: ""
     } : _ref$defaultValue,
     onChange = _ref.onChange,
     _ref$debounce = _ref.debounce,
@@ -4110,21 +4121,56 @@ function CurrencyRangeInput(_ref) {
     }
   }, [isControlled]);
 
+  // function toNumber(value: string): number {
+  // if (typeof value != "string") {
+  //   throw Error("Invalid default value")
+  // }
+  //   let cleaned = value.trim();
+
+  //   // Remove currency symbols and letters
+  //   cleaned = cleaned.replace(/[^\d.,-]/g, '');
+
+  //   // If both comma and dot exist → detect format
+  //   if (cleaned.includes(',') && cleaned.includes('.')) {
+  //     // If comma appears after dot → European format
+  //     if (cleaned.lastIndexOf(',') > cleaned.lastIndexOf('.')) {
+  //       cleaned = cleaned.replace(/\./g, '').replace(',', '.');
+  //     } else {
+  //       cleaned = cleaned.replace(/,/g, '');
+  //     }
+  //   }
+  //   // If only comma exists → assume European decimal
+  //   else if (cleaned.includes(',')) {
+  //     cleaned = cleaned.replace(',', '.');
+  //   }
+
+  //   return Number(cleaned);
+  // }
+
+  function toNumber(value) {
+    if (typeof value != "string") {
+      throw Error("Invalid default value");
+    }
+    var cleaned = value.replace(/[^\d.-]/g, '');
+    var result = Number(cleaned);
+    return isNaN(result) ? 0 : result;
+  }
+
   // Validation
   var isInvalid = React.useMemo(function () {
     if (!currentValue.min || !currentValue.max) return false;
-    return currentValue.max <= currentValue.min;
+    return toNumber(currentValue.max) <= toNumber(currentValue.min);
   }, [currentValue]);
 
   // Debounced onChange
   React.useEffect(function () {
     if (!onChange || isInvalid) return;
+    // console.log(currentValue, isInvalid);
     var handler = setTimeout(function () {
       if (currentValue.min && currentValue.max) {
         onChange({
           min: currentValue.min,
-          max: currentValue.max,
-          currency: ''
+          max: currentValue.max
         });
       }
     }, debounce);
@@ -4133,7 +4179,7 @@ function CurrencyRangeInput(_ref) {
     };
   }, [isInvalid, debounce, currentValue]);
   var finalError = externalError !== null && externalError !== void 0 ? externalError : isInvalid;
-  var finalHelperText = externalHelperText !== null && externalHelperText !== void 0 ? externalHelperText : isInvalid ? "Max must be greater than min" : undefined;
+  var finalHelperText = isInvalid ? "Max must be greater than min" : externalHelperText;
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
     className: "with-label",
     children: [children && /*#__PURE__*/jsxRuntime.jsx(InputBlockLabel, {
@@ -4142,10 +4188,10 @@ function CurrencyRangeInput(_ref) {
       gap: 2,
       children: [/*#__PURE__*/jsxRuntime.jsx(Grid, {
         children: /*#__PURE__*/jsxRuntime.jsx(Input.Currency, {
-          value: currentValue.min,
-          onChange: function onChange(val) {
+          value: toNumber(currentValue.min),
+          onValueChange: function onValueChange(_, __, values) {
             return setValue(_objectSpread2(_objectSpread2({}, currentValue), {}, {
-              min: Number(val)
+              min: values === null || values === void 0 ? void 0 : values.formatted
             }));
           },
           intlConfig: intlConfig,
@@ -4155,10 +4201,10 @@ function CurrencyRangeInput(_ref) {
         })
       }), /*#__PURE__*/jsxRuntime.jsx(Grid, {
         children: /*#__PURE__*/jsxRuntime.jsx(Input.Currency, {
-          value: currentValue.max,
-          onChange: function onChange(val) {
+          value: toNumber(currentValue.max),
+          onValueChange: function onValueChange(_, __, values) {
             return setValue(_objectSpread2(_objectSpread2({}, currentValue), {}, {
-              max: Number(val)
+              max: values === null || values === void 0 ? void 0 : values.formatted
             }));
           },
           intlConfig: intlConfig,

package/dist/input/index.js

@@ -3189,7 +3189,7 @@ var repositionCursor = function repositionCursor(_ref) {
   };
 };
 
-var _excluded$3 = ["allowDecimals", "allowNegativeValue", "id", "name", "className", "customInput", "decimalsLimit", "defaultValue", "disabled", "maxLength", "value", "fixedDecimalLength", "placeholder", "decimalScale", "prefix", "suffix", "intlConfig", "fullWidth", "step", "min", "max", "disableGroupSeparators", "disableAbbreviations", "decimalSeparator", "groupSeparator", "onChange", "onFocus", "onBlur", "onKeyDown", "onKeyUp", "transformRawValue", "formatValueOnBlur", "children"];
+var _excluded$3 = ["allowDecimals", "allowNegativeValue", "id", "name", "className", "customInput", "decimalsLimit", "defaultValue", "disabled", "maxLength", "value", "onValueChange", "fixedDecimalLength", "placeholder", "decimalScale", "prefix", "suffix", "intlConfig", "fullWidth", "step", "min", "max", "disableGroupSeparators", "disableAbbreviations", "decimalSeparator", "groupSeparator", "onChange", "onFocus", "onBlur", "onKeyDown", "onKeyUp", "transformRawValue", "formatValueOnBlur", "children"];
 var InputCurrency = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var _ref$allowDecimals = _ref.allowDecimals,
     allowDecimals = _ref$allowDecimals === void 0 ? true : _ref$allowDecimals,
@@ -3205,6 +3205,7 @@ var InputCurrency = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
     userMaxLength = _ref.maxLength,
     userValue = _ref.value,
+    onValueChange = _ref.onValueChange,
     fixedDecimalLength = _ref.fixedDecimalLength,
     placeholder = _ref.placeholder,
     decimalScale = _ref.decimalScale,
@@ -3325,7 +3326,7 @@ var InputCurrency = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       return;
     }
     if (stringValue === '' || stringValue === '-' || stringValue === decimalSeparator) {
-      onChange && onChange(undefined, name, {
+      onValueChange && onValueChange(undefined, name, {
         "float": null,
         formatted: '',
         value: ''
@@ -3363,15 +3364,15 @@ var InputCurrency = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     //     });
 
     setStateValue(formattedValue);
-    if (onChange) {
+    if (onValueChange) {
       var values = {
         "float": numberValue,
         formatted: formattedValue,
         value: stringValue
       };
-      onChange(stringValue, name, values);
+      onValueChange(stringValue, name, values);
     }
-    // onChange && onChange(stringValue);
+    // onValueChange && onValueChange(stringValue);
   };
 
   /**
@@ -3382,6 +3383,7 @@ var InputCurrency = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       value = _event$target.value,
       selectionStart = _event$target.selectionStart;
     processChange(value, selectionStart);
+    if (onChange) onChange(event);
   };
 
   /**
@@ -3413,8 +3415,8 @@ var InputCurrency = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     var formattedValue = formatValue(_objectSpread2(_objectSpread2({}, formatValueOptions), {}, {
       value: newValue
     }));
-    if (onChange && formatValueOnBlur) {
-      onChange(newValue, name, {
+    if (onValueChange && formatValueOnBlur) {
+      onValueChange(newValue, name, {
         "float": numberValue,
         formatted: formattedValue,
         value: newValue
@@ -3731,6 +3733,15 @@ var GridContainer = withScale(GridContainerComponent);
 
 Grid.Container = GridContainer;
 
+// function isDefaultValue(value: unknown): value is RangeValue {
+//   return (
+//     value instanceof RangeValue &&
+//     value !== null &&
+//     "min" in value &&
+//     "max" in value
+//   );
+// }
+
 function CurrencyRangeInput(_ref) {
   var prefix = _ref.prefix,
     allowDecimals = _ref.allowDecimals,
@@ -3739,8 +3750,8 @@ function CurrencyRangeInput(_ref) {
     value = _ref.value,
     _ref$defaultValue = _ref.defaultValue,
     defaultValue = _ref$defaultValue === void 0 ? {
-      min: 0,
-      max: 0
+      min: "",
+      max: ""
     } : _ref$defaultValue,
     onChange = _ref.onChange,
     _ref$debounce = _ref.debounce,
@@ -3759,21 +3770,56 @@ function CurrencyRangeInput(_ref) {
     }
   }, [isControlled]);
 
+  // function toNumber(value: string): number {
+  // if (typeof value != "string") {
+  //   throw Error("Invalid default value")
+  // }
+  //   let cleaned = value.trim();
+
+  //   // Remove currency symbols and letters
+  //   cleaned = cleaned.replace(/[^\d.,-]/g, '');
+
+  //   // If both comma and dot exist → detect format
+  //   if (cleaned.includes(',') && cleaned.includes('.')) {
+  //     // If comma appears after dot → European format
+  //     if (cleaned.lastIndexOf(',') > cleaned.lastIndexOf('.')) {
+  //       cleaned = cleaned.replace(/\./g, '').replace(',', '.');
+  //     } else {
+  //       cleaned = cleaned.replace(/,/g, '');
+  //     }
+  //   }
+  //   // If only comma exists → assume European decimal
+  //   else if (cleaned.includes(',')) {
+  //     cleaned = cleaned.replace(',', '.');
+  //   }
+
+  //   return Number(cleaned);
+  // }
+
+  function toNumber(value) {
+    if (typeof value != "string") {
+      throw Error("Invalid default value");
+    }
+    var cleaned = value.replace(/[^\d.-]/g, '');
+    var result = Number(cleaned);
+    return isNaN(result) ? 0 : result;
+  }
+
   // Validation
   var isInvalid = React.useMemo(function () {
     if (!currentValue.min || !currentValue.max) return false;
-    return currentValue.max <= currentValue.min;
+    return toNumber(currentValue.max) <= toNumber(currentValue.min);
   }, [currentValue]);
 
   // Debounced onChange
   React.useEffect(function () {
     if (!onChange || isInvalid) return;
+    // console.log(currentValue, isInvalid);
     var handler = setTimeout(function () {
       if (currentValue.min && currentValue.max) {
         onChange({
           min: currentValue.min,
-          max: currentValue.max,
-          currency: ''
+          max: currentValue.max
         });
       }
     }, debounce);
@@ -3782,7 +3828,7 @@ function CurrencyRangeInput(_ref) {
     };
   }, [isInvalid, debounce, currentValue]);
   var finalError = externalError !== null && externalError !== void 0 ? externalError : isInvalid;
-  var finalHelperText = externalHelperText !== null && externalHelperText !== void 0 ? externalHelperText : isInvalid ? "Max must be greater than min" : undefined;
+  var finalHelperText = isInvalid ? "Max must be greater than min" : externalHelperText;
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
     className: "with-label",
     children: [children && /*#__PURE__*/jsxRuntime.jsx(InputBlockLabel, {
@@ -3791,10 +3837,10 @@ function CurrencyRangeInput(_ref) {
       gap: 2,
       children: [/*#__PURE__*/jsxRuntime.jsx(Grid, {
         children: /*#__PURE__*/jsxRuntime.jsx(Input.Currency, {
-          value: currentValue.min,
-          onChange: function onChange(val) {
+          value: toNumber(currentValue.min),
+          onValueChange: function onValueChange(_, __, values) {
             return setValue(_objectSpread2(_objectSpread2({}, currentValue), {}, {
-              min: Number(val)
+              min: values === null || values === void 0 ? void 0 : values.formatted
             }));
           },
           intlConfig: intlConfig,
@@ -3804,10 +3850,10 @@ function CurrencyRangeInput(_ref) {
         })
       }), /*#__PURE__*/jsxRuntime.jsx(Grid, {
         children: /*#__PURE__*/jsxRuntime.jsx(Input.Currency, {
-          value: currentValue.max,
-          onChange: function onChange(val) {
+          value: toNumber(currentValue.max),
+          onValueChange: function onValueChange(_, __, values) {
             return setValue(_objectSpread2(_objectSpread2({}, currentValue), {}, {
-              max: Number(val)
+              max: values === null || values === void 0 ? void 0 : values.formatted
             }));
           },
           intlConfig: intlConfig,

package/dist/input/input-currency-props.d.ts

@@ -96,7 +96,7 @@ export type CurrencyInputProps = Overwrite<React.ComponentPropsWithRef<'input'>,
     /**
      * Handle change in value
      */
-    onChange?: (value: string | undefined, name?: string, values?: CurrencyInputOnChangeValues) => void;
+    onValueChange?: (value: string | undefined, name?: string, values?: CurrencyInputOnChangeValues) => void;
     /**
      * Placeholder if there is no value
      */

package/dist/input/input-currency-range.d.ts

@@ -2,18 +2,13 @@ import { CurrencyInputProps } from "./input-currency-props";
 import React from "react";
 type Override<T, U> = Omit<T, keyof U> & U;
 type RangeValue = {
-    min: number;
-    max: number;
-};
-type CurrencyRangeOutput = {
-    min: number;
-    max: number;
-    currency: string;
+    min?: string;
+    max?: string;
 };
 type CurrencyRangeProps = Override<CurrencyInputProps, {
     value?: RangeValue;
     defaultValue?: RangeValue;
-    onChange?: (val: CurrencyRangeOutput) => void;
+    onChange?: (val: RangeValue) => void;
     debounce?: number;
     error?: boolean;
     helperText?: string;

package/dist/table/index.js

@@ -3239,7 +3239,7 @@ var repositionCursor = function repositionCursor(_ref) {
   };
 };
 
-var _excluded$d = ["allowDecimals", "allowNegativeValue", "id", "name", "className", "customInput", "decimalsLimit", "defaultValue", "disabled", "maxLength", "value", "fixedDecimalLength", "placeholder", "decimalScale", "prefix", "suffix", "intlConfig", "fullWidth", "step", "min", "max", "disableGroupSeparators", "disableAbbreviations", "decimalSeparator", "groupSeparator", "onChange", "onFocus", "onBlur", "onKeyDown", "onKeyUp", "transformRawValue", "formatValueOnBlur", "children"];
+var _excluded$d = ["allowDecimals", "allowNegativeValue", "id", "name", "className", "customInput", "decimalsLimit", "defaultValue", "disabled", "maxLength", "value", "onValueChange", "fixedDecimalLength", "placeholder", "decimalScale", "prefix", "suffix", "intlConfig", "fullWidth", "step", "min", "max", "disableGroupSeparators", "disableAbbreviations", "decimalSeparator", "groupSeparator", "onChange", "onFocus", "onBlur", "onKeyDown", "onKeyUp", "transformRawValue", "formatValueOnBlur", "children"];
 var InputCurrency = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var _ref$allowDecimals = _ref.allowDecimals,
     allowDecimals = _ref$allowDecimals === void 0 ? true : _ref$allowDecimals,
@@ -3255,6 +3255,7 @@ var InputCurrency = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
     userMaxLength = _ref.maxLength,
     userValue = _ref.value,
+    onValueChange = _ref.onValueChange,
     fixedDecimalLength = _ref.fixedDecimalLength,
     placeholder = _ref.placeholder,
     decimalScale = _ref.decimalScale,
@@ -3375,7 +3376,7 @@ var InputCurrency = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       return;
     }
     if (stringValue === '' || stringValue === '-' || stringValue === decimalSeparator) {
-      onChange && onChange(undefined, name, {
+      onValueChange && onValueChange(undefined, name, {
         "float": null,
         formatted: '',
         value: ''
@@ -3413,15 +3414,15 @@ var InputCurrency = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     //     });
 
     setStateValue(formattedValue);
-    if (onChange) {
+    if (onValueChange) {
       var values = {
         "float": numberValue,
         formatted: formattedValue,
         value: stringValue
       };
-      onChange(stringValue, name, values);
+      onValueChange(stringValue, name, values);
     }
-    // onChange && onChange(stringValue);
+    // onValueChange && onValueChange(stringValue);
   };
 
   /**
@@ -3432,6 +3433,7 @@ var InputCurrency = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       value = _event$target.value,
       selectionStart = _event$target.selectionStart;
     processChange(value, selectionStart);
+    if (onChange) onChange(event);
   };
 
   /**
@@ -3463,8 +3465,8 @@ var InputCurrency = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     var formattedValue = formatValue(_objectSpread2(_objectSpread2({}, formatValueOptions), {}, {
       value: newValue
     }));
-    if (onChange && formatValueOnBlur) {
-      onChange(newValue, name, {
+    if (onValueChange && formatValueOnBlur) {
+      onValueChange(newValue, name, {
         "float": numberValue,
         formatted: formattedValue,
         value: newValue
@@ -3781,6 +3783,15 @@ var GridContainer = withScale(GridContainerComponent);
 
 Grid.Container = GridContainer;
 
+// function isDefaultValue(value: unknown): value is RangeValue {
+//   return (
+//     value instanceof RangeValue &&
+//     value !== null &&
+//     "min" in value &&
+//     "max" in value
+//   );
+// }
+
 function CurrencyRangeInput(_ref) {
   var prefix = _ref.prefix,
     allowDecimals = _ref.allowDecimals,
@@ -3789,8 +3800,8 @@ function CurrencyRangeInput(_ref) {
     value = _ref.value,
     _ref$defaultValue = _ref.defaultValue,
     defaultValue = _ref$defaultValue === void 0 ? {
-      min: 0,
-      max: 0
+      min: "",
+      max: ""
     } : _ref$defaultValue,
     onChange = _ref.onChange,
     _ref$debounce = _ref.debounce,
@@ -3809,21 +3820,56 @@ function CurrencyRangeInput(_ref) {
     }
   }, [isControlled]);
 
+  // function toNumber(value: string): number {
+  // if (typeof value != "string") {
+  //   throw Error("Invalid default value")
+  // }
+  //   let cleaned = value.trim();
+
+  //   // Remove currency symbols and letters
+  //   cleaned = cleaned.replace(/[^\d.,-]/g, '');
+
+  //   // If both comma and dot exist → detect format
+  //   if (cleaned.includes(',') && cleaned.includes('.')) {
+  //     // If comma appears after dot → European format
+  //     if (cleaned.lastIndexOf(',') > cleaned.lastIndexOf('.')) {
+  //       cleaned = cleaned.replace(/\./g, '').replace(',', '.');
+  //     } else {
+  //       cleaned = cleaned.replace(/,/g, '');
+  //     }
+  //   }
+  //   // If only comma exists → assume European decimal
+  //   else if (cleaned.includes(',')) {
+  //     cleaned = cleaned.replace(',', '.');
+  //   }
+
+  //   return Number(cleaned);
+  // }
+
+  function toNumber(value) {
+    if (typeof value != "string") {
+      throw Error("Invalid default value");
+    }
+    var cleaned = value.replace(/[^\d.-]/g, '');
+    var result = Number(cleaned);
+    return isNaN(result) ? 0 : result;
+  }
+
   // Validation
   var isInvalid = React.useMemo(function () {
     if (!currentValue.min || !currentValue.max) return false;
-    return currentValue.max <= currentValue.min;
+    return toNumber(currentValue.max) <= toNumber(currentValue.min);
   }, [currentValue]);
 
   // Debounced onChange
   React.useEffect(function () {
     if (!onChange || isInvalid) return;
+    // console.log(currentValue, isInvalid);
     var handler = setTimeout(function () {
       if (currentValue.min && currentValue.max) {
         onChange({
           min: currentValue.min,
-          max: currentValue.max,
-          currency: ''
+          max: currentValue.max
         });
       }
     }, debounce);
@@ -3832,7 +3878,7 @@ function CurrencyRangeInput(_ref) {
     };
   }, [isInvalid, debounce, currentValue]);
   var finalError = externalError !== null && externalError !== void 0 ? externalError : isInvalid;
-  var finalHelperText = externalHelperText !== null && externalHelperText !== void 0 ? externalHelperText : isInvalid ? "Max must be greater than min" : undefined;
+  var finalHelperText = isInvalid ? "Max must be greater than min" : externalHelperText;
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
     className: "with-label",
     children: [children && /*#__PURE__*/jsxRuntime.jsx(InputBlockLabel, {
@@ -3841,10 +3887,10 @@ function CurrencyRangeInput(_ref) {
       gap: 2,
       children: [/*#__PURE__*/jsxRuntime.jsx(Grid, {
         children: /*#__PURE__*/jsxRuntime.jsx(Input.Currency, {
-          value: currentValue.min,
-          onChange: function onChange(val) {
+          value: toNumber(currentValue.min),
+          onValueChange: function onValueChange(_, __, values) {
             return setValue(_objectSpread2(_objectSpread2({}, currentValue), {}, {
-              min: Number(val)
+              min: values === null || values === void 0 ? void 0 : values.formatted
             }));
           },
           intlConfig: intlConfig,
@@ -3854,10 +3900,10 @@ function CurrencyRangeInput(_ref) {
         })
       }), /*#__PURE__*/jsxRuntime.jsx(Grid, {
         children: /*#__PURE__*/jsxRuntime.jsx(Input.Currency, {
-          value: currentValue.max,
-          onChange: function onChange(val) {
+          value: toNumber(currentValue.max),
+          onValueChange: function onValueChange(_, __, values) {
             return setValue(_objectSpread2(_objectSpread2({}, currentValue), {}, {
-              max: Number(val)
+              max: values === null || values === void 0 ? void 0 : values.formatted
             }));
           },
           intlConfig: intlConfig,

package/esm/input/input-currency-props.d.ts

@@ -96,7 +96,7 @@ export type CurrencyInputProps = Overwrite<React.ComponentPropsWithRef<'input'>,
     /**
      * Handle change in value
      */
-    onChange?: (value: string | undefined, name?: string, values?: CurrencyInputOnChangeValues) => void;
+    onValueChange?: (value: string | undefined, name?: string, values?: CurrencyInputOnChangeValues) => void;
     /**
      * Placeholder if there is no value
      */

package/esm/input/input-currency-range.d.ts

@@ -2,18 +2,13 @@ import { CurrencyInputProps } from "./input-currency-props";
 import React from "react";
 type Override<T, U> = Omit<T, keyof U> & U;
 type RangeValue = {
-    min: number;
-    max: number;
-};
-type CurrencyRangeOutput = {
-    min: number;
-    max: number;
-    currency: string;
+    min?: string;
+    max?: string;
 };
 type CurrencyRangeProps = Override<CurrencyInputProps, {
     value?: RangeValue;
     defaultValue?: RangeValue;
-    onChange?: (val: CurrencyRangeOutput) => void;
+    onChange?: (val: RangeValue) => void;
     debounce?: number;
     error?: boolean;
     helperText?: string;

package/esm/input/input-currency-range.js

@@ -4,6 +4,15 @@ import Grid from "../grid";
 import Input from ".";
 import React, { useMemo, useState, useEffect, useCallback } from "react";
 import InputBlockLabel, { InputError } from "./input-block-label";
+// function isDefaultValue(value: unknown): value is RangeValue {
+//   return (
+//     value instanceof RangeValue &&
+//     value !== null &&
+//     "min" in value &&
+//     "max" in value
+//   );
+// }
+
 function CurrencyRangeInput(_ref) {
   var prefix = _ref.prefix,
     allowDecimals = _ref.allowDecimals,
@@ -12,8 +21,8 @@ function CurrencyRangeInput(_ref) {
     value = _ref.value,
     _ref$defaultValue = _ref.defaultValue,
     defaultValue = _ref$defaultValue === void 0 ? {
-      min: 0,
-      max: 0
+      min: "",
+      max: ""
     } : _ref$defaultValue,
     onChange = _ref.onChange,
     _ref$debounce = _ref.debounce,
@@ -32,21 +41,56 @@ function CurrencyRangeInput(_ref) {
     }
   }, [isControlled]);
 
+  // function toNumber(value: string): number {
+  // if (typeof value != "string") {
+  //   throw Error("Invalid default value")
+  // }
+  //   let cleaned = value.trim();
+
+  //   // Remove currency symbols and letters
+  //   cleaned = cleaned.replace(/[^\d.,-]/g, '');
+
+  //   // If both comma and dot exist → detect format
+  //   if (cleaned.includes(',') && cleaned.includes('.')) {
+  //     // If comma appears after dot → European format
+  //     if (cleaned.lastIndexOf(',') > cleaned.lastIndexOf('.')) {
+  //       cleaned = cleaned.replace(/\./g, '').replace(',', '.');
+  //     } else {
+  //       cleaned = cleaned.replace(/,/g, '');
+  //     }
+  //   }
+  //   // If only comma exists → assume European decimal
+  //   else if (cleaned.includes(',')) {
+  //     cleaned = cleaned.replace(',', '.');
+  //   }
+
+  //   return Number(cleaned);
+  // }
+
+  function toNumber(value) {
+    if (typeof value != "string") {
+      throw Error("Invalid default value");
+    }
+    var cleaned = value.replace(/[^\d.-]/g, '');
+    var result = Number(cleaned);
+    return isNaN(result) ? 0 : result;
+  }
+
   // Validation
   var isInvalid = useMemo(function () {
     if (!currentValue.min || !currentValue.max) return false;
-    return currentValue.max <= currentValue.min;
+    return toNumber(currentValue.max) <= toNumber(currentValue.min);
   }, [currentValue]);
 
   // Debounced onChange
   useEffect(function () {
     if (!onChange || isInvalid) return;
+    // console.log(currentValue, isInvalid);
     var handler = setTimeout(function () {
       if (currentValue.min && currentValue.max) {
         onChange({
           min: currentValue.min,
-          max: currentValue.max,
-          currency: ''
+          max: currentValue.max
         });
       }
     }, debounce);
@@ -55,16 +99,16 @@ function CurrencyRangeInput(_ref) {
     };
   }, [isInvalid, debounce, currentValue]);
   var finalError = externalError !== null && externalError !== void 0 ? externalError : isInvalid;
-  var finalHelperText = externalHelperText !== null && externalHelperText !== void 0 ? externalHelperText : isInvalid ? "Max must be greater than min" : undefined;
+  var finalHelperText = isInvalid ? "Max must be greater than min" : externalHelperText;
   return /*#__PURE__*/React.createElement("div", {
     className: "with-label"
   }, children && /*#__PURE__*/React.createElement(InputBlockLabel, null, children), /*#__PURE__*/React.createElement(Grid.Container, {
     gap: 2
   }, /*#__PURE__*/React.createElement(Grid, null, /*#__PURE__*/React.createElement(Input.Currency, {
-    value: currentValue.min,
-    onChange: function onChange(val) {
+    value: toNumber(currentValue.min),
+    onValueChange: function onValueChange(_, __, values) {
       return setValue(_extends({}, currentValue, {
-        min: Number(val)
+        min: values === null || values === void 0 ? void 0 : values.formatted
       }));
     },
     intlConfig: intlConfig,
@@ -72,10 +116,10 @@ function CurrencyRangeInput(_ref) {
     placeholder: "Min",
     allowDecimals: allowDecimals
   })), /*#__PURE__*/React.createElement(Grid, null, /*#__PURE__*/React.createElement(Input.Currency, {
-    value: currentValue.max,
-    onChange: function onChange(val) {
+    value: toNumber(currentValue.max),
+    onValueChange: function onValueChange(_, __, values) {
       return setValue(_extends({}, currentValue, {
-        max: Number(val)
+        max: values === null || values === void 0 ? void 0 : values.formatted
       }));
     },
     intlConfig: intlConfig,

package/esm/input/input-currency.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["allowDecimals", "allowNegativeValue", "id", "name", "className", "customInput", "decimalsLimit", "defaultValue", "disabled", "maxLength", "value", "fixedDecimalLength", "placeholder", "decimalScale", "prefix", "suffix", "intlConfig", "fullWidth", "step", "min", "max", "disableGroupSeparators", "disableAbbreviations", "decimalSeparator", "groupSeparator", "onChange", "onFocus", "onBlur", "onKeyDown", "onKeyUp", "transformRawValue", "formatValueOnBlur", "children"];
+var _excluded = ["allowDecimals", "allowNegativeValue", "id", "name", "className", "customInput", "decimalsLimit", "defaultValue", "disabled", "maxLength", "value", "onValueChange", "fixedDecimalLength", "placeholder", "decimalScale", "prefix", "suffix", "intlConfig", "fullWidth", "step", "min", "max", "disableGroupSeparators", "disableAbbreviations", "decimalSeparator", "groupSeparator", "onChange", "onFocus", "onBlur", "onKeyDown", "onKeyUp", "transformRawValue", "formatValueOnBlur", "children"];
 import _JSXStyle from "../styled-jsx.es.js";
 import React, { useState, useEffect, useRef, forwardRef, useMemo, useImperativeHandle } from 'react';
 import { isNumber, cleanValue, fixedDecimalValue, formatValue, getLocaleConfig, padTrimValue, getSuffix, repositionCursor } from './utils';
@@ -23,6 +23,7 @@ export var InputCurrency = /*#__PURE__*/forwardRef(function (_ref, ref) {
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
     userMaxLength = _ref.maxLength,
     userValue = _ref.value,
+    onValueChange = _ref.onValueChange,
     fixedDecimalLength = _ref.fixedDecimalLength,
     placeholder = _ref.placeholder,
     decimalScale = _ref.decimalScale,
@@ -143,7 +144,7 @@ export var InputCurrency = /*#__PURE__*/forwardRef(function (_ref, ref) {
       return;
     }
     if (stringValue === '' || stringValue === '-' || stringValue === decimalSeparator) {
-      onChange && onChange(undefined, name, {
+      onValueChange && onValueChange(undefined, name, {
         "float": null,
         formatted: '',
         value: ''
@@ -181,15 +182,15 @@ export var InputCurrency = /*#__PURE__*/forwardRef(function (_ref, ref) {
     //     });
 
     setStateValue(formattedValue);
-    if (onChange) {
+    if (onValueChange) {
       var values = {
         "float": numberValue,
         formatted: formattedValue,
         value: stringValue
       };
-      onChange(stringValue, name, values);
+      onValueChange(stringValue, name, values);
     }
-    // onChange && onChange(stringValue);
+    // onValueChange && onValueChange(stringValue);
   };
 
   /**
@@ -200,6 +201,7 @@ export var InputCurrency = /*#__PURE__*/forwardRef(function (_ref, ref) {
       value = _event$target.value,
       selectionStart = _event$target.selectionStart;
     processChange(value, selectionStart);
+    if (onChange) onChange(event);
   };
 
   /**
@@ -231,8 +233,8 @@ export var InputCurrency = /*#__PURE__*/forwardRef(function (_ref, ref) {
     var formattedValue = formatValue(_extends({}, formatValueOptions, {
       value: newValue
     }));
-    if (onChange && formatValueOnBlur) {
-      onChange(newValue, name, {
+    if (onValueChange && formatValueOnBlur) {
+      onValueChange(newValue, name, {
         "float": numberValue,
         formatted: formattedValue,
         value: newValue

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@helpdice/ui",
-  "version": "2.6.1-beta.3",
+  "version": "2.6.1-beta.4",
   "main": "dist/index.js",
   "types": "esm/index.d.ts",
   "unpkg": "dist/index.min.js",