@wise/dynamic-flow-client 4.0.0-experimental-af37aae → 4.0.0-experimental-9cbdd3f

package/build/main.js

@@ -443,8 +443,7 @@ __export(index_exports, {
   JsonSchemaForm: () => JsonSchemaForm_default,
   Layout: () => DynamicLayout_default,
   convertStepToLayout: () => convertStepToLayout,
-  find: () => find,
-  findType: () => findType,
+  findRendererPropsByType: () => findRendererPropsByType,
   inlineReferences: () => inlineReferences,
   isValidSchema: () => isValidSchema,
   makeHttpClient: () => makeHttpClient,
@@ -5410,10 +5409,50 @@ var z = /* @__PURE__ */ Object.freeze({
   quotelessJson,
   ZodError
 });
-var imageSchema = z.object({
-  text: z.string().optional(),
-  url: z.string(),
-  accessibilityDescription: z.string().optional()
+var linkBehaviorSchema = z.object({
+  type: z.literal("link"),
+  url: z.string()
+});
+var navigationStackBehaviorSchema = z.union([
+  z.literal("default"),
+  z.literal("remove-previous"),
+  z.literal("remove-all"),
+  z.literal("replace-current")
+]);
+var jsonElementSchema = z.lazy(
+  () => z.union([
+    z.string(),
+    z.number(),
+    z.boolean(),
+    z.record(jsonElementSchema),
+    z.array(jsonElementSchema)
+  ]).nullable()
+);
+var helpSchema = z.object({
+  markdown: z.string()
+});
+var actionTypeSchema = z.union([
+  z.literal("primary"),
+  z.literal("secondary"),
+  z.literal("link"),
+  z.literal("positive"),
+  z.literal("negative")
+]);
+var linkSchema = z.object({
+  url: z.string()
+});
+var httpMethodSchema = z.union([
+  z.literal("GET"),
+  z.literal("POST"),
+  z.literal("PUT"),
+  z.literal("PATCH"),
+  z.literal("DELETE")
+]);
+var uploadSourceSchema = z.union([z.literal("camera"), z.literal("file")]);
+var validateAsyncSchema = z.object({
+  param: z.string(),
+  method: httpMethodSchema,
+  url: z.string()
 });
 var summaryProviderSchema = z.object({
   providesTitle: z.boolean().optional(),
@@ -5421,6 +5460,139 @@ var summaryProviderSchema = z.object({
   providesIcon: z.boolean().optional(),
   providesImage: z.boolean().optional()
 });
+var imageSchema = z.object({
+  text: z.string().optional(),
+  url: z.string().optional(),
+  uri: z.string().optional(),
+  accessibilityDescription: z.string().optional()
+});
+var externalSchema = z.object({
+  url: z.string()
+});
+var columnsLayoutBiasSchema = z.union([
+  z.literal("none"),
+  z.literal("left"),
+  z.literal("right")
+]);
+var sizeSchema = z.union([
+  z.literal("xs"),
+  z.literal("sm"),
+  z.literal("md"),
+  z.literal("lg"),
+  z.literal("xl")
+]);
+var dividerLayoutSchema = z.object({
+  type: z.literal("divider"),
+  control: z.string().optional(),
+  margin: sizeSchema.optional()
+});
+var statusListLayoutStatusSchema = z.union([
+  z.literal("not-done"),
+  z.literal("pending"),
+  z.literal("done")
+]);
+var loadingIndicatorLayoutSchema = z.object({
+  type: z.literal("loading-indicator"),
+  size: sizeSchema.optional(),
+  control: z.string().optional(),
+  margin: sizeSchema.optional()
+});
+var contextSchema = z.union([
+  z.literal("positive"),
+  z.literal("neutral"),
+  z.literal("warning"),
+  z.literal("negative"),
+  z.literal("success"),
+  z.literal("failure"),
+  z.literal("info"),
+  z.literal("primary")
+]);
+var instructionsLayoutItemSchema = z.object({
+  text: z.string(),
+  context: contextSchema,
+  tag: z.string().optional()
+});
+var formLayoutSchemaReferenceSchema = z.object({
+  $ref: z.string()
+});
+var modalLayoutTriggerSchema = z.object({
+  title: z.string()
+});
+var instructionsLayoutSchema = z.object({
+  type: z.literal("instructions"),
+  title: z.string().optional(),
+  items: z.array(instructionsLayoutItemSchema),
+  control: z.string().optional(),
+  margin: sizeSchema.optional()
+});
+var reviewLayoutFieldSchema = z.object({
+  label: z.string(),
+  value: z.string(),
+  rawValue: z.string().optional(),
+  help: helpSchema.optional(),
+  tag: z.string().optional()
+});
+var alignSchema = z.union([z.literal("left"), z.literal("center"), z.literal("right")]);
+var searchLayoutSchema = z.object({
+  type: z.literal("search"),
+  title: z.string(),
+  method: httpMethodSchema,
+  url: z.string(),
+  param: z.string(),
+  emptyMessage: z.string().optional(),
+  control: z.string().optional(),
+  margin: sizeSchema.optional()
+});
+var headingLayoutSchema = z.object({
+  type: z.literal("heading"),
+  text: z.string(),
+  size: sizeSchema.optional(),
+  align: alignSchema.optional(),
+  control: z.string().optional(),
+  margin: sizeSchema.optional()
+});
+var imageLayoutSchema = z.object({
+  type: z.literal("image"),
+  text: z.string().optional(),
+  url: z.string().optional(),
+  accessibilityDescription: z.string().optional(),
+  content: imageSchema.optional(),
+  size: sizeSchema.optional(),
+  control: z.string().optional(),
+  margin: sizeSchema.optional()
+});
+var markdownLayoutSchema = z.object({
+  type: z.literal("markdown"),
+  content: z.string(),
+  align: alignSchema.optional(),
+  control: z.string().optional(),
+  margin: sizeSchema.optional()
+});
+var paragraphLayoutSchema = z.object({
+  type: z.literal("paragraph"),
+  text: z.string(),
+  align: alignSchema.optional(),
+  control: z.string().optional(),
+  margin: sizeSchema.optional()
+});
+var listLayoutStatusSchema = z.union([
+  z.literal("warning"),
+  z.literal("neutral"),
+  z.literal("positive")
+]);
+var errorResponseBodySchema = z.object({
+  refreshFormUrl: z.string().optional(),
+  analytics: z.record(z.string()).optional(),
+  error: z.string().optional(),
+  validation: jsonElementSchema.optional(),
+  refreshUrl: z.string().optional()
+});
+var searchSearchRequestSchema = z.object({
+  url: z.string(),
+  method: httpMethodSchema,
+  param: z.string(),
+  query: z.string()
+});
 var autocompleteTokenSchema = z.union([
   z.literal("on"),
   z.literal("name"),
@@ -5486,214 +5658,29 @@ var autocompleteTokenSchema = z.union([
   z.literal("fax"),
   z.literal("pager")
 ]);
-var helpSchema = z.object({
-  markdown: z.string()
-});
-var jsonElementSchema = z.lazy(
-  () => z.union([
-    z.string(),
-    z.number(),
-    z.boolean(),
-    z.record(jsonElementSchema),
-    z.array(jsonElementSchema)
-  ]).nullable()
-);
-var stringSchemaFormatSchema = z.union([
-  z.literal("date"),
-  z.literal("email"),
-  z.literal("numeric"),
-  z.literal("password"),
-  z.literal("phone-number"),
-  z.literal("base64url")
-]);
 var autocapitalizationTypeSchema = z.union([
   z.literal("none"),
   z.literal("characters"),
   z.literal("sentences"),
   z.literal("words")
 ]);
-var uploadSourceSchema = z.union([z.literal("camera"), z.literal("file")]);
-var externalSchema = z.object({
-  url: z.string()
-});
-var stepErrorSchema = z.object({
-  error: z.string().optional(),
-  validation: jsonElementSchema.optional()
-});
 var iconNamedSchema = z.object({
   name: z.string()
 });
 var iconTextSchema = z.object({
   text: z.string()
 });
-var alignSchema = z.union([z.literal("left"), z.literal("center"), z.literal("right")]);
-var httpMethodSchema = z.union([
-  z.literal("GET"),
-  z.literal("POST"),
-  z.literal("PUT"),
-  z.literal("PATCH"),
-  z.literal("DELETE")
-]);
-var sizeSchema = z.union([
-  z.literal("xs"),
-  z.literal("sm"),
-  z.literal("md"),
-  z.literal("lg"),
-  z.literal("xl")
-]);
-var contextSchema = z.union([
-  z.literal("positive"),
-  z.literal("neutral"),
-  z.literal("warning"),
-  z.literal("negative"),
-  z.literal("success"),
-  z.literal("failure"),
-  z.literal("info"),
-  z.literal("primary")
+var stringSchemaFormatSchema = z.union([
+  z.literal("date"),
+  z.literal("email"),
+  z.literal("numeric"),
+  z.literal("password"),
+  z.literal("phone-number"),
+  z.literal("base64url")
 ]);
-var imageLayoutSchema = z.object({
-  type: z.literal("image"),
-  text: z.string().optional(),
-  url: z.string(),
-  size: sizeSchema.optional(),
-  accessibilityDescription: z.string().optional(),
-  control: z.string().optional(),
-  margin: sizeSchema.optional()
-});
-var searchSearchRequestSchema = z.object({
-  url: z.string(),
-  method: httpMethodSchema,
-  param: z.string(),
-  query: z.string()
-});
-var errorResponseBodySchema = z.object({
-  refreshFormUrl: z.string().optional(),
-  analytics: z.record(z.string()).optional(),
+var stepErrorSchema = z.object({
   error: z.string().optional(),
-  validation: jsonElementSchema.optional(),
-  refreshUrl: z.string().optional()
-});
-var paragraphLayoutSchema = z.object({
-  type: z.literal("paragraph"),
-  text: z.string(),
-  align: alignSchema.optional(),
-  control: z.string().optional(),
-  margin: sizeSchema.optional()
-});
-var instructionsLayoutItemSchema = z.object({
-  text: z.string(),
-  context: contextSchema,
-  tag: z.string().optional()
-});
-var columnsLayoutBiasSchema = z.union([
-  z.literal("none"),
-  z.literal("left"),
-  z.literal("right")
-]);
-var formLayoutSchemaReferenceSchema = z.object({
-  $ref: z.string()
-});
-var headingLayoutSchema = z.object({
-  type: z.literal("heading"),
-  text: z.string(),
-  size: sizeSchema.optional(),
-  align: alignSchema.optional(),
-  control: z.string().optional(),
-  margin: sizeSchema.optional()
-});
-var dividerLayoutSchema = z.object({
-  type: z.literal("divider"),
-  control: z.string().optional(),
-  margin: sizeSchema.optional()
-});
-var infoLayoutSchema = z.object({
-  type: z.literal("info"),
-  markdown: z.string(),
-  align: alignSchema.optional(),
-  control: z.string().optional(),
-  margin: sizeSchema.optional()
-});
-var instructionsLayoutSchema = z.object({
-  type: z.literal("instructions"),
-  title: z.string().optional(),
-  items: z.array(instructionsLayoutItemSchema),
-  control: z.string().optional(),
-  margin: sizeSchema.optional()
-});
-var loadingIndicatorLayoutSchema = z.object({
-  type: z.literal("loading-indicator"),
-  size: sizeSchema.optional(),
-  control: z.string().optional(),
-  margin: sizeSchema.optional()
-});
-var markdownLayoutSchema = z.object({
-  type: z.literal("markdown"),
-  content: z.string(),
-  align: alignSchema.optional(),
-  control: z.string().optional(),
-  margin: sizeSchema.optional()
-});
-var searchLayoutSchema = z.object({
-  type: z.literal("search"),
-  title: z.string(),
-  method: httpMethodSchema,
-  url: z.string(),
-  param: z.string(),
-  emptyMessage: z.string().optional(),
-  control: z.string().optional(),
-  margin: sizeSchema.optional()
-});
-var modalLayoutTriggerSchema = z.object({
-  title: z.string()
-});
-var listLayoutStatusSchema = z.union([
-  z.literal("warning"),
-  z.literal("neutral"),
-  z.literal("positive")
-]);
-var reviewLayoutFieldSchema = z.object({
-  label: z.string(),
-  value: z.string(),
-  rawValue: z.string().optional(),
-  help: helpSchema.optional(),
-  tag: z.string().optional()
-});
-var statusListLayoutStatusSchema = z.union([
-  z.literal("not-done"),
-  z.literal("pending"),
-  z.literal("done")
-]);
-var linkSchema = z.object({
-  url: z.string()
-});
-var actionTypeSchema = z.union([
-  z.literal("primary"),
-  z.literal("secondary"),
-  z.literal("link"),
-  z.literal("positive"),
-  z.literal("negative")
-]);
-var navigationStackBehaviorSchema = z.union([
-  z.literal("default"),
-  z.literal("remove-previous"),
-  z.literal("remove-all"),
-  z.literal("replace-current")
-]);
-var iconSchema = z.union([iconNamedSchema, iconTextSchema]);
-var validateAsyncSchema = z.object({
-  param: z.string(),
-  method: httpMethodSchema,
-  url: z.string()
-});
-var summarySummariserSchema = z.object({
-  defaultTitle: z.string().optional(),
-  defaultDescription: z.string().optional(),
-  defaultIcon: iconSchema.optional(),
-  defaultImage: imageLayoutSchema.optional(),
-  providesTitle: z.boolean().optional(),
-  providesDescription: z.boolean().optional(),
-  providesIcon: z.boolean().optional(),
-  providesImage: z.boolean().optional()
+  validation: jsonElementSchema.optional()
 });
 var actionSchema = z.object({
   title: z.string().optional(),
@@ -5710,8 +5697,33 @@ var actionSchema = z.object({
   timeout: z.number().optional(),
   skipValidation: z.boolean().optional()
 });
-var linkHandlerSchema = z.object({
-  regexPattern: z.string(),
+var iconSchema = z.union([iconNamedSchema, iconTextSchema]);
+var formLayoutSchema = z.object({
+  type: z.literal("form"),
+  schema: formLayoutSchemaReferenceSchema.optional(),
+  schemaId: z.string(),
+  control: z.string().optional(),
+  margin: sizeSchema.optional()
+});
+var infoLayoutSchema = z.object({
+  type: z.literal("info"),
+  markdown: z.string(),
+  align: alignSchema.optional(),
+  control: z.string().optional(),
+  margin: sizeSchema.optional()
+});
+var listLayoutItemSchema = z.object({
+  description: z.string().optional(),
+  status: listLayoutStatusSchema.optional(),
+  icon: iconSchema.optional(),
+  image: imageSchema.optional(),
+  title: z.string().optional(),
+  subtitle: z.string().optional(),
+  value: z.string().optional(),
+  subvalue: z.string().optional(),
+  tag: z.string().optional()
+});
+var actionResponseBodySchema = z.object({
   action: actionSchema
 });
 var searchResultActionSchema = z.object({
@@ -5719,7 +5731,7 @@ var searchResultActionSchema = z.object({
   title: z.string(),
   description: z.string().optional(),
   icon: iconSchema.optional(),
-  image: imageLayoutSchema.optional(),
+  image: imageSchema.optional(),
   value: actionSchema
 });
 var searchResultSearchSchema = z.object({
@@ -5727,112 +5739,109 @@ var searchResultSearchSchema = z.object({
   title: z.string(),
   description: z.string().optional(),
   icon: iconSchema.optional(),
-  image: imageLayoutSchema.optional(),
+  image: imageSchema.optional(),
   value: searchSearchRequestSchema
 });
-var actionResponseBodySchema = z.object({
+var actionBehaviorSchema = z.object({
+  type: z.literal("action"),
   action: actionSchema
 });
-var reviewLayoutCallToActionSchema = z.object({
-  title: z.string(),
+var containerBehaviorSchema = z.object({
+  action: actionSchema.optional(),
+  link: linkSchema.optional()
+});
+var navigationBackBehaviorSchema = z.object({
+  title: z.string().optional(),
   action: actionSchema
 });
-var formLayoutSchema = z.object({
-  type: z.literal("form"),
-  schema: formLayoutSchemaReferenceSchema.optional(),
-  schemaId: z.string(),
-  control: z.string().optional(),
-  margin: sizeSchema.optional()
+var summarySummariserSchema = z.object({
+  defaultTitle: z.string().optional(),
+  defaultDescription: z.string().optional(),
+  defaultIcon: iconSchema.optional(),
+  defaultImage: imageSchema.optional(),
+  providesTitle: z.boolean().optional(),
+  providesDescription: z.boolean().optional(),
+  providesIcon: z.boolean().optional(),
+  providesImage: z.boolean().optional()
+});
+var searchResultSchema = z.union([searchResultActionSchema, searchResultSearchSchema]);
+var searchResponseBodySchema = z.object({
+  results: z.array(searchResultSchema)
+});
+var behaviorSchema = z.union([
+  actionBehaviorSchema,
+  containerBehaviorSchema,
+  linkBehaviorSchema
+]);
+var navigationSchema = z.object({
+  backButton: navigationBackBehaviorSchema.optional(),
+  back: navigationBackBehaviorSchema.optional(),
+  stackBehavior: navigationStackBehaviorSchema.optional()
 });
+var linkHandlerSchema = z.object({
+  regexPattern: z.string(),
+  behavior: behaviorSchema.optional()
+});
+var pollingOnErrorSchema = z.object({
+  action: actionSchema.optional(),
+  behavior: behaviorSchema.optional()
+});
+var pollingSchema = z.object({
+  interval: z.number().optional(),
+  url: z.string(),
+  delay: z.number().optional(),
+  timeout: z.number().optional(),
+  maxAttempts: z.number(),
+  onError: pollingOnErrorSchema
+});
+var summarySchema = z.union([summaryProviderSchema, summarySummariserSchema]);
 var decisionLayoutOptionSchema = z.object({
-  action: actionSchema,
+  action: actionSchema.optional(),
   title: z.string(),
   description: z.string().optional(),
   disabled: z.boolean().optional(),
   icon: iconSchema.optional(),
-  image: imageLayoutSchema.optional(),
+  image: imageSchema.optional(),
+  behavior: behaviorSchema.optional(),
   tag: z.string().optional()
 });
-var behaviorSchema = z.object({
-  action: actionSchema.optional(),
-  link: linkSchema.optional()
-});
 var buttonLayoutSchema = z.object({
   type: z.literal("button"),
+  action: actionSchema.optional(),
   size: sizeSchema.optional(),
   title: z.string().optional(),
-  action: actionSchema,
+  behavior: behaviorSchema.optional(),
   context: contextSchema.optional(),
   disabled: z.boolean().optional(),
   pinOrder: z.number().optional(),
   control: z.string().optional(),
   margin: sizeSchema.optional()
 });
-var reviewLayoutSchema = z.object({
-  type: z.literal("review"),
-  orientation: z.string().optional(),
-  action: actionSchema.optional(),
-  fields: z.array(reviewLayoutFieldSchema),
-  title: z.string().optional(),
-  callToAction: reviewLayoutCallToActionSchema.optional(),
-  control: z.string().optional(),
-  margin: sizeSchema.optional()
-});
-var itemCallToActionSchema = z.object({
-  title: z.string(),
-  accessibilityDescription: z.string().optional(),
-  behavior: behaviorSchema
-});
-var listLayoutCallToActionSchema = z.object({
-  title: z.string(),
-  accessibilityDescription: z.string().optional(),
-  behavior: behaviorSchema
-});
-var listLayoutItemSchema = z.object({
-  description: z.string().optional(),
-  status: listLayoutStatusSchema.optional(),
-  icon: iconSchema.optional(),
-  image: imageSchema.optional(),
-  title: z.string().optional(),
-  subtitle: z.string().optional(),
-  value: z.string().optional(),
-  subvalue: z.string().optional(),
-  tag: z.string().optional()
-});
-var statusListLayoutItemSchema = z.object({
-  title: z.string(),
-  description: z.string().optional(),
-  icon: iconSchema,
-  status: statusListLayoutStatusSchema.optional(),
-  callToAction: itemCallToActionSchema.optional(),
-  tag: z.string().optional()
-});
-var pollingOnErrorSchema = z.object({
-  action: actionSchema
-});
-var navigationBackBehaviorSchema = z.object({
-  title: z.string().optional(),
-  action: actionSchema
+var reviewLayoutCallToActionSchema = z.object({
+  action: actionSchema.optional(),
+  title: z.string(),
+  accessibilityDescription: z.string().optional(),
+  behavior: behaviorSchema.optional()
 });
-var summarySchema = z.union([summaryProviderSchema, summarySummariserSchema]);
-var pollingSchema = z.object({
-  url: z.string(),
-  interval: z.number().optional(),
-  delay: z.number().optional(),
-  timeout: z.number().optional(),
-  maxAttempts: z.number(),
-  onError: pollingOnErrorSchema
+var alertLayoutCallToActionSchema = z.object({
+  title: z.string(),
+  accessibilityDescription: z.string().optional(),
+  behavior: behaviorSchema
 });
-var navigationSchema = z.object({
-  backButton: navigationBackBehaviorSchema.optional(),
-  back: navigationBackBehaviorSchema.optional(),
-  stackBehavior: navigationStackBehaviorSchema.optional()
+var itemCallToActionSchema = z.object({
+  title: z.string(),
+  accessibilityDescription: z.string().optional(),
+  behavior: behaviorSchema
 });
-var searchResultSchema = z.union([searchResultActionSchema, searchResultSearchSchema]);
-var searchResponseBodySchema = z.object({
-  results: z.array(searchResultSchema)
+var alertLayoutSchema = z.object({
+  type: z.literal("alert"),
+  markdown: z.string(),
+  context: contextSchema.optional(),
+  control: z.string().optional(),
+  margin: sizeSchema.optional(),
+  callToAction: alertLayoutCallToActionSchema.optional()
 });
-var alertLayoutCallToActionSchema = z.object({
+var listLayoutCallToActionSchema = z.object({
   title: z.string(),
   accessibilityDescription: z.string().optional(),
   behavior: behaviorSchema
@@ -5852,21 +5861,6 @@ var listLayoutSchema = z.object({
   control: z.string().optional(),
   margin: sizeSchema.optional()
 });
-var statusListLayoutSchema = z.object({
-  type: z.literal("status-list"),
-  items: z.array(statusListLayoutItemSchema),
-  title: z.string().optional(),
-  control: z.string().optional(),
-  margin: sizeSchema.optional()
-});
-var alertLayoutSchema = z.object({
-  type: z.literal("alert"),
-  markdown: z.string(),
-  context: contextSchema.optional(),
-  control: z.string().optional(),
-  margin: sizeSchema.optional(),
-  callToAction: alertLayoutCallToActionSchema.optional()
-});
 var constSchemaSchema = z.object({
   hidden: z.boolean().optional(),
   alert: alertLayoutSchema.optional(),
@@ -5905,22 +5899,157 @@ var blobSchemaSchema = z.object({
   source: uploadSourceSchema.optional(),
   disabled: z.boolean().optional()
 });
-var numberSchemaSchema = z.lazy(
+var reviewLayoutSchema = z.object({
+  type: z.literal("review"),
+  orientation: z.string().optional(),
+  action: actionSchema.optional(),
+  fields: z.array(reviewLayoutFieldSchema),
+  title: z.string().optional(),
+  callToAction: reviewLayoutCallToActionSchema.optional(),
+  control: z.string().optional(),
+  margin: sizeSchema.optional()
+});
+var statusListLayoutItemSchema = z.object({
+  title: z.string(),
+  description: z.string().optional(),
+  icon: iconSchema,
+  status: statusListLayoutStatusSchema.optional(),
+  callToAction: itemCallToActionSchema.optional(),
+  tag: z.string().optional()
+});
+var statusListLayoutSchema = z.object({
+  type: z.literal("status-list"),
+  items: z.array(statusListLayoutItemSchema),
+  title: z.string().optional(),
+  control: z.string().optional(),
+  margin: sizeSchema.optional()
+});
+var persistAsyncSchema = z.lazy(
   () => z.object({
-    type: z.literal("number"),
+    param: z.string(),
+    idProperty: z.string(),
+    schema: schemaSchema,
+    url: z.string(),
+    method: httpMethodSchema
+  })
+);
+var schemaSchema = z.lazy(
+  () => z.union([
+    allOfSchemaSchema,
+    arraySchemaSchema,
+    blobSchemaSchema,
+    booleanSchemaSchema,
+    constSchemaSchema,
+    integerSchemaSchema,
+    numberSchemaSchema,
+    objectSchemaSchema,
+    oneOfSchemaSchema,
+    stringSchemaSchema
+  ])
+);
+var columnsLayoutSchema = z.lazy(
+  () => z.object({
+    type: z.literal("columns"),
+    left: z.array(layoutSchema),
+    right: z.array(layoutSchema),
+    bias: columnsLayoutBiasSchema.optional(),
+    control: z.string().optional(),
+    margin: sizeSchema.optional()
+  })
+);
+var layoutSchema = z.lazy(
+  () => z.union([
+    alertLayoutSchema,
+    boxLayoutSchema,
+    buttonLayoutSchema,
+    columnsLayoutSchema,
+    decisionLayoutSchema,
+    dividerLayoutSchema,
+    formLayoutSchema,
+    headingLayoutSchema,
+    imageLayoutSchema,
+    infoLayoutSchema,
+    instructionsLayoutSchema,
+    listLayoutSchema,
+    loadingIndicatorLayoutSchema,
+    markdownLayoutSchema,
+    modalLayoutSchema,
+    paragraphLayoutSchema,
+    reviewLayoutSchema,
+    searchLayoutSchema,
+    statusListLayoutSchema
+  ])
+);
+var modalLayoutContentSchema = z.lazy(
+  () => z.object({
+    title: z.string().optional(),
+    components: z.array(layoutSchema)
+  })
+);
+var boxLayoutSchema = z.lazy(
+  () => z.object({
+    type: z.literal("box"),
+    components: z.array(layoutSchema),
+    width: sizeSchema.optional(),
+    border: z.boolean().optional(),
+    control: z.string().optional(),
+    margin: sizeSchema.optional()
+  })
+);
+var modalLayoutSchema = z.lazy(
+  () => z.object({
+    type: z.literal("modal"),
+    control: z.string().optional(),
+    margin: sizeSchema.optional(),
+    trigger: modalLayoutTriggerSchema,
+    content: modalLayoutContentSchema
+  })
+);
+var stepSchema = z.lazy(
+  () => z.object({
+    key: z.string().optional(),
+    type: z.string().optional(),
+    actions: z.array(actionSchema).optional(),
+    refreshFormUrl: z.string().optional(),
+    id: z.string(),
+    title: z.string(),
+    schemas: z.array(schemaSchema),
+    layout: z.array(layoutSchema),
+    description: z.string().optional(),
+    model: jsonElementSchema.optional(),
+    external: externalSchema.optional(),
+    polling: pollingSchema.optional(),
+    linkHandlers: z.array(linkHandlerSchema).optional(),
+    analytics: z.record(z.string()).optional(),
+    errors: stepErrorSchema.optional(),
+    navigation: navigationSchema.optional(),
+    refreshUrl: z.string().optional(),
+    control: z.string().optional()
+  })
+);
+var stringSchemaSchema = z.lazy(
+  () => z.object({
+    type: z.literal("string"),
     autofillProvider: z.string().optional(),
     promoted: z.boolean().optional(),
     refreshFormOnChange: z.boolean().optional(),
     refreshUrl: z.string().optional(),
     refreshFormUrl: z.string().optional(),
+    format: stringSchemaFormatSchema.optional(),
+    displayFormat: z.string().optional(),
     placeholder: z.string().optional(),
-    minimum: z.number().optional(),
-    maximum: z.number().optional(),
+    minLength: z.number().optional(),
+    maxLength: z.number().optional(),
+    minimum: z.string().optional(),
+    maximum: z.string().optional(),
+    pattern: z.string().optional(),
+    autocapitalization: autocapitalizationTypeSchema.optional(),
+    autocorrect: z.boolean().optional(),
     $id: z.string().optional(),
     title: z.string().optional(),
     description: z.string().optional(),
     control: z.string().optional(),
-    default: z.number().optional(),
+    default: z.string().optional(),
     hidden: z.boolean().optional(),
     disabled: z.boolean().optional(),
     icon: iconSchema.optional(),
@@ -5933,67 +6062,61 @@ var numberSchemaSchema = z.lazy(
     validationAsync: validateAsyncSchema.optional(),
     validationMessages: z.record(z.string()).optional(),
     alert: alertLayoutSchema.optional(),
+    cameraConfig: jsonElementSchema.optional(),
+    accepts: z.array(z.string()).optional(),
+    maxSize: z.number().optional(),
+    source: uploadSourceSchema.optional(),
     autocompleteHint: z.array(autocompleteTokenSchema).optional(),
     autofillKey: z.string().optional(),
     help: helpSchema.optional()
   })
 );
-var persistAsyncSchema = z.lazy(
-  () => z.object({
-    param: z.string(),
-    idProperty: z.string(),
-    schema: schemaSchema,
-    url: z.string(),
-    method: httpMethodSchema
-  })
-);
-var arraySchemaTupleSchema = z.lazy(
+var oneOfSchemaSchema = z.lazy(
   () => z.object({
-    type: z.literal("array"),
+    autofillProvider: z.string().optional(),
     promoted: z.boolean().optional(),
+    refreshFormOnChange: z.boolean().optional(),
+    refreshUrl: z.string().optional(),
+    refreshFormUrl: z.string().optional(),
+    promotion: jsonElementSchema.optional(),
+    oneOf: z.array(schemaSchema),
+    placeholder: z.string().optional(),
     $id: z.string().optional(),
-    items: z.array(schemaSchema),
     title: z.string().optional(),
     description: z.string().optional(),
     control: z.string().optional(),
+    default: jsonElementSchema.optional(),
     hidden: z.boolean().optional(),
     icon: iconSchema.optional(),
     image: imageSchema.optional(),
     keywords: z.array(z.string()).optional(),
     summary: summaryProviderSchema.optional(),
     analyticsId: z.string().optional(),
-    persistAsync: persistAsyncSchema.optional(),
-    validationAsync: validateAsyncSchema.optional(),
-    alert: alertLayoutSchema.optional()
+    refreshStepOnChange: z.boolean().optional(),
+    alert: alertLayoutSchema.optional(),
+    help: helpSchema.optional(),
+    autocompleteHint: z.array(autocompleteTokenSchema).optional(),
+    autofillKey: z.string().optional(),
+    validationMessages: z.record(z.string()).optional(),
+    disabled: z.boolean().optional()
   })
 );
-var schemaSchema = z.lazy(
-  () => z.union([
-    allOfSchemaSchema,
-    arraySchemaSchema,
-    blobSchemaSchema,
-    booleanSchemaSchema,
-    constSchemaSchema,
-    integerSchemaSchema,
-    numberSchemaSchema,
-    objectSchemaSchema,
-    oneOfSchemaSchema,
-    stringSchemaSchema
-  ])
-);
-var booleanSchemaSchema = z.lazy(
+var numberSchemaSchema = z.lazy(
   () => z.object({
-    type: z.literal("boolean"),
+    type: z.literal("number"),
     autofillProvider: z.string().optional(),
     promoted: z.boolean().optional(),
     refreshFormOnChange: z.boolean().optional(),
     refreshUrl: z.string().optional(),
     refreshFormUrl: z.string().optional(),
+    placeholder: z.string().optional(),
+    minimum: z.number().optional(),
+    maximum: z.number().optional(),
     $id: z.string().optional(),
     title: z.string().optional(),
     description: z.string().optional(),
     control: z.string().optional(),
-    default: z.boolean().optional(),
+    default: z.number().optional(),
     hidden: z.boolean().optional(),
     disabled: z.boolean().optional(),
     icon: iconSchema.optional(),
@@ -6004,17 +6127,19 @@ var booleanSchemaSchema = z.lazy(
     persistAsync: persistAsyncSchema.optional(),
     refreshStepOnChange: z.boolean().optional(),
     validationAsync: validateAsyncSchema.optional(),
+    validationMessages: z.record(z.string()).optional(),
     alert: alertLayoutSchema.optional(),
+    autocompleteHint: z.array(autocompleteTokenSchema).optional(),
     autofillKey: z.string().optional(),
     help: helpSchema.optional()
   })
 );
-var allOfSchemaSchema = z.lazy(
+var arraySchemaTupleSchema = z.lazy(
   () => z.object({
-    disabled: z.boolean().optional(),
+    type: z.literal("array"),
     promoted: z.boolean().optional(),
-    allOf: z.array(schemaSchema),
     $id: z.string().optional(),
+    items: z.array(schemaSchema),
     title: z.string().optional(),
     description: z.string().optional(),
     control: z.string().optional(),
@@ -6024,12 +6149,11 @@ var allOfSchemaSchema = z.lazy(
     keywords: z.array(z.string()).optional(),
     summary: summaryProviderSchema.optional(),
     analyticsId: z.string().optional(),
+    persistAsync: persistAsyncSchema.optional(),
+    validationAsync: validateAsyncSchema.optional(),
     alert: alertLayoutSchema.optional()
   })
 );
-var arraySchemaSchema = z.lazy(
-  () => z.union([arraySchemaListSchema, arraySchemaTupleSchema])
-);
 var integerSchemaSchema = z.lazy(
   () => z.object({
     type: z.literal("integer"),
@@ -6063,16 +6187,20 @@ var integerSchemaSchema = z.lazy(
     help: helpSchema.optional()
   })
 );
-var objectSchemaSchema = z.lazy(
+var arraySchemaSchema = z.lazy(
+  () => z.union([arraySchemaListSchema, arraySchemaTupleSchema])
+);
+var arraySchemaListSchema = z.lazy(
   () => z.object({
-    type: z.literal("object"),
-    disabled: z.boolean().optional(),
+    type: z.literal("array"),
     promoted: z.boolean().optional(),
-    help: helpSchema.optional(),
-    properties: z.record(schemaSchema),
-    displayOrder: z.array(z.string()),
-    required: z.array(z.string()).optional(),
     $id: z.string().optional(),
+    items: schemaSchema,
+    addItemTitle: z.string(),
+    editItemTitle: z.string(),
+    minItems: z.number().optional(),
+    maxItems: z.number().optional(),
+    placeholder: z.string().optional(),
     title: z.string().optional(),
     description: z.string().optional(),
     control: z.string().optional(),
@@ -6080,64 +6208,46 @@ var objectSchemaSchema = z.lazy(
     icon: iconSchema.optional(),
     image: imageSchema.optional(),
     keywords: z.array(z.string()).optional(),
-    summary: summaryProviderSchema.optional(),
+    summary: summarySummariserSchema.optional(),
     analyticsId: z.string().optional(),
-    alert: alertLayoutSchema.optional()
+    persistAsync: persistAsyncSchema.optional(),
+    validationAsync: validateAsyncSchema.optional(),
+    alert: alertLayoutSchema.optional(),
+    validationMessages: z.record(z.string()).optional(),
+    disabled: z.boolean().optional()
   })
 );
-var oneOfSchemaSchema = z.lazy(
+var allOfSchemaSchema = z.lazy(
   () => z.object({
-    autofillProvider: z.string().optional(),
+    disabled: z.boolean().optional(),
     promoted: z.boolean().optional(),
-    refreshFormOnChange: z.boolean().optional(),
-    refreshUrl: z.string().optional(),
-    refreshFormUrl: z.string().optional(),
-    promotion: jsonElementSchema.optional(),
-    oneOf: z.array(schemaSchema),
-    placeholder: z.string().optional(),
+    allOf: z.array(schemaSchema),
     $id: z.string().optional(),
     title: z.string().optional(),
     description: z.string().optional(),
     control: z.string().optional(),
-    default: jsonElementSchema.optional(),
     hidden: z.boolean().optional(),
     icon: iconSchema.optional(),
     image: imageSchema.optional(),
     keywords: z.array(z.string()).optional(),
     summary: summaryProviderSchema.optional(),
     analyticsId: z.string().optional(),
-    refreshStepOnChange: z.boolean().optional(),
-    alert: alertLayoutSchema.optional(),
-    help: helpSchema.optional(),
-    autocompleteHint: z.array(autocompleteTokenSchema).optional(),
-    autofillKey: z.string().optional(),
-    validationMessages: z.record(z.string()).optional(),
-    disabled: z.boolean().optional()
+    alert: alertLayoutSchema.optional()
   })
 );
-var stringSchemaSchema = z.lazy(
+var booleanSchemaSchema = z.lazy(
   () => z.object({
-    type: z.literal("string"),
+    type: z.literal("boolean"),
     autofillProvider: z.string().optional(),
     promoted: z.boolean().optional(),
     refreshFormOnChange: z.boolean().optional(),
     refreshUrl: z.string().optional(),
     refreshFormUrl: z.string().optional(),
-    format: stringSchemaFormatSchema.optional(),
-    displayFormat: z.string().optional(),
-    placeholder: z.string().optional(),
-    minLength: z.number().optional(),
-    maxLength: z.number().optional(),
-    minimum: z.string().optional(),
-    maximum: z.string().optional(),
-    pattern: z.string().optional(),
-    autocapitalization: autocapitalizationTypeSchema.optional(),
-    autocorrect: z.boolean().optional(),
     $id: z.string().optional(),
     title: z.string().optional(),
     description: z.string().optional(),
     control: z.string().optional(),
-    default: z.string().optional(),
+    default: z.boolean().optional(),
     hidden: z.boolean().optional(),
     disabled: z.boolean().optional(),
     icon: iconSchema.optional(),
@@ -6148,28 +6258,21 @@ var stringSchemaSchema = z.lazy(
     persistAsync: persistAsyncSchema.optional(),
     refreshStepOnChange: z.boolean().optional(),
     validationAsync: validateAsyncSchema.optional(),
-    validationMessages: z.record(z.string()).optional(),
     alert: alertLayoutSchema.optional(),
-    cameraConfig: jsonElementSchema.optional(),
-    accepts: z.array(z.string()).optional(),
-    maxSize: z.number().optional(),
-    source: uploadSourceSchema.optional(),
-    autocompleteHint: z.array(autocompleteTokenSchema).optional(),
     autofillKey: z.string().optional(),
     help: helpSchema.optional()
   })
 );
-var arraySchemaListSchema = z.lazy(
+var objectSchemaSchema = z.lazy(
   () => z.object({
-    type: z.literal("array"),
+    type: z.literal("object"),
+    disabled: z.boolean().optional(),
     promoted: z.boolean().optional(),
+    help: helpSchema.optional(),
+    properties: z.record(schemaSchema),
+    displayOrder: z.array(z.string()),
+    required: z.array(z.string()).optional(),
     $id: z.string().optional(),
-    items: schemaSchema,
-    addItemTitle: z.string(),
-    editItemTitle: z.string(),
-    minItems: z.number().optional(),
-    maxItems: z.number().optional(),
-    placeholder: z.string().optional(),
     title: z.string().optional(),
     description: z.string().optional(),
     control: z.string().optional(),
@@ -6177,93 +6280,9 @@ var arraySchemaListSchema = z.lazy(
     icon: iconSchema.optional(),
     image: imageSchema.optional(),
     keywords: z.array(z.string()).optional(),
-    summary: summarySummariserSchema.optional(),
+    summary: summaryProviderSchema.optional(),
     analyticsId: z.string().optional(),
-    persistAsync: persistAsyncSchema.optional(),
-    validationAsync: validateAsyncSchema.optional(),
-    alert: alertLayoutSchema.optional(),
-    validationMessages: z.record(z.string()).optional(),
-    disabled: z.boolean().optional()
-  })
-);
-var stepSchema = z.lazy(
-  () => z.object({
-    key: z.string().optional(),
-    type: z.string().optional(),
-    actions: z.array(actionSchema).optional(),
-    refreshFormUrl: z.string().optional(),
-    id: z.string(),
-    title: z.string(),
-    schemas: z.array(schemaSchema),
-    layout: z.array(layoutSchema),
-    description: z.string().optional(),
-    model: jsonElementSchema.optional(),
-    external: externalSchema.optional(),
-    polling: pollingSchema.optional(),
-    linkHandlers: z.array(linkHandlerSchema).optional(),
-    analytics: z.record(z.string()).optional(),
-    errors: stepErrorSchema.optional(),
-    navigation: navigationSchema.optional(),
-    refreshUrl: z.string().optional(),
-    control: z.string().optional()
-  })
-);
-var layoutSchema = z.lazy(
-  () => z.union([
-    alertLayoutSchema,
-    boxLayoutSchema,
-    buttonLayoutSchema,
-    columnsLayoutSchema,
-    decisionLayoutSchema,
-    dividerLayoutSchema,
-    formLayoutSchema,
-    headingLayoutSchema,
-    imageLayoutSchema,
-    infoLayoutSchema,
-    instructionsLayoutSchema,
-    listLayoutSchema,
-    loadingIndicatorLayoutSchema,
-    markdownLayoutSchema,
-    modalLayoutSchema,
-    paragraphLayoutSchema,
-    reviewLayoutSchema,
-    searchLayoutSchema,
-    statusListLayoutSchema
-  ])
-);
-var columnsLayoutSchema = z.lazy(
-  () => z.object({
-    type: z.literal("columns"),
-    left: z.array(layoutSchema),
-    right: z.array(layoutSchema),
-    bias: columnsLayoutBiasSchema.optional(),
-    control: z.string().optional(),
-    margin: sizeSchema.optional()
-  })
-);
-var modalLayoutContentSchema = z.lazy(
-  () => z.object({
-    title: z.string().optional(),
-    components: z.array(layoutSchema)
-  })
-);
-var boxLayoutSchema = z.lazy(
-  () => z.object({
-    type: z.literal("box"),
-    components: z.array(layoutSchema),
-    width: sizeSchema.optional(),
-    border: z.boolean().optional(),
-    control: z.string().optional(),
-    margin: sizeSchema.optional()
-  })
-);
-var modalLayoutSchema = z.lazy(
-  () => z.object({
-    type: z.literal("modal"),
-    control: z.string().optional(),
-    margin: sizeSchema.optional(),
-    trigger: modalLayoutTriggerSchema,
-    content: modalLayoutContentSchema
+    alert: alertLayoutSchema.optional()
   })
 );
 var validateStep = (step) => validate(step, stepSchema);
@@ -6359,6 +6378,15 @@ var mergeModels = (valueA, valueB) => {
   return valueB;
 };
 
+// src/revamp/domain/mappers/utils/image.ts
+var mapSpecImage = (image) => {
+  var _a, _b, _c;
+  return image ? {
+    uri: (_b = (_a = image.uri) != null ? _a : image.url) != null ? _b : "",
+    accessibilityDescription: (_c = image.accessibilityDescription) != null ? _c : image.text
+  } : void 0;
+};
+
 // src/revamp/domain/features/summary/summary-utils.ts
 var getSummariser = (schema) => (value) => {
   const { summary, icon, image } = schema;
@@ -6391,7 +6419,7 @@ var summaryIfProvides = (summary, { value, icon, image }) => {
     title: summary.providesTitle && value || void 0,
     description: summary.providesDescription && value || void 0,
     icon: summary.providesIcon && icon || void 0,
-    image: summary.providesImage && image || void 0
+    image: summary.providesImage && mapSpecImage(image != null ? image : void 0) || void 0
   };
 };
 
@@ -6491,7 +6519,7 @@ var getOnErrorAction = (onError) => {
       return onError.behavior.action;
     }
   }
-  if ("action" in onError) {
+  if ("action" in onError && onError.action) {
     return onError.action;
   }
   return {};
@@ -6702,6 +6730,10 @@ var buttonLayoutToComponentWithBehavior = (uid, button, mapperProps) => {
   const { onAction, onLink, step } = mapperProps;
   const { context, control, disabled, margin = "md", pinOrder, size, title, behavior } = button;
   const getOnClick2 = () => {
+    if (!behavior) {
+      return () => {
+      };
+    }
     if ("type" in behavior) {
       switch (behavior.type) {
         case "action": {
@@ -6871,6 +6903,7 @@ var decisionLayoutToComponent = (uid, {
     return __spreadProps(__spreadValues({}, option), {
       disabled: (_a = option.disabled) != null ? _a : false,
       href: getHref(option),
+      image: mapSpecImage(option.image),
       onClick: getOnClick(option, mapperProps)
     });
   }),
@@ -6885,13 +6918,13 @@ var getHref = (option) => {
 };
 var getOnClick = (option, { step, onAction, onLink }) => {
   const { behavior } = option;
-  if (!behavior) {
+  if (!behavior && option.action) {
     const action = inlineAction(option.action, step == null ? void 0 : step.actions);
     return () => {
       void onAction(action);
     };
   }
-  if ("type" in behavior) {
+  if (behavior && "type" in behavior) {
     switch (behavior.type) {
       case "action": {
         const action = inlineAction(behavior.action, step == null ? void 0 : step.actions);
@@ -6965,6 +6998,9 @@ var isExactLocalValueMatch = (valueA, valueB) => {
   return valueA === valueB;
 };
 
+// src/revamp/domain/components/utils/getRandomId.ts
+var getRandomId = () => Math.random().toString(36).substring(2);
+
 // src/revamp/domain/features/persistAsync/getComponentPersistAsync.ts
 var getComponentPersistAsync = (update, performPersistAsync) => (
   /**
@@ -7044,7 +7080,7 @@ var getComponentMultiPersistAsync = (update, performPersistAsync) => (
       draft.persistedState = [
         ...draft.persistedState.slice(0, index),
         {
-          id: "123",
+          id: getRandomId(),
           abortController: newAbortController,
           lastResponse: null,
           lastSubmitted: null,
@@ -7605,7 +7641,7 @@ var mapCommonSchemaProps = (schemaMapperProps) => {
     errors: isString(validationErrors) ? [validationErrors] : void 0,
     hidden: Boolean(hidden),
     icon,
-    image,
+    image: mapSpecImage(image),
     keywords,
     required: Boolean(required),
     title,
@@ -8212,7 +8248,7 @@ var oneOfSchemaToComponent = (schemaMapperProps, mapperProps) => {
     return {
       title,
       description,
-      image,
+      image: mapSpecImage(image),
       icon,
       keywords,
       disabled: "disabled" in childSchema ? Boolean(childSchema.disabled) : false,
@@ -8933,7 +8969,9 @@ var arraySchemaToRepeatableComponent = (schemaMapperProps, mapperProps) => {
       editItemTitle,
       maxItems,
       minItems,
-      summary,
+      summary: __spreadProps(__spreadValues({}, summary), {
+        defaultImage: mapSpecImage(summary == null ? void 0 : summary.defaultImage)
+      }),
       createEditableComponent,
       onValueChange
     }),
@@ -8956,9 +8994,6 @@ var localValueToJsonElement = (localValue) => {
 };
 var getRandomInt = () => Math.floor(Math.random() * 1e8);
 
-// src/revamp/domain/components/utils/getRandomId.ts
-var getRandomId = () => Math.random().toString(36).substring(2);
-
 // src/revamp/domain/components/MultiUploadInputComponent.ts
 var createMultiUploadInputComponent = (uploadInputProps, updateComponent) => {
   const _a = uploadInputProps, {
@@ -9261,7 +9296,7 @@ var arraySchemaToMultiSelectComponent = (schemaMapperProps, mapperProps) => {
     return {
       title: title2,
       description,
-      image,
+      image: mapSpecImage(image),
       icon,
       keywords,
       disabled: "disabled" in childSchema ? Boolean(childSchema.disabled) : false,
@@ -9722,13 +9757,27 @@ var createImageComponent = (imageProps) => __spreadProps(__spreadValues({
 });
 
 // src/revamp/domain/mappers/layout/imageLayoutToComponent.ts
-var imageLayoutToComponent = (uid, { accessibilityDescription, content, control, margin = "md", size = "md", text, url }) => createImageComponent({
-  uid,
-  content: content != null ? content : { accessibilityDescription: accessibilityDescription != null ? accessibilityDescription : text, url },
+var imageLayoutToComponent = (uid, {
+  accessibilityDescription,
+  content,
   control,
-  margin,
-  size
-});
+  margin = "md",
+  size = "md",
+  text,
+  url
+}) => {
+  var _a, _b, _c;
+  return createImageComponent({
+    uid,
+    content: content ? {
+      uri: (_b = (_a = content.uri) != null ? _a : content.url) != null ? _b : "",
+      accessibilityDescription: (_c = content.accessibilityDescription) != null ? _c : content.text
+    } : { accessibilityDescription: accessibilityDescription != null ? accessibilityDescription : text, uri: url != null ? url : "" },
+    control,
+    margin,
+    size
+  });
+};
 
 // src/revamp/domain/components/MarkdownComponent.ts
 var createMarkdownComponent = (markdownProps) => __spreadProps(__spreadValues({
@@ -10253,7 +10302,9 @@ var createListComponent = (listProps) => __spreadProps(__spreadValues({
 var listLayoutToComponent = (uid, { callToAction, control, items, margin = "md", title }, mapperProps) => createListComponent({
   uid,
   control,
-  items: items.map((item) => __spreadValues({}, item)),
+  items: items.map((item) => __spreadProps(__spreadValues({}, item), {
+    image: mapSpecImage(item.image)
+  })),
   callToAction: getListCallToAction(callToAction, mapperProps),
   margin,
   title
@@ -10377,13 +10428,13 @@ var getUnreferencedSchemas = (step) => {
 // src/revamp/domain/mappers/mapStepToComponent.ts
 var mapStepToComponent = (_a) => {
   var _b = _a, {
-    bit,
+    count,
     loadingState,
     displayStepTitle,
     trackEvent,
     onPoll
   } = _b, restProps = __objRest(_b, [
-    "bit",
+    "count",
     "loadingState",
     "displayStepTitle",
     "trackEvent",
@@ -10391,7 +10442,18 @@ var mapStepToComponent = (_a) => {
   ]);
   var _a2, _b2;
   const { step, updateComponent } = restProps;
-  const { id, description, errors, external, key, layout = [], navigation, polling, title } = step;
+  const {
+    id,
+    control,
+    description,
+    errors,
+    external,
+    key,
+    layout = [],
+    navigation,
+    polling,
+    title
+  } = step;
   const backNavigation = (_a2 = navigation == null ? void 0 : navigation.back) != null ? _a2 : navigation == null ? void 0 : navigation.backButton;
   const back = backNavigation ? {
     title: backNavigation.title,
@@ -10404,7 +10466,7 @@ var mapStepToComponent = (_a) => {
   if (stepId === void 0) {
     throw new Error("Step must have an id or a key");
   }
-  const uid = `${stepId != null ? stepId : "step"}_${bit}`;
+  const uid = `${stepId != null ? stepId : "step"}_${count % 100}`;
   const onAction = async (action) => {
     try {
       await stepComponent.getSubmittableValue();
@@ -10431,6 +10493,7 @@ var mapStepToComponent = (_a) => {
     uid,
     back,
     components,
+    control,
     description,
     error: errors == null ? void 0 : errors.error,
     external,
@@ -10895,10 +10958,7 @@ function useDynamicFlowCore(props) {
   );
   const [stepComponent, setStepComponent] = (0, import_react3.useState)(null);
   const stepComponentRef = (0, import_react3.useRef)(null);
-  const stepBit = (0, import_react3.useRef)("flip");
-  const flipStepBit = () => {
-    stepBit.current = stepBit.current === "flip" ? "flop" : "flip";
-  };
+  const stepCount = (0, import_react3.useRef)(0);
   const stepRef = (0, import_react3.useRef)(initialStep != null ? initialStep : null);
   const etagRef = (0, import_react3.useRef)(null);
   const abortControllerRef = (0, import_react3.useRef)(new AbortController());
@@ -10913,13 +10973,23 @@ function useDynamicFlowCore(props) {
       void onAction(__spreadValues({ method: "GET" }, initialAction));
     }
     if (initialStep && !initialAction) {
-      initialiseWithStep(initialStep, null);
+      createStep(initialStep, null);
       trackCoreEvent("Step Shown", { isFirstStep: true });
     }
   }, []);
+  const createStep = (0, import_react3.useCallback)((newStep, etag) => {
+    if (stepComponentRef.current) {
+      stepCount.current += 1;
+    }
+    initialiseWithStep(newStep, etag, null);
+  }, []);
+  const updateStep = (0, import_react3.useCallback)((newStep, etag) => {
+    var _a2, _b;
+    initialiseWithStep(newStep, etag, (_b = (_a2 = stepComponentRef.current) == null ? void 0 : _a2.getLocalValue()) != null ? _b : null);
+  }, []);
   const initialiseWithStep = (0, import_react3.useCallback)(
-    (newStep, etag) => {
-      var _a2, _b, _c;
+    (newStep, etag, localValue) => {
+      var _a2;
       (_a2 = stepComponentRef.current) == null ? void 0 : _a2.stop();
       stepRef.current = newStep;
       etagRef.current = etag;
@@ -10942,8 +11012,8 @@ function useDynamicFlowCore(props) {
       };
       try {
         const newStepComponent = mapStepToComponent({
-          bit: stepBit.current,
-          stepLocalValue: (_c = (_b = stepComponentRef.current) == null ? void 0 : _b.getLocalValue()) != null ? _c : null,
+          count: stepCount.current,
+          stepLocalValue: localValue,
           step: newStep,
           displayStepTitle,
           loadingState: "idle",
@@ -11028,8 +11098,7 @@ function useDynamicFlowCore(props) {
         }
         case "replace-step": {
           const isFirstStep = stepRef.current === null;
-          flipStepBit();
-          initialiseWithStep(command.step, command.etag);
+          createStep(command.step, command.etag);
           trackCoreEvent("Step Shown", { isFirstStep });
           break;
         }
@@ -11037,7 +11106,7 @@ function useDynamicFlowCore(props) {
           const genericErrorMessage = getErrorMessageFunctions().genericErrorWithRetry();
           const { errors = { error: genericErrorMessage } } = command.body;
           if (stepRef.current) {
-            initialiseWithStep(
+            updateStep(
               __spreadProps(__spreadValues({}, stepRef.current), {
                 // the existing step
                 errors,
@@ -11085,7 +11154,7 @@ function useDynamicFlowCore(props) {
           case "refresh-step":
             {
               const errors = errorsOverride != null ? errorsOverride : command.step.errors;
-              initialiseWithStep(__spreadProps(__spreadValues({}, command.step), { errors }), command.etag);
+              updateStep(__spreadProps(__spreadValues({}, command.step), { errors }), command.etag);
             }
             break;
           case "error": {
@@ -11118,8 +11187,7 @@ function useDynamicFlowCore(props) {
       });
       switch (command.type) {
         case "replace-step":
-          flipStepBit();
-          initialiseWithStep(command.step, command.etag);
+          createStep(command.step, command.etag);
           return true;
         case "action":
           void onAction(command.action);
@@ -11175,7 +11243,7 @@ var mapErrorsToValidationState = (errors) => {
 
 // src/revamp/renderers/mappers/utils/inputComponentToProps.ts
 var inputComponentToProps = (component, type) => {
-  var _a, _b, _c, _d;
+  var _a;
   const {
     uid,
     control,
@@ -11204,11 +11272,7 @@ var inputComponentToProps = (component, type) => {
     help,
     icon,
     id,
-    image: image ? {
-      accessibilityDescription: (_b = image.accessibilityDescription) != null ? _b : image.text,
-      uri: image.uri,
-      url: (_d = (_c = image.uri) != null ? _c : image.url) != null ? _d : ""
-    } : void 0,
+    image,
     placeholder,
     required,
     title,
@@ -11263,7 +11327,7 @@ var mapBoxControl = ({
 
 // src/revamp/renderers/mappers/buttonComponentToProps.ts
 var buttonComponentToProps = (component, rendererMapperProps) => {
-  return __spreadValues(__spreadValues({
+  return __spreadValues(__spreadProps(__spreadValues({
     type: "button"
   }, pick(
     component,
@@ -11271,12 +11335,13 @@ var buttonComponentToProps = (component, rendererMapperProps) => {
     "title",
     "control",
     "context",
-    "disabled",
     "margin",
     "pinOrder",
     "size",
     "onClick"
-  )), rendererMapperProps);
+  )), {
+    disabled: component.disabled || rendererMapperProps.stepLoadingState !== "idle"
+  }), rendererMapperProps);
 };
 
 // src/revamp/renderers/mappers/columnsComponentToProps.ts
@@ -11322,14 +11387,9 @@ var dateInputComponentToProps = (component, rendererMapperProps) => __spreadProp
 // src/revamp/renderers/mappers/decisionComponentToProps.ts
 var decisionComponentToProps = (component, rendererMapperProps) => __spreadProps(__spreadValues(__spreadValues({}, pick(component, "uid", "type", "control", "margin", "title")), rendererMapperProps), {
   options: component.options.map((_a) => {
-    var _b = _a, { image } = _b, rest = __objRest(_b, ["image"]);
-    var _a2, _b2, _c;
+    var _b = _a, { disabled } = _b, rest = __objRest(_b, ["disabled"]);
     return __spreadProps(__spreadValues({}, rest), {
-      image: image ? {
-        accessibilityDescription: (_a2 = image.accessibilityDescription) != null ? _a2 : image.text,
-        uri: image.uri,
-        url: (_c = (_b2 = image.uri) != null ? _b2 : image.url) != null ? _c : ""
-      } : image
+      disabled: disabled || rendererMapperProps.stepLoadingState !== "idle"
     });
   })
 });
@@ -11361,14 +11421,10 @@ var hiddenComponentToProps = ({ uid }) => ({
 });
 
 // src/revamp/renderers/mappers/imageComponentToProps.ts
-var imageComponentToProps = (component, rendererMapperProps) => {
-  var _a;
-  return __spreadProps(__spreadValues(__spreadValues({}, pick(component, "uid", "type", "control", "margin", "size")), rendererMapperProps), {
-    accessibilityDescription: component.content.accessibilityDescription,
-    url: (_a = component.content.url) != null ? _a : "",
-    uri: component.content.uri
-  });
-};
+var imageComponentToProps = (component, rendererMapperProps) => __spreadProps(__spreadValues(__spreadValues({}, pick(component, "uid", "type", "control", "margin", "size")), rendererMapperProps), {
+  uri: component.content.uri,
+  accessibilityDescription: component.content.accessibilityDescription
+});
 
 // src/revamp/renderers/mappers/instructionsComponentToProps.ts
 var instructionsComponentToProps = (component, rendererMapperProps) => __spreadValues(__spreadValues({}, pick(component, "uid", "type", "control", "items", "margin", "title")), rendererMapperProps);
@@ -11433,15 +11489,10 @@ var numberInputComponentToProps = (component, rendererMapperProps) => __spreadPr
 
 // src/revamp/renderers/mappers/objectComponentToProps.ts
 var objectComponentToProps = (component, rendererMapperProps) => {
-  var _a, _b;
   const childrenProps = component.getChildren().map((c) => componentToRendererProps(c, rendererMapperProps));
   return __spreadProps(__spreadValues(__spreadValues({
     type: "section"
-  }, pick(component, "uid", "control", "description", "help", "icon", "title")), rendererMapperProps), {
-    // TODO: Remove when viewbindings are updated
-    image: component.image ? __spreadProps(__spreadValues({}, component.image), {
-      url: (_b = (_a = component.image) == null ? void 0 : _a.url) != null ? _b : ""
-    }) : void 0,
+  }, pick(component, "uid", "control", "description", "help", "icon", "image", "title")), rendererMapperProps), {
     children: childrenProps.map(rendererMapperProps.render),
     childrenProps
   });
@@ -11452,7 +11503,6 @@ var paragraphComponentToProps = (component, rendererMapperProps) => __spreadValu
 
 // src/revamp/renderers/mappers/repeatableComponentToProps.ts
 var repeatableComponentToProps = (component, rendererMapperProps) => {
-  var _a, _b;
   const {
     uid,
     addItemTitle,
@@ -11475,26 +11525,13 @@ var repeatableComponentToProps = (component, rendererMapperProps) => {
   } = component;
   const childrenProps = component.getChildren().map((c) => componentToRendererProps(c, rendererMapperProps));
   const editableItemProps = editableComponent ? componentToRendererProps(editableComponent, rendererMapperProps) : null;
-  const getSummaryImage = (componentSummary) => {
-    var _a2, _b2;
-    if (componentSummary.image) {
-      return __spreadProps(__spreadValues({}, componentSummary.image), {
-        url: (_a2 = componentSummary.image.url) != null ? _a2 : ""
-      });
-    }
-    if (summaryDefaults.image) {
-      return __spreadProps(__spreadValues({}, summaryDefaults.image), {
-        url: (_b2 = summaryDefaults.image.url) != null ? _b2 : ""
-      });
-    }
-  };
   const getSummary = (componentSummary) => {
-    var _a2, _b2, _c;
+    var _a, _b, _c, _d;
     return {
-      title: (_a2 = componentSummary.title) != null ? _a2 : summaryDefaults.title,
-      description: (_b2 = componentSummary.description) != null ? _b2 : summaryDefaults.description,
+      title: (_a = componentSummary.title) != null ? _a : summaryDefaults.title,
+      description: (_b = componentSummary.description) != null ? _b : summaryDefaults.description,
       icon: (_c = componentSummary.icon) != null ? _c : summaryDefaults.icon,
-      image: getSummaryImage(componentSummary)
+      image: (_d = componentSummary.image) != null ? _d : summaryDefaults.image
     };
   };
   const itemProps = components.map((childComponent) => __spreadProps(__spreadValues({}, getSummary(childComponent.getSummary())), {
@@ -11512,11 +11549,7 @@ var repeatableComponentToProps = (component, rendererMapperProps) => {
     editableItemProps,
     editItemTitle,
     icon,
-    image: image ? {
-      accessibilityDescription: (_a = image.accessibilityDescription) != null ? _a : image.text,
-      uri: image.uri,
-      url: (_b = image.url) != null ? _b : ""
-    } : void 0,
+    image,
     items: itemProps,
     maxItems,
     minItems,
@@ -11581,6 +11614,7 @@ var getSearchState = ({
     var _a;
     return __spreadProps(__spreadValues({}, result), {
       id: result.type === "action" ? (_a = result.value.id) != null ? _a : result.value.$id : void 0,
+      image: mapSpecImage(result.image),
       onClick: () => onSelect(result)
     });
   });
@@ -11644,15 +11678,10 @@ var uploadInputComponentToProps = (component, rendererMapperProps) => {
 
 // src/revamp/renderers/mappers/tupleComponentToProps.ts
 var tupleComponentToProps = (component, rendererMapperProps) => {
-  var _a, _b;
   const childrenProps = component.getChildren().map((c) => componentToRendererProps(c, rendererMapperProps));
   return __spreadProps(__spreadValues(__spreadValues({
     type: "section"
-  }, pick(component, "uid", "control", "description", "help", "icon", "title")), rendererMapperProps), {
-    // TODO Remove URL default after next types update (add back to `pick`)
-    image: component.image ? __spreadProps(__spreadValues({}, component.image), {
-      url: (_b = (_a = component.image) == null ? void 0 : _a.url) != null ? _b : ""
-    }) : void 0,
+  }, pick(component, "uid", "control", "description", "help", "icon", "image", "title")), rendererMapperProps), {
     children: childrenProps.map(rendererMapperProps.render),
     childrenProps
   });
@@ -11661,15 +11690,8 @@ var tupleComponentToProps = (component, rendererMapperProps) => {
 // src/revamp/renderers/mappers/listComponentToProps.ts
 var listComponentToProps = (component, rendererMapperProps) => __spreadProps(__spreadValues(__spreadValues({}, pick(component, "uid", "type", "callToAction", "control", "margin", "title")), rendererMapperProps), {
   items: component.items.map((_a) => {
-    var _b = _a, { image } = _b, rest = __objRest(_b, ["image"]);
-    var _a2, _b2, _c;
-    return __spreadProps(__spreadValues({}, rest), {
-      image: image ? {
-        accessibilityDescription: (_a2 = image == null ? void 0 : image.accessibilityDescription) != null ? _a2 : image == null ? void 0 : image.text,
-        uri: image == null ? void 0 : image.uri,
-        url: (_c = (_b2 = image == null ? void 0 : image.url) != null ? _b2 : image == null ? void 0 : image.url) != null ? _c : ""
-      } : void 0
-    });
+    var item = __objRest(_a, []);
+    return __spreadValues({}, item);
   })
 });
 
@@ -18907,22 +18929,13 @@ var noop8 = () => {
 };
 
 // src/revamp/renderers/utils.ts
-function find(root, predicate) {
-  if (isArray(root)) {
-    return root.flatMap((child) => find(child, predicate));
-  }
-  return [
-    ...predicate(root) ? [root] : [],
-    ...getChildren(root).flatMap((child) => find(child, predicate))
-  ];
-}
-function findType(root, type, predicate = () => true) {
+function findRendererPropsByType(root, type, predicate = () => true) {
   if (isArray(root)) {
-    return root.flatMap((child) => findType(child, type, predicate));
+    return root.flatMap((child) => findRendererPropsByType(child, type, predicate));
   }
   return [
     ...isType(root, type) && predicate(root) ? [root] : [],
-    ...getChildren(root).flatMap((child) => findType(child, type, predicate))
+    ...getChildren(root).flatMap((child) => findRendererPropsByType(child, type, predicate))
   ];
 }
 var isType = (node, type) => node.type === type;