@oneblink/apps-react 8.6.0-beta.3 → 8.6.0-beta.5

package/dist/services/form-validation/extensions.js

@@ -57,16 +57,11 @@ const validationExtensions = {
     },
     nestedElements(value, { formElement, formElements, formElementsConditionallyShown, executedLookups, captchaType, isOffline, }) {
         if (formElements) {
-            const executedLookupsValue = executedLookups !== undefined &&
+            const nestedExecutedLookupsValue = executedLookups !== undefined &&
                 typeof executedLookups !== 'boolean' &&
                 !Array.isArray(executedLookups)
                 ? executedLookups[formElement.name]
                 : {};
-            const nestedExecutedLookups = executedLookupsValue !== undefined &&
-                typeof executedLookupsValue !== 'boolean' &&
-                !Array.isArray(executedLookupsValue)
-                ? executedLookupsValue[formElement.name]
-                : {};
             const formElementConditionallyShown = formElementsConditionallyShown === null || formElementsConditionallyShown === void 0 ? void 0 : formElementsConditionallyShown[formElement.name];
             const errors = validateSubmission({
                 elements: formElements,
@@ -74,9 +69,9 @@ const validationExtensions = {
                 formElementsConditionallyShown: (formElementConditionallyShown === null || formElementConditionallyShown === void 0 ? void 0 : formElementConditionallyShown.type) === 'formElements'
                     ? formElementConditionallyShown.formElements
                     : undefined,
-                executedLookups: typeof nestedExecutedLookups !== 'boolean' &&
-                    !Array.isArray(nestedExecutedLookups)
-                    ? nestedExecutedLookups
+                executedLookups: typeof nestedExecutedLookupsValue !== 'boolean' &&
+                    !Array.isArray(nestedExecutedLookupsValue)
+                    ? nestedExecutedLookupsValue
                     : {},
                 captchaType,
                 isOffline,

package/dist/services/form-validation/extensions.js.map

@@ -1 +1 @@
-{"version":3,"file":"extensions.js","sourceRoot":"","sources":["../../../src/services/form-validation/extensions.ts"],"names":[],"mappings":"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","sourcesContent":["import { FormTypes, SubmissionTypes } from '@oneblink/types'\nimport { FormElementBinaryStorageValue } from '../../types/attachments'\nimport {\n  CaptchaType,\n  ExecutedLookups,\n  FormElementsConditionallyShown,\n} from '../../types/form'\nimport validateSubmission from './validateSubmission'\nimport {\n  generateLookupValidationMessage,\n  getInvalidAttachment,\n  validateAttachments,\n} from './validators'\nimport { validators } from './validate-dot-js'\nimport { Value as FormElementComplianceValue } from '../../form-elements/FormElementCompliance'\n\nconst validationExtensions = {\n  lookups({\n    executedLookups,\n    formElement,\n  }: {\n    formElement: FormTypes.LookupFormElement & FormTypes.FormElementRequired\n    executedLookups: ExecutedLookups\n  }): string[] {\n    if (!formElement.isDataLookup && !formElement.isElementLookup) {\n      return []\n    }\n\n    // Lookups must only be executed on required form elements\n    if (formElement && !formElement.required) {\n      return []\n    }\n\n    const elementExecutedLookups = executedLookups?.[formElement.name]\n    if (elementExecutedLookups === true) {\n      return []\n    }\n\n    return [generateLookupValidationMessage(formElement.lookupButton)]\n  },\n\n  presence(\n    value: unknown,\n    { required, requiredMessage }: FormTypes.FormElementRequired,\n    message: string,\n  ) {\n    if (required) {\n      return validators.presence(value, {\n        message: requiredMessage || message,\n      })\n    }\n    return []\n  },\n\n  regex<DefaultValue>(\n    value: unknown,\n    formElement: FormTypes.FormElementWithInput<DefaultValue>,\n  ) {\n    if (formElement.regexPattern) {\n      return validators.regexValidation(value, {\n        pattern: formElement.regexPattern,\n        flags: formElement.regexFlags,\n        message: formElement.regexMessage,\n      })\n    }\n    return []\n  },\n\n  attachment(value: unknown): string[] {\n    const attachmentError = getInvalidAttachment(value)\n    if (attachmentError) {\n      return [attachmentError.errorMessage]\n    }\n    return []\n  },\n\n  attachments(\n    value:\n      | FormElementBinaryStorageValue[]\n      | FormElementComplianceValue\n      | undefined,\n  ) {\n    if (Array.isArray(value)) {\n      return validateAttachments(value)\n    }\n    return validateAttachments(\n      value?.files as FormElementBinaryStorageValue[] | undefined,\n    )\n  },\n\n  numberRegex(value: unknown, formElement: FormTypes.NumberElement) {\n    if (\n      formElement.regexPattern &&\n      typeof value === 'number' &&\n      !Number.isNaN(value)\n    ) {\n      return validationExtensions.regex(value.toString(), formElement)\n    }\n    return []\n  },\n\n  nestedElements(\n    value: unknown,\n    {\n      formElement,\n      formElements,\n      formElementsConditionallyShown,\n      executedLookups,\n      captchaType,\n      isOffline,\n    }: {\n      formElement: FormTypes.FormElementWithName\n      formElements: FormTypes.FormElementWithName[] | undefined\n      formElementsConditionallyShown: FormElementsConditionallyShown | undefined\n      executedLookups: ExecutedLookups\n      captchaType: CaptchaType\n      isOffline: boolean\n    },\n  ) {\n    if (formElements) {\n      const executedLookupsValue =\n        executedLookups !== undefined &&\n        typeof executedLookups !== 'boolean' &&\n        !Array.isArray(executedLookups)\n          ? executedLookups[formElement.name]\n          : {}\n      const nestedExecutedLookups =\n        executedLookupsValue !== undefined &&\n        typeof executedLookupsValue !== 'boolean' &&\n        !Array.isArray(executedLookupsValue)\n          ? executedLookupsValue[formElement.name]\n          : {}\n      const formElementConditionallyShown =\n        formElementsConditionallyShown?.[formElement.name]\n      const errors = validateSubmission({\n        elements: formElements as FormTypes.FormElementWithName[],\n        submission: value as SubmissionTypes.S3SubmissionData['submission'],\n        formElementsConditionallyShown:\n          formElementConditionallyShown?.type === 'formElements'\n            ? formElementConditionallyShown.formElements\n            : undefined,\n        executedLookups:\n          typeof nestedExecutedLookups !== 'boolean' &&\n          !Array.isArray(nestedExecutedLookups)\n            ? nestedExecutedLookups\n            : {},\n        captchaType,\n        isOffline,\n      })\n      if (errors) {\n        return {\n          type: 'formElements' as const,\n          formElements: errors,\n        }\n      }\n    }\n  },\n\n  offline(isOffline: boolean, message: string) {\n    return isOffline ? [message] : []\n  },\n}\n\nexport default validationExtensions\n"]}
+{"version":3,"file":"extensions.js","sourceRoot":"","sources":["../../../src/services/form-validation/extensions.ts"],"names":[],"mappings":"AAOA,OAAO,kBAAkB,MAAM,sBAAsB,CAAA;AACrD,OAAO,EACL,+BAA+B,EAC/B,oBAAoB,EACpB,mBAAmB,GACpB,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAG9C,MAAM,oBAAoB,GAAG;IAC3B,OAAO,CAAC,EACN,eAAe,EACf,WAAW,GAIZ;QACC,IAAI,CAAC,WAAW,CAAC,YAAY,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,CAAC;YAC9D,OAAO,EAAE,CAAA;QACX,CAAC;QAED,0DAA0D;QAC1D,IAAI,WAAW,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;YACzC,OAAO,EAAE,CAAA;QACX,CAAC;QAED,MAAM,sBAAsB,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAG,WAAW,CAAC,IAAI,CAAC,CAAA;QAClE,IAAI,sBAAsB,KAAK,IAAI,EAAE,CAAC;YACpC,OAAO,EAAE,CAAA;QACX,CAAC;QAED,OAAO,CAAC,+BAA+B,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAA;IACpE,CAAC;IAED,QAAQ,CACN,KAAc,EACd,EAAE,QAAQ,EAAE,eAAe,EAAiC,EAC5D,OAAe;QAEf,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE;gBAChC,OAAO,EAAE,eAAe,IAAI,OAAO;aACpC,CAAC,CAAA;QACJ,CAAC;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IAED,KAAK,CACH,KAAc,EACd,WAAyD;QAEzD,IAAI,WAAW,CAAC,YAAY,EAAE,CAAC;YAC7B,OAAO,UAAU,CAAC,eAAe,CAAC,KAAK,EAAE;gBACvC,OAAO,EAAE,WAAW,CAAC,YAAY;gBACjC,KAAK,EAAE,WAAW,CAAC,UAAU;gBAC7B,OAAO,EAAE,WAAW,CAAC,YAAY;aAClC,CAAC,CAAA;QACJ,CAAC;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IAED,UAAU,CAAC,KAAc;QACvB,MAAM,eAAe,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAA;QACnD,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,CAAC,eAAe,CAAC,YAAY,CAAC,CAAA;QACvC,CAAC;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IAED,WAAW,CACT,KAGa;QAEb,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,mBAAmB,CAAC,KAAK,CAAC,CAAA;QACnC,CAAC;QACD,OAAO,mBAAmB,CACxB,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,KAAoD,CAC5D,CAAA;IACH,CAAC;IAED,WAAW,CAAC,KAAc,EAAE,WAAoC;QAC9D,IACE,WAAW,CAAC,YAAY;YACxB,OAAO,KAAK,KAAK,QAAQ;YACzB,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EACpB,CAAC;YACD,OAAO,oBAAoB,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,WAAW,CAAC,CAAA;QAClE,CAAC;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IAED,cAAc,CACZ,KAAc,EACd,EACE,WAAW,EACX,YAAY,EACZ,8BAA8B,EAC9B,eAAe,EACf,WAAW,EACX,SAAS,GAQV;QAED,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,0BAA0B,GAC9B,eAAe,KAAK,SAAS;gBAC7B,OAAO,eAAe,KAAK,SAAS;gBACpC,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC;gBAC7B,CAAC,CAAC,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC;gBACnC,CAAC,CAAC,EAAE,CAAA;YAER,MAAM,6BAA6B,GACjC,8BAA8B,aAA9B,8BAA8B,uBAA9B,8BAA8B,CAAG,WAAW,CAAC,IAAI,CAAC,CAAA;YACpD,MAAM,MAAM,GAAG,kBAAkB,CAAC;gBAChC,QAAQ,EAAE,YAA+C;gBACzD,UAAU,EAAE,KAAuD;gBACnE,8BAA8B,EAC5B,CAAA,6BAA6B,aAA7B,6BAA6B,uBAA7B,6BAA6B,CAAE,IAAI,MAAK,cAAc;oBACpD,CAAC,CAAC,6BAA6B,CAAC,YAAY;oBAC5C,CAAC,CAAC,SAAS;gBACf,eAAe,EACb,OAAO,0BAA0B,KAAK,SAAS;oBAC/C,CAAC,KAAK,CAAC,OAAO,CAAC,0BAA0B,CAAC;oBACxC,CAAC,CAAC,0BAA0B;oBAC5B,CAAC,CAAC,EAAE;gBACR,WAAW;gBACX,SAAS;aACV,CAAC,CAAA;YACF,IAAI,MAAM,EAAE,CAAC;gBACX,OAAO;oBACL,IAAI,EAAE,cAAuB;oBAC7B,YAAY,EAAE,MAAM;iBACrB,CAAA;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,CAAC,SAAkB,EAAE,OAAe;QACzC,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IACnC,CAAC;CACF,CAAA;AAED,eAAe,oBAAoB,CAAA","sourcesContent":["import { FormTypes, SubmissionTypes } from '@oneblink/types'\nimport { FormElementBinaryStorageValue } from '../../types/attachments'\nimport {\n  CaptchaType,\n  ExecutedLookups,\n  FormElementsConditionallyShown,\n} from '../../types/form'\nimport validateSubmission from './validateSubmission'\nimport {\n  generateLookupValidationMessage,\n  getInvalidAttachment,\n  validateAttachments,\n} from './validators'\nimport { validators } from './validate-dot-js'\nimport { Value as FormElementComplianceValue } from '../../form-elements/FormElementCompliance'\n\nconst validationExtensions = {\n  lookups({\n    executedLookups,\n    formElement,\n  }: {\n    formElement: FormTypes.LookupFormElement & FormTypes.FormElementRequired\n    executedLookups: ExecutedLookups\n  }): string[] {\n    if (!formElement.isDataLookup && !formElement.isElementLookup) {\n      return []\n    }\n\n    // Lookups must only be executed on required form elements\n    if (formElement && !formElement.required) {\n      return []\n    }\n\n    const elementExecutedLookups = executedLookups?.[formElement.name]\n    if (elementExecutedLookups === true) {\n      return []\n    }\n\n    return [generateLookupValidationMessage(formElement.lookupButton)]\n  },\n\n  presence(\n    value: unknown,\n    { required, requiredMessage }: FormTypes.FormElementRequired,\n    message: string,\n  ) {\n    if (required) {\n      return validators.presence(value, {\n        message: requiredMessage || message,\n      })\n    }\n    return []\n  },\n\n  regex<DefaultValue>(\n    value: unknown,\n    formElement: FormTypes.FormElementWithInput<DefaultValue>,\n  ) {\n    if (formElement.regexPattern) {\n      return validators.regexValidation(value, {\n        pattern: formElement.regexPattern,\n        flags: formElement.regexFlags,\n        message: formElement.regexMessage,\n      })\n    }\n    return []\n  },\n\n  attachment(value: unknown): string[] {\n    const attachmentError = getInvalidAttachment(value)\n    if (attachmentError) {\n      return [attachmentError.errorMessage]\n    }\n    return []\n  },\n\n  attachments(\n    value:\n      | FormElementBinaryStorageValue[]\n      | FormElementComplianceValue\n      | undefined,\n  ) {\n    if (Array.isArray(value)) {\n      return validateAttachments(value)\n    }\n    return validateAttachments(\n      value?.files as FormElementBinaryStorageValue[] | undefined,\n    )\n  },\n\n  numberRegex(value: unknown, formElement: FormTypes.NumberElement) {\n    if (\n      formElement.regexPattern &&\n      typeof value === 'number' &&\n      !Number.isNaN(value)\n    ) {\n      return validationExtensions.regex(value.toString(), formElement)\n    }\n    return []\n  },\n\n  nestedElements(\n    value: unknown,\n    {\n      formElement,\n      formElements,\n      formElementsConditionallyShown,\n      executedLookups,\n      captchaType,\n      isOffline,\n    }: {\n      formElement: FormTypes.FormElementWithName\n      formElements: FormTypes.FormElementWithName[] | undefined\n      formElementsConditionallyShown: FormElementsConditionallyShown | undefined\n      executedLookups: ExecutedLookups\n      captchaType: CaptchaType\n      isOffline: boolean\n    },\n  ) {\n    if (formElements) {\n      const nestedExecutedLookupsValue =\n        executedLookups !== undefined &&\n        typeof executedLookups !== 'boolean' &&\n        !Array.isArray(executedLookups)\n          ? executedLookups[formElement.name]\n          : {}\n\n      const formElementConditionallyShown =\n        formElementsConditionallyShown?.[formElement.name]\n      const errors = validateSubmission({\n        elements: formElements as FormTypes.FormElementWithName[],\n        submission: value as SubmissionTypes.S3SubmissionData['submission'],\n        formElementsConditionallyShown:\n          formElementConditionallyShown?.type === 'formElements'\n            ? formElementConditionallyShown.formElements\n            : undefined,\n        executedLookups:\n          typeof nestedExecutedLookupsValue !== 'boolean' &&\n          !Array.isArray(nestedExecutedLookupsValue)\n            ? nestedExecutedLookupsValue\n            : {},\n        captchaType,\n        isOffline,\n      })\n      if (errors) {\n        return {\n          type: 'formElements' as const,\n          formElements: errors,\n        }\n      }\n    }\n  },\n\n  offline(isOffline: boolean, message: string) {\n    return isOffline ? [message] : []\n  },\n}\n\nexport default validationExtensions\n"]}

package/dist/types/form.d.ts

@@ -1,4 +1,5 @@
 import { FormTypes, SubmissionTypes, IntegrationTypes } from '@oneblink/types';
+import { NewS3SubmissionData } from '@oneblink/types/typescript/submissions';
 export { FormElementConditionallyShownElement, FormElementConditionallyShown, FormElementsConditionallyShown, } from '@oneblink/sdk-core/dist/conditionalLogicService';
 export type FormElementKey = string;
 export type RepeatableSetEntryIndex = string;
@@ -23,12 +24,13 @@ export type NestedFormElementValueChangeHandler<T = unknown> = ValueChangeHandle
     value?: T | ((existingValue?: T) => T | undefined);
     executedLookups: ExecutedLookupValue | ((currentExecutedLookups: ExecutedLookupValue) => ExecutedLookupValue);
 }>;
+export type SectionState = NewS3SubmissionData['sectionState'];
 export type FormElementLookupHandler = (setter: (data: {
     submission: SubmissionTypes.S3SubmissionData['submission'];
     elements: FormTypes.FormElement[];
     lastElementUpdated: FormTypes.FormElement | undefined;
     executedLookups: ExecutedLookups;
-    collapsedSectionIds: string[] | undefined;
+    sectionState: SectionState | undefined;
 }) => {
     submission: SubmissionTypes.S3SubmissionData['submission'];
     elements: FormTypes.FormElement[];
@@ -40,7 +42,7 @@ export type SetFormSubmission = React.Dispatch<React.SetStateAction<{
     submission: SubmissionTypes.S3SubmissionData['submission'];
     lastElementUpdated: FormTypes.FormElement | undefined;
     executedLookups: ExecutedLookups;
-    collapsedSectionIds: string[] | undefined;
+    sectionState: SectionState | undefined;
 }>>;
 export type IsDirtyProps = {
     isDirty: boolean;

package/dist/types/form.js.map

@@ -1 +1 @@
-{"version":3,"file":"form.js","sourceRoot":"","sources":["../../src/types/form.ts"],"names":[],"mappings":"","sourcesContent":["import { FormTypes, SubmissionTypes, IntegrationTypes } from '@oneblink/types'\n\nexport {\n  FormElementConditionallyShownElement,\n  FormElementConditionallyShown,\n  FormElementsConditionallyShown,\n} from '@oneblink/sdk-core/dist/conditionalLogicService'\n\nexport type FormElementKey = string\nexport type RepeatableSetEntryIndex = string\n\nexport type FormElementsValidation = Record<\n  FormElementKey,\n  FormElementValidation\n>\n\nexport type FormElementValidation =\n  | undefined\n  | string\n  | {\n      type: 'formElements'\n      formElements: FormElementsValidation | undefined\n    }\n  | {\n      type: 'repeatableSet'\n      set: string | undefined\n      entries: Record<\n        RepeatableSetEntryIndex,\n        FormElementsValidation | undefined\n      >\n    }\n\nexport type ExecutedLookups =\n  | {\n      [elementName: string]:\n        | boolean\n        | ExecutedLookups\n        | ExecutedLookups[]\n        | undefined\n    }\n  | undefined\n\nexport type ExecutedLookupValue = NonNullable<ExecutedLookups>[string]\n\ntype ValueChangeHandler<U extends Record<string, unknown>> = (\n  element: FormTypes.FormElement,\n  opts: U,\n) => void\n\nexport type FormElementValueChangeHandler<T = unknown> = ValueChangeHandler<{\n  value?: T | ((existingValue?: T) => T | undefined)\n}>\n\nexport type NestedFormElementValueChangeHandler<T = unknown> =\n  ValueChangeHandler<{\n    value?: T | ((existingValue?: T) => T | undefined)\n    executedLookups:\n      | ExecutedLookupValue\n      | ((currentExecutedLookups: ExecutedLookupValue) => ExecutedLookupValue)\n  }>\n\nexport type FormElementLookupHandler = (\n  setter: (data: {\n    submission: SubmissionTypes.S3SubmissionData['submission']\n    elements: FormTypes.FormElement[]\n    lastElementUpdated: FormTypes.FormElement | undefined\n    executedLookups: ExecutedLookups\n    collapsedSectionIds: string[] | undefined\n  }) => {\n    submission: SubmissionTypes.S3SubmissionData['submission']\n    elements: FormTypes.FormElement[]\n    executedLookups: ExecutedLookups\n  },\n) => void\n\nexport type UpdateFormElementsHandler = (\n  setter: (element: FormTypes.FormElement[]) => FormTypes.FormElement[],\n) => void\n\nexport type SetFormSubmission = React.Dispatch<\n  React.SetStateAction<{\n    definition: FormTypes.Form\n    submission: SubmissionTypes.S3SubmissionData['submission']\n    lastElementUpdated: FormTypes.FormElement | undefined\n    executedLookups: ExecutedLookups\n    collapsedSectionIds: string[] | undefined\n  }>\n>\n\nexport type IsDirtyProps = {\n  isDirty: boolean\n  setIsDirty: () => void\n}\n\nexport type CaptchaType = NonNullable<\n  IntegrationTypes.IntegrationRecaptcha['configuration']['domains'][number]['type']\n>\n"]}
+{"version":3,"file":"form.js","sourceRoot":"","sources":["../../src/types/form.ts"],"names":[],"mappings":"","sourcesContent":["import { FormTypes, SubmissionTypes, IntegrationTypes } from '@oneblink/types'\nimport { NewS3SubmissionData } from '@oneblink/types/typescript/submissions'\n\nexport {\n  FormElementConditionallyShownElement,\n  FormElementConditionallyShown,\n  FormElementsConditionallyShown,\n} from '@oneblink/sdk-core/dist/conditionalLogicService'\n\nexport type FormElementKey = string\nexport type RepeatableSetEntryIndex = string\n\nexport type FormElementsValidation = Record<\n  FormElementKey,\n  FormElementValidation\n>\n\nexport type FormElementValidation =\n  | undefined\n  | string\n  | {\n      type: 'formElements'\n      formElements: FormElementsValidation | undefined\n    }\n  | {\n      type: 'repeatableSet'\n      set: string | undefined\n      entries: Record<\n        RepeatableSetEntryIndex,\n        FormElementsValidation | undefined\n      >\n    }\n\nexport type ExecutedLookups =\n  | {\n      [elementName: string]:\n        | boolean\n        | ExecutedLookups\n        | ExecutedLookups[]\n        | undefined\n    }\n  | undefined\n\nexport type ExecutedLookupValue = NonNullable<ExecutedLookups>[string]\n\ntype ValueChangeHandler<U extends Record<string, unknown>> = (\n  element: FormTypes.FormElement,\n  opts: U,\n) => void\n\nexport type FormElementValueChangeHandler<T = unknown> = ValueChangeHandler<{\n  value?: T | ((existingValue?: T) => T | undefined)\n}>\n\nexport type NestedFormElementValueChangeHandler<T = unknown> =\n  ValueChangeHandler<{\n    value?: T | ((existingValue?: T) => T | undefined)\n    executedLookups:\n      | ExecutedLookupValue\n      | ((currentExecutedLookups: ExecutedLookupValue) => ExecutedLookupValue)\n  }>\n\nexport type SectionState = NewS3SubmissionData['sectionState']\n\nexport type FormElementLookupHandler = (\n  setter: (data: {\n    submission: SubmissionTypes.S3SubmissionData['submission']\n    elements: FormTypes.FormElement[]\n    lastElementUpdated: FormTypes.FormElement | undefined\n    executedLookups: ExecutedLookups\n    sectionState: SectionState | undefined\n  }) => {\n    submission: SubmissionTypes.S3SubmissionData['submission']\n    elements: FormTypes.FormElement[]\n    executedLookups: ExecutedLookups\n  },\n) => void\n\nexport type UpdateFormElementsHandler = (\n  setter: (element: FormTypes.FormElement[]) => FormTypes.FormElement[],\n) => void\n\nexport type SetFormSubmission = React.Dispatch<\n  React.SetStateAction<{\n    definition: FormTypes.Form\n    submission: SubmissionTypes.S3SubmissionData['submission']\n    lastElementUpdated: FormTypes.FormElement | undefined\n    executedLookups: ExecutedLookups\n    sectionState: SectionState | undefined\n  }>\n>\n\nexport type IsDirtyProps = {\n  isDirty: boolean\n  setIsDirty: () => void\n}\n\nexport type CaptchaType = NonNullable<\n  IntegrationTypes.IntegrationRecaptcha['configuration']['domains'][number]['type']\n>\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oneblink/apps-react",
   "description": "Helper functions for OneBlink apps in ReactJS.",
-  "version": "8.6.0-beta.3",
+  "version": "8.6.0-beta.5",
   "author": "OneBlink <developers@oneblink.io> (https://oneblink.io)",
   "bugs": {
     "url": "https://github.com/oneblink/apps-react/issues"
@@ -47,7 +47,7 @@
     "@mui/lab": "^5.0.0-alpha.152",
     "@mui/material": "^5.15.6",
     "@mui/x-date-pickers": "^6.20.2",
-    "@oneblink/apps": "^22.2.0-beta.3",
+    "@oneblink/apps": "^23.0.0-beta.3",
     "@oneblink/release-cli": "^3.3.1-beta.4",
     "@oneblink/types": "github:oneblink/types",
     "@types/blueimp-load-image": "^5.16.6",