@formio/js 5.1.0-dev.6056.ba6432d → 5.1.0-dev.6059.845a6e3

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.
Files changed (196) hide show
  1. package/Changelog.md +13 -131
  2. package/README.md +1 -28
  3. package/dist/formio.builder.css +17 -19
  4. package/dist/formio.builder.min.css +1 -1
  5. package/dist/formio.embed.js +1 -1
  6. package/dist/formio.embed.min.js +1 -1
  7. package/dist/formio.embed.min.js.LICENSE.txt +1 -1
  8. package/dist/formio.form.css +17 -19
  9. package/dist/formio.form.js +176 -102
  10. package/dist/formio.form.min.css +1 -1
  11. package/dist/formio.form.min.js +1 -1
  12. package/dist/formio.form.min.js.LICENSE.txt +3 -3
  13. package/dist/formio.full.css +17 -19
  14. package/dist/formio.full.js +101 -123
  15. package/dist/formio.full.min.css +2 -2
  16. package/dist/formio.full.min.js +1 -1
  17. package/dist/formio.full.min.js.LICENSE.txt +3 -3
  18. package/dist/formio.js +10 -10
  19. package/dist/formio.min.js +1 -1
  20. package/dist/formio.min.js.LICENSE.txt +1 -1
  21. package/dist/formio.utils.js +3 -3
  22. package/dist/formio.utils.min.js +1 -1
  23. package/dist/formio.utils.min.js.LICENSE.txt +1 -1
  24. package/lib/cjs/CDN.d.ts +1 -1
  25. package/lib/cjs/CDN.js +2 -2
  26. package/lib/cjs/Embed.js +1 -1
  27. package/lib/cjs/Form.d.ts +6 -4
  28. package/lib/cjs/Form.js +8 -16
  29. package/lib/cjs/Formio.js +1 -1
  30. package/lib/cjs/PDFBuilder.js +4 -4
  31. package/lib/cjs/Webform.d.ts +13 -16
  32. package/lib/cjs/Webform.js +148 -162
  33. package/lib/cjs/WebformBuilder.js +28 -17
  34. package/lib/cjs/Wizard.js +1 -1
  35. package/lib/cjs/WizardBuilder.js +2 -15
  36. package/lib/cjs/components/Components.d.ts +0 -3
  37. package/lib/cjs/components/_classes/component/Component.d.ts +0 -1
  38. package/lib/cjs/components/_classes/component/Component.js +11 -38
  39. package/lib/cjs/components/_classes/component/editForm/Component.edit.conditional.js +1 -1
  40. package/lib/cjs/components/_classes/component/editForm/Component.edit.data.d.ts +0 -37
  41. package/lib/cjs/components/_classes/component/editForm/Component.edit.data.js +2 -13
  42. package/lib/cjs/components/_classes/component/editForm/utils.d.ts +0 -1
  43. package/lib/cjs/components/_classes/component/editForm/utils.js +0 -3
  44. package/lib/cjs/components/_classes/input/Input.js +1 -23
  45. package/lib/cjs/components/_classes/list/ListComponent.js +4 -4
  46. package/lib/cjs/components/_classes/multivalue/Multivalue.d.ts +1 -1
  47. package/lib/cjs/components/_classes/multivalue/Multivalue.js +3 -10
  48. package/lib/cjs/components/_classes/nested/NestedComponent.form.js +0 -13
  49. package/lib/cjs/components/_classes/nestedarray/NestedArrayComponent.d.ts +0 -2
  50. package/lib/cjs/components/_classes/nestedarray/NestedArrayComponent.js +31 -52
  51. package/lib/cjs/components/address/Address.js +1 -1
  52. package/lib/cjs/components/button/Button.js +6 -6
  53. package/lib/cjs/components/checkbox/Checkbox.d.ts +1 -1
  54. package/lib/cjs/components/checkbox/Checkbox.js +2 -2
  55. package/lib/cjs/components/content/editForm/Content.edit.display.js +0 -8
  56. package/lib/cjs/components/currency/editForm/Currency.edit.display.js +0 -12
  57. package/lib/cjs/components/datagrid/DataGrid.d.ts +0 -2
  58. package/lib/cjs/components/datagrid/DataGrid.js +26 -41
  59. package/lib/cjs/components/day/Day.js +7 -9
  60. package/lib/cjs/components/day/editForm/Day.edit.display.js +0 -8
  61. package/lib/cjs/components/editgrid/EditGrid.d.ts +1 -1
  62. package/lib/cjs/components/editgrid/EditGrid.js +8 -26
  63. package/lib/cjs/components/email/editForm/Email.edit.display.js +0 -12
  64. package/lib/cjs/components/fieldset/editForm/Fieldset.edit.display.js +0 -8
  65. package/lib/cjs/components/file/File.d.ts +1 -1
  66. package/lib/cjs/components/file/File.js +17 -23
  67. package/lib/cjs/components/form/Form.d.ts +1 -1
  68. package/lib/cjs/components/form/Form.js +5 -9
  69. package/lib/cjs/components/form/editForm/Form.edit.form.js +3 -3
  70. package/lib/cjs/components/hidden/Hidden.d.ts +1 -0
  71. package/lib/cjs/components/hidden/Hidden.js +1 -1
  72. package/lib/cjs/components/hidden/editForm/Hidden.edit.display.js +0 -8
  73. package/lib/cjs/components/html/editForm/HTML.edit.display.js +0 -8
  74. package/lib/cjs/components/number/Number.js +5 -12
  75. package/lib/cjs/components/number/editForm/Number.edit.display.js +0 -12
  76. package/lib/cjs/components/password/editForm/Password.edit.display.js +1 -13
  77. package/lib/cjs/components/phonenumber/PhoneNumber.form.js +1 -9
  78. package/lib/cjs/components/radio/Radio.js +0 -10
  79. package/lib/cjs/components/recaptcha/ReCaptcha.js +2 -2
  80. package/lib/cjs/components/select/Select.d.ts +1 -0
  81. package/lib/cjs/components/select/Select.js +33 -12
  82. package/lib/cjs/components/select/editForm/Select.edit.data.d.ts +1 -1
  83. package/lib/cjs/components/select/editForm/Select.edit.data.js +2 -3
  84. package/lib/cjs/components/selectboxes/SelectBoxes.js +2 -2
  85. package/lib/cjs/components/signature/Signature.d.ts +1 -1
  86. package/lib/cjs/components/signature/Signature.js +3 -5
  87. package/lib/cjs/components/signature/editForm/Signature.edit.display.d.ts +6 -0
  88. package/lib/cjs/components/signature/editForm/Signature.edit.display.js +1 -0
  89. package/lib/cjs/components/survey/Survey.js +2 -2
  90. package/lib/cjs/components/tabs/editForm/Tabs.edit.display.js +0 -8
  91. package/lib/cjs/components/tags/Tags.d.ts +1 -1
  92. package/lib/cjs/components/tags/Tags.js +2 -2
  93. package/lib/cjs/components/textarea/TextArea.js +6 -6
  94. package/lib/cjs/components/textarea/editForm/TextArea.edit.display.js +0 -12
  95. package/lib/cjs/components/url/editForm/Url.edit.display.js +0 -12
  96. package/lib/cjs/components/well/editForm/Well.edit.display.js +0 -8
  97. package/lib/cjs/formio.form.js +0 -5
  98. package/lib/cjs/providers/storage/googleDrive.js +2 -3
  99. package/lib/cjs/providers/storage/s3.js +3 -3
  100. package/lib/cjs/providers/storage/xhr.d.ts +0 -1
  101. package/lib/cjs/providers/storage/xhr.js +1 -6
  102. package/lib/cjs/translations/en.d.ts +81 -234
  103. package/lib/cjs/translations/en.js +81 -8
  104. package/lib/cjs/utils/ChoicesWrapper.d.ts +25 -4
  105. package/lib/cjs/utils/ChoicesWrapper.js +124 -47
  106. package/lib/cjs/utils/formUtils.d.ts +2 -2
  107. package/lib/cjs/utils/i18n.d.ts +2 -5
  108. package/lib/cjs/utils/i18n.js +5 -32
  109. package/lib/cjs/widgets/CalendarWidget.js +27 -27
  110. package/lib/mjs/CDN.d.ts +1 -1
  111. package/lib/mjs/CDN.js +2 -2
  112. package/lib/mjs/Embed.js +1 -1
  113. package/lib/mjs/Form.d.ts +6 -4
  114. package/lib/mjs/Form.js +9 -17
  115. package/lib/mjs/Formio.js +1 -1
  116. package/lib/mjs/PDFBuilder.js +4 -4
  117. package/lib/mjs/Webform.d.ts +13 -16
  118. package/lib/mjs/Webform.js +158 -171
  119. package/lib/mjs/WebformBuilder.js +28 -17
  120. package/lib/mjs/Wizard.js +1 -1
  121. package/lib/mjs/WizardBuilder.js +2 -15
  122. package/lib/mjs/components/Components.d.ts +0 -3
  123. package/lib/mjs/components/_classes/component/Component.d.ts +0 -1
  124. package/lib/mjs/components/_classes/component/Component.js +11 -27
  125. package/lib/mjs/components/_classes/component/editForm/Component.edit.conditional.js +1 -1
  126. package/lib/mjs/components/_classes/component/editForm/Component.edit.data.d.ts +0 -37
  127. package/lib/mjs/components/_classes/component/editForm/Component.edit.data.js +2 -13
  128. package/lib/mjs/components/_classes/component/editForm/utils.d.ts +0 -1
  129. package/lib/mjs/components/_classes/component/editForm/utils.js +0 -3
  130. package/lib/mjs/components/_classes/input/Input.js +1 -22
  131. package/lib/mjs/components/_classes/list/ListComponent.js +4 -4
  132. package/lib/mjs/components/_classes/multivalue/Multivalue.d.ts +1 -1
  133. package/lib/mjs/components/_classes/multivalue/Multivalue.js +3 -10
  134. package/lib/mjs/components/_classes/nested/NestedComponent.form.js +0 -13
  135. package/lib/mjs/components/_classes/nestedarray/NestedArrayComponent.d.ts +0 -2
  136. package/lib/mjs/components/_classes/nestedarray/NestedArrayComponent.js +31 -53
  137. package/lib/mjs/components/address/Address.js +1 -1
  138. package/lib/mjs/components/button/Button.js +6 -6
  139. package/lib/mjs/components/checkbox/Checkbox.d.ts +1 -1
  140. package/lib/mjs/components/checkbox/Checkbox.js +2 -2
  141. package/lib/mjs/components/content/editForm/Content.edit.display.js +0 -8
  142. package/lib/mjs/components/currency/editForm/Currency.edit.display.js +0 -12
  143. package/lib/mjs/components/datagrid/DataGrid.d.ts +0 -2
  144. package/lib/mjs/components/datagrid/DataGrid.js +26 -41
  145. package/lib/mjs/components/day/Day.js +7 -9
  146. package/lib/mjs/components/day/editForm/Day.edit.display.js +0 -8
  147. package/lib/mjs/components/editgrid/EditGrid.d.ts +1 -1
  148. package/lib/mjs/components/editgrid/EditGrid.js +7 -25
  149. package/lib/mjs/components/email/editForm/Email.edit.display.js +0 -12
  150. package/lib/mjs/components/fieldset/editForm/Fieldset.edit.display.js +0 -8
  151. package/lib/mjs/components/file/File.d.ts +1 -1
  152. package/lib/mjs/components/file/File.js +17 -23
  153. package/lib/mjs/components/form/Form.d.ts +1 -1
  154. package/lib/mjs/components/form/Form.js +5 -8
  155. package/lib/mjs/components/form/editForm/Form.edit.form.js +3 -3
  156. package/lib/mjs/components/hidden/Hidden.d.ts +1 -0
  157. package/lib/mjs/components/hidden/Hidden.js +1 -1
  158. package/lib/mjs/components/hidden/editForm/Hidden.edit.display.js +0 -8
  159. package/lib/mjs/components/html/editForm/HTML.edit.display.js +0 -8
  160. package/lib/mjs/components/number/Number.js +5 -12
  161. package/lib/mjs/components/number/editForm/Number.edit.display.js +0 -12
  162. package/lib/mjs/components/password/editForm/Password.edit.display.js +1 -13
  163. package/lib/mjs/components/phonenumber/PhoneNumber.form.js +1 -9
  164. package/lib/mjs/components/radio/Radio.js +0 -10
  165. package/lib/mjs/components/recaptcha/ReCaptcha.js +2 -2
  166. package/lib/mjs/components/select/Select.d.ts +1 -0
  167. package/lib/mjs/components/select/Select.js +34 -14
  168. package/lib/mjs/components/select/editForm/Select.edit.data.d.ts +1 -1
  169. package/lib/mjs/components/select/editForm/Select.edit.data.js +2 -3
  170. package/lib/mjs/components/selectboxes/SelectBoxes.js +2 -2
  171. package/lib/mjs/components/signature/Signature.d.ts +1 -1
  172. package/lib/mjs/components/signature/Signature.js +3 -5
  173. package/lib/mjs/components/signature/editForm/Signature.edit.display.d.ts +6 -0
  174. package/lib/mjs/components/signature/editForm/Signature.edit.display.js +1 -0
  175. package/lib/mjs/components/survey/Survey.js +2 -2
  176. package/lib/mjs/components/tabs/editForm/Tabs.edit.display.js +0 -8
  177. package/lib/mjs/components/tags/Tags.d.ts +1 -1
  178. package/lib/mjs/components/tags/Tags.js +2 -2
  179. package/lib/mjs/components/textarea/TextArea.js +6 -6
  180. package/lib/mjs/components/textarea/editForm/TextArea.edit.display.js +0 -12
  181. package/lib/mjs/components/url/editForm/Url.edit.display.js +0 -12
  182. package/lib/mjs/components/well/editForm/Well.edit.display.js +0 -8
  183. package/lib/mjs/formio.form.js +0 -5
  184. package/lib/mjs/providers/storage/googleDrive.js +2 -3
  185. package/lib/mjs/providers/storage/s3.js +3 -3
  186. package/lib/mjs/providers/storage/xhr.d.ts +0 -1
  187. package/lib/mjs/providers/storage/xhr.js +1 -6
  188. package/lib/mjs/translations/en.d.ts +81 -234
  189. package/lib/mjs/translations/en.js +1 -87
  190. package/lib/mjs/utils/ChoicesWrapper.d.ts +25 -4
  191. package/lib/mjs/utils/ChoicesWrapper.js +119 -26
  192. package/lib/mjs/utils/formUtils.d.ts +2 -2
  193. package/lib/mjs/utils/i18n.d.ts +2 -5
  194. package/lib/mjs/utils/i18n.js +5 -32
  195. package/lib/mjs/widgets/CalendarWidget.js +27 -27
  196. package/package.json +11 -27
