Save empty numeric value as null instead of empty string

sveltia · Dec 30, 2024 · 41b0bbe · 41b0bbe
1 parent 9fee23c
commit 41b0bbe
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/lib/components/contents/details/widgets/number/number-editor.svelte b/src/lib/components/contents/details/widgets/number/number-editor.svelte
@@ -30,7 +30,7 @@
    */
   export let fieldConfig;
   /**
-   * @type {string | number}
+   * @type {string | number | null}
    */
   export let currentValue;
   /**
@@ -92,16 +92,20 @@
   const setCurrentValue = () => {
     let newValue;
 
-    if (valueType === 'int') {
-      newValue = Number.parseInt(isNumeric ? String(numInputValue) : strInputValue, 10);
-    } else if (valueType === 'float') {
-      newValue = Number.parseFloat(isNumeric ? String(numInputValue) : strInputValue);
+    if (isNumeric) {
+      if (numInputValue === undefined) {
+        newValue = NaN;
+      } else if (valueType === 'int') {
+        newValue = Number.parseInt(isNumeric ? String(numInputValue) : strInputValue, 10);
+      } else {
+        newValue = Number.parseFloat(isNumeric ? String(numInputValue) : strInputValue);
+      }
     } else {
       newValue = strInputValue;
     }
 
     if (isNumeric && Number.isNaN(newValue)) {
-      newValue = '';
+      newValue = null;
     }
 
     // Avoid a cycle dependency & infinite loop

diff --git a/src/lib/components/contents/details/widgets/number/number-preview.svelte b/src/lib/components/contents/details/widgets/number/number-preview.svelte
@@ -20,7 +20,7 @@
    */
   export let fieldConfig;
   /**
-   * @type {string | number}
+   * @type {string | number | null}
    */
   export let currentValue;
 
@@ -33,7 +33,7 @@
   $: numberFormatter = Intl.NumberFormat(canonicalLocale);
 </script>
 
-{#if currentValue !== undefined && currentValue !== ''}
+{#if currentValue !== undefined && currentValue !== null && currentValue !== ''}
   <p lang={locale} dir="auto">
     {#if valueType === 'int' || valueType === 'float'}
       {numberFormatter.format(Number(currentValue))}