From a26ebd92e7a36dc40571fd9c839850be68b89eab Mon Sep 17 00:00:00 2001
From: Jefferson Bledsoe <me@jeffersonbledsoe.com>
Date: Thu, 3 Aug 2023 15:17:00 +0100
Subject: [PATCH] Fix empty dirty fields breaking sending (#170)

---
 package.json                                                  | 2 +-
 src/addons/volto-form-block                                   | 2 +-
 .../volto-form-block/components/Widget/EmailWidget.jsx        | 4 ++--
 .../volto-form-block/components/Widget/SelectWidget.jsx       | 2 +-
 .../volto-form-block/components/Widget/TextWidget.jsx         | 4 ++--
 .../volto-form-block/components/Widget/TextareaWidget.jsx     | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index f72309a6..64bb8859 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nsw-design-system-plone6",
-  "version": "0.7.0",
+  "version": "0.7.1-canary0",
   "description": "nsw-design-system-plone6: Volto add-on",
   "main": "src/index.js",
   "license": "MIT",
diff --git a/src/addons/volto-form-block b/src/addons/volto-form-block
index 52ee8854..69f99112 160000
--- a/src/addons/volto-form-block
+++ b/src/addons/volto-form-block
@@ -1 +1 @@
-Subproject commit 52ee8854ed9dfdaa827de861f206f96f10584559
+Subproject commit 69f99112183164e1ca50aa5689b7b2282eec88ac
diff --git a/src/customizations/volto-form-block/components/Widget/EmailWidget.jsx b/src/customizations/volto-form-block/components/Widget/EmailWidget.jsx
index f3932950..70595b8a 100644
--- a/src/customizations/volto-form-block/components/Widget/EmailWidget.jsx
+++ b/src/customizations/volto-form-block/components/Widget/EmailWidget.jsx
@@ -75,10 +75,10 @@ function EmailWidget(props) {
           value={value}
           onClick={() => onClick()}
           onBlur={({ target }) =>
-            onBlur(id, target.value === '' ? undefined : target.value)
+            onBlur(id, target.value === '' ? null : target.value)
           }
           onChange={({ target }) => {
-            return onChange(id, target.value === '' ? undefined : target.value);
+            return onChange(id, target.value === '' ? null : target.value);
           }}
         />
       </div>
diff --git a/src/customizations/volto-form-block/components/Widget/SelectWidget.jsx b/src/customizations/volto-form-block/components/Widget/SelectWidget.jsx
index c0882f8e..c9e6a1ea 100644
--- a/src/customizations/volto-form-block/components/Widget/SelectWidget.jsx
+++ b/src/customizations/volto-form-block/components/Widget/SelectWidget.jsx
@@ -165,7 +165,7 @@ function SelectWidget(props) {
               id,
               selectedOption && selectedOption.value !== 'no-value'
                 ? selectedOption.value
-                : undefined,
+                : null,
             );
           }}
         >
diff --git a/src/customizations/volto-form-block/components/Widget/TextWidget.jsx b/src/customizations/volto-form-block/components/Widget/TextWidget.jsx
index 206f25d9..6a532531 100644
--- a/src/customizations/volto-form-block/components/Widget/TextWidget.jsx
+++ b/src/customizations/volto-form-block/components/Widget/TextWidget.jsx
@@ -71,10 +71,10 @@ function TextWidget(props) {
           value={value}
           onClick={() => onClick()}
           onBlur={({ target }) =>
-            onBlur(id, target.value === '' ? undefined : target.value)
+            onBlur(id, target.value === '' ? null : target.value)
           }
           onChange={({ target }) => {
-            return onChange(id, target.value === '' ? undefined : target.value);
+            return onChange(id, target.value === '' ? null : target.value);
           }}
         />
       </div>
diff --git a/src/customizations/volto-form-block/components/Widget/TextareaWidget.jsx b/src/customizations/volto-form-block/components/Widget/TextareaWidget.jsx
index 4fb5ad66..3c19b154 100644
--- a/src/customizations/volto-form-block/components/Widget/TextareaWidget.jsx
+++ b/src/customizations/volto-form-block/components/Widget/TextareaWidget.jsx
@@ -86,7 +86,7 @@ const TextareaWidget = (props) => {
           placeholder={placeholder}
           disabled={isDisabled}
           onChange={({ target }) =>
-            onhandleChange(id, target.value === '' ? undefined : target.value)
+            onhandleChange(id, target.value === '' ? null : target.value)
           }
           {...attributes}
         ></textarea>