From 88354073aaa485db280934b1ea8b7c183d8f546f Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Mon, 23 Aug 2021 11:10:07 +0100
Subject: [PATCH] Add missing initial form values to form context and prefix
 static values to avoid clashes with column names

---
 packages/standard-components/manifest.json    |  6 +++---
 .../src/forms/InnerForm.svelte                | 21 +++++++++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/packages/standard-components/manifest.json b/packages/standard-components/manifest.json
index 559a34c4d2..da3736a076 100644
--- a/packages/standard-components/manifest.json
+++ b/packages/standard-components/manifest.json
@@ -1739,15 +1739,15 @@
         "values":  [
           {
             "label": "Valid",
-            "key": "valid"
+            "key": "__valid"
           },
           {
             "label": "Current Step",
-            "key": "currentStep"
+            "key": "__currentStep"
           },
           {
             "label": "Current Step Valid",
-            "key": "currentStepValid"
+            "key": "__currentStepValid"
           }
         ]
       },
diff --git a/packages/standard-components/src/forms/InnerForm.svelte b/packages/standard-components/src/forms/InnerForm.svelte
index 5422d50d1b..660b784fd0 100644
--- a/packages/standard-components/src/forms/InnerForm.svelte
+++ b/packages/standard-components/src/forms/InnerForm.svelte
@@ -256,17 +256,20 @@
     { type: ActionTypes.ClearForm, callback: formApi.clear },
     { type: ActionTypes.ChangeFormStep, callback: formApi.changeStep },
   ]
+
+  // Create data context to provide
+  $: dataContext = {
+    ...initialValues,
+    ...$values,
+
+    // These static values are prefixed to avoid clashes with actual columns
+    __valid: valid,
+    __currentStep: $currentStep,
+    __currentStepValid: $currentStepValid,
+  }
 </script>
 
-<Provider
-  {actions}
-  data={{
-    ...$values,
-    valid,
-    currentStep: $currentStep,
-    currentStepValid: $currentStepValid,
-  }}
->
+<Provider {actions} data={dataContext}>
   <div use:styleable={$component.styles}>
     <slot />
   </div>