@wise/dynamic-flow-client 3.12.1 → 3.13.0

package/build/main.mjs

@@ -1264,6 +1264,7 @@ var isObjectSchema = (schema) => "type" in schema && schema.type === "object";
 var isOneOfSchema = (schema) => "oneOf" in schema && !isNullish(schema.oneOf);
 var isArraySchema = (schema) => "items" in schema && !isNullish(schema.items);
 var isArrayListSchema = (schema) => "items" in schema && isObject(schema.items) && !isArray(schema.items);
+var isArrayTupleSchema = (schema) => "items" in schema && !isObject(schema.items) && isArray(schema.items);
 var isStringSchema = (schema) => "type" in schema && schema.type === "string";
 var isStringSchemaWithUpload = (schema) => isStringSchema(schema) && schema.format === "base64url";
 var isSchemaWithPersistAsync = (schema) => "persistAsync" in schema && !isNullish(schema.persistAsync);
@@ -1709,6 +1710,16 @@ var uploadInputComponentToProps = (component) => {
   });
 };
 
+// src/revamp/renderers/mappers/tupleComponentToProps.ts
+var tupleComponentToProps = ({ control, description, help, title }, children) => ({
+  type: "form-section",
+  children,
+  control,
+  description,
+  help,
+  title
+});
+
 // src/revamp/renderers/mappers/componentToRendererProps.ts
 var componentToRendererProps = (component, nestedContent) => {
   const { children, startChildren, endChildren, editableItemChildren } = nestedContent;
@@ -1778,6 +1789,8 @@ var componentToRendererProps = (component, nestedContent) => {
       return statusListComponentToProps(component);
     case "text":
       return textInputComponentToProps(component);
+    case "tuple":
+      return tupleComponentToProps(component, children);
     case "upload":
       return uploadInputComponentToProps(component);
     default:
@@ -7995,6 +8008,9 @@ var isPartialLocalValueMatch = (partialValue, component) => {
   if (isObjectLocalValue(partialValue) && isObjectLocalValue(componentValue)) {
     return isPartialObjectMatch(partialValue, componentValue, component);
   }
+  if (isArrayLocalValue(partialValue) && component.type === "tuple") {
+    return isPartialTupleMatch(partialValue, component);
+  }
   return null;
 };
 var isPartialObjectMatch = (partialValue, componentValue, component) => {
@@ -8010,6 +8026,23 @@ var isPartialObjectMatch = (partialValue, componentValue, component) => {
   }
   return null;
 };
+var isPartialTupleMatch = (partialValue, component) => {
+  const children = component.getChildren();
+  const shortest = partialValue.length < children.length ? partialValue : children;
+  const results = shortest.map((_value, index) => {
+    if (children[index].type !== "const") {
+      return null;
+    }
+    return isPartialLocalValueMatch(partialValue[index], children[index]);
+  });
+  if (results.includes(false)) {
+    return false;
+  }
+  if (results.includes(true)) {
+    return true;
+  }
+  return null;
+};
 var getMatchingKeys = (a, b) => {
   const allKeys = Array.from(/* @__PURE__ */ new Set([...Object.keys(a), ...Object.keys(b)]));
   return allKeys.filter((key) => !isNullish(a[key]) && !isNullish(b[key]));
@@ -9183,6 +9216,71 @@ var arraySchemaToMultiSelectComponent = (schemaMapperProps, mapperProps) => {
   );
 };
 
+// src/revamp/domain/components/TupleComponent.ts
+var createTupleComponent = (tupleProps) => {
+  const { uid, analyticsId, components, control, description, help, hidden, summariser, title } = tupleProps;
+  return {
+    type: "tuple",
+    uid,
+    analyticsId,
+    components,
+    control,
+    description,
+    help,
+    hidden,
+    title,
+    getChildren() {
+      return this.components;
+    },
+    async getSubmittableValue() {
+      return Promise.all(this.components.map((child) => child.getSubmittableValue()));
+    },
+    getSummary() {
+      const summary = summariser(this.getLocalValue());
+      const childSummary = summariseFromChildren(this.getChildren());
+      return mergeSummaries(summary, childSummary);
+    },
+    getLocalValue() {
+      return this.components.map((child) => child.getLocalValue());
+    },
+    validate() {
+      return validateComponents(this.getChildren());
+    }
+  };
+};
+
+// src/revamp/domain/mappers/schema/arraySchemaToComponent/arraySchemaToTupleComponent.ts
+var arraySchemaToTupleComponent = (schemaMapperProps, mapperProps) => {
+  const {
+    uid,
+    localValue,
+    schema,
+    model: initialModel,
+    required = false,
+    validationErrors
+  } = schemaMapperProps;
+  const { items } = schema;
+  const components = items.map(
+    (childSchema, index) => {
+      var _a, _b;
+      return mapSchemaToComponent(
+        {
+          uid: `${uid}-arr.${index}`,
+          schema: childSchema,
+          model: isArray(initialModel) ? (_a = initialModel[index]) != null ? _a : null : null,
+          localValue: isArray(localValue) ? (_b = localValue[index]) != null ? _b : null : null,
+          validationErrors: isArray(validationErrors) ? validationErrors[index] : void 0,
+          required
+        },
+        mapperProps
+      );
+    }
+  );
+  return createTupleComponent(__spreadProps(__spreadValues({}, mapCommonSchemaProps(schemaMapperProps)), {
+    components
+  }));
+};
+
 // src/revamp/domain/mappers/schema/arraySchemaToComponent/arraySchemaToComponent.ts
 var arraySchemaToComponent = (schemaMapperProps, mapperProps) => {
   const { schema, model: originalModel } = schemaMapperProps;
@@ -9193,10 +9291,10 @@ var arraySchemaToComponent = (schemaMapperProps, mapperProps) => {
   if (isArraySchemaListWithMultiSelect(schema)) {
     return arraySchemaToMultiSelectComponent(__spreadProps(__spreadValues({}, schemaMapperProps), { schema, model }), mapperProps);
   }
-  if (isArrayListSchema(schema)) {
-    return arraySchemaToRepeatableComponent(__spreadProps(__spreadValues({}, schemaMapperProps), { schema, model }), mapperProps);
+  if (isArrayTupleSchema(schema)) {
+    return arraySchemaToTupleComponent(__spreadProps(__spreadValues({}, schemaMapperProps), { schema, model }), mapperProps);
   }
-  throw new Error("Currently only repeatable array schemas are supported");
+  return arraySchemaToRepeatableComponent(__spreadProps(__spreadValues({}, schemaMapperProps), { schema, model }), mapperProps);
 };
 var isArraySchemaListWithMultiFileUpload = (schema) => isArrayListSchema(schema) && (isPersistAsyncWithUploadSchema(schema.items) || isStringSchemaWithUpload(schema.items));
 var isPersistAsyncWithUploadSchema = (schema) => isSchemaWithPersistAsync(schema) && (isBlobSchema(schema.persistAsync.schema) || isStringSchemaWithUpload(schema.persistAsync.schema));
@@ -10467,7 +10565,7 @@ function useDynamicFlowCore(props) {
   const onAction = useCallback2(async (action) => {
     var _a2, _b, _c;
     try {
-      (_a2 = stepComponentRef.current) == null ? void 0 : _a2.setLoadingState("loading");
+      (_a2 = stepComponentRef.current) == null ? void 0 : _a2.setLoadingState("submitting");
       const model = (_c = await ((_b = stepComponentRef.current) == null ? void 0 : _b.getSubmittableValue())) != null ? _c : null;
       const command = await executeSubmission({
         action,
@@ -10512,7 +10610,7 @@ function useDynamicFlowCore(props) {
     async (schemaId, refreshUrl = "", errorsOverride) => {
       var _a2, _b, _c, _d;
       try {
-        (_a2 = stepComponentRef.current) == null ? void 0 : _a2.setLoadingState("loading");
+        (_a2 = stepComponentRef.current) == null ? void 0 : _a2.setLoadingState("refreshing");
         const model = (_c = await ((_b = stepComponentRef.current) == null ? void 0 : _b.getSubmittableValue())) != null ? _c : null;
         const command = await executeRefresh({
           abortSignal: abortCurrentAndGetNewAbortSignal(),

package/build/types/legacy/layout/search/useSearch.d.ts

@@ -10,7 +10,7 @@ export type SearchState = {
     status: 'error';
 };
 export declare const useSearch: (defaultSearchConfig: SearchConfig) => {
-    status: "error" | "idle" | "loading" | "success";
+    status: "error" | "idle" | "success" | "loading";
     results: SearchResult[];
     search: (query: string, { url, method, param }?: SearchConfig) => Promise<void>;
 };

package/build/types/revamp/domain/components/TupleComponent.d.ts

@@ -0,0 +1,12 @@
+import { ComponentWithTitle, DomainComponent, LocalValue, LocalValueArray, RepeatableSummary } from '../types';
+export type TupleComponent = ComponentWithTitle & {
+    type: 'tuple';
+    components: DomainComponent[];
+    getChildren: () => DomainComponent[];
+    getLocalValue: () => LocalValueArray;
+};
+export declare const createTupleComponent: (tupleProps: Pick<TupleComponent, 'control' | 'description' | 'components' | 'title' | 'help' | 'hidden'> & {
+    uid: string;
+    analyticsId?: string;
+    summariser: (value: LocalValue | null) => RepeatableSummary;
+}) => TupleComponent;

package/build/types/revamp/domain/mappers/schema/arraySchemaToComponent/arraySchemaToComponent.d.ts

@@ -2,4 +2,4 @@ import type { MapperProps, SchemaMapperProps } from '../types';
 import type { ArraySchema } from '@wise/dynamic-flow-types/build/next';
 export declare const arraySchemaToComponent: (schemaMapperProps: SchemaMapperProps & {
     schema: ArraySchema;
-}, mapperProps: MapperProps) => import("../../../components/MultiSelectInputComponent").MultiSelectComponent | import("../../../components/MultiUploadInputComponent").MultiUploadInputComponent | import("../../../components/repeatableComponent/RepeatableComponent").RepeatableComponent;
+}, mapperProps: MapperProps) => import("../../../components/MultiSelectInputComponent").MultiSelectComponent | import("../../../components/MultiUploadInputComponent").MultiUploadInputComponent | import("../../../components/repeatableComponent/RepeatableComponent").RepeatableComponent | import("../../../components/TupleComponent").TupleComponent;

package/build/types/revamp/domain/mappers/schema/arraySchemaToComponent/arraySchemaToTupleComponent.d.ts

@@ -0,0 +1,5 @@
+import { ArraySchemaTuple } from '@wise/dynamic-flow-types/build/next';
+import { MapperProps, SchemaMapperProps } from '../types';
+export declare const arraySchemaToTupleComponent: (schemaMapperProps: SchemaMapperProps & {
+    schema: ArraySchemaTuple;
+}, mapperProps: MapperProps) => import("../../../components/TupleComponent").TupleComponent;

package/build/types/revamp/domain/types.d.ts

@@ -31,7 +31,8 @@ import type { StatusListComponent } from './components/StatusListComponent';
 import type { StepDomainComponent } from './components/StepDomainComponent';
 import type { TextInputComponent } from './components/TextInputComponent';
 import type { UploadInputComponent } from './components/UploadInputComponent';
-export type DomainComponent = StepDomainComponent | AlertComponent | AllOfComponent | BooleanInputComponent | BoxComponent | ButtonComponent | ColumnsComponent | ConstComponent | ContainerComponent | DateInputComponent | DecisionComponent | DividerComponent | FormComponent | HeadingComponent | ImageComponent | InstructionsComponent | IntegerInputComponent | LoadingIndicatorComponent | MarkdownComponent | ModalComponent | MultiSelectComponent | MultiUploadInputComponent | NumberInputComponent | ObjectComponent | ParagraphComponent | RepeatableComponent | ReviewComponent | SearchComponent | SelectInputComponent | StatusListComponent | TextInputComponent | UploadInputComponent;
+import { TupleComponent } from './components/TupleComponent';
+export type DomainComponent = StepDomainComponent | AlertComponent | AllOfComponent | BooleanInputComponent | BoxComponent | ButtonComponent | ColumnsComponent | ConstComponent | ContainerComponent | DateInputComponent | DecisionComponent | DividerComponent | FormComponent | HeadingComponent | ImageComponent | InstructionsComponent | IntegerInputComponent | LoadingIndicatorComponent | MarkdownComponent | ModalComponent | MultiSelectComponent | MultiUploadInputComponent | NumberInputComponent | ObjectComponent | ParagraphComponent | RepeatableComponent | ReviewComponent | SearchComponent | SelectInputComponent | StatusListComponent | TextInputComponent | TupleComponent | UploadInputComponent;
 export type LocalValue = LocalValuePrimitive | LocalValueObject | LocalValueArray;
 export type LocalValuePrimitive = string | number | boolean | File | null;
 export interface LocalValueObject extends Record<string, LocalValuePrimitive | LocalValueObject | LocalValueArray> {
@@ -98,4 +99,4 @@ export type ValidationState = {
         error?: string;
     };
 };
-export type LoadingState = 'idle' | 'loading';
+export type LoadingState = 'idle' | 'submitting' | 'refreshing';

package/build/types/revamp/renderers/mappers/tupleComponentToProps.d.ts

@@ -0,0 +1,4 @@
+import type { ReactNode } from 'react';
+import type { TupleComponent } from '../../domain/components/TupleComponent';
+import { FormSectionRendererProps } from '../types';
+export declare const tupleComponentToProps: ({ control, description, help, title }: TupleComponent, children: ReactNode) => FormSectionRendererProps;

package/build/types/revamp/renderers/types.d.ts

@@ -10,7 +10,7 @@ export type Bias = 'none' | 'start' | 'end';
 export type Context = 'positive' | 'negative' | 'warning' | 'neutral';
 export type Margin = DFMargin;
 export type Size = DFSize;
-export type LoadingState = 'idle' | 'loading';
+export type LoadingState = 'idle' | 'submitting' | 'refreshing';
 export type Image = {
     url: string;
     accessibilityDescription?: string;

package/build/types/revamp/utils/type-utils.d.ts

@@ -36,6 +36,7 @@ export declare const isObjectSchema: (schema: Schema) => schema is ObjectSchema;
 export declare const isOneOfSchema: (schema: Schema) => schema is OneOfSchema;
 export declare const isArraySchema: (schema: Schema) => schema is ArraySchema;
 export declare const isArrayListSchema: (schema: Schema) => schema is ArraySchemaList;
+export declare const isArrayTupleSchema: (schema: Schema) => schema is ArraySchemaTuple;
 export declare const isStringSchema: (schema: Schema) => schema is StringSchema;
 export declare const isStringSchemaWithUpload: (schema: Schema) => schema is StringSchemaWithUpload;
 export declare const isSchemaWithPersistAsync: (schema: Schema) => schema is SchemaWithPersistAsync;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wise/dynamic-flow-client",
-  "version": "3.12.1",
+  "version": "3.13.0",
   "description": "Dynamic Flow web client",
   "license": "Apache-2.0",
   "main": "./build/main.min.js",
@@ -95,7 +95,7 @@
     "classnames": "2.5.1",
     "react-webcam": "^7.2.0",
     "screenfull": "^5.2.0",
-    "@wise/dynamic-flow-types": "2.15.3"
+    "@wise/dynamic-flow-types": "2.15.4"
   },
   "scripts": {
     "dev": "pnpm build:visual-tests && storybook dev -p 3003",