@@ -1,6 +1,4 @@
1
- import bootstrap from '@formio/bootstrap';
2
1
  export default {
3
- ...(bootstrap?.translations?.en || {}),
4
2
  unsavedRowsError: 'Please save all rows before proceeding.',
5
3
  invalidRowsError: 'Please correct invalid rows before proceeding.',
6
4
  invalidRowError: 'Invalid row. Please correct it or delete.',
@@ -79,89 +77,5 @@ export default {
79
77
  requiredDayField: '{{ field }} is required',
80
78
  requiredDayEmpty: '{{ field }} is required',
81
79
  requiredMonthField: '{{ field }} is required',
82
- requiredYearField: '{{ field }} is required',
83
- formNotReady: 'Form not ready. Use form.ready promise',
84
- noFormElement: 'No DOM element for form.',
85
- notUniqueKey: 'API Key is not unique',
86
- newFormSchema: 'Form schema is for a newer version, please upgrade your renderer. Some functionality may not work.',
87
- missingUrl: 'Missing URL argument',
88
- urlNotAttachedToBtn: 'You should add a URL to this button.',
89
- loadingProjectSettingsError: 'Could not load project settings',
90
- sessionStorageSupportError: 'Session storage is not supported in this browser.',
91
- builderUniqueError: `You cannot add more than one {{componentKeyOrTitle}} component to one page.`,
92
- pageNotFound: 'Page not found',
93
- noDragInfoError: 'There is no Drag Info available for either dragged or sibling element',
94
- addonSupportTypeError: 'Addon {{label}} does not support component of type {{type}}',
95
- setPathError: 'Should not be setting the path of a component.',
96
- calculatedPathDeprecation: 'component.calculatedPath was deprecated, use component.path instead.',
97
- unknownTemplate: 'Unknown template: {{name}}',
98
- unknownComponent: 'Unknown component: {{type}}',
99
- renderTemplateFunctionDeprecation: `Form.io 'render' template function is deprecated.
100
- If you need to render template (template A) inside of another template (template B),
101
- pass pre-compiled template A (use this.renderTemplate('template_A_name') as template context variable for template B`,
102
- whenReadyDeprecation: 'The whenReady() method has been deprecated. Please use the dataReady property instead.',
103
- loadResourcesError: 'Unable to load resources for {{componentKey}}',
104
- noSelectDataConfiguration: 'Select component {{componentKey}} does not have data configuration.',
105
- indexedDBSupportError: "Your browser doesn't support current version of indexedDB",
106
- caretPositionSavingError: 'An error occurred while trying to save caret position',
107
- iteratableRowsError: 'Getter #iteratableRows() is not implemented',
108
- checkRowDeprecation: 'Deprecation Warning: checkRow method has been replaced with processRow',
109
- noOAuthBtn: 'You must add the OAuth button to a form for it to function properly',
110
- noOAuthConfiguration: 'OAuth not configured. You must configure oauth for your project before it will work.',
111
- oAuthErrorsTitle: 'The Following Error Has Occured',
112
- noOAuthFormUrl: 'You must attach a Form API url to your form in order to use OAuth buttons.',
113
- oAuthStateError: 'OAuth state does not match. Please try logging in again.',
114
- componentInvalidRowValidation: 'Invalid row validation for {{componentKey}}',
115
- videoPlayerNotFound: 'Video player not found in template.',
116
- synchronizationFailed: 'Synchronization is failed',
117
- fileWithDuplicatedNameInProgress: 'File with the same name is already being uploaded',
118
- fileWithDuplicatedNameLoaded: 'File with the same name is already uploaded',
119
- nestedForm: 'Nested form',
120
- noDataProvided: 'No data provided',
121
- subformSubmissionLoadingError: 'Unable to load subform submission {{submissionId}}:',
122
- noDelimiterSet: 'In order for thousands separator to work properly, you must set the delimiter to true in the component json',
123
- noSiteKey: 'There is no Site Key specified in settings in form JSON',
124
- failedToNormalize: 'Failed to normalize value',
125
- failedToCompareItems: 'Error while comparing items',
126
- editorFocusError: 'An editor did not initialize properly when trying to focus:',
127
- quillImageUploadFailed: 'Quill image upload failed',
128
- noFilesSelected: 'No files selected',
129
- needConfigurationForQuill: 'The WYSIWYG settings are configured for CKEditor. For this renderer, you will need to use configurations for the Quill Editor. See https://quilljs.com/docs/configuration for more information.',
130
- waitPdfConverting: 'Converting PDF. Please wait.',
131
- uploading: 'Uploading',
132
- pasteBelow: 'Paste below',
133
- copy: 'Copy',
134
- move: 'Move',
135
- edit: 'Edit',
136
- editJson: 'Edit JSON',
137
- remove: 'Remove',
138
- clickToSetValue: 'Click to set value',
139
- words: 'words',
140
- characters: 'characters',
141
- addAnother: 'Add Another',
142
- yes: 'Yes',
143
- no: 'No',
144
- wantToClearData: 'Do you want to clear data?',
145
- yesDelete: 'Yes, delete it',
146
- waitFileProcessing: 'Processing file. Please wait...',
147
- wrongFileType: 'File is the wrong type; it must be {{ pattern }}',
148
- fileTooSmall: 'File is too small; it must be at least {{ size }}',
149
- fileTooBig: 'File is too big; it must be at most {{ size }}',
150
- noFileService: 'File Service not provided.',
151
- fileProcessingFailed: 'File processing has been failed.',
152
- readyForUpload: 'Ready to be uploaded into storage',
153
- readyForRemovingFromStorage: 'Ready to be removed from storage',
154
- preparingFileToRemove: 'Preparing file to remove',
155
- succefullyRemoved: 'Succefully removed',
156
- succefullyUploaded: 'Succefully uploaded',
157
- maxSelectItems: 'You may only select up to {{maxCount}} items',
158
- minSelectItems: 'You must select at least {{minCount}} items',
159
- clickToSign: 'Click to Sign',
160
- surveyQuestion: 'Question',
161
- surveyQuestionValue: 'Value',
162
- success: 'Success',
163
- noResultsFound: 'No results found',
164
- noChoices: 'No choices to choose from',
165
- typeToSearch: 'Type to search',
166
- loading: 'Loading',
80
+ requiredYearField: '{{ field }} is required'
167
81
  };
@@ -1,17 +1,38 @@
1
+ export namespace KEY_CODES {
2
+ let BACK_KEY: number;
3
+ let DELETE_KEY: number;
4
+ let TAB_KEY: number;
5
+ let ENTER_KEY: number;
6
+ let A_KEY: number;
7
+ let ESC_KEY: number;
8
+ let UP_KEY: number;
9
+ let DOWN_KEY: number;
10
+ let PAGE_UP_KEY: number;
11
+ let PAGE_DOWN_KEY: number;
12
+ }
1
13
  export default ChoicesWrapper;
2
14
  declare class ChoicesWrapper extends Choices {
3
15
  constructor(...args: any[]);
4
- _onTabKey(): void;
16
+ _onTabKey({ activeItems, hasActiveDropdown }: {
17
+ activeItems: any;
18
+ hasActiveDropdown: any;
19
+ }): void;
5
20
  isDirectionUsing: boolean;
6
21
  shouldOpenDropDown: boolean;
7
22
  _onTouchEnd(event: any): void;
8
- _onEnterKey(...args: any[]): void;
23
+ _handleButtonAction(activeItems: any, element: any): void;
24
+ _onEnterKey(args: any): void;
9
25
  _onDirectionKey(...args: any[]): void;
10
26
  timeout: NodeJS.Timeout | undefined;
11
27
  _selectHighlightedChoice(): void;
12
28
  _onKeyDown(event: any): void;
13
- onSelectValue(event: any, hasActiveDropdown: any): void;
29
+ onSelectValue({ event, activeItems, hasActiveDropdown }: {
30
+ event: any;
31
+ activeItems: any;
32
+ hasActiveDropdown: any;
33
+ }): void;
14
34
  showDropdown(...args: any[]): void;
15
35
  hideDropdown(...args: any[]): void;
36
+ _onBlur(...args: any[]): void;
16
37
  }
17
- import Choices from 'choices.js';
38
+ import Choices from '@formio/choices.js';
@@ -1,7 +1,41 @@
1
- import Choices, { KeyCodeMap } from 'choices.js';
2
- const ExtendedKeyCodeMap = {
3
- ...KeyCodeMap,
1
+ import Choices from '@formio/choices.js';
2
+ /**
3
+ * TODO: REMOVE THIS ONCE THE PULL REQUEST HAS BEEN RESOLVED.
4
+ *
5
+ * https://github.com/jshjohnson/Choices/pull/788
6
+ *
7
+ * This is intentionally not part of the extended class, since other components use Choices and need this fix as well.
8
+ * @type {Choices._generatePlaceholderValue}
9
+ * @private
10
+ */
11
+ Choices.prototype._generatePlaceholderValue = function () {
12
+ if (this._isSelectElement && this.passedElement.placeholderOption) {
13
+ const { placeholderOption } = this.passedElement;
14
+ return placeholderOption ? placeholderOption.text : false;
15
+ }
16
+ const { placeholder, placeholderValue } = this.config;
17
+ const { element: { dataset }, } = this.passedElement;
18
+ if (placeholder) {
19
+ if (placeholderValue) {
20
+ return placeholderValue;
21
+ }
22
+ if (dataset.placeholder) {
23
+ return dataset.placeholder;
24
+ }
25
+ }
26
+ return false;
27
+ };
28
+ export const KEY_CODES = {
29
+ BACK_KEY: 46,
30
+ DELETE_KEY: 8,
4
31
  TAB_KEY: 9,
32
+ ENTER_KEY: 13,
33
+ A_KEY: 65,
34
+ ESC_KEY: 27,
35
+ UP_KEY: 38,
36
+ DOWN_KEY: 40,
37
+ PAGE_UP_KEY: 33,
38
+ PAGE_DOWN_KEY: 34,
5
39
  };
6
40
  class ChoicesWrapper extends Choices {
7
41
  constructor(...args) {
@@ -29,13 +63,24 @@ class ChoicesWrapper extends Choices {
29
63
  }
30
64
  this._wasTap = true;
31
65
  }
32
- _onEnterKey(...args) {
33
- const [event] = args;
66
+ _handleButtonAction(activeItems, element) {
67
+ if (!this._isSelectOneElement) {
68
+ return super._handleButtonAction(activeItems, element);
69
+ }
70
+ if (!activeItems ||
71
+ !element ||
72
+ !this.config.removeItems ||
73
+ !this.config.removeItemButton) {
74
+ return;
75
+ }
76
+ super._handleButtonAction(activeItems, element);
77
+ }
78
+ _onEnterKey(args) {
34
79
  // Prevent dropdown form opening when removeItemButton was pressed using 'Enter' on keyboard
35
- if (event.target.className === 'choices__button') {
80
+ if (args.event.target.className === 'choices__button') {
36
81
  this.shouldOpenDropDown = false;
37
82
  }
38
- super._onEnterKey(...args);
83
+ super._onEnterKey(args);
39
84
  }
40
85
  _onDirectionKey(...args) {
41
86
  if (!this._isSelectOneElement) {
@@ -49,18 +94,17 @@ class ChoicesWrapper extends Choices {
49
94
  this.isDirectionUsing = false;
50
95
  }, 250);
51
96
  }
52
- _onTabKey() {
53
- if (this.dropdown.isActive) {
54
- this._selectHighlightedChoice();
97
+ _onTabKey({ activeItems, hasActiveDropdown }) {
98
+ if (hasActiveDropdown) {
99
+ this._selectHighlightedChoice(activeItems);
55
100
  }
56
101
  }
57
102
  _selectHighlightedChoice() {
58
- const highlightedChoice = this.dropdown.element.querySelector(`.${this.config.classNames.highlightedState}`);
103
+ const highlightedChoice = this.dropdown.getChild(`.${this.config.classNames.highlightedState}`);
59
104
  if (highlightedChoice) {
60
105
  const id = highlightedChoice.dataset.id;
61
- const choice = id && this._store.getChoiceById(Number(id));
106
+ const choice = id && this._store.getChoiceById(id);
62
107
  this._addItem({
63
- id: choice.id,
64
108
  value: choice.value,
65
109
  label: choice.label,
66
110
  choiceId: choice.id,
@@ -71,16 +115,61 @@ class ChoicesWrapper extends Choices {
71
115
  });
72
116
  this._triggerChange(choice.value);
73
117
  }
118
+ event.preventDefault();
74
119
  }
75
120
  _onKeyDown(event) {
76
- const keyCode = event.keyCode;
77
- return this._isSelectOneElement && keyCode === ExtendedKeyCodeMap.TAB_KEY
78
- ? this._onTabKey()
79
- : super._onKeyDown(event);
121
+ if (!this._isSelectOneElement) {
122
+ return super._onKeyDown(event);
123
+ }
124
+ const { target, keyCode, ctrlKey, metaKey } = event;
125
+ if (target !== this.input.element &&
126
+ !this.containerOuter.element.contains(target)) {
127
+ return;
128
+ }
129
+ const activeItems = this._store.activeItems;
130
+ const hasFocusedInput = this.input.isFocussed;
131
+ const hasActiveDropdown = this.dropdown.isActive;
132
+ const hasItems = this.itemList.hasChildren;
133
+ const keyString = String.fromCharCode(keyCode);
134
+ const { BACK_KEY, DELETE_KEY, TAB_KEY, ENTER_KEY, A_KEY, ESC_KEY, UP_KEY, DOWN_KEY, PAGE_UP_KEY, PAGE_DOWN_KEY, } = KEY_CODES;
135
+ const hasCtrlDownKeyPressed = ctrlKey || metaKey;
136
+ // If a user is typing and the dropdown is not active
137
+ if (!hasActiveDropdown && !this._isTextElement && /[a-zA-Z0-9-_ ]/.test(keyString)) {
138
+ const currentValue = this.input.element.value;
139
+ this.input.element.value = currentValue ? `${currentValue}${keyString}` : keyString;
140
+ this.showDropdown();
141
+ }
142
+ // Map keys to key actions
143
+ const keyDownActions = {
144
+ [A_KEY]: this._onAKey,
145
+ [TAB_KEY]: this._onTabKey,
146
+ [ENTER_KEY]: this._onEnterKey,
147
+ [ESC_KEY]: this._onEscapeKey,
148
+ [UP_KEY]: this._onDirectionKey,
149
+ [PAGE_UP_KEY]: this._onDirectionKey,
150
+ [DOWN_KEY]: this._onDirectionKey,
151
+ [PAGE_DOWN_KEY]: this._onDirectionKey,
152
+ [DELETE_KEY]: this._onDeleteKey,
153
+ [BACK_KEY]: this._onDeleteKey,
154
+ };
155
+ // If keycode has a function, run it
156
+ if (keyDownActions[keyCode]) {
157
+ keyDownActions[keyCode]({
158
+ event,
159
+ target,
160
+ keyCode,
161
+ metaKey,
162
+ activeItems,
163
+ hasFocusedInput,
164
+ hasActiveDropdown,
165
+ hasItems,
166
+ hasCtrlDownKeyPressed,
167
+ });
168
+ }
80
169
  }
81
- onSelectValue(event, hasActiveDropdown) {
170
+ onSelectValue({ event, activeItems, hasActiveDropdown }) {
82
171
  if (hasActiveDropdown) {
83
- this._selectHighlightedChoice();
172
+ this._selectHighlightedChoice(activeItems);
84
173
  }
85
174
  else if (this._isSelectOneElement) {
86
175
  this.showDropdown();
@@ -88,13 +177,11 @@ class ChoicesWrapper extends Choices {
88
177
  }
89
178
  }
90
179
  showDropdown(...args) {
91
- setTimeout(() => {
92
- if (!this.shouldOpenDropDown) {
93
- this.shouldOpenDropDown = true;
94
- return;
95
- }
96
- super.showDropdown(...args);
97
- }, 0);
180
+ if (!this.shouldOpenDropDown) {
181
+ this.shouldOpenDropDown = true;
182
+ return;
183
+ }
184
+ super.showDropdown(...args);
98
185
  }
99
186
  hideDropdown(...args) {
100
187
  if (this.isDirectionUsing) {
@@ -102,5 +189,11 @@ class ChoicesWrapper extends Choices {
102
189
  }
103
190
  super.hideDropdown(...args);
104
191
  }
192
+ _onBlur(...args) {
193
+ if (this._isScrollingOnIe) {
194
+ return;
195
+ }
196
+ super._onBlur(...args);
197
+ }
105
198
  }
106
199
  export default ChoicesWrapper;
@@ -26,8 +26,8 @@ export const getBestMatch: typeof Utils.getBestMatch;
26
26
  export const getComponentFromPath: typeof Utils.getComponentFromPath;
27
27
  export const getComponentValue: typeof Utils.getComponentValue;
28
28
  export const findComponents: typeof Utils.findComponents;
29
- export const eachComponentDataAsync: (components: Component[], data: DataObject, fn: EachComponentDataAsyncCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: any, parentPaths?: any) => Promise<void>;
30
- export const eachComponentData: (components: Component[], data: DataObject, fn: EachComponentDataCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: any, parentPaths?: any) => void;
29
+ export const eachComponentDataAsync: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataAsyncCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined) => Promise<void>;
30
+ export const eachComponentData: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined) => void;
31
31
  export const getComponentKey: typeof Utils.getComponentKey;
32
32
  export const getContextualRowPath: typeof Utils.getContextualRowPath;
33
33
  export const getContextualRowData: typeof Utils.getContextualRowData;
@@ -2,16 +2,13 @@
2
2
  * This file is used to mimic the i18n library interface.
3
3
  */
4
4
  export class I18n {
5
- static languages: {};
6
- static setDefaultTranslations(languages: any): void;
7
5
  static init(languages?: {}): I18n;
8
6
  static createInstance(): I18n;
9
7
  constructor(languages?: {});
10
- languages: any;
11
- defaultKeys: any;
8
+ languages: {};
12
9
  language: string;
13
10
  currentLanguage: any;
14
- setLanguages(languages: any, noDefaultOverride: any): void;
11
+ setLanguages(languages: any): void;
15
12
  dir(lang?: string): "rtl" | "ltr";
16
13
  changeLanguage(language: any, ready?: null): void;
17
14
  addResourceBundle(language: any, type: any, strings: any): void;
@@ -1,7 +1,5 @@
1
1
  import { Evaluator } from '@formio/core/utils';
2
2
  import i18n from '../i18n';
3
- import { isEmpty } from 'lodash';
4
- import { fastCloneDeep } from '@formio/core';
5
3
  const i18Defaults = {};
6
4
  for (const lang in i18n.resources) {
7
5
  if (i18n.resources.hasOwnProperty(lang)) {
@@ -12,29 +10,14 @@ for (const lang in i18n.resources) {
12
10
  * This file is used to mimic the i18n library interface.
13
11
  */
14
12
  export class I18n {
15
- static languages = i18Defaults;
16
- languages = fastCloneDeep(I18n.languages || {});
17
- defaultKeys = I18n.languages?.en || {};
13
+ languages = i18Defaults;
18
14
  language = 'en';
19
15
  currentLanguage = i18Defaults.en;
20
16
  constructor(languages = {}) {
21
17
  this.setLanguages(languages);
22
18
  this.changeLanguage(this.language);
23
19
  }
24
- static setDefaultTranslations(languages) {
25
- if (isEmpty(languages)) {
26
- return;
27
- }
28
- for (const lang in languages) {
29
- if (lang !== 'language' && languages.hasOwnProperty(lang)) {
30
- if (!this.languages[lang]) {
31
- this.languages[lang] = {};
32
- }
33
- this.languages[lang] = { ...languages[lang], ...this.languages[lang], };
34
- }
35
- }
36
- }
37
- setLanguages(languages, noDefaultOverride) {
20
+ setLanguages(languages) {
38
21
  if (languages.resources) {
39
22
  for (const lang in languages.resources) {
40
23
  if (languages.resources.hasOwnProperty(lang)) {
@@ -61,9 +44,7 @@ export class I18n {
61
44
  if (!this.languages[lang]) {
62
45
  this.languages[lang] = {};
63
46
  }
64
- this.languages[lang] = noDefaultOverride
65
- ? { ...languages[lang], ...this.languages[lang] }
66
- : { ...this.languages[lang], ...languages[lang] };
47
+ this.languages[lang] = { ...this.languages[lang], ...languages[lang] };
67
48
  }
68
49
  }
69
50
  }
@@ -92,20 +73,12 @@ export class I18n {
92
73
  this.languages[language] = strings;
93
74
  }
94
75
  t(text, ...args) {
95
- let currentTranslation = this.currentLanguage[text];
96
- // provide compatibility with cases where the entire phrase is used as a key
97
- // get the phrase that is possibly being used as a key
98
- const defaultKey = this.defaultKeys[text];
99
- if (defaultKey && this.currentLanguage[defaultKey]) {
100
- // get translation using the phrase as a key
101
- currentTranslation = this.currentLanguage[defaultKey];
102
- }
103
- if (currentTranslation) {
76
+ if (this.currentLanguage[text]) {
104
77
  const customTranslationFieldName = args[0]?.field;
105
78
  if (customTranslationFieldName && this.currentLanguage[customTranslationFieldName]) {
106
79
  args[0].field = this.currentLanguage[customTranslationFieldName];
107
80
  }
108
- return Evaluator.interpolateString(currentTranslation, ...args);
81
+ return Evaluator.interpolateString(this.currentLanguage[text], ...args);
109
82
  }
110
83
  return Evaluator.interpolateString(text, ...args);
111
84
  }
@@ -87,6 +87,8 @@ export default class CalendarWidget extends InputWidget {
87
87
  this.settings.disableWeekends ? this.settings.disable.push(this.disableWeekends) : '';
88
88
  this.settings.disableWeekdays ? this.settings.disable.push(this.disableWeekdays) : '';
89
89
  this.settings.disableFunction ? this.settings.disable.push(this.disableFunction) : '';
90
+ this.settings.wasDefaultValueChanged = false;
91
+ this.settings.defaultValue = '';
90
92
  this.settings.manualInputValue = '';
91
93
  this.settings.isManuallyOverriddenValue = false;
92
94
  this.settings.currentValue = '';
@@ -94,8 +96,14 @@ export default class CalendarWidget extends InputWidget {
94
96
  this.settings.dateFormat = convertFormatToFlatpickr(this.settings.dateFormat);
95
97
  this.settings.position = 'auto center';
96
98
  this.settings.onChange = () => {
97
- if (this.settings.allowInput && this.settings.enableTime) {
98
- this.calendar._input.value = this.settings.isManuallyOverriddenValue ? this.settings.manualInputValue : this.calendar.altInput.value;
99
+ if (this.settings.allowInput) {
100
+ if (this.settings.isManuallyOverriddenValue && this.settings.enableTime) {
101
+ this.calendar._input.value = this.settings.manualInputValue;
102
+ }
103
+ else {
104
+ this.settings.manualInputValue = '';
105
+ }
106
+ this.settings.isManuallyOverriddenValue = false;
99
107
  }
100
108
  this.emit('update');
101
109
  };
@@ -104,15 +112,20 @@ export default class CalendarWidget extends InputWidget {
104
112
  this.hook('onCalendarClose');
105
113
  this.closedOn = Date.now();
106
114
  if (this.settings.allowInput && this.settings.enableTime) {
107
- this.calendar._input.value = this.settings.isManuallyOverriddenValue ? this.settings.manualInputValue : this.calendar.altInput.value;
115
+ this.calendar._input.value = this.settings.manualInputValue || this.calendar._input.value;
116
+ this.settings.isManuallyOverriddenValue = false;
108
117
  this.emit('update');
109
118
  }
119
+ if (this.settings.wasDefaultValueChanged) {
120
+ this.calendar._input.value = this.settings.defaultValue;
121
+ this.settings.wasDefaultValueChanged = false;
122
+ }
110
123
  if (this.calendar) {
111
124
  this.emit('blur');
112
125
  }
113
126
  };
114
127
  Formio.requireLibrary('flatpickr-css', 'flatpickr', [
115
- { type: 'styles', src: `${Formio.cdn['flatpickr']}/flatpickr.min.css` }
128
+ { type: 'styles', src: `${Formio.cdn['flatpickr-formio']}/flatpickr.min.css` }
116
129
  ], true);
117
130
  if (this.component.shortcutButtons) {
118
131
  this.component.shortcutButtons = this.component.shortcutButtons.filter((btn) => btn.label && btn.onClick);
@@ -129,7 +142,7 @@ export default class CalendarWidget extends InputWidget {
129
142
  }
130
143
  })
131
144
  .then((ShortcutButtonsPlugin) => {
132
- return Formio.requireLibrary('flatpickr', 'flatpickr', `${Formio.cdn['flatpickr']}/flatpickr.min.js`, true)
145
+ return Formio.requireLibrary('flatpickr', 'flatpickr', `${Formio.cdn['flatpickr-formio']}/flatpickr.min.js`, true)
133
146
  .then((Flatpickr) => {
134
147
  if (this.component.shortcutButtons?.length && ShortcutButtonsPlugin) {
135
148
  this.initShortcutButtonsPlugin(ShortcutButtonsPlugin);
@@ -138,7 +151,7 @@ export default class CalendarWidget extends InputWidget {
138
151
  if (this._input) {
139
152
  const { locale } = this.settings;
140
153
  if (locale && locale.length >= 2 && locale !== 'en') {
141
- return Formio.requireLibrary(`flatpickr-${locale}`, `flatpickr.l10ns.${locale}`, `${Formio.cdn['flatpickr']}/l10n/${locale}.js`, true).then(() => this.initFlatpickr(Flatpickr));
154
+ return Formio.requireLibrary(`flatpickr-${locale}`, `flatpickr-${locale}`, `${Formio.cdn['flatpickr-formio']}/l10n/flatpickr-${locale}.js`, true).then(() => this.initFlatpickr(Flatpickr));
142
155
  }
143
156
  else {
144
157
  this.initFlatpickr(Flatpickr);
@@ -336,28 +349,19 @@ export default class CalendarWidget extends InputWidget {
336
349
  this.calendar = new Flatpickr(this._input, { ...this.settings, disableMobile: true });
337
350
  this.addEventListener(this.calendar.altInput, 'input', (event) => {
338
351
  if (this.settings.allowInput && this.settings.currentValue !== event.target.value) {
339
- if (event.target.mask) {
340
- event.target.mask.textMaskInputElement.update();
341
- }
342
352
  this.settings.manualInputValue = event.target.value;
343
- this._input.value = this.settings.manualInputValue;
344
353
  this.settings.isManuallyOverriddenValue = true;
345
354
  this.settings.currentValue = event.target.value;
346
- this.emit('update');
355
+ }
356
+ if (event.target.value === '' && this.calendar.selectedDates.length > 0) {
357
+ this.settings.wasDefaultValueChanged = true;
358
+ this.settings.defaultValue = event.target.value;
359
+ this.calendar.clear();
360
+ }
361
+ else {
362
+ this.settings.wasDefaultValueChanged = false;
347
363
  }
348
364
  });
349
- if (this.calendar.daysContainer) {
350
- this.calendar.daysContainer.addEventListener('click', () => {
351
- this.settings.isManuallyOverriddenValue = false;
352
- this.calendar.updateValue(false);
353
- });
354
- }
355
- if (this.calendar.timeContainer) {
356
- this.calendar.timeContainer.addEventListener('click', () => {
357
- this.settings.isManuallyOverriddenValue = false;
358
- this.calendar.updateValue(false);
359
- });
360
- }
361
365
  const excludedFromMaskFormats = ['MMMM'];
362
366
  if (!this.settings.readOnly && !_.some(excludedFromMaskFormats, format => _.includes(this.settings.format, format))) {
363
367
  // Enforce the input mask of the format.
@@ -383,10 +387,6 @@ export default class CalendarWidget extends InputWidget {
383
387
  }
384
388
  // Make sure we commit the value after a blur event occurs.
385
389
  this.addEventListener(this.calendar._input, 'blur', (event) => {
386
- // If we have manually overridden the value then we shouldn't call setDate because this will fill the input mask
387
- if (this.settings.isManuallyOverriddenValue) {
388
- return;
389
- }
390
390
  const activeElement = this.settings.shadowRoot ? this.settings.shadowRoot.activeElement : document.activeElement;
391
391
  const relatedTarget = event.relatedTarget ? event.relatedTarget : activeElement;
392
392
  if (!(isIEBrowser && !relatedTarget) && !this.isCalendarElement(relatedTarget)) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@formio/js",
3
- "version": "5.1.0-dev.6056.ba6432d",
3
+ "version": "5.1.0-dev.6059.845a6e3",
4
4
  "description": "JavaScript powered Forms with JSON Form Builder",
5
5
  "main": "lib/cjs/index.js",
6
6
  "exports": {
@@ -56,10 +56,9 @@
56
56
  "dopublish": "npm run build && npm run tag && npm publish",
57
57
  "lint": "eslint ./src --fix",
58
58
  "serve": "jekyll serve --config _config.yml,_config.dev.yml",
59
- "test": "nyc --reporter=lcov --reporter=text --reporter=text-summary mocha test/unit/*.unit.js",
60
- "test:updateRenders": "npm run lib && cross-env TZ=UTC node --require jsdom-global/register test/updateRenders.js",
61
- "test:e2e": "NODE_OPTIONS=\"--max-old-space-size=4096\" karma start --verbose --single-run",
62
- "show-coverage": "open coverage/lcov-report/index.html"
59
+ "test": "mocha 'test/unit/*.unit.js'",
60
+ "test:updateRenders": "npm run lib && TZ=UTC node --require jsdom-global/register test/updateRenders.js",
61
+ "test:e2e": "NODE_OPTIONS=\"--max-old-space-size=4096\" karma start --verbose --single-run"
63
62
  },
64
63
  "repository": {
65
64
  "type": "git",
@@ -80,21 +79,21 @@
80
79
  },
81
80
  "homepage": "https://github.com/formio/formio.js#readme",
82
81
  "dependencies": {
83
- "@formio/bootstrap": "v3.0.0-dev.121.085d187",
84
- "@formio/core": "v2.4.0-dev.2",
85
- "@formio/text-mask-addons": "3.8.0-formio.4",
82
+ "@formio/bootstrap": "3.1.0-rc.4",
83
+ "@formio/choices.js": "^10.2.1",
84
+ "@formio/core": "2.4.0-rc.12",
85
+ "@formio/text-mask-addons": "^3.8.0-formio.4",
86
86
  "@formio/vanilla-text-mask": "^5.1.1-formio.1",
87
87
  "abortcontroller-polyfill": "^1.7.5",
88
88
  "autocompleter": "^8.0.4",
89
89
  "bootstrap": "^5.3.3",
90
90
  "browser-cookies": "^1.2.0",
91
91
  "browser-md5-file": "^1.1.1",
92
- "choices.js": "^11.0.6",
93
- "compare-versions": "^6.1.1",
92
+ "compare-versions": "^6.0.0-rc.2",
94
93
  "core-js": "^3.37.1",
95
94
  "dialog-polyfill": "^0.5.6",
96
95
  "dom-autoscroller": "^2.3.4",
97
- "dompurify": "^3.1.6",
96
+ "dompurify": "^3.2.4",
98
97
  "downloadjs": "^1.4.7",
99
98
  "dragula": "^3.7.3",
100
99
  "eventemitter3": "^5.0.1",
@@ -103,7 +102,7 @@
103
102
  "idb": "^7.1.1",
104
103
  "inputmask": "^5.0.8",
105
104
  "ismobilejs": "^1.1.1",
106
- "json-logic-js": "^2.0.5",
105
+ "json-logic-js": "^2.0.2",
107
106
  "jstimezonedetect": "^1.0.7",
108
107
  "jwt-decode": "^3.1.2",
109
108
  "lodash": "^4.17.21",
@@ -156,7 +155,6 @@
156
155
  "mocha": "^10.3.0",
157
156
  "mock-local-storage": "^1.1.24",
158
157
  "natives": "^1.1.6",
159
- "nyc": "^17.0.0",
160
158
  "power-assert": "^1.6.1",
161
159
  "pre-commit": "^1.2.2",
162
160
  "pretty": "^2.0.0",
@@ -176,19 +174,5 @@
176
174
  "webpack-cli": "^5.1.1",
177
175
  "webpack-node-externals": "^3.0.0",
178
176
  "webpack-stream": "^7.0.0"
179
- },
180
- "nyc": {
181
- "check-coverage": true,
182
- "statements": 63,
183
- "branches": 63,
184
- "functions": 61,
185
- "lines": 64,
186
- "include": [
187
- "src/**/*.js"
188
- ],
189
- "exclude": [
190
- "src/**/fixtures"
191
- ],
192
- "all": true
193
177
  }
194
178
  }