@oneblink/apps-react 13.6.1-beta.1 → 13.7.0-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/OneBlinkFormBase.js +8 -6
- package/dist/OneBlinkFormBase.js.map +1 -1
- package/dist/apps/services/integration-elements.js +3 -3
- package/dist/apps/services/integration-elements.js.map +1 -1
- package/dist/components/renderer/PageFormElements.js +10 -3
- package/dist/components/renderer/PageFormElements.js.map +1 -1
- package/dist/form-elements/FormElementABN.js +0 -9
- package/dist/form-elements/FormElementABN.js.map +1 -1
- package/dist/form-elements/FormElementAutocomplete.js +5 -6
- package/dist/form-elements/FormElementAutocomplete.js.map +1 -1
- package/dist/form-elements/FormElementBSB.js +30 -26
- package/dist/form-elements/FormElementBSB.js.map +1 -1
- package/dist/hooks/useFormValidation.js +3 -43
- package/dist/hooks/useFormValidation.js.map +1 -1
- package/dist/hooks/usePages.d.ts +4 -2
- package/dist/hooks/usePages.js +48 -39
- package/dist/hooks/usePages.js.map +1 -1
- package/dist/services/form-validation/getFormElementsValidatedForAudience.d.ts +6 -0
- package/dist/services/form-validation/getFormElementsValidatedForAudience.js +48 -0
- package/dist/services/form-validation/getFormElementsValidatedForAudience.js.map +1 -0
- package/dist/services/page-visibility.d.ts +13 -0
- package/dist/services/page-visibility.js +20 -0
- package/dist/services/page-visibility.js.map +1 -0
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FormElementBSB.js","sourceRoot":"","sources":["../../src/form-elements/FormElementBSB.tsx"],"names":[],"mappings":"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","sourcesContent":["import * as React from 'react'\nimport { InputMask } from '@react-input/mask'\nimport clsx from 'clsx'\nimport CopyToClipboardButton from '../components/renderer/CopyToClipboardButton'\nimport LookupButton from '../components/renderer/LookupButton'\nimport { FormTypes, MiscTypes } from '@oneblink/types'\nimport FormElementLabelContainer from '../components/renderer/FormElementLabelContainer'\nimport { FormElementValueChangeHandler, IsDirtyProps } from '../types/form'\nimport { formService, OneBlinkAppsError } from '../apps'\nimport useIsOffline from '../hooks/useIsOffline'\nimport {\n isOffline as isNavigatorOffline,\n OFFLINE_ERROR_MESSAGE,\n} from '../apps/offline-service'\nimport { LookupNotificationContext } from '../hooks/useLookupNotification'\nimport useElementAriaDescribedby from '../hooks/useElementAriaDescribedby'\nimport FormElementValidationMessage from '../components/renderer/FormElementValidationMessage'\nimport useBooleanState from '../hooks/useBooleanState'\n\ntype Props = {\n id: string\n formId: number\n element: FormTypes.BSBElement\n readOnly: boolean\n value: unknown\n onChange: FormElementValueChangeHandler<\n string | { isInvalid: boolean; isValidating: boolean }\n >\n displayValidationMessage: boolean\n validationMessage: string | undefined\n autocompleteAttributes?: string\n} & IsDirtyProps\n\nfunction FormElementBSB({\n id,\n formId,\n element,\n readOnly,\n value,\n onChange,\n validationMessage,\n displayValidationMessage,\n isDirty,\n setIsDirty,\n autocompleteAttributes,\n}: Props) {\n const ariaDescribedby = useElementAriaDescribedby(id, element)\n const isOffline = useIsOffline()\n const [text, setText] = React.useState(typeof value === 'string' ? value : '')\n // A BSB already stored on the submission, or returned by a successful lookup.\n // Kept in a ref so a connectivity change can see it without starting another lookup.\n const validatedBsbRef = React.useRef(\n typeof value === 'string' ? value : undefined,\n )\n // Mirrors `bsbRecord` for the lookup effect. The effect must not list the\n // record as a dependency: clearing it to start a lookup would abort that lookup.\n const bsbRecordRef = React.useRef<MiscTypes.BSBRecord | null>(null)\n const [hasFocus, setHasFocus, removeFocus] = useBooleanState(false)\n const isValidFormat = /\\d{3}-\\d{3}/.test(text)\n\n const [{ isLoading, errorMessage, bsbRecord }, setState] = React.useState<{\n isLoading: boolean\n errorMessage: string | null\n bsbRecord: MiscTypes.BSBRecord | null\n }>({\n isLoading: false,\n errorMessage: null,\n bsbRecord: null,\n })\n\n React.useEffect(() => {\n bsbRecordRef.current = bsbRecord\n if (bsbRecord?.bsb) {\n validatedBsbRef.current = bsbRecord.bsb\n }\n }, [bsbRecord])\n\n React.useEffect(() => {\n if (bsbRecord) {\n onChange(element, {\n value: bsbRecord.bsb,\n })\n }\n }, [bsbRecord, element, onChange, value])\n\n React.useEffect(() => {\n if (text === '') {\n return\n }\n\n if (!isValidFormat) {\n setState({\n isLoading: false,\n errorMessage: null,\n bsbRecord: null,\n })\n return\n }\n\n // This text was already accepted. Offline, leave a stored BSB alone.\n // Online, leave it alone when its bank record is still showing — a\n // reconnect would otherwise clear that record and, if the retry failed,\n // replace the known-good value with { isInvalid: true }.\n if (\n validatedBsbRef.current === text &&\n (isOffline || bsbRecordRef.current)\n ) {\n return\n }\n\n if (isOffline) {\n onChange(element, {\n value: { isInvalid: true, isValidating: false },\n })\n setState({\n isLoading: false,\n errorMessage: OFFLINE_ERROR_MESSAGE,\n bsbRecord: null,\n })\n return\n }\n\n setState({\n isLoading: true,\n errorMessage: null,\n bsbRecord: null,\n })\n\n const abortController = new AbortController()\n const getBSBRecord = async () => {\n onChange(element, {\n value: { isValidating: true, isInvalid: false },\n })\n try {\n const bsbRecord = await formService.getBSBRecord(\n formId,\n text,\n abortController.signal,\n )\n if (!abortController.signal.aborted) {\n setState({\n isLoading: false,\n errorMessage: null,\n bsbRecord,\n })\n }\n } catch (error) {\n console.warn('Error validating BSB number', error)\n if (!abortController.signal.aborted) {\n const isOfflineError =\n isNavigatorOffline() ||\n (error instanceof OneBlinkAppsError && error.isOffline)\n onChange(element, {\n value: { isInvalid: true, isValidating: false },\n })\n setState({\n isLoading: false,\n errorMessage: isOfflineError\n ? OFFLINE_ERROR_MESSAGE\n : `The BSB number \"${text}\" does not exist`,\n bsbRecord: null,\n })\n }\n }\n }\n\n getBSBRecord()\n\n return () => {\n abortController.abort()\n }\n }, [formId, isOffline, isValidFormat, text, onChange, element])\n\n const { isLookingUp } = React.useContext(LookupNotificationContext)\n const isDisplayingValidationMessage =\n (((isDirty || displayValidationMessage) &&\n !!validationMessage &&\n !isLoading) ||\n errorMessage) &&\n !isLookingUp\n\n const hasCopyButton = !!value && !!readOnly\n const hasLookupButton = element.isDataLookup || element.isElementLookup\n return (\n <div className=\"cypress-bsb-element\">\n <FormElementLabelContainer\n className=\"ob-bsb\"\n id={id}\n element={element}\n required={element.required}\n >\n <div\n className={clsx('field has-addons', {\n 'no-addons-mobile': !hasCopyButton && !hasLookupButton,\n })}\n >\n <div\n className={clsx('control is-expanded', {\n 'is-loading': isLoading,\n })}\n >\n <InputMask\n mask=\"xxx-xxx\"\n replacement={{ x: /\\d/ }}\n showMask={hasFocus}\n type=\"text\"\n placeholder={element.placeholderValue}\n id={id}\n name={element.name}\n className=\"input ob-input cypress-bsb-control\"\n value={text}\n onChange={(e) => {\n setText(e.target.value)\n }}\n required={element.required}\n disabled={readOnly}\n onFocus={setHasFocus}\n onBlur={() => {\n removeFocus()\n if (text === 'xxx-xxx') {\n onChange(element, {\n value: undefined,\n })\n setText('')\n }\n setIsDirty()\n }}\n aria-describedby={ariaDescribedby}\n autoComplete={autocompleteAttributes}\n aria-required={element.required}\n />\n </div>\n {bsbRecord && (\n <BSBDisplay\n bsbRecord={bsbRecord}\n className=\"ob-bsb__display-desktop\"\n />\n )}\n {hasCopyButton && (\n <div className=\"control\">\n <CopyToClipboardButton\n className=\"button is-input-addon copy-button cypress-copy-to-clipboard-button\"\n text={text}\n />\n </div>\n )}\n <LookupButton\n isInputButton\n value={value}\n validationMessage={validationMessage}\n lookupButtonConfig={element.lookupButton}\n overrideRequiredMessage={undefined}\n />\n </div>\n {bsbRecord && (\n <BSBDisplay\n bsbRecord={bsbRecord}\n className=\"ob-bsb__display-mobile\"\n />\n )}\n {isDisplayingValidationMessage && (\n <FormElementValidationMessage\n message={errorMessage || validationMessage}\n />\n )}\n </FormElementLabelContainer>\n </div>\n )\n}\n\nconst BSBDisplay = ({\n bsbRecord,\n className,\n}: {\n bsbRecord: MiscTypes.BSBRecord\n className: string\n}) => {\n return (\n <div className={`control ob-bsb__record-control ${className}`}>\n <a className=\"button is-static ob-bsb__record-button\">\n {bsbRecord.financialInstitutionMnemonic} - {bsbRecord.name}\n </a>\n </div>\n )\n}\nexport default React.memo(FormElementBSB)\n"]}
|
|
1
|
+
{"version":3,"file":"FormElementBSB.js","sourceRoot":"","sources":["../../src/form-elements/FormElementBSB.tsx"],"names":[],"mappings":"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","sourcesContent":["import * as React from 'react'\nimport { InputMask } from '@react-input/mask'\nimport clsx from 'clsx'\nimport CopyToClipboardButton from '../components/renderer/CopyToClipboardButton'\nimport LookupButton from '../components/renderer/LookupButton'\nimport { FormTypes, MiscTypes } from '@oneblink/types'\nimport FormElementLabelContainer from '../components/renderer/FormElementLabelContainer'\nimport { FormElementValueChangeHandler, IsDirtyProps } from '../types/form'\nimport { formService, OneBlinkAppsError } from '../apps'\nimport useIsOffline from '../hooks/useIsOffline'\nimport { OFFLINE_ERROR_MESSAGE } from '../apps/offline-service'\nimport { LookupNotificationContext } from '../hooks/useLookupNotification'\nimport useElementAriaDescribedby from '../hooks/useElementAriaDescribedby'\nimport FormElementValidationMessage from '../components/renderer/FormElementValidationMessage'\nimport useBooleanState from '../hooks/useBooleanState'\n\ntype Props = {\n id: string\n formId: number\n element: FormTypes.BSBElement\n readOnly: boolean\n value: unknown\n onChange: FormElementValueChangeHandler<\n string | { isInvalid: boolean; isValidating: boolean }\n >\n displayValidationMessage: boolean\n validationMessage: string | undefined\n autocompleteAttributes?: string\n} & IsDirtyProps\n\nfunction FormElementBSB({\n id,\n formId,\n element,\n readOnly,\n value,\n onChange,\n validationMessage,\n displayValidationMessage,\n isDirty,\n setIsDirty,\n autocompleteAttributes,\n}: Props) {\n const ariaDescribedby = useElementAriaDescribedby(id, element)\n const isOffline = useIsOffline()\n const [text, setText] = React.useState(typeof value === 'string' ? value : '')\n // A BSB already stored on the submission, or returned by a successful lookup.\n // Kept in a ref so a connectivity change can see it without starting another lookup.\n const validatedBsbRef = React.useRef(\n typeof value === 'string' ? value : undefined,\n )\n // Mirrors `bsbRecord` for the lookup effect. The effect must not list the\n // record as a dependency: clearing it to start a lookup would abort that lookup.\n const bsbRecordRef = React.useRef<MiscTypes.BSBRecord | null>(null)\n // Latest submission value, read by the lookup effect without re-running it\n // when that effect itself writes a new value.\n const valueRef = React.useRef(value)\n const [hasFocus, setHasFocus, removeFocus] = useBooleanState(false)\n const isValidFormat = /\\d{3}-\\d{3}/.test(text)\n\n const [{ isLoading, errorMessage, bsbRecord }, setState] = React.useState<{\n isLoading: boolean\n errorMessage: string | null\n bsbRecord: MiscTypes.BSBRecord | null\n }>({\n isLoading: false,\n errorMessage: null,\n bsbRecord: null,\n })\n\n React.useEffect(() => {\n bsbRecordRef.current = bsbRecord\n if (bsbRecord?.bsb) {\n validatedBsbRef.current = bsbRecord.bsb\n }\n }, [bsbRecord])\n\n React.useEffect(() => {\n if (bsbRecord) {\n onChange(element, {\n value: bsbRecord.bsb,\n })\n }\n }, [bsbRecord, element, onChange, value])\n\n React.useEffect(() => {\n valueRef.current = value\n }, [value])\n\n React.useEffect(() => {\n // Editing away from a validated BSB forgets that lookup. Typing the same\n // number back is a new check, so offline it shows the offline message\n // instead of keeping the previous result.\n if (\n validatedBsbRef.current !== undefined &&\n validatedBsbRef.current !== text\n ) {\n validatedBsbRef.current = undefined\n }\n\n if (text === '' || !isValidFormat) {\n setState((current) =>\n !current.isLoading && !current.errorMessage && !current.bsbRecord\n ? current\n : {\n isLoading: false,\n errorMessage: null,\n bsbRecord: null,\n },\n )\n if (valueRef.current !== undefined) {\n onChange(element, { value: undefined })\n }\n return\n }\n\n // This text was already accepted and has not been edited since.\n // Offline, leave a stored BSB alone. Online, leave it alone when its\n // bank record is still showing — a reconnect would otherwise clear that\n // record and, if the retry failed, replace the known-good value with\n // { isInvalid: true }.\n if (\n validatedBsbRef.current === text &&\n (isOffline || bsbRecordRef.current)\n ) {\n return\n }\n\n setState({\n isLoading: true,\n errorMessage: null,\n bsbRecord: null,\n })\n\n const abortController = new AbortController()\n const getBSBRecord = async () => {\n onChange(element, {\n value: { isValidating: true, isInvalid: false },\n })\n try {\n const bsbRecord = await formService.getBSBRecord(\n formId,\n text,\n abortController.signal,\n )\n if (!abortController.signal.aborted) {\n setState({\n isLoading: false,\n errorMessage: null,\n bsbRecord,\n })\n }\n } catch (error) {\n console.warn('Error validating BSB number', error)\n if (!abortController.signal.aborted) {\n const isOfflineError =\n error instanceof OneBlinkAppsError && error.isOffline\n onChange(element, {\n value: { isInvalid: true, isValidating: false },\n })\n setState({\n isLoading: false,\n errorMessage: isOfflineError\n ? OFFLINE_ERROR_MESSAGE\n : `The BSB number \"${text}\" does not exist`,\n bsbRecord: null,\n })\n }\n }\n }\n\n getBSBRecord()\n\n return () => {\n abortController.abort()\n }\n }, [formId, isOffline, isValidFormat, text, onChange, element])\n\n const { isLookingUp } = React.useContext(LookupNotificationContext)\n const isDisplayingValidationMessage =\n (((isDirty || displayValidationMessage) &&\n !!validationMessage &&\n !isLoading) ||\n errorMessage) &&\n !isLookingUp\n\n const hasCopyButton = !!value && !!readOnly\n const hasLookupButton = element.isDataLookup || element.isElementLookup\n return (\n <div className=\"cypress-bsb-element\">\n <FormElementLabelContainer\n className=\"ob-bsb\"\n id={id}\n element={element}\n required={element.required}\n >\n <div\n className={clsx('field has-addons', {\n 'no-addons-mobile': !hasCopyButton && !hasLookupButton,\n })}\n >\n <div\n className={clsx('control is-expanded', {\n 'is-loading': isLoading,\n })}\n >\n <InputMask\n mask=\"xxx-xxx\"\n replacement={{ x: /\\d/ }}\n showMask={hasFocus}\n type=\"text\"\n placeholder={element.placeholderValue}\n id={id}\n name={element.name}\n className=\"input ob-input cypress-bsb-control\"\n value={text}\n onChange={(e) => {\n setText(e.target.value)\n }}\n required={element.required}\n disabled={readOnly}\n onFocus={setHasFocus}\n onBlur={() => {\n removeFocus()\n if (text === 'xxx-xxx') {\n onChange(element, {\n value: undefined,\n })\n setText('')\n }\n setIsDirty()\n }}\n aria-describedby={ariaDescribedby}\n autoComplete={autocompleteAttributes}\n aria-required={element.required}\n />\n </div>\n {bsbRecord && (\n <BSBDisplay\n bsbRecord={bsbRecord}\n className=\"ob-bsb__display-desktop\"\n />\n )}\n {hasCopyButton && (\n <div className=\"control\">\n <CopyToClipboardButton\n className=\"button is-input-addon copy-button cypress-copy-to-clipboard-button\"\n text={text}\n />\n </div>\n )}\n <LookupButton\n isInputButton\n value={value}\n validationMessage={validationMessage}\n lookupButtonConfig={element.lookupButton}\n overrideRequiredMessage={undefined}\n />\n </div>\n {bsbRecord && (\n <BSBDisplay\n bsbRecord={bsbRecord}\n className=\"ob-bsb__display-mobile\"\n />\n )}\n {isDisplayingValidationMessage && (\n <FormElementValidationMessage\n message={errorMessage || validationMessage}\n />\n )}\n </FormElementLabelContainer>\n </div>\n )\n}\n\nconst BSBDisplay = ({\n bsbRecord,\n className,\n}: {\n bsbRecord: MiscTypes.BSBRecord\n className: string\n}) => {\n return (\n <div className={`control ob-bsb__record-control ${className}`}>\n <a className=\"button is-static ob-bsb__record-button\">\n {bsbRecord.financialInstitutionMnemonic} - {bsbRecord.name}\n </a>\n </div>\n )\n}\nexport default React.memo(FormElementBSB)\n"]}
|
|
@@ -1,52 +1,12 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
2
|
import validateSubmission from '../services/form-validation/validateSubmission';
|
|
3
3
|
import getApproverEditableFormElementIds from '../services/form-validation/getApproverEditableFormElementIds';
|
|
4
|
-
|
|
5
|
-
return formElements.reduce((memo, formElement) => {
|
|
6
|
-
const isReadOnly = hasReadOnlyAncestor ||
|
|
7
|
-
('readOnly' in formElement && formElement.readOnly === true);
|
|
8
|
-
switch (formElement.type) {
|
|
9
|
-
case 'captcha': {
|
|
10
|
-
// The renderer omits a captcha inside a read-only container, so
|
|
11
|
-
// requiring one here would fail validation with an error the user
|
|
12
|
-
// cannot see or resolve.
|
|
13
|
-
if (isReadOnly) {
|
|
14
|
-
return memo;
|
|
15
|
-
}
|
|
16
|
-
return [...memo, formElement];
|
|
17
|
-
}
|
|
18
|
-
case 'page':
|
|
19
|
-
case 'section': {
|
|
20
|
-
return [
|
|
21
|
-
...memo,
|
|
22
|
-
...stripFormElementsWithoutName(formElement.elements, isReadOnly),
|
|
23
|
-
];
|
|
24
|
-
}
|
|
25
|
-
case 'infoPage':
|
|
26
|
-
case 'form':
|
|
27
|
-
case 'repeatableSet': {
|
|
28
|
-
return [
|
|
29
|
-
...memo,
|
|
30
|
-
{
|
|
31
|
-
...formElement,
|
|
32
|
-
elements: stripFormElementsWithoutName(formElement.elements || [], isReadOnly),
|
|
33
|
-
},
|
|
34
|
-
];
|
|
35
|
-
}
|
|
36
|
-
default: {
|
|
37
|
-
return [...memo, formElement];
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
}, []);
|
|
41
|
-
}
|
|
4
|
+
import getFormElementsValidatedForAudience from '../services/form-validation/getFormElementsValidatedForAudience';
|
|
42
5
|
export default function useFormValidation(pages, approvalSteps) {
|
|
43
|
-
const formElementsWithName = React.useMemo(() => {
|
|
44
|
-
return stripFormElementsWithoutName(pages, false);
|
|
45
|
-
}, [pages]);
|
|
46
6
|
const approverEditableFormElementIds = React.useMemo(() => getApproverEditableFormElementIds(approvalSteps), [approvalSteps]);
|
|
47
7
|
const handleValidate = React.useCallback((submission, formElementsConditionallyShown, executedLookups, captchaType, isOffline, audience, editableFormElementIds) => {
|
|
48
8
|
return validateSubmission({
|
|
49
|
-
elements:
|
|
9
|
+
elements: getFormElementsValidatedForAudience(pages, audience),
|
|
50
10
|
submission,
|
|
51
11
|
formElementsConditionallyShown,
|
|
52
12
|
executedLookups,
|
|
@@ -56,7 +16,7 @@ export default function useFormValidation(pages, approvalSteps) {
|
|
|
56
16
|
editableFormElementIds,
|
|
57
17
|
approverEditableFormElementIds,
|
|
58
18
|
});
|
|
59
|
-
}, [approverEditableFormElementIds,
|
|
19
|
+
}, [approverEditableFormElementIds, pages]);
|
|
60
20
|
return {
|
|
61
21
|
validate: handleValidate,
|
|
62
22
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useFormValidation.js","sourceRoot":"","sources":["../../src/hooks/useFormValidation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,kBAAkB,MAAM,gDAAgD,CAAA;AAC/E,OAAO,iCAAiC,MAAM,+DAA+D,CAAA;
|
|
1
|
+
{"version":3,"file":"useFormValidation.js","sourceRoot":"","sources":["../../src/hooks/useFormValidation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,kBAAkB,MAAM,gDAAgD,CAAA;AAC/E,OAAO,iCAAiC,MAAM,+DAA+D,CAAA;AAC7G,OAAO,mCAAmC,MAAM,iEAAiE,CAAA;AAOjH,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACvC,KAA8B,EAC9B,aAA8C;IAE9C,MAAM,8BAA8B,GAAG,KAAK,CAAC,OAAO,CAClD,GAAG,EAAE,CAAC,iCAAiC,CAAC,aAAa,CAAC,EACtD,CAAC,aAAa,CAAC,CAChB,CAAA;IAED,MAAM,cAAc,GAAG,KAAK,CAAC,WAAW,CACtC,CACE,UAA0D,EAC1D,8BAA8D,EAC9D,eAAgC,EAChC,WAAwB,EACxB,SAAkB,EAClB,QAAiD,EACjD,sBAA4C,EAC5C,EAAE;QACF,OAAO,kBAAkB,CAAC;YACxB,QAAQ,EAAE,mCAAmC,CAAC,KAAK,EAAE,QAAQ,CAAC;YAC9D,UAAU;YACV,8BAA8B;YAC9B,eAAe;YACf,WAAW;YACX,SAAS;YACT,QAAQ;YACR,sBAAsB;YACtB,8BAA8B;SAC/B,CAAC,CAAA;IACJ,CAAC,EACD,CAAC,8BAA8B,EAAE,KAAK,CAAC,CACxC,CAAA;IAED,OAAO;QACL,QAAQ,EAAE,cAAc;KACzB,CAAA;AACH,CAAC","sourcesContent":["import { FormTypes, SubmissionTypes } from '@oneblink/types'\nimport * as React from 'react'\n\nimport validateSubmission from '../services/form-validation/validateSubmission'\nimport getApproverEditableFormElementIds from '../services/form-validation/getApproverEditableFormElementIds'\nimport getFormElementsValidatedForAudience from '../services/form-validation/getFormElementsValidatedForAudience'\nimport {\n CaptchaType,\n ExecutedLookups,\n FormElementsConditionallyShown,\n} from '../types/form'\n\nexport default function useFormValidation(\n pages: FormTypes.PageElement[],\n approvalSteps: FormTypes.Form['approvalSteps'],\n) {\n const approverEditableFormElementIds = React.useMemo(\n () => getApproverEditableFormElementIds(approvalSteps),\n [approvalSteps],\n )\n\n const handleValidate = React.useCallback(\n (\n submission: SubmissionTypes.S3SubmissionData['submission'],\n formElementsConditionallyShown: FormElementsConditionallyShown,\n executedLookups: ExecutedLookups,\n captchaType: CaptchaType,\n isOffline: boolean,\n audience: FormTypes.FormElementHiddenFromAudience,\n editableFormElementIds: string[] | undefined,\n ) => {\n return validateSubmission({\n elements: getFormElementsValidatedForAudience(pages, audience),\n submission,\n formElementsConditionallyShown,\n executedLookups,\n captchaType,\n isOffline,\n audience,\n editableFormElementIds,\n approverEditableFormElementIds,\n })\n },\n [approverEditableFormElementIds, pages],\n )\n\n return {\n validate: handleValidate,\n }\n}\n"]}
|
package/dist/hooks/usePages.d.ts
CHANGED
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
import { FormTypes } from '@oneblink/types';
|
|
2
2
|
import * as React from 'react';
|
|
3
3
|
import { FormElementsConditionallyShown, FormElementsValidation } from '../types/form';
|
|
4
|
-
export default function usePages({ pages, formElementsValidation, formElementsConditionallyShown, hasAttemptedSubmit, scrollToTopOfPage, }: {
|
|
4
|
+
export default function usePages({ pages, formElementsValidation, formElementsConditionallyShown, hasAttemptedSubmit, scrollToTopOfPage, audience, }: {
|
|
5
5
|
pages: FormTypes.PageElement[];
|
|
6
6
|
formElementsValidation: FormElementsValidation | undefined;
|
|
7
7
|
formElementsConditionallyShown: FormElementsConditionallyShown;
|
|
8
8
|
hasAttemptedSubmit: boolean;
|
|
9
9
|
scrollToTopOfPage?: boolean;
|
|
10
|
+
audience: FormTypes.FormElementHiddenFromAudience;
|
|
10
11
|
}): {
|
|
12
|
+
renderedPages: FormTypes.PageElement[];
|
|
11
13
|
visiblePages: FormTypes.PageElement[];
|
|
12
14
|
isFirstVisiblePage: boolean;
|
|
13
15
|
isLastVisiblePage: boolean;
|
|
@@ -16,7 +18,7 @@ export default function usePages({ pages, formElementsValidation, formElementsCo
|
|
|
16
18
|
isStepsHeaderActive: boolean;
|
|
17
19
|
toggleStepsNavigation: () => void;
|
|
18
20
|
currentPageIndex: number;
|
|
19
|
-
currentPage: FormTypes.PageElement;
|
|
21
|
+
currentPage: FormTypes.PageElement | undefined;
|
|
20
22
|
currentPageNumber: number | undefined;
|
|
21
23
|
checkDisplayPageError: (page: FormTypes.PageElement) => boolean;
|
|
22
24
|
setPageId: (pageId: string) => void;
|
package/dist/hooks/usePages.js
CHANGED
|
@@ -3,32 +3,36 @@ import useBooleanState from '../hooks/useBooleanState';
|
|
|
3
3
|
import { checkSectionValidity } from '../services/form-validation/validators';
|
|
4
4
|
import scrollingService from '../services/scrolling-service';
|
|
5
5
|
import { injectDynamicElements } from '../services/dynamic-elements';
|
|
6
|
-
|
|
6
|
+
import { getNavigablePages, getRenderedPages, } from '../services/page-visibility';
|
|
7
|
+
export default function usePages({ pages, formElementsValidation, formElementsConditionallyShown, hasAttemptedSubmit, scrollToTopOfPage, audience, }) {
|
|
7
8
|
const scrollToTopOfPageHTMLElementRef = React.useRef(null);
|
|
8
9
|
const [visitedPageIds, setVisitedPageIds] = React.useState([]);
|
|
9
10
|
const [isStepsHeaderActive, , closeStepsNavigation, toggleStepsNavigation] = useBooleanState(false);
|
|
10
11
|
const pagesWithDynamicElements = React.useMemo(() => {
|
|
11
12
|
return injectDynamicElements(pages);
|
|
12
13
|
}, [pages]);
|
|
13
|
-
const
|
|
14
|
-
return pagesWithDynamicElements
|
|
15
|
-
var _a;
|
|
16
|
-
return !((_a = formElementsConditionallyShown === null || formElementsConditionallyShown === void 0 ? void 0 : formElementsConditionallyShown[pageElement.id]) === null || _a === void 0 ? void 0 : _a.isHidden);
|
|
17
|
-
});
|
|
14
|
+
const renderedPages = React.useMemo(() => {
|
|
15
|
+
return getRenderedPages(pagesWithDynamicElements, formElementsConditionallyShown);
|
|
18
16
|
}, [formElementsConditionallyShown, pagesWithDynamicElements]);
|
|
19
|
-
const
|
|
17
|
+
const visiblePages = React.useMemo(() => {
|
|
18
|
+
return getNavigablePages(pagesWithDynamicElements, formElementsConditionallyShown, audience);
|
|
19
|
+
}, [audience, formElementsConditionallyShown, pagesWithDynamicElements]);
|
|
20
|
+
const [currentPageId, setCurrentPageId] = React.useState(() => { var _a, _b; return (_b = (_a = visiblePages[0]) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : ''; });
|
|
20
21
|
const currentPage = React.useMemo(() => {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
if (currentPageById) {
|
|
25
|
-
return currentPageById;
|
|
26
|
-
}
|
|
27
|
-
else {
|
|
28
|
-
return visiblePages[0];
|
|
22
|
+
var _a;
|
|
23
|
+
if (!visiblePages.length) {
|
|
24
|
+
return undefined;
|
|
29
25
|
}
|
|
26
|
+
return ((_a = visiblePages.find((pageElement) => {
|
|
27
|
+
return pageElement.id === currentPageId;
|
|
28
|
+
})) !== null && _a !== void 0 ? _a : visiblePages[0]);
|
|
30
29
|
}, [currentPageId, visiblePages]);
|
|
31
|
-
|
|
30
|
+
React.useEffect(() => {
|
|
31
|
+
if (currentPage && currentPage.id !== currentPageId) {
|
|
32
|
+
setCurrentPageId(currentPage.id);
|
|
33
|
+
}
|
|
34
|
+
}, [currentPage, currentPageId]);
|
|
35
|
+
const currentPageIndex = React.useMemo(() => (currentPage ? visiblePages.indexOf(currentPage) : -1), [currentPage, visiblePages]);
|
|
32
36
|
const currentPageNumber = React.useMemo(() => {
|
|
33
37
|
if (currentPage) {
|
|
34
38
|
return visiblePages.indexOf(currentPage) + 1;
|
|
@@ -36,6 +40,9 @@ export default function usePages({ pages, formElementsValidation, formElementsCo
|
|
|
36
40
|
}, [currentPage, visiblePages]);
|
|
37
41
|
const isShowingMultiplePages = visiblePages.length > 1;
|
|
38
42
|
const setPageId = React.useCallback((pageId) => {
|
|
43
|
+
if (!visiblePages.some((page) => page.id === pageId)) {
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
39
46
|
setVisitedPageIds((currentVisitedPageIds) => {
|
|
40
47
|
if (currentVisitedPageIds.includes(currentPageId)) {
|
|
41
48
|
return currentVisitedPageIds;
|
|
@@ -83,31 +90,28 @@ export default function usePages({ pages, formElementsValidation, formElementsCo
|
|
|
83
90
|
currentPageId,
|
|
84
91
|
isShowingMultiplePages,
|
|
85
92
|
scrollToTopOfPage,
|
|
93
|
+
visiblePages,
|
|
86
94
|
]);
|
|
87
95
|
const goToNextPage = React.useCallback(() => {
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
if (page.id === currentPageId) {
|
|
91
|
-
const nextVisiblePage = visiblePages[i + 1];
|
|
92
|
-
if (nextVisiblePage) {
|
|
93
|
-
setPageId(nextVisiblePage.id);
|
|
94
|
-
}
|
|
95
|
-
break;
|
|
96
|
-
}
|
|
96
|
+
if (!currentPage) {
|
|
97
|
+
return;
|
|
97
98
|
}
|
|
98
|
-
|
|
99
|
+
const index = visiblePages.indexOf(currentPage);
|
|
100
|
+
const nextVisiblePage = visiblePages[index + 1];
|
|
101
|
+
if (nextVisiblePage) {
|
|
102
|
+
setPageId(nextVisiblePage.id);
|
|
103
|
+
}
|
|
104
|
+
}, [currentPage, setPageId, visiblePages]);
|
|
99
105
|
const goToPreviousPage = React.useCallback(() => {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
break;
|
|
108
|
-
}
|
|
106
|
+
if (!currentPage) {
|
|
107
|
+
return;
|
|
108
|
+
}
|
|
109
|
+
const index = visiblePages.indexOf(currentPage);
|
|
110
|
+
const previousVisiblePage = visiblePages[index - 1];
|
|
111
|
+
if (previousVisiblePage) {
|
|
112
|
+
setPageId(previousVisiblePage.id);
|
|
109
113
|
}
|
|
110
|
-
}, [
|
|
114
|
+
}, [currentPage, setPageId, visiblePages]);
|
|
111
115
|
const checkDisplayPageError = React.useCallback((page) => {
|
|
112
116
|
// If we have not visited the page yet, we will not display errors
|
|
113
117
|
if (!visitedPageIds.includes(page.id) && !hasAttemptedSubmit) {
|
|
@@ -133,9 +137,13 @@ export default function usePages({ pages, formElementsValidation, formElementsCo
|
|
|
133
137
|
}, [currentPageId, isStepsHeaderActive]);
|
|
134
138
|
const firstVisiblePage = visiblePages[0];
|
|
135
139
|
const lastVisiblePage = visiblePages[visiblePages.length - 1];
|
|
136
|
-
const isLastVisiblePage = lastVisiblePage && lastVisiblePage.id ===
|
|
137
|
-
const isFirstVisiblePage =
|
|
138
|
-
|
|
140
|
+
const isLastVisiblePage = !!currentPage && !!lastVisiblePage && lastVisiblePage.id === currentPage.id;
|
|
141
|
+
const isFirstVisiblePage = !!currentPage &&
|
|
142
|
+
!!firstVisiblePage &&
|
|
143
|
+
firstVisiblePage.id === currentPage.id;
|
|
144
|
+
const isDisplayingCurrentPageError = currentPage
|
|
145
|
+
? checkDisplayPageError(currentPage)
|
|
146
|
+
: false;
|
|
139
147
|
// Clean up when form is navigated away
|
|
140
148
|
React.useEffect(() => {
|
|
141
149
|
return () => {
|
|
@@ -143,6 +151,7 @@ export default function usePages({ pages, formElementsValidation, formElementsCo
|
|
|
143
151
|
};
|
|
144
152
|
}, []);
|
|
145
153
|
return {
|
|
154
|
+
renderedPages,
|
|
146
155
|
visiblePages,
|
|
147
156
|
isFirstVisiblePage,
|
|
148
157
|
isLastVisiblePage,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usePages.js","sourceRoot":"","sources":["../../src/hooks/usePages.ts"],"names":[],"mappings":"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","sourcesContent":["import { FormTypes } from '@oneblink/types'\nimport * as React from 'react'\n\nimport useBooleanState from '../hooks/useBooleanState'\nimport { checkSectionValidity } from '../services/form-validation/validators'\nimport scrollingService from '../services/scrolling-service'\nimport {\n FormElementsConditionallyShown,\n FormElementsValidation,\n} from '../types/form'\nimport { injectDynamicElements } from '../services/dynamic-elements'\n\nexport default function usePages({\n pages,\n formElementsValidation,\n formElementsConditionallyShown,\n hasAttemptedSubmit,\n scrollToTopOfPage,\n}: {\n pages: FormTypes.PageElement[]\n formElementsValidation: FormElementsValidation | undefined\n formElementsConditionallyShown: FormElementsConditionallyShown\n hasAttemptedSubmit: boolean\n scrollToTopOfPage?: boolean\n}) {\n const scrollToTopOfPageHTMLElementRef = React.useRef<HTMLDivElement>(null)\n const [visitedPageIds, setVisitedPageIds] = React.useState<string[]>([])\n\n const [isStepsHeaderActive, , closeStepsNavigation, toggleStepsNavigation] =\n useBooleanState(false)\n\n const pagesWithDynamicElements = React.useMemo<\n FormTypes.PageElement[]\n >(() => {\n return injectDynamicElements(pages) as FormTypes.PageElement[]\n }, [pages])\n\n const visiblePages = React.useMemo<FormTypes.PageElement[]>(() => {\n return pagesWithDynamicElements.filter((pageElement) => {\n return !formElementsConditionallyShown?.[pageElement.id]?.isHidden\n })\n }, [formElementsConditionallyShown, pagesWithDynamicElements])\n\n const [currentPageId, setCurrentPageId] = React.useState(visiblePages[0].id)\n\n const currentPage = React.useMemo(() => {\n const currentPageById = visiblePages.find((pageElement) => {\n return pageElement.id === currentPageId\n })\n if (currentPageById) {\n return currentPageById\n } else {\n return visiblePages[0]\n }\n }, [currentPageId, visiblePages])\n\n const currentPageIndex = React.useMemo(\n () => visiblePages.indexOf(currentPage),\n [currentPage, visiblePages],\n )\n\n const currentPageNumber = React.useMemo(() => {\n if (currentPage) {\n return visiblePages.indexOf(currentPage) + 1\n }\n }, [currentPage, visiblePages])\n\n const isShowingMultiplePages = visiblePages.length > 1\n\n const setPageId = React.useCallback(\n (pageId: string) => {\n setVisitedPageIds((currentVisitedPageIds) => {\n if (currentVisitedPageIds.includes(currentPageId)) {\n return currentVisitedPageIds\n } else {\n return [...currentVisitedPageIds, currentPageId]\n }\n })\n setCurrentPageId(pageId)\n closeStepsNavigation()\n\n const scrollToTopOfPageHTMLElement =\n scrollToTopOfPageHTMLElementRef.current\n if (isShowingMultiplePages && scrollToTopOfPageHTMLElement) {\n if (scrollToTopOfPage) {\n window.requestAnimationFrame(() => {\n window.scrollTo({ top: 0, behavior: 'smooth' })\n })\n } else if (scrollToTopOfPageHTMLElement) {\n window.requestAnimationFrame(() => {\n scrollToTopOfPageHTMLElement.scrollIntoView({\n block: 'start',\n behavior: 'smooth',\n })\n })\n const stepItemHTMLElement = document.getElementById(\n `steps-navigation-step-${pageId}`,\n )\n if (stepItemHTMLElement) {\n window.requestAnimationFrame(() => {\n stepItemHTMLElement.scrollIntoView({\n block: 'start',\n behavior: 'smooth',\n })\n })\n }\n }\n\n // Move focus to the active page container after prev/next navigation\n window.requestAnimationFrame(() => {\n const pageContainer = document.getElementById(pageId)\n if (pageContainer) {\n pageContainer.focus({ preventScroll: true })\n }\n })\n }\n },\n [\n closeStepsNavigation,\n currentPageId,\n isShowingMultiplePages,\n scrollToTopOfPage,\n ],\n )\n\n const goToNextPage = React.useCallback(() => {\n for (let i = 0; i < visiblePages.length; i++) {\n const page = visiblePages[i]\n if (page.id === currentPageId) {\n const nextVisiblePage = visiblePages[i + 1]\n if (nextVisiblePage) {\n setPageId(nextVisiblePage.id)\n }\n break\n }\n }\n }, [currentPageId, setPageId, visiblePages])\n\n const goToPreviousPage = React.useCallback(() => {\n for (let i = visiblePages.length - 1; i > -1; i--) {\n const page = visiblePages[i]\n if (page && page.id === currentPageId) {\n const previousVisiblePage = visiblePages[i - 1]\n if (previousVisiblePage) {\n setPageId(previousVisiblePage.id)\n }\n break\n }\n }\n }, [currentPageId, setPageId, visiblePages])\n\n const checkDisplayPageError = React.useCallback(\n (page: FormTypes.PageElement) => {\n // If we have not visited the page yet, we will not display errors\n if (!visitedPageIds.includes(page.id) && !hasAttemptedSubmit) {\n return false\n }\n\n return checkSectionValidity(page, formElementsValidation)\n },\n [formElementsValidation, visitedPageIds, hasAttemptedSubmit],\n )\n\n React.useEffect(() => {\n if (isStepsHeaderActive) {\n scrollingService.disableScrolling()\n\n const activeStepElement = document.getElementById(\n `steps-navigation-step-${currentPageId}`,\n )\n\n if (activeStepElement) {\n activeStepElement.scrollIntoView({\n behavior: 'smooth',\n block: 'start',\n })\n }\n } else {\n // Re-enable scroll on body when inactive\n scrollingService.enableScrolling()\n }\n }, [currentPageId, isStepsHeaderActive])\n\n const firstVisiblePage = visiblePages[0]\n const lastVisiblePage = visiblePages[visiblePages.length - 1]\n const isLastVisiblePage =\n lastVisiblePage && lastVisiblePage.id === currentPageId\n const isFirstVisiblePage =\n firstVisiblePage && firstVisiblePage.id === currentPageId\n const isDisplayingCurrentPageError = checkDisplayPageError(currentPage)\n\n // Clean up when form is navigated away\n React.useEffect(() => {\n return () => {\n scrollingService.enableScrolling()\n }\n }, [])\n\n return {\n visiblePages,\n isFirstVisiblePage,\n isLastVisiblePage,\n isDisplayingCurrentPageError,\n isShowingMultiplePages,\n isStepsHeaderActive,\n toggleStepsNavigation,\n currentPageIndex,\n currentPage,\n currentPageNumber,\n checkDisplayPageError,\n setPageId,\n goToPreviousPage,\n goToNextPage,\n scrollToTopOfPageHTMLElementRef,\n }\n}\n"]}
|
|
1
|
+
{"version":3,"file":"usePages.js","sourceRoot":"","sources":["../../src/hooks/usePages.ts"],"names":[],"mappings":"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","sourcesContent":["import { FormTypes } from '@oneblink/types'\nimport * as React from 'react'\n\nimport useBooleanState from '../hooks/useBooleanState'\nimport { checkSectionValidity } from '../services/form-validation/validators'\nimport scrollingService from '../services/scrolling-service'\nimport {\n FormElementsConditionallyShown,\n FormElementsValidation,\n} from '../types/form'\nimport { injectDynamicElements } from '../services/dynamic-elements'\nimport {\n getNavigablePages,\n getRenderedPages,\n} from '../services/page-visibility'\n\nexport default function usePages({\n pages,\n formElementsValidation,\n formElementsConditionallyShown,\n hasAttemptedSubmit,\n scrollToTopOfPage,\n audience,\n}: {\n pages: FormTypes.PageElement[]\n formElementsValidation: FormElementsValidation | undefined\n formElementsConditionallyShown: FormElementsConditionallyShown\n hasAttemptedSubmit: boolean\n scrollToTopOfPage?: boolean\n audience: FormTypes.FormElementHiddenFromAudience\n}) {\n const scrollToTopOfPageHTMLElementRef = React.useRef<HTMLDivElement>(null)\n const [visitedPageIds, setVisitedPageIds] = React.useState<string[]>([])\n\n const [isStepsHeaderActive, , closeStepsNavigation, toggleStepsNavigation] =\n useBooleanState(false)\n\n const pagesWithDynamicElements = React.useMemo<\n FormTypes.PageElement[]\n >(() => {\n return injectDynamicElements(pages) as FormTypes.PageElement[]\n }, [pages])\n\n const renderedPages = React.useMemo<FormTypes.PageElement[]>(() => {\n return getRenderedPages(\n pagesWithDynamicElements,\n formElementsConditionallyShown,\n )\n }, [formElementsConditionallyShown, pagesWithDynamicElements])\n\n const visiblePages = React.useMemo<FormTypes.PageElement[]>(() => {\n return getNavigablePages(\n pagesWithDynamicElements,\n formElementsConditionallyShown,\n audience,\n )\n }, [audience, formElementsConditionallyShown, pagesWithDynamicElements])\n\n const [currentPageId, setCurrentPageId] = React.useState(\n () => visiblePages[0]?.id ?? '',\n )\n\n const currentPage = React.useMemo(() => {\n if (!visiblePages.length) {\n return undefined\n }\n return (\n visiblePages.find((pageElement) => {\n return pageElement.id === currentPageId\n }) ?? visiblePages[0]\n )\n }, [currentPageId, visiblePages])\n\n React.useEffect(() => {\n if (currentPage && currentPage.id !== currentPageId) {\n setCurrentPageId(currentPage.id)\n }\n }, [currentPage, currentPageId])\n\n const currentPageIndex = React.useMemo(\n () => (currentPage ? visiblePages.indexOf(currentPage) : -1),\n [currentPage, visiblePages],\n )\n\n const currentPageNumber = React.useMemo(() => {\n if (currentPage) {\n return visiblePages.indexOf(currentPage) + 1\n }\n }, [currentPage, visiblePages])\n\n const isShowingMultiplePages = visiblePages.length > 1\n\n const setPageId = React.useCallback(\n (pageId: string) => {\n if (!visiblePages.some((page) => page.id === pageId)) {\n return\n }\n setVisitedPageIds((currentVisitedPageIds) => {\n if (currentVisitedPageIds.includes(currentPageId)) {\n return currentVisitedPageIds\n } else {\n return [...currentVisitedPageIds, currentPageId]\n }\n })\n setCurrentPageId(pageId)\n closeStepsNavigation()\n\n const scrollToTopOfPageHTMLElement =\n scrollToTopOfPageHTMLElementRef.current\n if (isShowingMultiplePages && scrollToTopOfPageHTMLElement) {\n if (scrollToTopOfPage) {\n window.requestAnimationFrame(() => {\n window.scrollTo({ top: 0, behavior: 'smooth' })\n })\n } else if (scrollToTopOfPageHTMLElement) {\n window.requestAnimationFrame(() => {\n scrollToTopOfPageHTMLElement.scrollIntoView({\n block: 'start',\n behavior: 'smooth',\n })\n })\n const stepItemHTMLElement = document.getElementById(\n `steps-navigation-step-${pageId}`,\n )\n if (stepItemHTMLElement) {\n window.requestAnimationFrame(() => {\n stepItemHTMLElement.scrollIntoView({\n block: 'start',\n behavior: 'smooth',\n })\n })\n }\n }\n\n // Move focus to the active page container after prev/next navigation\n window.requestAnimationFrame(() => {\n const pageContainer = document.getElementById(pageId)\n if (pageContainer) {\n pageContainer.focus({ preventScroll: true })\n }\n })\n }\n },\n [\n closeStepsNavigation,\n currentPageId,\n isShowingMultiplePages,\n scrollToTopOfPage,\n visiblePages,\n ],\n )\n\n const goToNextPage = React.useCallback(() => {\n if (!currentPage) {\n return\n }\n const index = visiblePages.indexOf(currentPage)\n const nextVisiblePage = visiblePages[index + 1]\n if (nextVisiblePage) {\n setPageId(nextVisiblePage.id)\n }\n }, [currentPage, setPageId, visiblePages])\n\n const goToPreviousPage = React.useCallback(() => {\n if (!currentPage) {\n return\n }\n const index = visiblePages.indexOf(currentPage)\n const previousVisiblePage = visiblePages[index - 1]\n if (previousVisiblePage) {\n setPageId(previousVisiblePage.id)\n }\n }, [currentPage, setPageId, visiblePages])\n\n const checkDisplayPageError = React.useCallback(\n (page: FormTypes.PageElement) => {\n // If we have not visited the page yet, we will not display errors\n if (!visitedPageIds.includes(page.id) && !hasAttemptedSubmit) {\n return false\n }\n\n return checkSectionValidity(page, formElementsValidation)\n },\n [formElementsValidation, visitedPageIds, hasAttemptedSubmit],\n )\n\n React.useEffect(() => {\n if (isStepsHeaderActive) {\n scrollingService.disableScrolling()\n\n const activeStepElement = document.getElementById(\n `steps-navigation-step-${currentPageId}`,\n )\n\n if (activeStepElement) {\n activeStepElement.scrollIntoView({\n behavior: 'smooth',\n block: 'start',\n })\n }\n } else {\n // Re-enable scroll on body when inactive\n scrollingService.enableScrolling()\n }\n }, [currentPageId, isStepsHeaderActive])\n\n const firstVisiblePage = visiblePages[0]\n const lastVisiblePage = visiblePages[visiblePages.length - 1]\n const isLastVisiblePage =\n !!currentPage && !!lastVisiblePage && lastVisiblePage.id === currentPage.id\n const isFirstVisiblePage =\n !!currentPage &&\n !!firstVisiblePage &&\n firstVisiblePage.id === currentPage.id\n const isDisplayingCurrentPageError = currentPage\n ? checkDisplayPageError(currentPage)\n : false\n\n // Clean up when form is navigated away\n React.useEffect(() => {\n return () => {\n scrollingService.enableScrolling()\n }\n }, [])\n\n return {\n renderedPages,\n visiblePages,\n isFirstVisiblePage,\n isLastVisiblePage,\n isDisplayingCurrentPageError,\n isShowingMultiplePages,\n isStepsHeaderActive,\n toggleStepsNavigation,\n currentPageIndex,\n currentPage,\n currentPageNumber,\n checkDisplayPageError,\n setPageId,\n goToPreviousPage,\n goToNextPage,\n scrollToTopOfPageHTMLElementRef,\n }\n}\n"]}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { FormTypes } from '@oneblink/types';
|
|
2
|
+
/**
|
|
3
|
+
* Elements validated for an audience. Elements on a page that audience cannot
|
|
4
|
+
* see are omitted, because that audience cannot resolve errors on them.
|
|
5
|
+
*/
|
|
6
|
+
export default function getFormElementsValidatedForAudience(pages: FormTypes.PageElement[], audience: FormTypes.FormElementHiddenFromAudience): FormTypes.FormElementWithName[];
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import isElementHiddenForAudience from '../isElementHiddenForAudience';
|
|
2
|
+
function stripFormElementsWithoutName(formElements, hasReadOnlyAncestor) {
|
|
3
|
+
return formElements.reduce((memo, formElement) => {
|
|
4
|
+
const isReadOnly = hasReadOnlyAncestor ||
|
|
5
|
+
('readOnly' in formElement && formElement.readOnly === true);
|
|
6
|
+
switch (formElement.type) {
|
|
7
|
+
case 'captcha': {
|
|
8
|
+
// The renderer omits a captcha inside a read-only container, so
|
|
9
|
+
// requiring one here would fail validation with an error the user
|
|
10
|
+
// cannot see or resolve.
|
|
11
|
+
if (isReadOnly) {
|
|
12
|
+
return memo;
|
|
13
|
+
}
|
|
14
|
+
return [...memo, formElement];
|
|
15
|
+
}
|
|
16
|
+
case 'page':
|
|
17
|
+
case 'section': {
|
|
18
|
+
return [
|
|
19
|
+
...memo,
|
|
20
|
+
...stripFormElementsWithoutName(formElement.elements, isReadOnly),
|
|
21
|
+
];
|
|
22
|
+
}
|
|
23
|
+
case 'infoPage':
|
|
24
|
+
case 'form':
|
|
25
|
+
case 'repeatableSet': {
|
|
26
|
+
return [
|
|
27
|
+
...memo,
|
|
28
|
+
{
|
|
29
|
+
...formElement,
|
|
30
|
+
elements: stripFormElementsWithoutName(formElement.elements || [], isReadOnly),
|
|
31
|
+
},
|
|
32
|
+
];
|
|
33
|
+
}
|
|
34
|
+
default: {
|
|
35
|
+
return [...memo, formElement];
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
}, []);
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* Elements validated for an audience. Elements on a page that audience cannot
|
|
42
|
+
* see are omitted, because that audience cannot resolve errors on them.
|
|
43
|
+
*/
|
|
44
|
+
export default function getFormElementsValidatedForAudience(pages, audience) {
|
|
45
|
+
const pagesVisibleToAudience = pages.filter((page) => !isElementHiddenForAudience(page, audience));
|
|
46
|
+
return stripFormElementsWithoutName(pagesVisibleToAudience, false);
|
|
47
|
+
}
|
|
48
|
+
//# sourceMappingURL=getFormElementsValidatedForAudience.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getFormElementsValidatedForAudience.js","sourceRoot":"","sources":["../../../src/services/form-validation/getFormElementsValidatedForAudience.ts"],"names":[],"mappings":"AAEA,OAAO,0BAA0B,MAAM,+BAA+B,CAAA;AAEtE,SAAS,4BAA4B,CACnC,YAAqC,EACrC,mBAA4B;IAE5B,OAAO,YAAY,CAAC,MAAM,CACxB,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE;QACpB,MAAM,UAAU,GACd,mBAAmB;YACnB,CAAC,UAAU,IAAI,WAAW,IAAI,WAAW,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAA;QAE9D,QAAQ,WAAW,CAAC,IAAI,EAAE,CAAC;YACzB,KAAK,SAAS,CAAC,CAAC,CAAC;gBACf,gEAAgE;gBAChE,kEAAkE;gBAClE,yBAAyB;gBACzB,IAAI,UAAU,EAAE,CAAC;oBACf,OAAO,IAAI,CAAA;gBACb,CAAC;gBACD,OAAO,CAAC,GAAG,IAAI,EAAE,WAAW,CAAC,CAAA;YAC/B,CAAC;YACD,KAAK,MAAM,CAAC;YACZ,KAAK,SAAS,CAAC,CAAC,CAAC;gBACf,OAAO;oBACL,GAAG,IAAI;oBACP,GAAG,4BAA4B,CAAC,WAAW,CAAC,QAAQ,EAAE,UAAU,CAAC;iBAClE,CAAA;YACH,CAAC;YACD,KAAK,UAAU,CAAC;YAChB,KAAK,MAAM,CAAC;YACZ,KAAK,eAAe,CAAC,CAAC,CAAC;gBACrB,OAAO;oBACL,GAAG,IAAI;oBACP;wBACE,GAAG,WAAW;wBACd,QAAQ,EAAE,4BAA4B,CACpC,WAAW,CAAC,QAAQ,IAAI,EAAE,EAC1B,UAAU,CACX;qBACF;iBACF,CAAA;YACH,CAAC;YACD,OAAO,CAAC,CAAC,CAAC;gBACR,OAAO,CAAC,GAAG,IAAI,EAAE,WAAW,CAAC,CAAA;YAC/B,CAAC;QACH,CAAC;IACH,CAAC,EACD,EAAE,CACH,CAAA;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,mCAAmC,CACzD,KAA8B,EAC9B,QAAiD;IAEjD,MAAM,sBAAsB,GAAG,KAAK,CAAC,MAAM,CACzC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,0BAA0B,CAAC,IAAI,EAAE,QAAQ,CAAC,CACtD,CAAA;IACD,OAAO,4BAA4B,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAA;AACpE,CAAC","sourcesContent":["import { FormTypes } from '@oneblink/types'\n\nimport isElementHiddenForAudience from '../isElementHiddenForAudience'\n\nfunction stripFormElementsWithoutName(\n formElements: FormTypes.FormElement[],\n hasReadOnlyAncestor: boolean,\n): FormTypes.FormElementWithName[] {\n return formElements.reduce<FormTypes.FormElementWithName[]>(\n (memo, formElement) => {\n const isReadOnly =\n hasReadOnlyAncestor ||\n ('readOnly' in formElement && formElement.readOnly === true)\n\n switch (formElement.type) {\n case 'captcha': {\n // The renderer omits a captcha inside a read-only container, so\n // requiring one here would fail validation with an error the user\n // cannot see or resolve.\n if (isReadOnly) {\n return memo\n }\n return [...memo, formElement]\n }\n case 'page':\n case 'section': {\n return [\n ...memo,\n ...stripFormElementsWithoutName(formElement.elements, isReadOnly),\n ]\n }\n case 'infoPage':\n case 'form':\n case 'repeatableSet': {\n return [\n ...memo,\n {\n ...formElement,\n elements: stripFormElementsWithoutName(\n formElement.elements || [],\n isReadOnly,\n ),\n },\n ]\n }\n default: {\n return [...memo, formElement]\n }\n }\n },\n [],\n )\n}\n\n/**\n * Elements validated for an audience. Elements on a page that audience cannot\n * see are omitted, because that audience cannot resolve errors on them.\n */\nexport default function getFormElementsValidatedForAudience(\n pages: FormTypes.PageElement[],\n audience: FormTypes.FormElementHiddenFromAudience,\n): FormTypes.FormElementWithName[] {\n const pagesVisibleToAudience = pages.filter(\n (page) => !isElementHiddenForAudience(page, audience),\n )\n return stripFormElementsWithoutName(pagesVisibleToAudience, false)\n}\n"]}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { FormTypes } from '@oneblink/types';
|
|
2
|
+
import { FormElementsConditionallyShown } from '../types/form';
|
|
3
|
+
/**
|
|
4
|
+
* Pages that are still part of the form for an audience. Conditionally hidden
|
|
5
|
+
* pages are omitted. Pages hidden from the audience stay here so their
|
|
6
|
+
* elements keep running, while navigation uses {@link getNavigablePages}.
|
|
7
|
+
*/
|
|
8
|
+
export declare function getRenderedPages(pages: FormTypes.PageElement[], formElementsConditionallyShown: FormElementsConditionallyShown | undefined): FormTypes.PageElement[];
|
|
9
|
+
/**
|
|
10
|
+
* Pages the audience can open. A page with `isHidden` is left out for every
|
|
11
|
+
* audience in `hiddenFrom`, or for every audience when `hiddenFrom` is omitted.
|
|
12
|
+
*/
|
|
13
|
+
export declare function getNavigablePages(pages: FormTypes.PageElement[], formElementsConditionallyShown: FormElementsConditionallyShown | undefined, audience: FormTypes.FormElementHiddenFromAudience): FormTypes.PageElement[];
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import isElementHiddenForAudience from './isElementHiddenForAudience';
|
|
2
|
+
/**
|
|
3
|
+
* Pages that are still part of the form for an audience. Conditionally hidden
|
|
4
|
+
* pages are omitted. Pages hidden from the audience stay here so their
|
|
5
|
+
* elements keep running, while navigation uses {@link getNavigablePages}.
|
|
6
|
+
*/
|
|
7
|
+
export function getRenderedPages(pages, formElementsConditionallyShown) {
|
|
8
|
+
return pages.filter((pageElement) => {
|
|
9
|
+
var _a;
|
|
10
|
+
return !((_a = formElementsConditionallyShown === null || formElementsConditionallyShown === void 0 ? void 0 : formElementsConditionallyShown[pageElement.id]) === null || _a === void 0 ? void 0 : _a.isHidden);
|
|
11
|
+
});
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* Pages the audience can open. A page with `isHidden` is left out for every
|
|
15
|
+
* audience in `hiddenFrom`, or for every audience when `hiddenFrom` is omitted.
|
|
16
|
+
*/
|
|
17
|
+
export function getNavigablePages(pages, formElementsConditionallyShown, audience) {
|
|
18
|
+
return getRenderedPages(pages, formElementsConditionallyShown).filter((pageElement) => !isElementHiddenForAudience(pageElement, audience));
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=page-visibility.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"page-visibility.js","sourceRoot":"","sources":["../../src/services/page-visibility.ts"],"names":[],"mappings":"AAGA,OAAO,0BAA0B,MAAM,8BAA8B,CAAA;AAErE;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAC9B,KAA8B,EAC9B,8BAA0E;IAE1E,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE;;QAClC,OAAO,CAAC,CAAA,MAAA,8BAA8B,aAA9B,8BAA8B,uBAA9B,8BAA8B,CAAG,WAAW,CAAC,EAAE,CAAC,0CAAE,QAAQ,CAAA,CAAA;IACpE,CAAC,CAAC,CAAA;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAC/B,KAA8B,EAC9B,8BAA0E,EAC1E,QAAiD;IAEjD,OAAO,gBAAgB,CAAC,KAAK,EAAE,8BAA8B,CAAC,CAAC,MAAM,CACnE,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,0BAA0B,CAAC,WAAW,EAAE,QAAQ,CAAC,CACpE,CAAA;AACH,CAAC","sourcesContent":["import { FormTypes } from '@oneblink/types'\n\nimport { FormElementsConditionallyShown } from '../types/form'\nimport isElementHiddenForAudience from './isElementHiddenForAudience'\n\n/**\n * Pages that are still part of the form for an audience. Conditionally hidden\n * pages are omitted. Pages hidden from the audience stay here so their\n * elements keep running, while navigation uses {@link getNavigablePages}.\n */\nexport function getRenderedPages(\n pages: FormTypes.PageElement[],\n formElementsConditionallyShown: FormElementsConditionallyShown | undefined,\n): FormTypes.PageElement[] {\n return pages.filter((pageElement) => {\n return !formElementsConditionallyShown?.[pageElement.id]?.isHidden\n })\n}\n\n/**\n * Pages the audience can open. A page with `isHidden` is left out for every\n * audience in `hiddenFrom`, or for every audience when `hiddenFrom` is omitted.\n */\nexport function getNavigablePages(\n pages: FormTypes.PageElement[],\n formElementsConditionallyShown: FormElementsConditionallyShown | undefined,\n audience: FormTypes.FormElementHiddenFromAudience,\n): FormTypes.PageElement[] {\n return getRenderedPages(pages, formElementsConditionallyShown).filter(\n (pageElement) => !isElementHiddenForAudience(pageElement, audience),\n )\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oneblink/apps-react",
|
|
3
3
|
"description": "Helper functions for OneBlink apps in ReactJS.",
|
|
4
|
-
"version": "13.
|
|
4
|
+
"version": "13.7.0-beta.2",
|
|
5
5
|
"author": "OneBlink <developers@oneblink.io> (https://oneblink.io)",
|
|
6
6
|
"bugs": {
|
|
7
7
|
"url": "https://github.com/oneblink/apps-react/issues"
|