@ledgerhq/lumen-utils-shared 0.1.5 → 0.1.7

package/dist/index.js

@@ -1,142 +1,138 @@
-import { jsx as k } from "react/jsx-runtime";
-import { createContext as W, useRef as F, useContext as w, useMemo as I } from "react";
+import { jsx as F } from "react/jsx-runtime";
+import { createContext as W, useRef as v, useContext as w, useMemo as C } from "react";
 import { clsx as B } from "clsx";
 import { twMerge as R } from "tailwind-merge";
-function G(t) {
+function et(t) {
   return t ? t.split(/[-_ ]+/).map((e) => e.charAt(0).toUpperCase() + e.slice(1).toLowerCase()).join("") : "";
 }
 const _ = {
   md: { max: 48, min: 17, scale: 2, startAt: 0 },
   sm: { max: 28, min: 12, scale: 2, startAt: 6 }
 };
-function J(t, e = "md") {
-  const { max: r, min: o, scale: s, startAt: l } = _[e], i = t.replace(/\D/g, "").length;
-  return Math.max(o, r - Math.max(0, i - l) * s);
+function nt(t, e = "md") {
+  const { max: r, min: n, scale: i, startAt: s } = _[e], o = t.replace(/\D/g, "").length;
+  return Math.max(n, r - Math.max(0, o - s) * i);
 }
-function A(t, e = !0) {
+function z(t, e = !0) {
   if (!t) return "";
-  const r = t.includes("."), [o, s] = t.split("."), l = o.replace(/\B(?=(\d{3})+(?!\d))/g, " ");
-  return r && e ? s ? `${l}.${s}` : `${l}.` : l;
+  const r = t.includes("."), [n, i] = t.split("."), s = n.replace(/\B(?=(\d{3})+(?!\d))/g, " ");
+  return r && e ? i ? `${s}.${i}` : `${s}.` : s;
 }
-function Q(t, e = {}) {
+const Z = (t) => t.replaceAll(",", ".").replaceAll(/[^\d.]/g, ""), q = (t) => t.replace(/^0+(?=\d)/, ""), T = (t, e) => e > 0 ? t.slice(0, e) : t, K = (t, e) => T(t.replaceAll(/\D/g, ""), e), N = (t, e, r) => {
+  if (t === ".") return "0.";
+  const n = t.indexOf(".");
+  if (n === -1) return T(t, e);
+  const i = T(t.slice(0, n), e) || "0", s = t.slice(n + 1).replaceAll(".", "").slice(0, r);
+  return s.length > 0 ? `${i}.${s}` : t.endsWith(".") ? `${i}.` : i;
+};
+function rt(t, e = {}) {
   const {
     allowDecimals: r = !0,
-    thousandsSeparator: o = !0,
-    maxIntegerLength: s = 9,
-    maxDecimalLength: l = 9
-  } = e, i = t.replace(",", ".").replace(/[^\d.]/g, "");
-  let n = i;
-  if (n = n.replace(/^0+(?=\d)/, ""), !r)
-    return n = n.replace(/\D/g, ""), s > 0 && n.length > s && (n = n.slice(0, s)), o ? A(n) : n;
-  n === "." && (n = "0.");
-  const u = n.indexOf(".");
-  if (u !== -1) {
-    let a = n.slice(0, u), f = n.slice(u + 1).replace(/\./g, "");
-    s > 0 && a.length > s && (a = a.slice(0, s)), f = f.slice(0, l), a === "" && (a = "0");
-    const h = i.endsWith(".") || n.endsWith(".");
-    n = f.length > 0 ? `${a}.${f}` : h ? `${a}.` : a;
-  } else
-    s > 0 && n.length > s && (n = n.slice(0, s));
-  return o ? A(n) : n;
+    thousandsSeparator: n = !0,
+    maxIntegerLength: i = 9,
+    maxDecimalLength: s = 9,
+    decimalSeparator: o = "."
+  } = e, c = q(Z(t)), a = r ? N(c, i, s) : K(c, i), d = n ? z(a) : a;
+  return o === "." ? d : d.replaceAll(".", o);
 }
-function q(t, e) {
+function H(t, e) {
   if (Object.is(t, e)) return !0;
-  const r = t, o = e, s = Object.keys(r), l = Object.keys(o);
-  return s.length !== l.length ? !1 : s.every(
-    (i) => Object.prototype.hasOwnProperty.call(o, i) && Object.is(r[i], o[i])
+  const r = t, n = e, i = Object.keys(r), s = Object.keys(n);
+  return i.length !== s.length ? !1 : i.every(
+    (o) => Object.prototype.hasOwnProperty.call(n, o) && Object.is(r[o], n[o])
   );
 }
-function z(t, e) {
-  const r = W(e), o = ({ children: l, value: i }) => {
-    const n = F(i);
-    return q(n.current, i) || (n.current = i), /* @__PURE__ */ k(r.Provider, { value: n.current, children: l });
+function U(t, e) {
+  const r = W(e), n = ({ children: s, value: o }) => {
+    const c = v(o);
+    return H(c.current, o) || (c.current = o), /* @__PURE__ */ F(r.Provider, { value: c.current, children: s });
   };
-  o.displayName = t + "Provider";
-  function s({
-    consumerName: l,
-    contextRequired: i
+  n.displayName = t + "Provider";
+  function i({
+    consumerName: s,
+    contextRequired: o
   }) {
-    const n = w(r);
-    if (n)
-      return n;
-    if (i)
+    const c = w(r);
+    if (c)
+      return c;
+    if (o)
       throw new Error(
-        `${l} must be used within ${t}`
+        `${s} must be used within ${t}`
       );
     return e || {};
   }
-  return [o, s];
+  return [n, i];
 }
-const [X, K] = z("Disabled", { disabled: !1 }), tt = ({
+const [ot, Y] = U("Disabled", { disabled: !1 }), it = ({
   consumerName: t,
   contextRequired: e,
   mergeWith: r
 }) => {
-  const o = K({
+  const n = Y({
     consumerName: t,
     contextRequired: e ?? !1
   });
-  return !!(r?.disabled || o.disabled);
+  return !!(r?.disabled || n.disabled);
 };
-function et(...t) {
+function st(...t) {
   return R(B(t));
 }
-const O = (t) => typeof t == "string" || typeof t == "number", nt = (t) => Array.isArray(t) ? t.every(O) : O(t);
+const O = (t) => typeof t == "string" || typeof t == "number", ct = (t) => Array.isArray(t) ? t.every(O) : O(t);
 function S(t, e) {
   if (typeof t == "function")
     return t(e);
   typeof t == "object" && t !== null && "current" in t && (t.current = e);
 }
-function N(...t) {
+function G(...t) {
   const e = /* @__PURE__ */ new Map();
   return (r) => {
     if (r === null) {
-      t.forEach((o) => {
-        const s = e.get(o);
-        typeof s == "function" && s(), S(o, null);
+      t.forEach((n) => {
+        const i = e.get(n);
+        typeof i == "function" && i(), S(n, null);
       }), e.clear();
       return;
     }
-    t.forEach((o) => {
-      const s = S(o, r);
-      typeof s == "function" && e.set(o, s);
+    t.forEach((n) => {
+      const i = S(n, r);
+      typeof i == "function" && e.set(n, i);
     });
   };
 }
-function rt(...t) {
-  return I(() => N(...t), t);
+function lt(...t) {
+  return C(() => G(...t), t);
 }
-const ot = (t, e) => {
+const at = (t, e) => {
   let r = t;
-  for (const o of e) {
+  for (const n of e) {
     if (r == null)
       return;
-    r = r[o];
+    r = r[n];
   }
   return r;
-}, it = ({
+}, ut = ({
   currentStep: t,
   totalSteps: e,
   size: r,
-  label: o,
-  strokeWidth: s = 4,
-  arcPercentage: l = 0.75
+  label: n,
+  strokeWidth: i = 4,
+  arcPercentage: s = 0.75
 }) => {
-  const i = Math.min(Math.max(t, 0), e), n = o ?? `${i}/${e}`, u = e <= 0 ? 0 : i / e, a = (r - s) / 2, f = r / 2, h = r / 2, d = 2 * Math.PI * a, g = d * l, b = g * (1 - u), p = i <= 0, D = `${g} ${d}`, P = p ? g - 2 : b;
+  const o = Math.min(Math.max(t, 0), e), c = n ?? `${o}/${e}`, a = e <= 0 ? 0 : o / e, d = (r - i) / 2, g = r / 2, p = r / 2, u = 2 * Math.PI * d, m = u * s, b = m * (1 - a), h = o <= 0, D = `${m} ${u}`, P = h ? m - 2 : b;
   return {
-    displayLabel: n,
-    progress: u,
-    r: a,
-    cx: f,
-    cy: h,
-    circumference: d,
-    trackArcLength: g,
-    trackDashArray: `${g} ${d}`,
+    displayLabel: c,
+    progress: a,
+    r: d,
+    cx: g,
+    cy: p,
+    circumference: u,
+    trackArcLength: m,
+    trackDashArray: `${m} ${u}`,
     progressDashArray: D,
     progressDashOffset: P,
-    showMinimalDot: p
+    showMinimalDot: h
   };
-}, st = (t) => I(
+}, ft = (t) => C(
   () => ({
     integerPart: Array.from(t.integerPart, (e) => ({
       value: e,
@@ -148,57 +144,57 @@ const ot = (t, e) => {
     })) : []
   }),
   [t.integerPart, t.decimalPart]
-), ct = (t, e, r) => {
+), dt = (t, e, r) => {
   if (e) return r;
-  const o = t.decimalPart ? `${t.decimalSeparator}${t.decimalPart}` : "", s = `${t.integerPart}${o}`;
-  return t.currencyPosition === "end" ? `${s} ${t.currencyText}` : `${t.currencyText} ${s}`;
+  const n = t.decimalPart ? `${t.decimalSeparator}${t.decimalPart}` : "", i = `${t.integerPart}${n}`;
+  return t.currencyPosition === "end" ? `${i} ${t.currencyText}` : `${t.currencyText} ${i}`;
 };
-function Z(t, e, r = {}) {
-  const { leading: o = !1, trailing: s = !0, maxWait: l } = r;
-  let i = null, n = null, u = null, a = 0, f = null, h = null, d;
-  const g = l !== void 0, b = g ? Math.max(l, e) : 0, p = (c) => {
-    a = c;
-    const m = f, y = h;
-    return f = null, h = null, d = t.apply(y, m), d;
-  }, D = (c) => {
-    const m = u ? c - u : 0;
-    return e - m;
-  }, P = (c) => {
-    const m = u ? c - u : e, y = c - a;
-    return u === null || m >= e || m < 0 || g && y >= b;
-  }, $ = (c) => (i = null, s && f ? p(c) : (f = null, h = null, d)), x = () => {
-    const c = Date.now();
-    if (P(c)) {
-      $(c);
+function J(t, e, r = {}) {
+  const { leading: n = !1, trailing: i = !0, maxWait: s } = r;
+  let o = null, c = null, a = null, d = 0, g = null, p = null, u;
+  const m = s !== void 0, b = m ? Math.max(s, e) : 0, h = (l) => {
+    d = l;
+    const f = g, x = p;
+    return g = null, p = null, u = t.apply(x, f), u;
+  }, D = (l) => {
+    const f = a ? l - a : 0;
+    return e - f;
+  }, P = (l) => {
+    const f = a ? l - a : e, x = l - d;
+    return a === null || f >= e || f < 0 || m && x >= b;
+  }, $ = (l) => (o = null, i && g ? h(l) : (g = null, p = null, u)), y = () => {
+    const l = Date.now();
+    if (P(l)) {
+      $(l);
       return;
     }
-    i = setTimeout(x, D(c));
+    o = setTimeout(y, D(l));
   }, M = () => {
-    const c = Date.now();
-    n = null, f && (p(c), i !== null && (clearTimeout(i), i = setTimeout(x, e)));
-  }, v = (c) => (a = c, i = setTimeout(x, e), g && (n = setTimeout(M, b)), o ? p(c) : d), E = () => {
-    i !== null && clearTimeout(i), n !== null && clearTimeout(n), a = 0, f = null, h = null, u = null, i = null, n = null;
-  }, L = () => i === null && n === null ? d : $(Date.now()), j = () => i !== null || n !== null, T = function(...c) {
-    const m = Date.now(), y = P(m);
-    if (f = c, h = this, u = m, y) {
-      if (i === null)
-        return v(m);
-      if (g)
-        return clearTimeout(i), i = setTimeout(x, e), p(m);
+    const l = Date.now();
+    c = null, g && (h(l), o !== null && (clearTimeout(o), o = setTimeout(y, e)));
+  }, E = (l) => (d = l, o = setTimeout(y, e), m && (c = setTimeout(M, b)), n ? h(l) : u), L = () => {
+    o !== null && clearTimeout(o), c !== null && clearTimeout(c), d = 0, g = null, p = null, a = null, o = null, c = null;
+  }, j = () => o === null && c === null ? u : $(Date.now()), k = () => o !== null || c !== null, A = function(...l) {
+    const f = Date.now(), x = P(f);
+    if (g = l, p = this, a = f, x) {
+      if (o === null)
+        return E(f);
+      if (m)
+        return clearTimeout(o), o = setTimeout(y, e), h(f);
     }
-    return i === null && (i = setTimeout(x, e)), d;
+    return o === null && (o = setTimeout(y, e)), u;
   };
-  return T.cancel = E, T.flush = L, T.pending = j, T;
+  return A.cancel = L, A.flush = j, A.pending = k, A;
 }
-function lt(t, e, r = {}) {
-  const { leading: o = !0, trailing: s = !0 } = r;
-  return Z(t, e, {
-    leading: o,
-    trailing: s,
+function mt(t, e, r = {}) {
+  const { leading: n = !0, trailing: i = !0 } = r;
+  return J(t, e, {
+    leading: n,
+    trailing: i,
     maxWait: e
   });
 }
-const at = ({
+const gt = ({
   onClick: t,
   disabled: e
 }) => t ? e ? {
@@ -208,43 +204,43 @@ const at = ({
 } : {
   role: "button",
   tabIndex: 0,
-  onKeyDown: (o) => {
-    (o.key === "Enter" || o.key === " ") && (o.preventDefault(), t?.(o));
+  onKeyDown: (n) => {
+    (n.key === "Enter" || n.key === " ") && (n.preventDefault(), t?.(n));
   },
   onClick: t
-} : void 0, C = " ", ut = ({
+} : void 0, I = " ", pt = ({
   label: t,
   placeholder: e
 }) => {
   const r = typeof e == "string" && e.trim().length > 0 ? e : void 0;
   return t ? {
-    inputPlaceholder: r ?? C,
+    inputPlaceholder: r ?? I,
     labelStaysFloatedWithPlaceholder: r !== void 0
   } : {
-    inputPlaceholder: e ?? C,
+    inputPlaceholder: e ?? I,
     labelStaysFloatedWithPlaceholder: !1
   };
 };
 export {
-  X as DisabledProvider,
+  ot as DisabledProvider,
   S as assignRef,
-  ct as buildAriaLabel,
-  et as cn,
-  z as createSafeContext,
-  Z as debounce,
-  A as formatThousands,
-  at as getButtonA11yProps,
-  J as getFontSize,
-  ot as getObjectPath,
-  it as getStepperCalculations,
-  nt as isTextChildren,
-  N as mergeRefs,
-  ut as resolveBaseInputPlaceholder,
-  q as shallowEqual,
-  Q as textFormatter,
-  lt as throttle,
-  G as toPascalCase,
-  tt as useDisabledContext,
-  rt as useMergedRef,
-  st as useSplitText
+  dt as buildAriaLabel,
+  st as cn,
+  U as createSafeContext,
+  J as debounce,
+  z as formatThousands,
+  gt as getButtonA11yProps,
+  nt as getFontSize,
+  at as getObjectPath,
+  ut as getStepperCalculations,
+  ct as isTextChildren,
+  G as mergeRefs,
+  pt as resolveBaseInputPlaceholder,
+  H as shallowEqual,
+  rt as textFormatter,
+  mt as throttle,
+  et as toPascalCase,
+  it as useDisabledContext,
+  lt as useMergedRef,
+  ft as useSplitText
 };

package/dist/lib/inputFormatter/textFormatter.d.ts

@@ -7,11 +7,20 @@ export type TextFormatterOptions = {
     maxIntegerLength?: number;
     /** Maximum length for decimal part (after decimal) */
     maxDecimalLength?: number;
+    /**
+     * Character used to display the decimal separator.
+     * Input parsing always accepts both `.` and `,` regardless of this value.
+     */
+    decimalSeparator?: '.' | ',';
 };
 /**
  * Formats and validates numeric input text for amount inputs.
- * Handles decimal formatting, leading zeros, and prevents multiple decimal points.
- * Can optionally format with space-separated thousands.
+ *
+ * Parsing is always lenient: both `.` and `,` are accepted as the decimal
+ * separator on input, so the result stays correct regardless of the locale
+ * keyboard. The `decimalSeparator` option only controls how the result is
+ * displayed.
+ *
  * @returns Formatted and cleaned numeric string
  *
  * @example
@@ -19,9 +28,11 @@ export type TextFormatterOptions = {
  * textFormatter('.5') // '0.5'
  * textFormatter('1.2.3') // '1.23'
  * textFormatter('1,5') // '1.5'
+ * textFormatter('1,5', { decimalSeparator: ',' }) // '1,5'
  * textFormatter('abc123') // '123'
  * textFormatter('1000000', { thousandsSeparator: true }) // '1 000 000'
  * textFormatter('1234.5678', { thousandsSeparator: true }) // '1 234.5678'
+ * textFormatter('1234.5', { decimalSeparator: ',' }) // '1 234,5'
  * textFormatter('123456789012', { maxIntegerLength: 9 }) // '123456789'
  * textFormatter('123.123456', { maxDecimalLength: 2 }) // '123.12'
  */

package/dist/lib/inputFormatter/textFormatter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"textFormatter.d.ts","sourceRoot":"","sources":["../../../src/lib/inputFormatter/textFormatter.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,oBAAoB,GAAG;IACjC,sCAAsC;IACtC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,uDAAuD;IACvD,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,uDAAuD;IACvD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,sDAAsD;IACtD,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,aAAa;AAC3B,gCAAgC;AAChC,KAAK,EAAE,MAAM,EACb,OAAO,GAAE,oBAAyB,GACjC,MAAM,CA4DR"}
+{"version":3,"file":"textFormatter.d.ts","sourceRoot":"","sources":["../../../src/lib/inputFormatter/textFormatter.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,oBAAoB,GAAG;IACjC,sCAAsC;IACtC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,uDAAuD;IACvD,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,uDAAuD;IACvD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,sDAAsD;IACtD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;;OAGG;IACH,gBAAgB,CAAC,EAAE,GAAG,GAAG,GAAG,CAAC;CAC9B,CAAC;AAyCF;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,aAAa;AAC3B,gCAAgC;AAChC,KAAK,EAAE,MAAM,EACb,OAAO,GAAE,oBAAyB,GACjC,MAAM,CAsBR"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/lumen-utils-shared",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",

package/src/lib/inputFormatter/textFormatter.test.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { textFormatter } from './textFormatter.js';
+import { textFormatter, type TextFormatterOptions } from './textFormatter.js';
 
 describe('textFormatter', () => {
   describe('decimal handling with allowDecimals=true (default)', () => {
@@ -93,6 +93,64 @@ describe('textFormatter', () => {
     });
   });
 
+  describe('decimalSeparator display', () => {
+    type Case = {
+      name: string;
+      input: string;
+      expected: string;
+      options?: TextFormatterOptions;
+    };
+
+    const commaSeparatorCases: Case[] = [
+      {
+        name: 'display dot decimal as comma',
+        input: '1.5',
+        expected: '1,5',
+        options: { decimalSeparator: ',' },
+      },
+      {
+        name: 'display comma input as comma',
+        input: '1,5',
+        expected: '1,5',
+        options: { decimalSeparator: ',' },
+      },
+      {
+        name: 'comma decimal with space thousands',
+        input: '1234.5',
+        expected: '1 234,5',
+        options: { decimalSeparator: ',' },
+      },
+      {
+        name: 'preserve trailing separator while typing',
+        input: '12.',
+        expected: '12,',
+        options: { decimalSeparator: ',' },
+      },
+      {
+        name: 'no decimal part is unaffected',
+        input: '1234',
+        expected: '1 234',
+        options: { decimalSeparator: ',' },
+      },
+      {
+        name: 'integer-only mode is unaffected by comma separator',
+        input: '1.5',
+        expected: '15',
+        options: { decimalSeparator: ',', allowDecimals: false },
+      },
+      {
+        name: 'explicit dot separator matches default',
+        input: '1234.5',
+        expected: '1 234.5',
+        options: { decimalSeparator: '.' },
+      },
+    ];
+
+    it.each(commaSeparatorCases)('$name', ({ input, expected, options }) => {
+      expect(textFormatter(input, options)).toBe(expected);
+    });
+  });
+
   describe('non-numeric character removal', () => {
     type Case = { name: string; input: string; expected: string };
 

package/src/lib/inputFormatter/textFormatter.ts

@@ -9,12 +9,60 @@ export type TextFormatterOptions = {
   maxIntegerLength?: number;
   /** Maximum length for decimal part (after decimal) */
   maxDecimalLength?: number;
+  /**
+   * Character used to display the decimal separator.
+   * Input parsing always accepts both `.` and `,` regardless of this value.
+   */
+  decimalSeparator?: '.' | ',';
+};
+
+/** Keep only digits and dots; commas are treated as decimal separators. */
+const sanitize = (value: string): string =>
+  value.replaceAll(',', '.').replaceAll(/[^\d.]/g, '');
+
+/** Drop leading zeros, keeping one when it precedes a dot or stands alone (e.g. "0", "0.5"). */
+const stripLeadingZeros = (value: string): string =>
+  value.replace(/^0+(?=\d)/, '');
+
+/** Truncate to `max` characters. A `max` of 0 disables the limit. */
+const limitIntegerLength = (value: string, max: number): string =>
+  max > 0 ? value.slice(0, max) : value;
+
+const formatIntegerOnly = (value: string, maxIntegerLength: number): string =>
+  limitIntegerLength(value.replaceAll(/\D/g, ''), maxIntegerLength);
+
+const formatDecimal = (
+  value: string,
+  maxIntegerLength: number,
+  maxDecimalLength: number,
+): string => {
+  // A lone separator becomes "0." so the user can keep typing decimals.
+  if (value === '.') return '0.';
+
+  const firstDot = value.indexOf('.');
+  if (firstDot === -1) return limitIntegerLength(value, maxIntegerLength);
+
+  const integerPart =
+    limitIntegerLength(value.slice(0, firstDot), maxIntegerLength) || '0';
+  // Extra dots are ignored, e.g. the decimal part of "1.2.3" is "23".
+  const decimalPart = value
+    .slice(firstDot + 1)
+    .replaceAll('.', '')
+    .slice(0, maxDecimalLength);
+
+  if (decimalPart.length > 0) return `${integerPart}.${decimalPart}`;
+  // Preserve a trailing dot mid-typing (e.g. "12.").
+  return value.endsWith('.') ? `${integerPart}.` : integerPart;
 };
 
 /**
  * Formats and validates numeric input text for amount inputs.
- * Handles decimal formatting, leading zeros, and prevents multiple decimal points.
- * Can optionally format with space-separated thousands.
+ *
+ * Parsing is always lenient: both `.` and `,` are accepted as the decimal
+ * separator on input, so the result stays correct regardless of the locale
+ * keyboard. The `decimalSeparator` option only controls how the result is
+ * displayed.
+ *
  * @returns Formatted and cleaned numeric string
  *
  * @example
@@ -22,9 +70,11 @@ export type TextFormatterOptions = {
  * textFormatter('.5') // '0.5'
  * textFormatter('1.2.3') // '1.23'
  * textFormatter('1,5') // '1.5'
+ * textFormatter('1,5', { decimalSeparator: ',' }) // '1,5'
  * textFormatter('abc123') // '123'
  * textFormatter('1000000', { thousandsSeparator: true }) // '1 000 000'
  * textFormatter('1234.5678', { thousandsSeparator: true }) // '1 234.5678'
+ * textFormatter('1234.5', { decimalSeparator: ',' }) // '1 234,5'
  * textFormatter('123456789012', { maxIntegerLength: 9 }) // '123456789'
  * textFormatter('123.123456', { maxDecimalLength: 2 }) // '123.12'
  */
@@ -38,58 +88,20 @@ export function textFormatter(
     thousandsSeparator = true,
     maxIntegerLength = 9,
     maxDecimalLength = 9,
+    decimalSeparator = '.',
   } = options;
-  // Normalize input: convert comma to dot, remove non-digit/non-dot characters
-  const normalizedValue = value.replace(',', '.').replace(/[^\d.]/g, '');
-  let cleaned = normalizedValue;
-
-  // Remove leading zeros (except when followed by dot)
-  cleaned = cleaned.replace(/^0+(?=\d)/, '');
-
-  if (!allowDecimals) {
-    // Integer-only: remove any non-digit and apply max length
-    cleaned = cleaned.replace(/\D/g, '');
-    if (maxIntegerLength > 0 && cleaned.length > maxIntegerLength) {
-      cleaned = cleaned.slice(0, maxIntegerLength);
-    }
-    return thousandsSeparator ? formatThousands(cleaned) : cleaned;
-  }
-
-  // Handle single dot input as "0."
-  if (cleaned === '.') {
-    cleaned = '0.';
-  }
-
-  const firstDot = cleaned.indexOf('.');
-  if (firstDot !== -1) {
-    // Split integer and decimal parts
-    let integerPart = cleaned.slice(0, firstDot);
-    let decimalPart = cleaned.slice(firstDot + 1).replace(/\./g, '');
 
-    // Apply length limits
-    if (maxIntegerLength > 0 && integerPart.length > maxIntegerLength) {
-      integerPart = integerPart.slice(0, maxIntegerLength);
-    }
-    decimalPart = decimalPart.slice(0, maxDecimalLength);
+  const sanitized = stripLeadingZeros(sanitize(value));
 
-    // Ensure integer part is not empty
-    if (integerPart === '') integerPart = '0';
+  const cleaned = allowDecimals
+    ? formatDecimal(sanitized, maxIntegerLength, maxDecimalLength)
+    : formatIntegerOnly(sanitized, maxIntegerLength);
 
-    // Preserve trailing dot if user is typing
-    const hasTrailingDot =
-      normalizedValue.endsWith('.') || cleaned.endsWith('.');
-    cleaned =
-      decimalPart.length > 0
-        ? `${integerPart}.${decimalPart}`
-        : hasTrailingDot
-          ? `${integerPart}.`
-          : integerPart;
-  } else {
-    // No decimal point, just apply integer length limit
-    if (maxIntegerLength > 0 && cleaned.length > maxIntegerLength) {
-      cleaned = cleaned.slice(0, maxIntegerLength);
-    }
-  }
+  const grouped = thousandsSeparator ? formatThousands(cleaned) : cleaned;
 
-  return thousandsSeparator ? formatThousands(cleaned) : cleaned;
+  // formatThousands groups with spaces and keeps a single dot for the decimal,
+  // so localizing the separator only ever touches that one dot.
+  return decimalSeparator === '.'
+    ? grouped
+    : grouped.replaceAll('.', decimalSeparator);
 }