@formio/js 5.1.0-dev.6114.02b6d9c → 5.1.0-dev.6123.055aa35
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/formio.builder.css +6 -0
- package/dist/formio.builder.min.css +1 -1
- package/dist/formio.embed.css +1 -1
- package/dist/formio.embed.min.css +1 -1
- package/dist/formio.form.css +6 -0
- package/dist/formio.form.js +112 -123
- package/dist/formio.form.min.css +1 -1
- package/dist/formio.form.min.js +1 -1
- package/dist/formio.full.css +6 -0
- package/dist/formio.full.js +119 -130
- package/dist/formio.full.min.css +1 -1
- package/dist/formio.full.min.js +1 -1
- package/dist/formio.js +61 -50
- package/dist/formio.min.js +1 -1
- package/dist/formio.utils.js +72 -72
- package/dist/formio.utils.min.js +1 -1
- package/lib/cjs/Element.js +13 -36
- package/lib/cjs/EventEmitter.js +2 -25
- package/lib/cjs/Form.js +2 -25
- package/lib/cjs/PDF.js +1 -1
- package/lib/cjs/PDFBuilder.js +4 -5
- package/lib/cjs/Webform.js +5 -6
- package/lib/cjs/WebformBuilder.js +9 -10
- package/lib/cjs/Wizard.js +1 -1
- package/lib/cjs/WizardBuilder.js +1 -1
- package/lib/cjs/components/_classes/component/Component.js +29 -52
- package/lib/cjs/components/_classes/component/editForm/Component.edit.conditional.js +1 -1
- package/lib/cjs/components/_classes/component/editForm/Component.edit.logic.js +1 -1
- package/lib/cjs/components/_classes/componentModal/ComponentModal.js +1 -1
- package/lib/cjs/components/_classes/input/Input.js +1 -1
- package/lib/cjs/components/_classes/list/ListComponent.js +1 -1
- package/lib/cjs/components/_classes/nested/NestedComponent.js +6 -6
- package/lib/cjs/components/_classes/nestedarray/NestedArrayComponent.js +1 -1
- package/lib/cjs/components/_classes/nesteddata/NestedDataComponent.js +1 -1
- package/lib/cjs/components/address/Address.js +1 -1
- package/lib/cjs/components/alert/Alert.js +1 -1
- package/lib/cjs/components/button/Button.d.ts +1 -1
- package/lib/cjs/components/button/Button.js +4 -4
- package/lib/cjs/components/checkbox/Checkbox.js +1 -1
- package/lib/cjs/components/container/Container.js +1 -1
- package/lib/cjs/components/currency/Currency.js +1 -1
- package/lib/cjs/components/datagrid/DataGrid.js +1 -1
- package/lib/cjs/components/datamap/DataMap.d.ts +1 -1
- package/lib/cjs/components/datamap/DataMap.js +4 -4
- package/lib/cjs/components/datetime/DateTime.d.ts +1 -1
- package/lib/cjs/components/datetime/DateTime.js +15 -13
- package/lib/cjs/components/day/Day.js +1 -1
- package/lib/cjs/components/editgrid/EditGrid.js +1 -1
- package/lib/cjs/components/editgrid/editForm/EditGrid.edit.display.js +1 -1
- package/lib/cjs/components/file/File.js +1 -1
- package/lib/cjs/components/form/Form.js +14 -2
- package/lib/cjs/components/form/editForm/Form.edit.form.js +4 -3
- package/lib/cjs/components/number/Number.js +1 -1
- package/lib/cjs/components/panel/Panel.js +1 -1
- package/lib/cjs/components/radio/Radio.js +1 -1
- package/lib/cjs/components/recaptcha/editForm/ReCaptcha.edit.display.js +1 -1
- package/lib/cjs/components/select/Select.js +1 -1
- package/lib/cjs/components/select/editForm/Select.edit.data.js +1 -1
- package/lib/cjs/components/selectboxes/SelectBoxes.js +1 -1
- package/lib/cjs/components/signature/Signature.js +1 -1
- package/lib/cjs/components/survey/Survey.js +1 -1
- package/lib/cjs/components/tags/Tags.js +1 -1
- package/lib/cjs/components/textarea/TextArea.js +3 -3
- package/lib/cjs/components/textfield/TextField.js +7 -30
- package/lib/cjs/components/time/Time.js +1 -1
- package/lib/cjs/formio.form.js +3 -3
- package/lib/cjs/i18n.js +1 -1
- package/lib/cjs/providers/storage/uploadAdapter.js +1 -1
- package/lib/cjs/utils/Evaluator.d.ts +13 -6
- package/lib/cjs/utils/Evaluator.js +27 -15
- package/lib/cjs/utils/builder.js +5 -5
- package/lib/cjs/utils/conditionOperators/IsEqualTo.js +3 -3
- package/lib/cjs/utils/i18n.js +3 -3
- package/lib/cjs/utils/index.d.ts +161 -2
- package/lib/cjs/utils/index.js +12 -2
- package/lib/cjs/utils/utils.d.ts +18 -33
- package/lib/cjs/utils/utils.js +52 -130
- package/lib/cjs/widgets/CalendarWidget.d.ts +0 -7
- package/lib/cjs/widgets/CalendarWidget.js +15 -39
- package/lib/mjs/Element.js +6 -6
- package/lib/mjs/EventEmitter.js +2 -2
- package/lib/mjs/Form.js +1 -1
- package/lib/mjs/PDF.js +1 -1
- package/lib/mjs/PDFBuilder.js +1 -2
- package/lib/mjs/Webform.js +3 -4
- package/lib/mjs/WebformBuilder.js +1 -2
- package/lib/mjs/Wizard.js +1 -1
- package/lib/mjs/WizardBuilder.js +1 -1
- package/lib/mjs/components/_classes/component/Component.js +2 -2
- package/lib/mjs/components/_classes/component/editForm/Component.edit.conditional.js +1 -1
- package/lib/mjs/components/_classes/component/editForm/Component.edit.logic.js +1 -1
- package/lib/mjs/components/_classes/componentModal/ComponentModal.js +1 -1
- package/lib/mjs/components/_classes/input/Input.js +1 -1
- package/lib/mjs/components/_classes/list/ListComponent.js +1 -1
- package/lib/mjs/components/_classes/nested/NestedComponent.js +6 -6
- package/lib/mjs/components/_classes/nestedarray/NestedArrayComponent.js +1 -1
- package/lib/mjs/components/_classes/nesteddata/NestedDataComponent.js +1 -1
- package/lib/mjs/components/address/Address.js +1 -1
- package/lib/mjs/components/alert/Alert.js +1 -1
- package/lib/mjs/components/button/Button.d.ts +1 -1
- package/lib/mjs/components/button/Button.js +1 -1
- package/lib/mjs/components/checkbox/Checkbox.js +1 -1
- package/lib/mjs/components/container/Container.js +1 -1
- package/lib/mjs/components/currency/Currency.js +1 -1
- package/lib/mjs/components/datagrid/DataGrid.js +1 -1
- package/lib/mjs/components/datamap/DataMap.d.ts +1 -1
- package/lib/mjs/components/datamap/DataMap.js +1 -1
- package/lib/mjs/components/datetime/DateTime.d.ts +1 -1
- package/lib/mjs/components/datetime/DateTime.js +15 -13
- package/lib/mjs/components/day/Day.js +1 -1
- package/lib/mjs/components/editgrid/EditGrid.js +1 -1
- package/lib/mjs/components/editgrid/editForm/EditGrid.edit.display.js +1 -1
- package/lib/mjs/components/file/File.js +1 -1
- package/lib/mjs/components/form/Form.js +13 -2
- package/lib/mjs/components/form/editForm/Form.edit.form.js +3 -2
- package/lib/mjs/components/number/Number.js +1 -1
- package/lib/mjs/components/panel/Panel.js +1 -1
- package/lib/mjs/components/radio/Radio.js +1 -1
- package/lib/mjs/components/recaptcha/editForm/ReCaptcha.edit.display.js +1 -1
- package/lib/mjs/components/select/Select.js +1 -1
- package/lib/mjs/components/select/editForm/Select.edit.data.js +1 -1
- package/lib/mjs/components/selectboxes/SelectBoxes.js +1 -1
- package/lib/mjs/components/signature/Signature.js +1 -1
- package/lib/mjs/components/survey/Survey.js +1 -1
- package/lib/mjs/components/tags/Tags.js +1 -1
- package/lib/mjs/components/textarea/TextArea.js +3 -3
- package/lib/mjs/components/textfield/TextField.js +1 -1
- package/lib/mjs/components/time/Time.js +1 -1
- package/lib/mjs/formio.form.js +2 -2
- package/lib/mjs/i18n.js +1 -1
- package/lib/mjs/providers/storage/uploadAdapter.js +1 -1
- package/lib/mjs/utils/Evaluator.d.ts +13 -6
- package/lib/mjs/utils/Evaluator.js +21 -13
- package/lib/mjs/utils/builder.js +1 -1
- package/lib/mjs/utils/conditionOperators/IsEqualTo.js +1 -1
- package/lib/mjs/utils/i18n.js +1 -1
- package/lib/mjs/utils/index.d.ts +161 -2
- package/lib/mjs/utils/index.js +11 -1
- package/lib/mjs/utils/utils.d.ts +18 -33
- package/lib/mjs/utils/utils.js +45 -105
- package/lib/mjs/widgets/CalendarWidget.d.ts +0 -7
- package/lib/mjs/widgets/CalendarWidget.js +15 -39
- package/package.json +3 -2
package/lib/mjs/utils/index.d.ts
CHANGED
@@ -1,3 +1,162 @@
|
|
1
|
-
export
|
1
|
+
export * from "./utils";
|
2
|
+
export * from "./formUtils";
|
2
3
|
export default FormioUtils;
|
3
|
-
|
4
|
+
declare const FormioUtils: {
|
5
|
+
Evaluator: import("./Evaluator").DefaultEvaluator;
|
6
|
+
flattenComponents: typeof import("@formio/core/lib/utils/formUtil").flattenComponents;
|
7
|
+
guid: typeof import("@formio/core/lib/utils/formUtil").guid;
|
8
|
+
uniqueName: typeof import("@formio/core/lib/utils/formUtil").uniqueName;
|
9
|
+
MODEL_TYPES_OF_KNOWN_COMPONENTS: {
|
10
|
+
nestedArray: string[];
|
11
|
+
nestedDataArray: string[];
|
12
|
+
dataObject: string[];
|
13
|
+
object: string[];
|
14
|
+
map: string[];
|
15
|
+
content: string[];
|
16
|
+
string: string[];
|
17
|
+
number: string[];
|
18
|
+
boolean: string[];
|
19
|
+
none: string[];
|
20
|
+
any: string[];
|
21
|
+
};
|
22
|
+
getModelType: typeof import("@formio/core/lib/utils/formUtil").getModelType;
|
23
|
+
getComponentPath: any;
|
24
|
+
setComponentScope: typeof import("@formio/core/lib/utils/formUtil").setComponentScope;
|
25
|
+
resetComponentScope: typeof import("@formio/core/lib/utils/formUtil").resetComponentScope;
|
26
|
+
isComponentNestedDataType: typeof import("@formio/core/lib/utils/formUtil").isComponentNestedDataType;
|
27
|
+
componentPath: typeof import("@formio/core/lib/utils/formUtil").componentPath;
|
28
|
+
getComponentPaths: typeof import("@formio/core/lib/utils/formUtil").getComponentPaths;
|
29
|
+
componentMatches: typeof import("@formio/core/lib/utils/formUtil").componentMatches;
|
30
|
+
getBestMatch: typeof import("@formio/core/lib/utils/formUtil").getBestMatch;
|
31
|
+
getComponentFromPath: typeof import("@formio/core/lib/utils/formUtil").getComponentFromPath;
|
32
|
+
getComponentValue: typeof import("@formio/core/lib/utils/formUtil").getComponentValue;
|
33
|
+
findComponents: typeof import("@formio/core/lib/utils/formUtil").findComponents;
|
34
|
+
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>;
|
35
|
+
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;
|
36
|
+
getComponentKey: typeof import("@formio/core/lib/utils/formUtil").getComponentKey;
|
37
|
+
getContextualRowPath: typeof import("@formio/core/lib/utils/formUtil").getContextualRowPath;
|
38
|
+
getContextualRowData: typeof import("@formio/core/lib/utils/formUtil").getContextualRowData;
|
39
|
+
componentInfo: typeof import("@formio/core/lib/utils/formUtil").componentInfo;
|
40
|
+
eachComponent: typeof import("@formio/core/lib/utils/formUtil").eachComponent;
|
41
|
+
eachComponentAsync: typeof import("@formio/core/lib/utils/formUtil").eachComponentAsync;
|
42
|
+
getComponentData: typeof import("@formio/core/lib/utils/formUtil").getComponentData;
|
43
|
+
getComponentActualValue: any;
|
44
|
+
isLayoutComponent: typeof import("@formio/core/lib/utils/formUtil").isLayoutComponent;
|
45
|
+
matchComponent: typeof import("@formio/core/lib/utils/formUtil").matchComponent;
|
46
|
+
getComponent: typeof import("@formio/core/lib/utils/formUtil").getComponent;
|
47
|
+
searchComponents: typeof import("@formio/core/lib/utils/formUtil").searchComponents;
|
48
|
+
removeComponent: typeof import("@formio/core/lib/utils/formUtil").removeComponent;
|
49
|
+
hasCondition: typeof import("@formio/core/lib/utils/formUtil").hasCondition;
|
50
|
+
parseFloatExt: typeof import("@formio/core/lib/utils/formUtil").parseFloatExt;
|
51
|
+
formatAsCurrency: typeof import("@formio/core/lib/utils/formUtil").formatAsCurrency;
|
52
|
+
escapeRegExCharacters: typeof import("@formio/core/lib/utils/formUtil").escapeRegExCharacters;
|
53
|
+
getValue: typeof import("@formio/core/lib/utils/formUtil").getValue;
|
54
|
+
getStrings: typeof import("@formio/core/lib/utils/formUtil").getStrings;
|
55
|
+
generateFormChange: typeof import("@formio/core/lib/utils/formUtil").generateFormChange;
|
56
|
+
applyFormChanges: typeof import("@formio/core/lib/utils/formUtil").applyFormChanges;
|
57
|
+
findComponent: typeof import("@formio/core/lib/utils/formUtil").findComponent;
|
58
|
+
getEmptyValue: typeof import("@formio/core/lib/utils/formUtil").getEmptyValue;
|
59
|
+
isComponentDataEmpty: typeof import("@formio/core/lib/utils/formUtil").isComponentDataEmpty;
|
60
|
+
isSelectResourceWithObjectValue: typeof import("@formio/core/lib/utils/formUtil").isSelectResourceWithObjectValue;
|
61
|
+
compareSelectResourceWithObjectTypeValues: typeof import("@formio/core/lib/utils/formUtil").compareSelectResourceWithObjectTypeValues;
|
62
|
+
getItemTemplateKeys: typeof import("@formio/core/lib/utils/formUtil").getItemTemplateKeys;
|
63
|
+
evaluate(func: string | object | Function, args: any, ret: string, interpolate: boolean, options?: import("@formio/core").EvaluatorOptions): any;
|
64
|
+
getRandomComponentId(): string;
|
65
|
+
getPropertyValue(style: CSSStyleDeclaration, prop: string): number;
|
66
|
+
getElementRect(element: HTMLElement): {
|
67
|
+
x: number;
|
68
|
+
y: number;
|
69
|
+
width: number;
|
70
|
+
height: number;
|
71
|
+
};
|
72
|
+
getScriptPlugin(property: string): any;
|
73
|
+
boolValue(value: string | boolean): boolean;
|
74
|
+
isMongoId(text: string): boolean;
|
75
|
+
checkCalculated(component: import("@formio/core").Component, submission: import("@formio/core").Submission, rowData: any): void;
|
76
|
+
checkSimpleConditional(component: any, condition: any, row: any, data: any, instance: any): boolean;
|
77
|
+
checkCustomConditional(component: import("@formio/core").Component, custom: string, row: any, data: any, form: import("@formio/core").Form, variable: string, onError: any, instance: any): any;
|
78
|
+
checkJsonConditional(component: import("@formio/core").Component, json: import("@formio/core").JSONConditional, row: any, data: any, form: import("@formio/core").Form, onError: any): boolean;
|
79
|
+
checkCondition(component: import("@formio/core").Component, row: any, data: any, form: import("@formio/core").Form, instance: any): boolean;
|
80
|
+
checkTrigger(component: import("@formio/core").Component, trigger: any, row: import("@formio/core").DataObject, data: import("@formio/core").DataObject, form: import("@formio/core").Form, instance: any): boolean;
|
81
|
+
setActionProperty(component: import("@formio/core").Component, action: any, result: string, row: import("@formio/core").DataObject, data: import("@formio/core").DataObject, instance: any): import("@formio/core").Component;
|
82
|
+
removeHTML(str: string): string;
|
83
|
+
unescapeHTML(str: string): string;
|
84
|
+
convertStringToHTMLElement(str: string, selector: string): HTMLElement;
|
85
|
+
getDateSetting(date: string | Date): import("dayjs").Dayjs | null;
|
86
|
+
isValidDate(date: string | Date): boolean;
|
87
|
+
currentTimezone(): string;
|
88
|
+
offsetDate(date: Date, timezone: string): {
|
89
|
+
date: Date;
|
90
|
+
abbr: string;
|
91
|
+
};
|
92
|
+
shouldHandleTimezone(timezone: string): boolean;
|
93
|
+
dayjsDate(value: string | Date, format: string, timezone: string, options: object): import("dayjs").Dayjs;
|
94
|
+
formatDate(value: string | Date, format: string, timezone: string, flatPickrInputFormat: string): string;
|
95
|
+
formatOffset(formatFn: Function, date: string | Date, format: string, timezone: string): string;
|
96
|
+
getLocaleDateFormatInfo(locale: Intl.LocalesArgument): object;
|
97
|
+
convertFormatToFlatpickr(format: string): string;
|
98
|
+
convertFormatToDayjs(format: string): string;
|
99
|
+
convertFormatToMask(format: string): string;
|
100
|
+
getInputMask(mask: string, placeholderChar: string): any[];
|
101
|
+
unmaskValue(value: string, mask: string, placeholderChar: string): string;
|
102
|
+
matchInputMask(value: string, inputMask: string): boolean;
|
103
|
+
getNumberSeparators(lang?: string): {
|
104
|
+
delimiter: string;
|
105
|
+
decimalSeparator: string;
|
106
|
+
};
|
107
|
+
getNumberDecimalLimit(component: import("@formio/core").Component, defaultLimit: number): number;
|
108
|
+
getCurrencyAffixes({ currency, decimalLimit, decimalSeparator, lang, }: {
|
109
|
+
currency: string;
|
110
|
+
decimalLimit: number;
|
111
|
+
decimalSeparator: string;
|
112
|
+
lang: string;
|
113
|
+
}): {
|
114
|
+
prefix: string;
|
115
|
+
suffix: string;
|
116
|
+
};
|
117
|
+
fieldData(data: import("@formio/core").DataObject, component: import("@formio/core").Component): any;
|
118
|
+
delay(fn: Function, delay?: number, ...args: any[]): any;
|
119
|
+
iterateKey(key: string): string;
|
120
|
+
uniqueKey(map: Record<string, string>, base: string): string;
|
121
|
+
bootstrapVersion(options: {
|
122
|
+
bootstrap: string;
|
123
|
+
}): number;
|
124
|
+
unfold(e: any): any;
|
125
|
+
withSwitch(a: any, b: any): Functions[];
|
126
|
+
observeOverload(callback: Function, options?: {
|
127
|
+
limit: number;
|
128
|
+
delay: number;
|
129
|
+
}): Function;
|
130
|
+
getContextComponents(context: any, excludeNested: boolean, excludedTypes?: string[]): any[];
|
131
|
+
getContextButtons(context: any): any[];
|
132
|
+
translateHTMLTemplate(template: string, translate: Function): string;
|
133
|
+
sanitize(string: string, options: any): string;
|
134
|
+
fastCloneDeep(obj: any): any;
|
135
|
+
isInputComponent(componentJson: import("@formio/core").Component): bool;
|
136
|
+
getArrayFromComponentPath(pathStr: string): Arryay<number>;
|
137
|
+
isChildOf(child: any, parent: any): boolean;
|
138
|
+
getStringFromComponentPath(path: number[]): string;
|
139
|
+
round(number: number, precision: number): string;
|
140
|
+
getIEBrowserVersion(): number | null;
|
141
|
+
getBrowserInfo(): object;
|
142
|
+
getComponentPathWithoutIndicies(path?: string): string;
|
143
|
+
getDataParentComponent(componentInstance: Component): any;
|
144
|
+
isPromise(value: any): boolean;
|
145
|
+
getFocusableElements(element: HTMLElement): NodeList<HTMLElement>;
|
146
|
+
getComponentSavedTypes(fullSchema: import("@formio/core").Component): string[] | null;
|
147
|
+
hasEncodedTimezone(value: string): boolean;
|
148
|
+
firstNonNil: any;
|
149
|
+
componentValueTypes: {
|
150
|
+
number: string;
|
151
|
+
string: string;
|
152
|
+
boolean: string;
|
153
|
+
array: string;
|
154
|
+
object: string;
|
155
|
+
date: string;
|
156
|
+
any: string;
|
157
|
+
};
|
158
|
+
interpolateErrors: (component: Component, errors: FieldError[], interpolateFn: Function) => [];
|
159
|
+
};
|
160
|
+
import { Evaluator } from './Evaluator';
|
161
|
+
import { registerEvaluator } from './Evaluator';
|
162
|
+
export { FormioUtils as Utils, Evaluator, registerEvaluator };
|
package/lib/mjs/utils/index.js
CHANGED
@@ -1,6 +1,16 @@
|
|
1
|
-
import * as
|
1
|
+
import * as utils from './utils';
|
2
|
+
import * as formUtils from './formUtils';
|
3
|
+
import { Evaluator, registerEvaluator } from './Evaluator';
|
4
|
+
const FormioUtils = {
|
5
|
+
...utils,
|
6
|
+
...formUtils,
|
7
|
+
Evaluator,
|
8
|
+
};
|
2
9
|
if (typeof global === 'object') {
|
3
10
|
global.FormioUtils = FormioUtils;
|
4
11
|
}
|
5
12
|
export { FormioUtils as Utils };
|
13
|
+
export { Evaluator, registerEvaluator };
|
14
|
+
export * from './utils';
|
15
|
+
export * from './formUtils';
|
6
16
|
export default FormioUtils;
|
package/lib/mjs/utils/utils.d.ts
CHANGED
@@ -164,9 +164,9 @@ export function guid(): string;
|
|
164
164
|
/**
|
165
165
|
* Return a translated date setting.
|
166
166
|
* @param {string|Date} date - The date to translate.
|
167
|
-
* @returns {(null|
|
167
|
+
* @returns {(null|dayjs.Dayjs)} - The translated date.
|
168
168
|
*/
|
169
|
-
export function getDateSetting(date: string | Date): (null |
|
169
|
+
export function getDateSetting(date: string | Date): (null | dayjs.Dayjs);
|
170
170
|
/**
|
171
171
|
* Returns true if the date is a valid date. False otherwise.
|
172
172
|
* @param {Date|string} date - The date to check for validity.
|
@@ -182,56 +182,45 @@ export function currentTimezone(): string;
|
|
182
182
|
* Get an offset date provided a date object and timezone object.
|
183
183
|
* @param {Date} date - The date to offset.
|
184
184
|
* @param {string} timezone - The timezone to offset the date to.
|
185
|
-
* @returns {Date} - The offset date.
|
185
|
+
* @returns {{date: Date, abbr: string}} - The offset date.
|
186
186
|
*/
|
187
|
-
export function offsetDate(date: Date, timezone: string):
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
*/
|
192
|
-
export function zonesLoaded(): boolean;
|
187
|
+
export function offsetDate(date: Date, timezone: string): {
|
188
|
+
date: Date;
|
189
|
+
abbr: string;
|
190
|
+
};
|
193
191
|
/**
|
194
|
-
* Returns if we should
|
192
|
+
* Returns if we should handle a timezone difference.
|
195
193
|
* @param {string} timezone - The timezone to check if we should load the zones.
|
196
|
-
* @returns {boolean} - TRUE if we should
|
197
|
-
*/
|
198
|
-
export function shouldLoadZones(timezone: string): boolean;
|
199
|
-
/**
|
200
|
-
* Externally load the timezone data.
|
201
|
-
* @param {string} url - The URL to load the timezone data from.
|
202
|
-
* @param {string} timezone - The timezone to load.
|
203
|
-
* @returns {Promise<any> | *} - Resolves when the zones for this timezone are loaded.
|
194
|
+
* @returns {boolean} - TRUE if we should handle timezones; FALSE otherwise.
|
204
195
|
*/
|
205
|
-
export function
|
196
|
+
export function shouldHandleTimezone(timezone: string): boolean;
|
206
197
|
/**
|
207
|
-
* Get the
|
208
|
-
* @param {string|Date} value - The value to convert into a
|
198
|
+
* Get the Dayjs date object for translating dates with timezones.
|
199
|
+
* @param {string|Date} value - The value to convert into a dayjs date.
|
209
200
|
* @param {string} format - The format to convert the date to.
|
210
201
|
* @param {string} timezone - The timezone to convert the date to.
|
211
202
|
* @param {object} options - The options object
|
212
|
-
* @returns {
|
203
|
+
* @returns {dayjs.Dayjs} - The dayjs date object.
|
213
204
|
*/
|
214
|
-
export function
|
205
|
+
export function dayjsDate(value: string | Date, format: string, timezone: string, options: object): dayjs.Dayjs;
|
215
206
|
/**
|
216
207
|
* Format a date provided a value, format, and timezone object.
|
217
|
-
* @param {string} timezonesUrl - The URL to load the timezone data from.
|
218
208
|
* @param {string|Date} value - The value to format.
|
219
209
|
* @param {string} format - The format to format the date to.
|
220
210
|
* @param {string} timezone - The timezone to format the date to.
|
221
211
|
* @param {string} flatPickrInputFormat - The format to use for flatpickr input.
|
222
212
|
* @returns {string} - The formatted date.
|
223
213
|
*/
|
224
|
-
export function formatDate(
|
214
|
+
export function formatDate(value: string | Date, format: string, timezone: string, flatPickrInputFormat: string): string;
|
225
215
|
/**
|
226
216
|
* Pass a format function to format within a timezone.
|
227
|
-
* @param {string} timezonesUrl - The URL to load the timezone data from.
|
228
217
|
* @param {Function} formatFn - The format function to use.
|
229
218
|
* @param {Date|string} date - The date to format.
|
230
219
|
* @param {string} format - The format to format the date to.
|
231
220
|
* @param {string} timezone - The timezone to format the date to.
|
232
221
|
* @returns {string} - The formatted date.
|
233
222
|
*/
|
234
|
-
export function formatOffset(
|
223
|
+
export function formatOffset(formatFn: Function, date: Date | string, format: string, timezone: string): string;
|
235
224
|
/**
|
236
225
|
* Returns the local date format information.
|
237
226
|
* @param {Intl.LocalesArgument} locale - The locale to get the date format for.
|
@@ -249,7 +238,7 @@ export function convertFormatToFlatpickr(format: string): string;
|
|
249
238
|
* @param {string} format - The format to convert.
|
250
239
|
* @returns {string} - The converted format.
|
251
240
|
*/
|
252
|
-
export function
|
241
|
+
export function convertFormatToDayjs(format: string): string;
|
253
242
|
/**
|
254
243
|
* Convert the format from the angular-datepicker module to mask format.
|
255
244
|
* @param {string} format - The format to convert.
|
@@ -499,7 +488,6 @@ export function getComponentSavedTypes(fullSchema: import('@formio/core').Compon
|
|
499
488
|
* @returns {boolean} if value has encoded timezone
|
500
489
|
*/
|
501
490
|
export function hasEncodedTimezone(value: string): boolean;
|
502
|
-
export * from "./formUtils";
|
503
491
|
/**
|
504
492
|
* Map values through unfold and return first non-nil value.
|
505
493
|
* @param {Array<T>} collection - The collection to map through unfold.;
|
@@ -516,7 +504,4 @@ export namespace componentValueTypes {
|
|
516
504
|
let any: string;
|
517
505
|
}
|
518
506
|
export function interpolateErrors(component: Component, errors: FieldError[], interpolateFn: Function): [];
|
519
|
-
import
|
520
|
-
import { Evaluator } from './Evaluator';
|
521
|
-
export const interpolate: typeof Evaluator.interpolate;
|
522
|
-
export { jsonLogic, ConditionOperators, moment, Evaluator, _ };
|
507
|
+
import dayjs from "dayjs";
|
package/lib/mjs/utils/utils.js
CHANGED
@@ -1,31 +1,19 @@
|
|
1
1
|
/* global jQuery */
|
2
2
|
import _ from 'lodash';
|
3
|
-
import jsonLogic from 'json-logic-js';
|
4
3
|
import moment from 'moment-timezone/moment-timezone';
|
5
4
|
import jtz from 'jstimezonedetect';
|
6
|
-
import { lodashOperators } from './jsonlogic/operators';
|
7
5
|
import dompurify from 'dompurify';
|
6
|
+
import dayjs from "dayjs";
|
7
|
+
import utc from 'dayjs/plugin/utc';
|
8
|
+
import timezone from 'dayjs/plugin/timezone';
|
9
|
+
import advancedFormat from 'dayjs/plugin/advancedFormat';
|
10
|
+
import { jsonLogic, convertShowToBoolean } from '@formio/core';
|
8
11
|
import { getValue } from './formUtils';
|
9
12
|
import { Evaluator } from './Evaluator';
|
10
13
|
import ConditionOperators from './conditionOperators';
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
// Configure JsonLogic
|
15
|
-
lodashOperators.forEach((name) => jsonLogic.add_operation(`_${name}`, _[name]));
|
16
|
-
// Retrieve Any Date
|
17
|
-
jsonLogic.add_operation('getDate', (date) => {
|
18
|
-
return moment(date).toISOString();
|
19
|
-
});
|
20
|
-
// Set Relative Minimum Date
|
21
|
-
jsonLogic.add_operation('relativeMinDate', (relativeMinDate) => {
|
22
|
-
return moment().subtract(relativeMinDate, 'days').toISOString();
|
23
|
-
});
|
24
|
-
// Set Relative Maximum Date
|
25
|
-
jsonLogic.add_operation('relativeMaxDate', (relativeMaxDate) => {
|
26
|
-
return moment().add(relativeMaxDate, 'days').toISOString();
|
27
|
-
});
|
28
|
-
export { jsonLogic, ConditionOperators, moment };
|
14
|
+
dayjs.extend(timezone);
|
15
|
+
dayjs.extend(advancedFormat);
|
16
|
+
dayjs.extend(utc);
|
29
17
|
/**
|
30
18
|
* Evaluate a method.
|
31
19
|
* @param {Function|string|object} func - The function to evaluate.
|
@@ -505,7 +493,7 @@ export function guid() {
|
|
505
493
|
/**
|
506
494
|
* Return a translated date setting.
|
507
495
|
* @param {string|Date} date - The date to translate.
|
508
|
-
* @returns {(null|
|
496
|
+
* @returns {(null|dayjs.Dayjs)} - The translated date.
|
509
497
|
*/
|
510
498
|
export function getDateSetting(date) {
|
511
499
|
if (_.isNil(date) || _.isNaN(date) || date === '') {
|
@@ -525,13 +513,13 @@ export function getDateSetting(date) {
|
|
525
513
|
try {
|
526
514
|
const value = Evaluator.evaluator(`return ${date};`, 'moment')(moment);
|
527
515
|
if (typeof value === 'string') {
|
528
|
-
dateSetting =
|
516
|
+
dateSetting = dayjs(value);
|
529
517
|
}
|
530
518
|
else if (typeof value.toDate === 'function') {
|
531
|
-
dateSetting =
|
519
|
+
dateSetting = dayjs(value.toDate().toUTCString());
|
532
520
|
}
|
533
521
|
else if (value instanceof Date) {
|
534
|
-
dateSetting =
|
522
|
+
dateSetting = dayjs(value);
|
535
523
|
}
|
536
524
|
}
|
537
525
|
catch (e) {
|
@@ -559,17 +547,17 @@ export function isValidDate(date) {
|
|
559
547
|
* @returns {string} - The current timezone.
|
560
548
|
*/
|
561
549
|
export function currentTimezone() {
|
562
|
-
if (
|
563
|
-
return
|
550
|
+
if (dayjs.currentTimezone) {
|
551
|
+
return dayjs.currentTimezone;
|
564
552
|
}
|
565
|
-
|
566
|
-
return
|
553
|
+
dayjs.currentTimezone = jtz.determine().name();
|
554
|
+
return dayjs.currentTimezone;
|
567
555
|
}
|
568
556
|
/**
|
569
557
|
* Get an offset date provided a date object and timezone object.
|
570
558
|
* @param {Date} date - The date to offset.
|
571
559
|
* @param {string} timezone - The timezone to offset the date to.
|
572
|
-
* @returns {Date} - The offset date.
|
560
|
+
* @returns {{date: Date, abbr: string}} - The offset date.
|
573
561
|
*/
|
574
562
|
export function offsetDate(date, timezone) {
|
575
563
|
if (timezone === 'UTC') {
|
@@ -578,134 +566,89 @@ export function offsetDate(date, timezone) {
|
|
578
566
|
abbr: 'UTC'
|
579
567
|
};
|
580
568
|
}
|
581
|
-
const dateMoment =
|
569
|
+
const dateMoment = dayjs(date).tz(timezone);
|
582
570
|
return {
|
583
571
|
date: new Date(date.getTime() + ((dateMoment.utcOffset() + date.getTimezoneOffset()) * 60000)),
|
584
572
|
abbr: dateMoment.format('z')
|
585
573
|
};
|
586
574
|
}
|
587
575
|
/**
|
588
|
-
* Returns if
|
589
|
-
* @returns {boolean} - TRUE if the zones are loaded; FALSE otherwise.
|
590
|
-
*/
|
591
|
-
export function zonesLoaded() {
|
592
|
-
return moment.zonesLoaded;
|
593
|
-
}
|
594
|
-
/**
|
595
|
-
* Returns if we should load the zones.
|
576
|
+
* Returns if we should handle a timezone difference.
|
596
577
|
* @param {string} timezone - The timezone to check if we should load the zones.
|
597
|
-
* @returns {boolean} - TRUE if we should
|
578
|
+
* @returns {boolean} - TRUE if we should handle timezones; FALSE otherwise.
|
598
579
|
*/
|
599
|
-
export function
|
600
|
-
|
601
|
-
return false;
|
602
|
-
}
|
603
|
-
return true;
|
580
|
+
export function shouldHandleTimezone(timezone) {
|
581
|
+
return !(timezone === currentTimezone() || timezone === 'UTC');
|
604
582
|
}
|
605
583
|
/**
|
606
|
-
*
|
607
|
-
* @param {string}
|
608
|
-
* @param {string} timezone - The timezone to load.
|
609
|
-
* @returns {Promise<any> | *} - Resolves when the zones for this timezone are loaded.
|
610
|
-
*/
|
611
|
-
export function loadZones(url, timezone) {
|
612
|
-
if (timezone && !shouldLoadZones(timezone)) {
|
613
|
-
// Return non-resolving promise.
|
614
|
-
return new Promise(_.noop);
|
615
|
-
}
|
616
|
-
if (moment.zonesPromise) {
|
617
|
-
return moment.zonesPromise;
|
618
|
-
}
|
619
|
-
return moment.zonesPromise = fetch(url)
|
620
|
-
.then(resp => resp.json().then(zones => {
|
621
|
-
moment.tz.load(zones);
|
622
|
-
moment.zonesLoaded = true;
|
623
|
-
// Trigger a global event that the timezones have finished loading.
|
624
|
-
if (document && document.createEvent && document.body && document.body.dispatchEvent) {
|
625
|
-
var event = document.createEvent('Event');
|
626
|
-
event.initEvent('zonesLoaded', true, true);
|
627
|
-
document.body.dispatchEvent(event);
|
628
|
-
}
|
629
|
-
}));
|
630
|
-
}
|
631
|
-
/**
|
632
|
-
* Get the moment date object for translating dates with timezones.
|
633
|
-
* @param {string|Date} value - The value to convert into a moment date.
|
584
|
+
* Get the Dayjs date object for translating dates with timezones.
|
585
|
+
* @param {string|Date} value - The value to convert into a dayjs date.
|
634
586
|
* @param {string} format - The format to convert the date to.
|
635
587
|
* @param {string} timezone - The timezone to convert the date to.
|
636
588
|
* @param {object} options - The options object
|
637
|
-
* @returns {
|
589
|
+
* @returns {dayjs.Dayjs} - The dayjs date object.
|
638
590
|
*/
|
639
|
-
export function
|
640
|
-
const
|
591
|
+
export function dayjsDate(value, format, timezone, options) {
|
592
|
+
const dayjsDate = dayjs(value);
|
641
593
|
if (!timezone) {
|
642
|
-
return
|
594
|
+
return dayjsDate;
|
643
595
|
}
|
644
596
|
if (timezone === 'UTC') {
|
645
597
|
timezone = 'Etc/UTC';
|
646
598
|
}
|
647
|
-
if ((timezone !== currentTimezone() || (format && format.match(/\s(z$|z\s)/))) && (
|
648
|
-
return
|
599
|
+
if ((timezone !== currentTimezone() || (format && format.match(/\s(z$|z\s)/))) && (shouldHandleTimezone(timezone) || options?.email)) {
|
600
|
+
return dayjsDate.tz(timezone);
|
649
601
|
}
|
650
|
-
return
|
602
|
+
return dayjsDate;
|
651
603
|
}
|
652
604
|
/**
|
653
605
|
* Format a date provided a value, format, and timezone object.
|
654
|
-
* @param {string} timezonesUrl - The URL to load the timezone data from.
|
655
606
|
* @param {string|Date} value - The value to format.
|
656
607
|
* @param {string} format - The format to format the date to.
|
657
608
|
* @param {string} timezone - The timezone to format the date to.
|
658
609
|
* @param {string} flatPickrInputFormat - The format to use for flatpickr input.
|
659
610
|
* @returns {string} - The formatted date.
|
660
611
|
*/
|
661
|
-
export function formatDate(
|
662
|
-
const
|
612
|
+
export function formatDate(value, format, timezone, flatPickrInputFormat) {
|
613
|
+
const dayjsDate = dayjs(value, flatPickrInputFormat || undefined);
|
663
614
|
if (timezone === currentTimezone()) {
|
664
615
|
// See if our format contains a "z" timezone character.
|
665
616
|
if (format.match(/\s(z$|z\s)/)) {
|
666
|
-
|
667
|
-
|
668
|
-
return momentDate.tz(timezone).format(convertFormatToMoment(format));
|
617
|
+
if (shouldHandleTimezone(timezone)) {
|
618
|
+
return dayjsDate.tz(timezone).format(convertFormatToDayjs(format));
|
669
619
|
}
|
670
620
|
else {
|
671
|
-
return
|
621
|
+
return dayjsDate.format(convertFormatToDayjs(format.replace(/\s(z$|z\s)/, '')));
|
672
622
|
}
|
673
623
|
}
|
674
624
|
// Return the standard format.
|
675
|
-
return
|
625
|
+
return dayjsDate.format(convertFormatToDayjs(format));
|
676
626
|
}
|
677
627
|
if (timezone === 'UTC') {
|
678
|
-
const offset = offsetDate(
|
679
|
-
return `${
|
628
|
+
const offset = offsetDate(dayjsDate.toDate(), 'UTC');
|
629
|
+
return `${dayjs(offset.date).format(convertFormatToDayjs(format))} UTC`;
|
680
630
|
}
|
681
|
-
|
682
|
-
|
683
|
-
if (moment.zonesLoaded && timezone) {
|
684
|
-
return momentDate.tz(timezone).format(`${convertFormatToMoment(format)} z`);
|
685
|
-
}
|
686
|
-
else {
|
687
|
-
return momentDate.format(convertFormatToMoment(format));
|
631
|
+
if (shouldHandleTimezone(timezone)) {
|
632
|
+
return dayjsDate.tz(timezone).format(`${convertFormatToDayjs(format)} z`);
|
688
633
|
}
|
634
|
+
return dayjsDate.format(convertFormatToDayjs(format));
|
689
635
|
}
|
690
636
|
/**
|
691
637
|
* Pass a format function to format within a timezone.
|
692
|
-
* @param {string} timezonesUrl - The URL to load the timezone data from.
|
693
638
|
* @param {Function} formatFn - The format function to use.
|
694
639
|
* @param {Date|string} date - The date to format.
|
695
640
|
* @param {string} format - The format to format the date to.
|
696
641
|
* @param {string} timezone - The timezone to format the date to.
|
697
642
|
* @returns {string} - The formatted date.
|
698
643
|
*/
|
699
|
-
export function formatOffset(
|
644
|
+
export function formatOffset(formatFn, date, format, timezone) {
|
700
645
|
if (timezone === currentTimezone()) {
|
701
646
|
return formatFn(date, format);
|
702
647
|
}
|
703
648
|
if (timezone === 'UTC') {
|
704
649
|
return `${formatFn(offsetDate(date, 'UTC').date, format)} UTC`;
|
705
650
|
}
|
706
|
-
|
707
|
-
loadZones(timezonesUrl);
|
708
|
-
if (moment.zonesLoaded) {
|
651
|
+
if (shouldHandleTimezone(timezone)) {
|
709
652
|
const offset = offsetDate(date, timezone);
|
710
653
|
return `${formatFn(offset.date, format)} ${offset.abbr}`;
|
711
654
|
}
|
@@ -762,7 +705,7 @@ export function convertFormatToFlatpickr(format) {
|
|
762
705
|
* @param {string} format - The format to convert.
|
763
706
|
* @returns {string} - The converted format.
|
764
707
|
*/
|
765
|
-
export function
|
708
|
+
export function convertFormatToDayjs(format) {
|
766
709
|
return format
|
767
710
|
// Year conversion.
|
768
711
|
.replace(/y/g, 'Y')
|
@@ -1311,7 +1254,6 @@ export function sanitize(string, options) {
|
|
1311
1254
|
export function fastCloneDeep(obj) {
|
1312
1255
|
return obj ? JSON.parse(JSON.stringify(obj)) : obj;
|
1313
1256
|
}
|
1314
|
-
export { Evaluator, interpolate };
|
1315
1257
|
/**
|
1316
1258
|
* Returns if the component is an input component.
|
1317
1259
|
* @param {import('@formio/core').Component} componentJson - The JSON of a component.
|
@@ -1513,8 +1455,6 @@ export function getFocusableElements(element) {
|
|
1513
1455
|
textarea:not([disabled]), button:not([disabled]), [href]`;
|
1514
1456
|
return element.querySelectorAll(focusableSelector);
|
1515
1457
|
}
|
1516
|
-
// Export lodash to save space with other libraries.
|
1517
|
-
export { _ };
|
1518
1458
|
export const componentValueTypes = {
|
1519
1459
|
number: 'number',
|
1520
1460
|
string: 'string',
|
@@ -22,13 +22,6 @@ export default class CalendarWidget extends InputWidget {
|
|
22
22
|
minDate: string;
|
23
23
|
maxDate: string;
|
24
24
|
};
|
25
|
-
zoneLoading: boolean;
|
26
|
-
timezonesUrl: string;
|
27
|
-
/**
|
28
|
-
* Load the timezones.
|
29
|
-
* @returns {boolean} TRUE if the zones are loading, FALSE otherwise.
|
30
|
-
*/
|
31
|
-
loadZones(): boolean;
|
32
25
|
attach(input: any): Promise<any>;
|
33
26
|
defaultFormat: {
|
34
27
|
date: string;
|