Merge pull request #11011 from Budibase/form-step-updates

Persist the current step when remounting a form

packages/client/src/components/app/forms/Form.svelte

@@ -2,6 +2,7 @@
   import { getContext } from "svelte"
   import InnerForm from "./InnerForm.svelte"
   import { Helpers } from "@budibase/bbui"
+  import { writable } from "svelte/store"
 
   export let dataSource
   export let theme
@@ -23,6 +24,7 @@
   let loaded = false
   let schema
   let table
+  let currentStep = writable(1)
 
   $: fetchSchema(dataSource)
   $: schemaKey = generateSchemaKey(schema)
@@ -92,6 +94,7 @@
       {initialValues}
       {disableValidation}
       {editAutoColumns}
+      {currentStep}
     >
       <slot />
     </InnerForm>

packages/client/src/components/app/forms/InnerForm.svelte

@@ -13,16 +13,19 @@
   export let disableValidation = false
   export let editAutoColumns = false
 
+  // We export this store so that when we remount the inner form we can still
+  // persist what step we're on
+  export let currentStep
+
   const component = getContext("component")
   const { styleable, Provider, ActionTypes } = getContext("sdk")
 
   let fields = []
-  const currentStep = writable(1)
   const formState = writable({
     values: {},
     errors: {},
     valid: true,
-    currentStep: 1,
+    currentStep: get(currentStep),
   })
 
   // Reactive derived stores to derive form state from field array