[formatNumber] Fix default style handling and update tests

techniq · Jan 9, 2024 · 71f4382 · 71f4382
1 parent 5d5c82d
commit 71f4382
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/packages/svelte-ux/src/lib/utils/number.test.ts b/packages/svelte-ux/src/lib/utils/number.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect } from 'vitest';
 
 import { clamp, formatNumber, formatNumberWithLocale, round } from './number';
-import { knownLocales } from './locale';
+import { createLocaleSettings, knownLocales } from './locale';
 
 describe('clamp()', () => {
   it('no change', () => {
@@ -61,17 +61,21 @@ describe('formatNumber()', () => {
   });
 
   it('returns value as string for style "none"', () => {
-    const actual = formatNumber(1234.5678, { style: 'none' });
+    const actual = formatNumber(1234.5678, 'none');
     expect(actual).equal('1234.5678');
   });
 
   it('formats number with integer default', () => {
-    const actual = formatNumber(1234.5678, { style: 'integer' });
+    const actual = formatNumber(1234.5678, 'integer');
     expect(actual).equal('1,235');
   });
 
   it('formats number with integer fr', () => {
-    const actual = formatNumber(1234.5678, { style: 'integer', locales: 'fr' });
+    const actual = formatNumberWithLocale(
+      createLocaleSettings({ locale: 'fr' }),
+      1234.5678,
+      'integer'
+    );
     expect(actual).equal('1 235');
   });
 

diff --git a/packages/svelte-ux/src/lib/utils/number.ts b/packages/svelte-ux/src/lib/utils/number.ts
@@ -60,7 +60,9 @@ export function formatNumberWithLocale(
     // Let's always starts with all defaults
     ...defaults,
 
-    style,
+    ...(style !== 'default' && {
+      style,
+    }),
 
     // If currency is specified, then style must be currency
     ...(options.currency != null && {