Merge branch 'master' into global-bindings

packages/account-portal

@@ -1 +1 @@
-Subproject commit b23fb3b17961fb04badd9487913a683fcf26dbe6
+Subproject commit 319c8499e7c3d33fbb96cf4d73a922690709686c

packages/builder/src/components/design/settings/controls/FormStepControls.svelte

@@ -23,7 +23,7 @@
         stepAction("addStep")
       }}
     >
-      Add Step
+      Add step
     </ActionButton>
   </div>
 {:else}

packages/client/manifest.json

@@ -6085,15 +6085,44 @@
             "key": "steps",
             "nested": true,
             "labelHidden": true,
-            "resetOn": [
+            "resetOn": ["dataSource", "actionType"],
-              "dataSource",
+            "defaultValue": [{}]
-              "actionType"
-            ],
-            "defaultValue": [
-              {}
-            ]
           }
         ]
+      },
+      {
+        "tag": "style",
+        "type": "select",
+        "label": "Size",
+        "key": "size",
+        "options": [
+          {
+            "label": "Medium",
+            "value": "spectrum--medium"
+          },
+          {
+            "label": "Large",
+            "value": "spectrum--large"
+          }
+        ],
+        "defaultValue": "spectrum--medium"
+      },
+      {
+        "tag": "style",
+        "type": "select",
+        "label": "Button position",
+        "key": "buttonPosition",
+        "options": [
+          {
+            "label": "Bottom",
+            "value": "bottom"
+          },
+          {
+            "label": "Top",
+            "value": "top"
+          }
+        ],
+        "defaultValue": "bottom"
       }
     ],
     "actions": [

packages/client/src/components/app/blocks/MultiStepFormblock.svelte

@@ -12,6 +12,8 @@
   export let noRowsMessage
   export let steps
   export let dataSource
+  export let buttonPosition = "bottom"
+  export let size
 
   const { fetchDatasourceSchema } = getContext("sdk")
   const component = getContext("component")
@@ -129,6 +131,7 @@
     type="form"
     context="form"
     props={{
+      size,
       dataSource,
       actionType: actionType === "Create" ? "Create" : "Update",
       readonly: actionType === "View",
@@ -156,8 +159,33 @@
             size: "shrink",
           }}
         >
-          <BlockComponent type="container" order={0}>
+          <BlockComponent
-            <BlockComponent type="heading" props={{ text: step.title }} />
+            type="container"
+            props={{
+              direction: "column",
+              gap: "S",
+            }}
+            order={0}
+          >
+            <BlockComponent
+              type="container"
+              props={{
+                direction: "row",
+                hAlign: "stretch",
+                vAlign: "center",
+                gap: "M",
+                wrap: true,
+              }}
+              order={0}
+            >
+              <BlockComponent type="heading" props={{ text: step.title }} />
+              {#if buttonPosition === "top"}
+                <BlockComponent
+                  type="buttongroup"
+                  props={{ buttons: step.buttons }}
+                />
+              {/if}
+            </BlockComponent>
           </BlockComponent>
           <BlockComponent type="text" props={{ text: step.desc }} order={1} />
 
@@ -179,16 +207,13 @@
               {/each}
             </div>
           </BlockComponent>
-          <BlockComponent
+          {#if buttonPosition === "bottom"}
-            type="buttongroup"
+            <BlockComponent
-            props={{ buttons: step.buttons }}
+              type="buttongroup"
-            styles={{
+              props={{ buttons: step.buttons }}
-              normal: {
+              order={3}
-                "margin-top": "16px",
+            />
-              },
+          {/if}
-            }}
-            order={3}
-          />
         </BlockComponent>
       </BlockComponent>
     {/each}