envoc-form 5.0.7 → 6.0.1-0
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/README.md +4636 -1236
- package/dist/index.cjs +21685 -0
- package/dist/index.d.ts +599 -0
- package/dist/index.js +21617 -0
- package/package.json +73 -77
- package/dist/css/envoc-form-styles.css +0 -3
- package/dist/css/envoc-form-styles.css.map +0 -1
- package/es/AddressInput/AddressInput.d.ts +0 -24
- package/es/AddressInput/AddressInput.js +0 -20
- package/es/AddressInput/UsStates.d.ts +0 -3
- package/es/AddressInput/UsStates.js +0 -53
- package/es/ConfirmBaseForm/ConfirmBaseForm.d.ts +0 -26
- package/es/ConfirmBaseForm/ConfirmBaseForm.js +0 -42
- package/es/ConfirmDeleteForm/ConfirmDeleteForm.d.ts +0 -24
- package/es/ConfirmDeleteForm/ConfirmDeleteForm.js +0 -60
- package/es/DatePicker/DatePickerGroup.d.ts +0 -13
- package/es/DatePicker/DatePickerGroup.js +0 -87
- package/es/DatePicker/DatePickerHelper.d.ts +0 -3
- package/es/DatePicker/DatePickerHelper.js +0 -1
- package/es/DatePicker/StringDateOnlyPickerGroup.d.ts +0 -9
- package/es/DatePicker/StringDateOnlyPickerGroup.js +0 -29
- package/es/DatePicker/StringDatePickerGroup.d.ts +0 -9
- package/es/DatePicker/StringDatePickerGroup.js +0 -24
- package/es/Field/CustomFieldInputProps.d.ts +0 -7
- package/es/Field/CustomFieldInputProps.js +0 -1
- package/es/Field/CustomFieldMetaProps.d.ts +0 -4
- package/es/Field/CustomFieldMetaProps.js +0 -1
- package/es/Field/Field.d.ts +0 -29
- package/es/Field/Field.js +0 -59
- package/es/Field/FieldErrorScrollTarget.d.ts +0 -2
- package/es/Field/FieldErrorScrollTarget.js +0 -12
- package/es/Field/FieldNameContext.d.ts +0 -3
- package/es/Field/FieldNameContext.js +0 -3
- package/es/Field/FieldSection.d.ts +0 -7
- package/es/Field/FieldSection.js +0 -9
- package/es/Field/InjectedFieldProps.d.ts +0 -7
- package/es/Field/InjectedFieldProps.js +0 -1
- package/es/Field/StandAloneInput.d.ts +0 -13
- package/es/Field/StandAloneInput.js +0 -50
- package/es/Field/useStandardField.d.ts +0 -21
- package/es/Field/useStandardField.js +0 -92
- package/es/FieldArray/FieldArray.d.ts +0 -24
- package/es/FieldArray/FieldArray.js +0 -77
- package/es/File/FileGroup.d.ts +0 -10
- package/es/File/FileGroup.js +0 -53
- package/es/File/FileList.d.ts +0 -5
- package/es/File/FileList.js +0 -10
- package/es/File/humanFileSize.d.ts +0 -1
- package/es/File/humanFileSize.js +0 -6
- package/es/Form/FocusError.d.ts +0 -7
- package/es/Form/FocusError.js +0 -42
- package/es/Form/Form.d.ts +0 -33
- package/es/Form/Form.js +0 -141
- package/es/Form/FormBasedPreventNavigation.d.ts +0 -6
- package/es/Form/FormBasedPreventNavigation.js +0 -20
- package/es/Form/LegacyFormBasedPreventNavigation.d.ts +0 -17
- package/es/Form/LegacyFormBasedPreventNavigation.js +0 -69
- package/es/Form/NewFormBasedPreventNavigation.d.ts +0 -14
- package/es/Form/NewFormBasedPreventNavigation.js +0 -39
- package/es/Form/ServerErrorContext.d.ts +0 -11
- package/es/Form/ServerErrorContext.js +0 -9
- package/es/FormActions.d.ts +0 -12
- package/es/FormActions.js +0 -16
- package/es/FormDefaults.d.ts +0 -4
- package/es/FormDefaults.js +0 -2
- package/es/Group.d.ts +0 -16
- package/es/Group.js +0 -14
- package/es/Input/CheckboxGroup.d.ts +0 -6
- package/es/Input/CheckboxGroup.js +0 -14
- package/es/Input/CheckboxInputGroup.d.ts +0 -13
- package/es/Input/CheckboxInputGroup.js +0 -41
- package/es/Input/IconInputGroup.d.ts +0 -12
- package/es/Input/IconInputGroup.js +0 -43
- package/es/Input/InputGroup.d.ts +0 -12
- package/es/Input/InputGroup.js +0 -34
- package/es/Input/MoneyInputGroup.d.ts +0 -9
- package/es/Input/MoneyInputGroup.js +0 -43
- package/es/Input/NumberInputGroup.d.ts +0 -9
- package/es/Input/NumberInputGroup.js +0 -43
- package/es/Input/PhoneNumberInputGroup.d.ts +0 -10
- package/es/Input/PhoneNumberInputGroup.js +0 -47
- package/es/Input/StringInputGroup.d.ts +0 -8
- package/es/Input/StringInputGroup.js +0 -43
- package/es/Normalization/NormalizationFunction.d.ts +0 -4
- package/es/Normalization/NormalizationFunction.js +0 -1
- package/es/Normalization/normalizers.d.ts +0 -4
- package/es/Normalization/normalizers.js +0 -32
- package/es/Select/BooleanSelectGroup.d.ts +0 -7
- package/es/Select/BooleanSelectGroup.js +0 -28
- package/es/Select/NumberSelectGroup.d.ts +0 -9
- package/es/Select/NumberSelectGroup.js +0 -21
- package/es/Select/SelectGroup.d.ts +0 -27
- package/es/Select/SelectGroup.js +0 -65
- package/es/Select/SelectGroupPropsHelper.d.ts +0 -3
- package/es/Select/SelectGroupPropsHelper.js +0 -1
- package/es/Select/StringSelectGroup.d.ts +0 -9
- package/es/Select/StringSelectGroup.js +0 -21
- package/es/StandardFormActions.d.ts +0 -11
- package/es/StandardFormActions.js +0 -14
- package/es/SubmitFormButton.d.ts +0 -10
- package/es/SubmitFormButton.js +0 -40
- package/es/TextArea/TextAreaGroup.d.ts +0 -9
- package/es/TextArea/TextAreaGroup.js +0 -35
- package/es/Validation/ValidatedApiResult.d.ts +0 -6
- package/es/Validation/ValidatedApiResult.js +0 -1
- package/es/Validation/ValidationError.d.ts +0 -5
- package/es/Validation/ValidationError.js +0 -1
- package/es/Validation/ValidationFunction.d.ts +0 -4
- package/es/Validation/ValidationFunction.js +0 -1
- package/es/Validation/validators.d.ts +0 -18
- package/es/Validation/validators.js +0 -77
- package/es/index.d.ts +0 -77
- package/es/index.js +0 -52
- package/es/setupTests.d.ts +0 -1
- package/es/setupTests.js +0 -1
- package/es/utils/objectContainsNonSerializableProperty.d.ts +0 -1
- package/es/utils/objectContainsNonSerializableProperty.js +0 -14
- package/es/utils/objectToFormData.d.ts +0 -10
- package/es/utils/objectToFormData.js +0 -77
- package/es/utils/typeChecks.d.ts +0 -8
- package/es/utils/typeChecks.js +0 -18
- package/lib/AddressInput/AddressInput.d.ts +0 -24
- package/lib/AddressInput/AddressInput.js +0 -26
- package/lib/AddressInput/UsStates.d.ts +0 -3
- package/lib/AddressInput/UsStates.js +0 -55
- package/lib/ConfirmBaseForm/ConfirmBaseForm.d.ts +0 -26
- package/lib/ConfirmBaseForm/ConfirmBaseForm.js +0 -45
- package/lib/ConfirmDeleteForm/ConfirmDeleteForm.d.ts +0 -24
- package/lib/ConfirmDeleteForm/ConfirmDeleteForm.js +0 -66
- package/lib/DatePicker/DatePickerGroup.d.ts +0 -13
- package/lib/DatePicker/DatePickerGroup.js +0 -95
- package/lib/DatePicker/DatePickerHelper.d.ts +0 -3
- package/lib/DatePicker/DatePickerHelper.js +0 -2
- package/lib/DatePicker/StringDateOnlyPickerGroup.d.ts +0 -9
- package/lib/DatePicker/StringDateOnlyPickerGroup.js +0 -35
- package/lib/DatePicker/StringDatePickerGroup.d.ts +0 -9
- package/lib/DatePicker/StringDatePickerGroup.js +0 -30
- package/lib/Field/CustomFieldInputProps.d.ts +0 -7
- package/lib/Field/CustomFieldInputProps.js +0 -2
- package/lib/Field/CustomFieldMetaProps.d.ts +0 -4
- package/lib/Field/CustomFieldMetaProps.js +0 -2
- package/lib/Field/Field.d.ts +0 -29
- package/lib/Field/Field.js +0 -64
- package/lib/Field/FieldErrorScrollTarget.d.ts +0 -2
- package/lib/Field/FieldErrorScrollTarget.js +0 -15
- package/lib/Field/FieldNameContext.d.ts +0 -3
- package/lib/Field/FieldNameContext.js +0 -9
- package/lib/Field/FieldSection.d.ts +0 -7
- package/lib/Field/FieldSection.js +0 -12
- package/lib/Field/InjectedFieldProps.d.ts +0 -7
- package/lib/Field/InjectedFieldProps.js +0 -2
- package/lib/Field/StandAloneInput.d.ts +0 -13
- package/lib/Field/StandAloneInput.js +0 -76
- package/lib/Field/useStandardField.d.ts +0 -21
- package/lib/Field/useStandardField.js +0 -95
- package/lib/FieldArray/FieldArray.d.ts +0 -24
- package/lib/FieldArray/FieldArray.js +0 -83
- package/lib/File/FileGroup.d.ts +0 -10
- package/lib/File/FileGroup.js +0 -58
- package/lib/File/FileList.d.ts +0 -5
- package/lib/File/FileList.js +0 -13
- package/lib/File/humanFileSize.d.ts +0 -1
- package/lib/File/humanFileSize.js +0 -10
- package/lib/Form/FocusError.d.ts +0 -7
- package/lib/Form/FocusError.js +0 -48
- package/lib/Form/Form.d.ts +0 -33
- package/lib/Form/Form.js +0 -147
- package/lib/Form/FormBasedPreventNavigation.d.ts +0 -6
- package/lib/Form/FormBasedPreventNavigation.js +0 -26
- package/lib/Form/LegacyFormBasedPreventNavigation.d.ts +0 -17
- package/lib/Form/LegacyFormBasedPreventNavigation.js +0 -72
- package/lib/Form/NewFormBasedPreventNavigation.d.ts +0 -14
- package/lib/Form/NewFormBasedPreventNavigation.js +0 -42
- package/lib/Form/ServerErrorContext.d.ts +0 -11
- package/lib/Form/ServerErrorContext.js +0 -15
- package/lib/FormActions.d.ts +0 -12
- package/lib/FormActions.js +0 -22
- package/lib/FormDefaults.d.ts +0 -4
- package/lib/FormDefaults.js +0 -5
- package/lib/Group.d.ts +0 -16
- package/lib/Group.js +0 -20
- package/lib/Input/CheckboxGroup.d.ts +0 -6
- package/lib/Input/CheckboxGroup.js +0 -20
- package/lib/Input/CheckboxInputGroup.d.ts +0 -13
- package/lib/Input/CheckboxInputGroup.js +0 -46
- package/lib/Input/IconInputGroup.d.ts +0 -12
- package/lib/Input/IconInputGroup.js +0 -48
- package/lib/Input/InputGroup.d.ts +0 -12
- package/lib/Input/InputGroup.js +0 -39
- package/lib/Input/MoneyInputGroup.d.ts +0 -9
- package/lib/Input/MoneyInputGroup.js +0 -48
- package/lib/Input/NumberInputGroup.d.ts +0 -9
- package/lib/Input/NumberInputGroup.js +0 -48
- package/lib/Input/PhoneNumberInputGroup.d.ts +0 -10
- package/lib/Input/PhoneNumberInputGroup.js +0 -52
- package/lib/Input/StringInputGroup.d.ts +0 -8
- package/lib/Input/StringInputGroup.js +0 -48
- package/lib/Normalization/NormalizationFunction.d.ts +0 -4
- package/lib/Normalization/NormalizationFunction.js +0 -2
- package/lib/Normalization/normalizers.d.ts +0 -4
- package/lib/Normalization/normalizers.js +0 -37
- package/lib/Select/BooleanSelectGroup.d.ts +0 -7
- package/lib/Select/BooleanSelectGroup.js +0 -35
- package/lib/Select/NumberSelectGroup.d.ts +0 -9
- package/lib/Select/NumberSelectGroup.js +0 -29
- package/lib/Select/SelectGroup.d.ts +0 -27
- package/lib/Select/SelectGroup.js +0 -71
- package/lib/Select/SelectGroupPropsHelper.d.ts +0 -3
- package/lib/Select/SelectGroupPropsHelper.js +0 -2
- package/lib/Select/StringSelectGroup.d.ts +0 -9
- package/lib/Select/StringSelectGroup.js +0 -29
- package/lib/StandardFormActions.d.ts +0 -11
- package/lib/StandardFormActions.js +0 -20
- package/lib/SubmitFormButton.d.ts +0 -10
- package/lib/SubmitFormButton.js +0 -45
- package/lib/TextArea/TextAreaGroup.d.ts +0 -9
- package/lib/TextArea/TextAreaGroup.js +0 -40
- package/lib/Validation/ValidatedApiResult.d.ts +0 -6
- package/lib/Validation/ValidatedApiResult.js +0 -2
- package/lib/Validation/ValidationError.d.ts +0 -5
- package/lib/Validation/ValidationError.js +0 -2
- package/lib/Validation/ValidationFunction.d.ts +0 -4
- package/lib/Validation/ValidationFunction.js +0 -2
- package/lib/Validation/validators.d.ts +0 -18
- package/lib/Validation/validators.js +0 -90
- package/lib/index.d.ts +0 -77
- package/lib/index.js +0 -121
- package/lib/setupTests.d.ts +0 -1
- package/lib/setupTests.js +0 -3
- package/lib/utils/objectContainsNonSerializableProperty.d.ts +0 -1
- package/lib/utils/objectContainsNonSerializableProperty.js +0 -17
- package/lib/utils/objectToFormData.d.ts +0 -10
- package/lib/utils/objectToFormData.js +0 -79
- package/lib/utils/typeChecks.d.ts +0 -8
- package/lib/utils/typeChecks.js +0 -29
- package/src/AddressInput/AddressInput.test.tsx +0 -27
- package/src/AddressInput/AddressInput.tsx +0 -82
- package/src/AddressInput/UsStates.ts +0 -55
- package/src/AddressInput/__snapshots__/AddressInput.test.tsx.snap +0 -182
- package/src/ConfirmBaseForm/ConfirmBaseForm.test.tsx +0 -24
- package/src/ConfirmBaseForm/ConfirmBaseForm.tsx +0 -74
- package/src/ConfirmBaseForm/__snapshots__/ConfirmBaseForm.test.tsx.snap +0 -23
- package/src/ConfirmDeleteForm/ConfirmDeleteForm.test.tsx +0 -24
- package/src/ConfirmDeleteForm/ConfirmDeleteForm.tsx +0 -87
- package/src/ConfirmDeleteForm/__snapshots__/ConfirmDeleteForm.test.tsx.snap +0 -25
- package/src/DatePicker/DatePicker.test.tsx +0 -48
- package/src/DatePicker/DatePickerGroup.tsx +0 -109
- package/src/DatePicker/DatePickerHelper.ts +0 -4
- package/src/DatePicker/StringDateOnlyPickerGroup.tsx +0 -28
- package/src/DatePicker/StringDatePickerGroup.tsx +0 -20
- package/src/DatePicker/__snapshots__/DatePicker.test.tsx.snap +0 -152
- package/src/Field/CustomFieldInputProps.ts +0 -10
- package/src/Field/CustomFieldMetaProps.ts +0 -5
- package/src/Field/Field.tsx +0 -127
- package/src/Field/FieldErrorScrollTarget.tsx +0 -12
- package/src/Field/FieldNameContext.ts +0 -6
- package/src/Field/FieldSection.tsx +0 -18
- package/src/Field/InjectedFieldProps.ts +0 -8
- package/src/Field/StandAloneInput.tsx +0 -55
- package/src/Field/useStandardField.ts +0 -125
- package/src/FieldArray/FieldArray.tsx +0 -154
- package/src/File/FileGroup.test.tsx +0 -35
- package/src/File/FileGroup.tsx +0 -82
- package/src/File/FileList.tsx +0 -21
- package/src/File/__snapshots__/FileGroup.test.tsx.snap +0 -34
- package/src/File/humanFileSize.ts +0 -8
- package/src/Form/FocusError.tsx +0 -55
- package/src/Form/Form.test.tsx +0 -14
- package/src/Form/Form.tsx +0 -234
- package/src/Form/FormBasedPreventNavigation.tsx +0 -56
- package/src/Form/LegacyFormBasedPreventNavigation.tsx +0 -77
- package/src/Form/NewFormBasedPreventNavigation.tsx +0 -59
- package/src/Form/ServerErrorContext.ts +0 -18
- package/src/Form/__snapshots__/Form.test.tsx.snap +0 -10
- package/src/FormActions.tsx +0 -47
- package/src/FormDefaults.ts +0 -2
- package/src/Group.tsx +0 -62
- package/src/Input/CheckboxGroup.tsx +0 -60
- package/src/Input/CheckboxInputGroup.tsx +0 -78
- package/src/Input/IconInputGroup.tsx +0 -54
- package/src/Input/InputGroup.tsx +0 -66
- package/src/Input/MoneyInputGroup.tsx +0 -47
- package/src/Input/NumberInputGroup.tsx +0 -45
- package/src/Input/PhoneNumberInputGroup.tsx +0 -45
- package/src/Input/StringInputGroup.tsx +0 -50
- package/src/Input/__Tests__/CheckboxInputGroup.test.tsx +0 -26
- package/src/Input/__Tests__/IconInputGroup.test.tsx +0 -35
- package/src/Input/__Tests__/MoneyInputGroup.test.tsx +0 -37
- package/src/Input/__Tests__/NumberInputGroup.test.tsx +0 -35
- package/src/Input/__Tests__/PhoneNumberInputGroup.test.tsx +0 -36
- package/src/Input/__Tests__/StringInputGroup.test.tsx +0 -27
- package/src/Input/__Tests__/__snapshots__/CheckboxInputGroup.test.tsx.snap +0 -33
- package/src/Input/__Tests__/__snapshots__/IconInputGroup.test.tsx.snap +0 -32
- package/src/Input/__Tests__/__snapshots__/MoneyInputGroup.test.tsx.snap +0 -34
- package/src/Input/__Tests__/__snapshots__/NumberInputGroup.test.tsx.snap +0 -32
- package/src/Input/__Tests__/__snapshots__/PhoneNumberInputGroup.test.tsx.snap +0 -33
- package/src/Input/__Tests__/__snapshots__/StringInputGroup.test.tsx.snap +0 -31
- package/src/Normalization/NormalizationFunction.ts +0 -4
- package/src/Normalization/normalizers.ts +0 -44
- package/src/Select/BooleanSelectGroup.tsx +0 -28
- package/src/Select/NumberSelectGroup.tsx +0 -16
- package/src/Select/SelectGroup.tsx +0 -124
- package/src/Select/SelectGroupPropsHelper.ts +0 -4
- package/src/Select/StringSelectGroup.tsx +0 -16
- package/src/Select/__tests__/BooleanSelectGroup.test.tsx +0 -35
- package/src/Select/__tests__/NumberSelectGroup.test.tsx +0 -87
- package/src/Select/__tests__/StringSelectGroup.test.tsx +0 -89
- package/src/Select/__tests__/__snapshots__/BooleanSelectGroup.test.tsx.snap +0 -98
- package/src/Select/__tests__/__snapshots__/NumberSelectGroup.test.tsx.snap +0 -195
- package/src/Select/__tests__/__snapshots__/StringSelectGroup.test.tsx.snap +0 -195
- package/src/StandardFormActions.tsx +0 -41
- package/src/SubmitFormButton.tsx +0 -54
- package/src/TextArea/TextAreaGroup.tsx +0 -64
- package/src/Validation/ValidatedApiResult.ts +0 -8
- package/src/Validation/ValidationError.ts +0 -6
- package/src/Validation/ValidationFunction.ts +0 -4
- package/src/Validation/validators.test.tsx +0 -81
- package/src/Validation/validators.ts +0 -97
- package/src/__Tests__/FormTestBase.tsx +0 -65
- package/src/__Tests__/RealisticForm.test.tsx +0 -82
- package/src/__Tests__/StandardFormActions.test.tsx +0 -17
- package/src/__Tests__/SubmitFormButton.test.tsx +0 -17
- package/src/__Tests__/__snapshots__/StandardFormActions.test.tsx.snap +0 -27
- package/src/__Tests__/__snapshots__/SubmitFormButton.test.tsx.snap +0 -20
- package/src/__Tests__/index.ts +0 -3
- package/src/_variables.scss +0 -11
- package/src/index.ts +0 -156
- package/src/react-app-env.d.ts +0 -1
- package/src/setupTests.ts +0 -1
- package/src/styles.scss +0 -0
- package/src/utils/objectContainsNonSerializableProperty.test.tsx +0 -49
- package/src/utils/objectContainsNonSerializableProperty.ts +0 -17
- package/src/utils/objectToFormData.test.tsx +0 -76
- package/src/utils/objectToFormData.ts +0 -105
- package/src/utils/typeChecks.ts +0 -18
@@ -1,35 +0,0 @@
|
|
1
|
-
import React from 'react';
|
2
|
-
import { render } from '@testing-library/react';
|
3
|
-
import { FileGroup } from '../';
|
4
|
-
import FormTestBase from '../__Tests__/FormTestBase';
|
5
|
-
|
6
|
-
describe('FileGroup', () => {
|
7
|
-
it('renders without crashing', () => {
|
8
|
-
render(
|
9
|
-
<FormTestBase>
|
10
|
-
{({ Field }) => (
|
11
|
-
<Field
|
12
|
-
name="profileImage"
|
13
|
-
Component={FileGroup}
|
14
|
-
label="Profile Image"
|
15
|
-
/>
|
16
|
-
)}
|
17
|
-
</FormTestBase>
|
18
|
-
);
|
19
|
-
});
|
20
|
-
|
21
|
-
it('has matching snapshot', () => {
|
22
|
-
const renderResult = render(
|
23
|
-
<FormTestBase>
|
24
|
-
{({ Field }) => (
|
25
|
-
<Field
|
26
|
-
name="profileImage"
|
27
|
-
Component={FileGroup}
|
28
|
-
label="Profile Image"
|
29
|
-
/>
|
30
|
-
)}
|
31
|
-
</FormTestBase>
|
32
|
-
);
|
33
|
-
expect(renderResult.asFragment()).toMatchSnapshot();
|
34
|
-
});
|
35
|
-
});
|
package/src/File/FileGroup.tsx
DELETED
@@ -1,82 +0,0 @@
|
|
1
|
-
import React, { ComponentType, LegacyRef } from 'react';
|
2
|
-
import { clsx } from 'clsx';
|
3
|
-
import FileList from './FileList';
|
4
|
-
import { InjectedFieldProps } from '../Field/InjectedFieldProps';
|
5
|
-
import { FormDefaults } from '../FormDefaults';
|
6
|
-
import Group, { GroupProps } from '../Group';
|
7
|
-
|
8
|
-
export interface FileGroupProps
|
9
|
-
// note: file props are of type "any" with the current type generation
|
10
|
-
extends InjectedFieldProps<any | undefined | null>,
|
11
|
-
Omit<GroupProps, keyof InjectedFieldProps<any> | 'children'>,
|
12
|
-
Omit<
|
13
|
-
React.HTMLProps<HTMLInputElement>,
|
14
|
-
keyof InjectedFieldProps<any> | 'children' | 'className' | 'label'
|
15
|
-
> {
|
16
|
-
/** Allow multiple files to be uploaded. */
|
17
|
-
multiple?: boolean | undefined;
|
18
|
-
}
|
19
|
-
|
20
|
-
function FileGroup(
|
21
|
-
{
|
22
|
-
input,
|
23
|
-
meta,
|
24
|
-
label,
|
25
|
-
helpText,
|
26
|
-
className,
|
27
|
-
required,
|
28
|
-
disabled,
|
29
|
-
multiple,
|
30
|
-
...rest
|
31
|
-
}: FileGroupProps,
|
32
|
-
ref: LegacyRef<HTMLInputElement>
|
33
|
-
) {
|
34
|
-
return (
|
35
|
-
<Group
|
36
|
-
input={input}
|
37
|
-
meta={meta}
|
38
|
-
label={label}
|
39
|
-
helpText={helpText}
|
40
|
-
className={clsx(
|
41
|
-
className,
|
42
|
-
{ [FormDefaults.cssClassPrefix + 'multiple']: multiple },
|
43
|
-
FormDefaults.cssClassPrefix + 'file-group'
|
44
|
-
)}
|
45
|
-
required={required}
|
46
|
-
disabled={disabled}>
|
47
|
-
<input
|
48
|
-
{...input}
|
49
|
-
{...rest}
|
50
|
-
multiple={multiple}
|
51
|
-
onChange={(e) => {
|
52
|
-
if (!e?.target?.files?.length) {
|
53
|
-
input.onChange(undefined);
|
54
|
-
} else {
|
55
|
-
const files: File[] = [];
|
56
|
-
for (let i = 0; i < e.target.files.length; i++) {
|
57
|
-
files.push(e.target.files[i]);
|
58
|
-
}
|
59
|
-
if (!multiple) {
|
60
|
-
input.onChange(files[0]);
|
61
|
-
} else {
|
62
|
-
input.onChange(files);
|
63
|
-
}
|
64
|
-
}
|
65
|
-
}}
|
66
|
-
value={undefined}
|
67
|
-
ref={ref}
|
68
|
-
type="file"
|
69
|
-
className={clsx(className, FormDefaults.cssClassPrefix + 'file-group')}
|
70
|
-
/>
|
71
|
-
{/* Note: because input.value is any - due to how files are currently handled - type safeness isn't great here */}
|
72
|
-
<FileList files={input.value} />
|
73
|
-
</Group>
|
74
|
-
);
|
75
|
-
}
|
76
|
-
|
77
|
-
/** File upload input group. */
|
78
|
-
const FileGroupWithRef = React.forwardRef(
|
79
|
-
FileGroup
|
80
|
-
) as ComponentType<FileGroupProps>;
|
81
|
-
|
82
|
-
export default FileGroupWithRef;
|
package/src/File/FileList.tsx
DELETED
@@ -1,21 +0,0 @@
|
|
1
|
-
import { FormDefaults } from '../FormDefaults';
|
2
|
-
|
3
|
-
export interface FileListProps {
|
4
|
-
files?: File | File[] | undefined | null;
|
5
|
-
rejectedFiles?: File | File[] | undefined | null;
|
6
|
-
}
|
7
|
-
export default function FileList({ files, rejectedFiles }: FileListProps) {
|
8
|
-
return (
|
9
|
-
<div className={FormDefaults.cssClassPrefix + 'file-list'}>
|
10
|
-
{!files ? null : Array.isArray(files) ? (
|
11
|
-
files.map((x, i) => <File file={x} key={i} />)
|
12
|
-
) : (
|
13
|
-
<File file={files} />
|
14
|
-
)}
|
15
|
-
</div>
|
16
|
-
);
|
17
|
-
}
|
18
|
-
|
19
|
-
function File({ file }: { file: File }) {
|
20
|
-
return null;
|
21
|
-
}
|
@@ -1,34 +0,0 @@
|
|
1
|
-
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
2
|
-
|
3
|
-
exports[`FileGroup has matching snapshot 1`] = `
|
4
|
-
<DocumentFragment>
|
5
|
-
<form
|
6
|
-
action="#"
|
7
|
-
class="envoc-form-form"
|
8
|
-
>
|
9
|
-
<div
|
10
|
-
class="envoc-form-file-group envoc-form-group"
|
11
|
-
>
|
12
|
-
<div
|
13
|
-
id="profileimage-error-scroll-target"
|
14
|
-
style="display: none;"
|
15
|
-
/>
|
16
|
-
<label
|
17
|
-
for="profileImage"
|
18
|
-
>
|
19
|
-
Profile Image
|
20
|
-
</label>
|
21
|
-
<input
|
22
|
-
class="envoc-form-file-group"
|
23
|
-
id="profileImage"
|
24
|
-
name="profileImage"
|
25
|
-
type="file"
|
26
|
-
value=""
|
27
|
-
/>
|
28
|
-
<div
|
29
|
-
class="envoc-form-file-list"
|
30
|
-
/>
|
31
|
-
</div>
|
32
|
-
</form>
|
33
|
-
</DocumentFragment>
|
34
|
-
`;
|
package/src/Form/FocusError.tsx
DELETED
@@ -1,55 +0,0 @@
|
|
1
|
-
import { useEffect } from 'react';
|
2
|
-
import { useFormikContext } from 'formik';
|
3
|
-
import smoothscroll from 'smoothscroll-polyfill';
|
4
|
-
import { ServerErrorContextProps } from './ServerErrorContext';
|
5
|
-
|
6
|
-
export interface FocusErrorProps {
|
7
|
-
/** Validation errors that have been received from the server. */
|
8
|
-
serverErrors: ServerErrorContextProps;
|
9
|
-
}
|
10
|
-
|
11
|
-
/** Function to scroll to the field that has an error. */
|
12
|
-
export default function FocusError(props: FocusErrorProps) {
|
13
|
-
const { errors, isSubmitting, isValidating } = useFormikContext();
|
14
|
-
smoothscroll.polyfill();
|
15
|
-
useEffect(() => {
|
16
|
-
if (!isSubmitting || isValidating) {
|
17
|
-
return;
|
18
|
-
}
|
19
|
-
//This block handles any front-end input validation errors
|
20
|
-
//e.g. required fields, max characters, etc
|
21
|
-
const keys = Object.keys(errors);
|
22
|
-
if (keys.length > 0) {
|
23
|
-
return scrollToErrorElement(keys);
|
24
|
-
}
|
25
|
-
//This block handles any input-specific server-side errors
|
26
|
-
//e.g. improper email formatting, invalid phone number, etc.
|
27
|
-
if (
|
28
|
-
props.serverErrors.errors &&
|
29
|
-
Object.values(props.serverErrors.errors).some((x) => !!x)
|
30
|
-
) {
|
31
|
-
const names = Object.keys(props.serverErrors.errors);
|
32
|
-
return scrollToErrorElement(names);
|
33
|
-
}
|
34
|
-
}, [errors, isSubmitting, isValidating, props]);
|
35
|
-
return null;
|
36
|
-
}
|
37
|
-
|
38
|
-
const scrollToErrorElement = (keys: string[]) => {
|
39
|
-
let firstErrorElement: HTMLElement | null = document.getElementById(
|
40
|
-
`${keys[0].toLowerCase()}-error-scroll-target`
|
41
|
-
);
|
42
|
-
if (!firstErrorElement || !firstErrorElement.parentNode) {
|
43
|
-
return;
|
44
|
-
}
|
45
|
-
firstErrorElement = firstErrorElement.parentNode as HTMLElement;
|
46
|
-
const headerOffset = -110;
|
47
|
-
const y =
|
48
|
-
firstErrorElement.getBoundingClientRect().top +
|
49
|
-
window.pageYOffset +
|
50
|
-
headerOffset;
|
51
|
-
window.scrollTo({ top: y, behavior: 'smooth' });
|
52
|
-
setTimeout(() => {
|
53
|
-
firstErrorElement?.focus();
|
54
|
-
}, 500);
|
55
|
-
};
|
package/src/Form/Form.test.tsx
DELETED
@@ -1,14 +0,0 @@
|
|
1
|
-
import React from 'react';
|
2
|
-
import { render } from '@testing-library/react';
|
3
|
-
import FormTestBase from '../__Tests__/FormTestBase';
|
4
|
-
|
5
|
-
describe('FormTestBase', () => {
|
6
|
-
it('renders without crashing', () => {
|
7
|
-
render(<FormTestBase>{() => <></>}</FormTestBase>);
|
8
|
-
});
|
9
|
-
|
10
|
-
it('has matching snapshot', () => {
|
11
|
-
const renderResult = render(<FormTestBase>{() => <></>}</FormTestBase>);
|
12
|
-
expect(renderResult.asFragment()).toMatchSnapshot();
|
13
|
-
});
|
14
|
-
});
|
package/src/Form/Form.tsx
DELETED
@@ -1,234 +0,0 @@
|
|
1
|
-
import {
|
2
|
-
CSSProperties,
|
3
|
-
ElementType,
|
4
|
-
useContext,
|
5
|
-
useMemo,
|
6
|
-
useState,
|
7
|
-
} from 'react';
|
8
|
-
import { clsx } from 'clsx';
|
9
|
-
import {
|
10
|
-
Form as FormikFormWrapper,
|
11
|
-
Formik,
|
12
|
-
FormikHelpers,
|
13
|
-
useFormikContext,
|
14
|
-
} from 'formik';
|
15
|
-
import FocusError from './FocusError';
|
16
|
-
import FormBasedPreventNavigation from './FormBasedPreventNavigation';
|
17
|
-
import {
|
18
|
-
ServerErrorContext,
|
19
|
-
ServerErrorContextProps,
|
20
|
-
ServerErrors,
|
21
|
-
} from './ServerErrorContext';
|
22
|
-
import Field, { FieldProps } from '../Field/Field';
|
23
|
-
import FieldArray, { FieldArrayProps } from '../FieldArray/FieldArray';
|
24
|
-
import { FormDefaults } from '../FormDefaults';
|
25
|
-
import objectContainsNonSerializableProperty from '../utils/objectContainsNonSerializableProperty';
|
26
|
-
import objectToFormData from '../utils/objectToFormData';
|
27
|
-
import { ValidatedApiResult } from '../Validation/ValidatedApiResult';
|
28
|
-
import { ValidationError } from '../Validation/ValidationError';
|
29
|
-
|
30
|
-
// This exposes the builder that ensures only "name" values on the given TForm can be used
|
31
|
-
// Further, each Field can then infer the proper type given the name
|
32
|
-
export type FormBuilderProp<TForm extends object> = {
|
33
|
-
// the first set of <> is a generic method signature - we don't split this off because we need the TForm closure
|
34
|
-
Field: <TProp extends keyof TForm, TRenderComponent extends ElementType>(
|
35
|
-
props: FieldProps<TForm, TProp, TRenderComponent>
|
36
|
-
) => JSX.Element; // assumes this is never null - thought he final component may not render
|
37
|
-
|
38
|
-
FieldArray: <TProp extends keyof TForm>(
|
39
|
-
props: FieldArrayProps<TForm, TProp>
|
40
|
-
) => JSX.Element;
|
41
|
-
};
|
42
|
-
|
43
|
-
export interface FullFormProps<TForm extends object> {
|
44
|
-
/** The `<Field/>` and `<FieldArray/>` components. */
|
45
|
-
children: (formBuilder: FormBuilderProp<TForm>) => JSX.Element;
|
46
|
-
/** Submission handler */
|
47
|
-
onSubmit: (
|
48
|
-
formValues: TForm,
|
49
|
-
formikBag: FormikHelpers<TForm>
|
50
|
-
) => Promise<ValidatedApiResult>;
|
51
|
-
/** Submission handler for forms that use [FormData](https://developer.mozilla.org/en-US/docs/Web/API/FormData).*/
|
52
|
-
onFormDataSubmit: (
|
53
|
-
formValues: FormData,
|
54
|
-
formikBag: FormikHelpers<TForm>
|
55
|
-
) => Promise<ValidatedApiResult>;
|
56
|
-
className?: string;
|
57
|
-
style?: CSSProperties;
|
58
|
-
/** Prevent the user from leaving the form if they have edited any field. This is presented as a JS `alert()`. */
|
59
|
-
ignoreLostChanges?: boolean;
|
60
|
-
/** The intitial values of the form. */
|
61
|
-
initialValues?: TForm;
|
62
|
-
}
|
63
|
-
|
64
|
-
type RequireAtLeastOne<T, Keys extends keyof T = keyof T> = Pick<
|
65
|
-
T,
|
66
|
-
Exclude<keyof T, Keys>
|
67
|
-
> &
|
68
|
-
{
|
69
|
-
[K in Keys]-?: Required<Pick<T, K>> & Partial<Pick<T, Exclude<Keys, K>>>;
|
70
|
-
}[Keys];
|
71
|
-
|
72
|
-
export type FormProps<TForm extends object> = RequireAtLeastOne<
|
73
|
-
FullFormProps<TForm>,
|
74
|
-
'onSubmit' | 'onFormDataSubmit'
|
75
|
-
>;
|
76
|
-
|
77
|
-
/** Define a form. Uses [formik](https://formik.org/docs/overview). Usually contains many `<Field/>` components. */
|
78
|
-
export default function Form<TForm extends object>({
|
79
|
-
children,
|
80
|
-
className,
|
81
|
-
style,
|
82
|
-
ignoreLostChanges,
|
83
|
-
onSubmit,
|
84
|
-
onFormDataSubmit,
|
85
|
-
initialValues,
|
86
|
-
...props
|
87
|
-
}: FormProps<TForm>) {
|
88
|
-
// formik resets all error on each blur (with our settings)
|
89
|
-
// this means that ALL errors from the server disappear when any one field is blurred
|
90
|
-
// So, we have to store server errors ourselves
|
91
|
-
// Since we only use useStandardFormInput, that means there is only one consumer
|
92
|
-
const [serverErrors, setServerErrors] = useState<ServerErrors>({});
|
93
|
-
const serverErrorContextValue = useMemo<ServerErrorContextProps>(
|
94
|
-
() => ({
|
95
|
-
errors: serverErrors,
|
96
|
-
getError: (path) => {
|
97
|
-
const lowered = path.toLowerCase();
|
98
|
-
return serverErrors && serverErrors[lowered];
|
99
|
-
},
|
100
|
-
setError: (path, errorMessage) => {
|
101
|
-
const lowered = path.toLowerCase();
|
102
|
-
setServerErrors(
|
103
|
-
Object.assign({}, serverErrors, {
|
104
|
-
[lowered]: !errorMessage ? undefined : errorMessage,
|
105
|
-
})
|
106
|
-
);
|
107
|
-
},
|
108
|
-
}),
|
109
|
-
[serverErrors]
|
110
|
-
);
|
111
|
-
|
112
|
-
return (
|
113
|
-
<Formik
|
114
|
-
validateOnChange={false}
|
115
|
-
validateOnBlur={true}
|
116
|
-
validateOnMount={false}
|
117
|
-
initialValues={initialValues || ({} as TForm)}
|
118
|
-
onSubmit={handleSubmit}
|
119
|
-
{...props}>
|
120
|
-
<ServerErrorContext.Provider value={serverErrorContextValue}>
|
121
|
-
<FormikFormWrapper
|
122
|
-
className={clsx(className, FormDefaults.cssClassPrefix + 'form')}
|
123
|
-
style={style}>
|
124
|
-
<FocusError serverErrors={serverErrorContextValue} />
|
125
|
-
<FormBasedPreventNavigation ignoreLostChanges={ignoreLostChanges} />
|
126
|
-
{children({
|
127
|
-
// hack for ref forwarding
|
128
|
-
Field: Field as any,
|
129
|
-
FieldArray: FieldArray as any,
|
130
|
-
})}
|
131
|
-
</FormikFormWrapper>
|
132
|
-
</ServerErrorContext.Provider>
|
133
|
-
</Formik>
|
134
|
-
);
|
135
|
-
|
136
|
-
function handleSubmit(values: TForm, formikBag: FormikHelpers<TForm>) {
|
137
|
-
let formData: FormData | undefined = undefined;
|
138
|
-
let submitFunc: () => Promise<ValidatedApiResult>;
|
139
|
-
if (objectContainsNonSerializableProperty(values)) {
|
140
|
-
formData = objectToFormData(values, {
|
141
|
-
indices: true,
|
142
|
-
dotNotation: true,
|
143
|
-
allowEmptyArrays: true,
|
144
|
-
noFileListBrackets: true,
|
145
|
-
});
|
146
|
-
if (onFormDataSubmit === undefined) {
|
147
|
-
throw new Error(
|
148
|
-
'No onFormDataSubmit supplied for non-serializable properties.'
|
149
|
-
);
|
150
|
-
}
|
151
|
-
submitFunc = () =>
|
152
|
-
onFormDataSubmit(formData ?? new FormData(), formikBag);
|
153
|
-
} else {
|
154
|
-
if (onSubmit === undefined) {
|
155
|
-
formData = objectToFormData(values, {
|
156
|
-
indices: true,
|
157
|
-
dotNotation: true,
|
158
|
-
allowEmptyArrays: true,
|
159
|
-
noFileListBrackets: true,
|
160
|
-
});
|
161
|
-
if (onFormDataSubmit === undefined) {
|
162
|
-
// This error should never occur, as this case is covered by RequireAtLeastOne type safety
|
163
|
-
throw new Error(
|
164
|
-
'No onFormDataSubmit supplied for non-serializable properties.'
|
165
|
-
);
|
166
|
-
}
|
167
|
-
submitFunc = () =>
|
168
|
-
onFormDataSubmit(formData ?? new FormData(), formikBag);
|
169
|
-
} else {
|
170
|
-
submitFunc = () => onSubmit(values, formikBag);
|
171
|
-
}
|
172
|
-
}
|
173
|
-
|
174
|
-
return submitFunc()
|
175
|
-
.then((response) => {
|
176
|
-
return response;
|
177
|
-
})
|
178
|
-
.catch((err) => {
|
179
|
-
//this is an http error
|
180
|
-
if (
|
181
|
-
err &&
|
182
|
-
err.response &&
|
183
|
-
err.response.data &&
|
184
|
-
err.response.data.validationFailures
|
185
|
-
) {
|
186
|
-
try {
|
187
|
-
const serverErrors = err.response.data.validationFailures.reduce(
|
188
|
-
(acc: ServerErrors, value: ValidationError) => {
|
189
|
-
// for simplicity, just keep it to one server error at a time per path
|
190
|
-
// don't care of the property name case changes
|
191
|
-
const path = value.propertyName?.toLowerCase();
|
192
|
-
if (!!path && !!value.errorMessage) {
|
193
|
-
acc[path] = value.errorMessage;
|
194
|
-
}
|
195
|
-
return acc;
|
196
|
-
},
|
197
|
-
{} as ServerErrors
|
198
|
-
);
|
199
|
-
setServerErrors(serverErrors);
|
200
|
-
} catch (err) {
|
201
|
-
console.error('Failure to getErrorObject');
|
202
|
-
console.error(err);
|
203
|
-
throw err;
|
204
|
-
}
|
205
|
-
}
|
206
|
-
throw err;
|
207
|
-
});
|
208
|
-
}
|
209
|
-
}
|
210
|
-
|
211
|
-
Form.DisplayFormState = DisplayFormState;
|
212
|
-
function DisplayFormState() {
|
213
|
-
const formState = useFormikContext();
|
214
|
-
const serverErrorContext = useContext(ServerErrorContext);
|
215
|
-
return (
|
216
|
-
<div style={{ margin: '1rem 0' }}>
|
217
|
-
<pre
|
218
|
-
style={{
|
219
|
-
background: '#f6f8fa',
|
220
|
-
fontSize: '.65rem',
|
221
|
-
padding: '.5rem',
|
222
|
-
}}>
|
223
|
-
{serverErrorContext && serverErrorContext.errors && (
|
224
|
-
<div>
|
225
|
-
<strong>serverErrors = </strong>
|
226
|
-
{JSON.stringify(serverErrorContext.errors, null, 2)}
|
227
|
-
</div>
|
228
|
-
)}
|
229
|
-
<strong>formState = </strong>
|
230
|
-
{JSON.stringify(formState, null, 2)}
|
231
|
-
</pre>
|
232
|
-
</div>
|
233
|
-
);
|
234
|
-
}
|
@@ -1,56 +0,0 @@
|
|
1
|
-
import type { History } from 'history';
|
2
|
-
import { ContextType, useContext } from 'react';
|
3
|
-
import {
|
4
|
-
Navigator as BaseNavigator,
|
5
|
-
UNSAFE_NavigationContext as NavigationContext,
|
6
|
-
} from 'react-router-dom';
|
7
|
-
import { useFormikContext } from 'formik';
|
8
|
-
import LegacyFormBasedPreventNavigation from './LegacyFormBasedPreventNavigation';
|
9
|
-
import NewFormBasedPreventNavigation from './NewFormBasedPreventNavigation';
|
10
|
-
|
11
|
-
interface Navigator extends BaseNavigator {
|
12
|
-
block?: History['block'];
|
13
|
-
location: Location;
|
14
|
-
}
|
15
|
-
|
16
|
-
type NavigationContextWithBlock = ContextType<typeof NavigationContext> & {
|
17
|
-
navigator: Navigator;
|
18
|
-
};
|
19
|
-
|
20
|
-
export interface FormBasedPreventNavigationProps {
|
21
|
-
ignoreLostChanges?: boolean;
|
22
|
-
promptMessage?: string;
|
23
|
-
}
|
24
|
-
|
25
|
-
/** Prevent the user from navigating away from a form if there are any changes. */
|
26
|
-
export default function FormBasedPreventNavigation({
|
27
|
-
ignoreLostChanges,
|
28
|
-
promptMessage = 'Changes you made may not be saved.',
|
29
|
-
}: FormBasedPreventNavigationProps) {
|
30
|
-
const { dirty, isSubmitting } = useFormikContext();
|
31
|
-
const preventNavigate = !ignoreLostChanges && dirty && !isSubmitting;
|
32
|
-
|
33
|
-
const { navigator } = useContext(
|
34
|
-
NavigationContext
|
35
|
-
) as NavigationContextWithBlock;
|
36
|
-
|
37
|
-
const isUsingDataRouter = navigator.location === undefined;
|
38
|
-
|
39
|
-
if (isUsingDataRouter) {
|
40
|
-
return (
|
41
|
-
<NewFormBasedPreventNavigation
|
42
|
-
promptMessage={promptMessage}
|
43
|
-
preventNavigate={preventNavigate}
|
44
|
-
navigator={navigator}
|
45
|
-
/>
|
46
|
-
);
|
47
|
-
} else {
|
48
|
-
return (
|
49
|
-
<LegacyFormBasedPreventNavigation
|
50
|
-
promptMessage={promptMessage}
|
51
|
-
preventNavigate={preventNavigate}
|
52
|
-
navigator={navigator}
|
53
|
-
/>
|
54
|
-
);
|
55
|
-
}
|
56
|
-
}
|
@@ -1,77 +0,0 @@
|
|
1
|
-
import type { History, Blocker, Transition } from 'history';
|
2
|
-
import { useEffect } from 'react';
|
3
|
-
// see: https://gist.github.com/rmorse/426ffcc579922a82749934826fa9f743
|
4
|
-
import { Navigator as BaseNavigator } from 'react-router-dom';
|
5
|
-
|
6
|
-
interface Navigator extends BaseNavigator {
|
7
|
-
block?: History['block'];
|
8
|
-
}
|
9
|
-
|
10
|
-
export interface FormBasedPreventNavigationProps {
|
11
|
-
promptMessage?: string;
|
12
|
-
preventNavigate: boolean;
|
13
|
-
navigator: Navigator;
|
14
|
-
}
|
15
|
-
/** Only use this if the project uses `<BrowserRouter/>` or any router that does not support the new
|
16
|
-
* [react-router Data API](https://reactrouter.com/en/main/routers/picking-a-router#using-v64-data-apis)
|
17
|
-
*
|
18
|
-
* Legacy function to prevent the user from navigating away from a form if there are any changes.
|
19
|
-
*/
|
20
|
-
export default function LegacyFormBasedPreventNavigation({
|
21
|
-
promptMessage = 'Changes you made may not be saved.',
|
22
|
-
preventNavigate,
|
23
|
-
navigator,
|
24
|
-
}: FormBasedPreventNavigationProps) {
|
25
|
-
useEffect(() => {
|
26
|
-
if (!preventNavigate) {
|
27
|
-
return;
|
28
|
-
}
|
29
|
-
let unblock = () => {};
|
30
|
-
const push = navigator.push;
|
31
|
-
|
32
|
-
// TODO: https://reactrouter.com/docs/en/v6/upgrading/v5#prompt-is-not-currently-supported
|
33
|
-
// this is a workaround until we get native support for prompt on navigate
|
34
|
-
if (navigator.block) {
|
35
|
-
const blocker: Blocker = (tx) => {
|
36
|
-
if (window.confirm(promptMessage)) {
|
37
|
-
tx.retry();
|
38
|
-
}
|
39
|
-
};
|
40
|
-
unblock = navigator.block((tx: Transition) => {
|
41
|
-
const autoUnblockingTx = {
|
42
|
-
...tx,
|
43
|
-
retry() {
|
44
|
-
// Automatically unblock the transition so it can play all the way
|
45
|
-
// through before retrying it. TODO: Figure out how to re-enable
|
46
|
-
// this block if the transition is cancelled for some reason.
|
47
|
-
unblock();
|
48
|
-
tx.retry();
|
49
|
-
},
|
50
|
-
};
|
51
|
-
|
52
|
-
blocker(autoUnblockingTx);
|
53
|
-
});
|
54
|
-
} else {
|
55
|
-
//https://gist.github.com/MarksCode/64e438c82b0b2a1161e01c88ca0d0355
|
56
|
-
navigator.push = (...args: Parameters<typeof push>) => {
|
57
|
-
if (window.confirm(promptMessage)) {
|
58
|
-
push(...args);
|
59
|
-
}
|
60
|
-
};
|
61
|
-
}
|
62
|
-
|
63
|
-
window.addEventListener('beforeunload', beforeUnload);
|
64
|
-
return () => {
|
65
|
-
unblock();
|
66
|
-
navigator.push = push;
|
67
|
-
window.removeEventListener('beforeunload', beforeUnload);
|
68
|
-
};
|
69
|
-
|
70
|
-
function beforeUnload(e: BeforeUnloadEvent) {
|
71
|
-
e.preventDefault();
|
72
|
-
e.returnValue = promptMessage;
|
73
|
-
}
|
74
|
-
}, [preventNavigate, promptMessage, navigator]);
|
75
|
-
|
76
|
-
return null;
|
77
|
-
}
|
@@ -1,59 +0,0 @@
|
|
1
|
-
import type { History, Blocker, Transition } from 'history';
|
2
|
-
import { useEffect } from 'react';
|
3
|
-
import {
|
4
|
-
Navigator as BaseNavigator,
|
5
|
-
unstable_usePrompt as usePrompt,
|
6
|
-
} from 'react-router-dom';
|
7
|
-
|
8
|
-
interface Navigator extends BaseNavigator {
|
9
|
-
block?: History['block'];
|
10
|
-
location: Location;
|
11
|
-
}
|
12
|
-
|
13
|
-
interface FormBasedPreventNavigationProps {
|
14
|
-
promptMessage?: string;
|
15
|
-
preventNavigate: boolean;
|
16
|
-
navigator: Navigator;
|
17
|
-
}
|
18
|
-
|
19
|
-
/** Temporary function to allow backwards compatibility with routers that do not use the new Data API */
|
20
|
-
export default function NewFormBasedPreventNavigation({
|
21
|
-
promptMessage = 'Changes you made may not be saved.',
|
22
|
-
preventNavigate,
|
23
|
-
navigator,
|
24
|
-
}: FormBasedPreventNavigationProps) {
|
25
|
-
usePrompt({
|
26
|
-
when: preventNavigate,
|
27
|
-
message: promptMessage,
|
28
|
-
});
|
29
|
-
|
30
|
-
// TODO: Once react-router fully supports usePrompt and when we do not want to support routers
|
31
|
-
// that do not support the react-router Data API we can remove this.
|
32
|
-
useEffect(() => {
|
33
|
-
if (!preventNavigate) {
|
34
|
-
return;
|
35
|
-
}
|
36
|
-
let unblock = () => {};
|
37
|
-
const push = navigator.push;
|
38
|
-
|
39
|
-
navigator.push = (...args: Parameters<typeof push>) => {
|
40
|
-
if (window.confirm(promptMessage)) {
|
41
|
-
push(...args);
|
42
|
-
}
|
43
|
-
};
|
44
|
-
|
45
|
-
window.addEventListener('beforeunload', beforeUnload);
|
46
|
-
return () => {
|
47
|
-
unblock();
|
48
|
-
navigator.push = push;
|
49
|
-
window.removeEventListener('beforeunload', beforeUnload);
|
50
|
-
};
|
51
|
-
|
52
|
-
function beforeUnload(e: BeforeUnloadEvent) {
|
53
|
-
e.preventDefault();
|
54
|
-
e.returnValue = promptMessage;
|
55
|
-
}
|
56
|
-
}, [preventNavigate, promptMessage, navigator]);
|
57
|
-
|
58
|
-
return null;
|
59
|
-
}
|