@formio/js 5.0.0-dev.5821.2452432 → 5.0.0-dev.5822.ae2ec5b

package/lib/cjs/CDN.d.ts

@@ -15,7 +15,6 @@ declare class CDN {
         ckeditor: string;
         dragula: string;
         flatpickr: string;
-        'flatpickr-formio': string;
         'font-awesome': string;
         grid: string;
         'moment-timezone': string;

package/lib/cjs/CDN.js

@@ -18,8 +18,7 @@ class CDN {
             'bootstrap-icons': '1.11.1',
             'ckeditor': '19.0.0',
             'dragula': '3.7.3',
-            'flatpickr': '4.6.8',
-            'flatpickr-formio': '4.6.13-formio.3',
+            'flatpickr': '4.6.13',
             'font-awesome': '4.7.0',
             'grid': 'latest',
             'moment-timezone': 'latest',

package/lib/cjs/components/_classes/list/ListComponent.d.ts

@@ -1,7 +1,6 @@
 export default class ListComponent extends Field {
     get isSelectURL(): boolean;
     get selectData(): any;
-    get dataReady(): any;
     get shouldLoad(): boolean;
     getTemplateKeys(): void;
     templateKeys: string[] | undefined;
@@ -11,9 +10,6 @@ export default class ListComponent extends Field {
     loadItems(): void;
     getOptionTemplate(data: any, value: any, index: any): any;
     itemTemplate(data: any, value: any, index: any): any;
-    set itemsLoaded(promise: any);
-    get itemsLoaded(): any;
-    _itemsLoaded: any;
     handleLoadingError(err: any): void;
     loading: boolean | undefined;
     networkError: boolean | undefined;

package/lib/cjs/components/_classes/list/ListComponent.js

@@ -26,16 +26,6 @@ class ListComponent extends Field_1.default {
         const selectData = lodash_1.default.get(this.root, 'submission.metadata.selectData', {});
         return lodash_1.default.get(selectData, this.path);
     }
-    get dataReady() {
-        // If the root submission has been set, and we are still not attached, then assume
-        // that our data is ready.
-        if (this.root &&
-            this.root.submissionSet &&
-            !this.attached) {
-            return Promise.resolve();
-        }
-        return this.itemsLoaded;
-    }
     get shouldLoad() {
         if (this.loadingError) {
             return false;
@@ -122,12 +112,6 @@ class ListComponent extends Field_1.default {
             return this.sanitize(JSON.stringify(data), this.shouldSanitizeValue);
         }
     }
-    get itemsLoaded() {
-        return this._itemsLoaded || Promise.resolve();
-    }
-    set itemsLoaded(promise) {
-        this._itemsLoaded = promise;
-    }
     handleLoadingError(err) {
         this.loading = false;
         if (err.networkError) {

package/lib/cjs/components/radio/Radio.d.ts

@@ -23,10 +23,10 @@ export default class RadioComponent extends ListComponent {
     get listData(): any;
     templateData: {} | undefined;
     triggerUpdate: ((...args: any[]) => any) | undefined;
+    itemsLoaded: Promise<any> | undefined;
     itemsLoadedResolve: ((value: any) => void) | undefined;
     optionsLoaded: boolean | undefined;
     loadedOptions: any[] | undefined;
-    beforeSubmit(): Promise<any>;
     render(): import("../_classes/field/Field").default;
     attach(element: any): Promise<void>;
     detach(element: any): void;

package/lib/cjs/components/radio/Radio.js

@@ -126,23 +126,12 @@ class RadioComponent extends ListComponent_1.default {
         this.itemsLoaded = new Promise((resolve) => {
             this.itemsLoadedResolve = resolve;
         });
-        this.optionsLoaded = !this.component.dataSrc || this.component.dataSrc === 'values';
+        this.optionsLoaded = false;
         this.loadedOptions = [];
-        if (!this.visible) {
-            this.itemsLoadedResolve();
-        }
         // Get the template keys for this radio component.
         this.getTemplateKeys();
     }
-    beforeSubmit() {
-        return new Promise(res => {
-            this.dataReady.then(() => res(true));
-        });
-    }
     render() {
-        if (!this.optionsLoaded) {
-            return super.render(this.renderTemplate('loader'));
-        }
         return super.render(this.renderTemplate('radio', {
             input: this.inputInfo,
             inline: this.component.inline,
@@ -253,22 +242,12 @@ class RadioComponent extends ListComponent_1.default {
             this.refs.input[index].checked = (inputValue === value.toString());
         }
     }
-    get shouldLoad() {
-        // do not load options if the value is empty in readOnly and we have options available in metadata
-        if (this.options.readOnly && this.isEmpty() && this.listData) {
-            return false;
-        }
-        return super.shouldLoad;
-    }
     loadItems(url, search, headers, options, method, body) {
         if (this.optionsLoaded) {
-            this.itemsLoadedResolve();
             return;
         }
         if (!this.shouldLoad && this.listData) {
             this.loadItemsFromMetadata();
-            this.itemsLoadedResolve();
-            this.optionsLoaded = true;
             return;
         }
         // Ensure we have a method and remove any body if method is get
@@ -299,7 +278,6 @@ class RadioComponent extends ListComponent_1.default {
             this.redraw();
         })
             .catch((err) => {
-            this.optionsLoaded = true;
             this.handleLoadingError(err);
         });
     }
@@ -340,7 +318,6 @@ class RadioComponent extends ListComponent_1.default {
             }
             lodash_1.default.set(submission.metadata.listData, this.path, listData);
         }
-        this.itemsLoadedResolve();
     }
     setSelectedClasses() {
         if (this.refs.wrapper) {

package/lib/cjs/components/select/Select.d.ts

@@ -54,6 +54,8 @@ export default class SelectComponent extends ListComponent {
     static savedValueTypes(schema: any): any[];
     templateData: {} | undefined;
     triggerUpdate: ((...args: any[]) => any) | undefined;
+    set itemsLoaded(promise: any);
+    get itemsLoaded(): any;
     itemsLoadedResolve: ((value: any) => void) | undefined;
     isFromSearch: boolean | undefined;
     searchServerCount: any;
@@ -63,6 +65,7 @@ export default class SelectComponent extends ListComponent {
     defaultDownloadedResources: any;
     activated: boolean | undefined;
     shouldPositionDropdown: any;
+    get dataReady(): any;
     get emptyValue(): {};
     get valueProperty(): any;
     get inputInfo(): any;
@@ -138,6 +141,7 @@ export default class SelectComponent extends ListComponent {
     lazyLoadInit: boolean | undefined;
     isInitApiCallNeeded(hasValue: any): any;
     setChoicesValue(value: any, hasPreviousValue: any, flags?: {}): void;
+    _itemsLoaded: any;
     validateValueAvailability(setting: any, value: any): boolean;
     /**
      * Performs required transformations on the initial value to use in selectOptions

package/lib/cjs/components/select/Select.js

@@ -150,6 +150,16 @@ class SelectComponent extends ListComponent_1.default {
         // Get the template keys for this select component.
         this.getTemplateKeys();
     }
+    get dataReady() {
+        // If the root submission has been set, and we are still not attached, then assume
+        // that our data is ready.
+        if (this.root &&
+            this.root.submissionSet &&
+            !this.attached) {
+            return Promise.resolve();
+        }
+        return this.itemsLoaded;
+    }
     get defaultSchema() {
         return SelectComponent.schema();
     }
@@ -1359,6 +1369,12 @@ class SelectComponent extends ListComponent_1.default {
             }
         }
     }
+    get itemsLoaded() {
+        return this._itemsLoaded || Promise.resolve();
+    }
+    set itemsLoaded(promise) {
+        this._itemsLoaded = promise;
+    }
     validateValueAvailability(setting, value) {
         if (!(0, utils_1.boolValue)(setting) || !value) {
             return true;

package/lib/cjs/widgets/CalendarWidget.js

@@ -124,7 +124,7 @@ class CalendarWidget extends InputWidget_1.default {
             }
         };
         Formio_1.Formio.requireLibrary('flatpickr-css', 'flatpickr', [
-            { type: 'styles', src: `${Formio_1.Formio.cdn['flatpickr-formio']}/flatpickr.min.css` }
+            { type: 'styles', src: `${Formio_1.Formio.cdn['flatpickr']}/flatpickr.min.css` }
         ], true);
         if (this.component.shortcutButtons) {
             this.component.shortcutButtons = this.component.shortcutButtons.filter((btn) => btn.label && btn.onClick);
@@ -142,7 +142,7 @@ class CalendarWidget extends InputWidget_1.default {
             }
         })
             .then((ShortcutButtonsPlugin) => {
-            return Formio_1.Formio.requireLibrary('flatpickr', 'flatpickr', `${Formio_1.Formio.cdn['flatpickr-formio']}/flatpickr.min.js`, true)
+            return Formio_1.Formio.requireLibrary('flatpickr', 'flatpickr', `${Formio_1.Formio.cdn['flatpickr']}/flatpickr.min.js`, true)
                 .then((Flatpickr) => {
                 var _a;
                 if (((_a = this.component.shortcutButtons) === null || _a === void 0 ? void 0 : _a.length) && ShortcutButtonsPlugin) {
@@ -152,7 +152,7 @@ class CalendarWidget extends InputWidget_1.default {
                 if (this._input) {
                     const { locale } = this.settings;
                     if (locale && locale.length >= 2 && locale !== 'en') {
-                        return Formio_1.Formio.requireLibrary(`flatpickr-${locale}`, `flatpickr-${locale}`, `${Formio_1.Formio.cdn['flatpickr-formio']}/l10n/flatpickr-${locale}.js`, true).then(() => this.initFlatpickr(Flatpickr));
+                        return Formio_1.Formio.requireLibrary(`flatpickr-${locale}`, `flatpickr.l10ns.${locale}`, `${Formio_1.Formio.cdn['flatpickr']}/l10n/${locale}.js`, true).then(() => this.initFlatpickr(Flatpickr));
                     }
                     else {
                         this.initFlatpickr(Flatpickr);

package/lib/mjs/CDN.d.ts

@@ -15,7 +15,6 @@ declare class CDN {
         ckeditor: string;
         dragula: string;
         flatpickr: string;
-        'flatpickr-formio': string;
         'font-awesome': string;
         grid: string;
         'moment-timezone': string;

package/lib/mjs/CDN.js

@@ -17,8 +17,7 @@ class CDN {
             'bootstrap-icons': '1.11.1',
             'ckeditor': '19.0.0',
             'dragula': '3.7.3',
-            'flatpickr': '4.6.8',
-            'flatpickr-formio': '4.6.13-formio.3',
+            'flatpickr': '4.6.13',
             'font-awesome': '4.7.0',
             'grid': 'latest',
             'moment-timezone': 'latest',

package/lib/mjs/components/_classes/list/ListComponent.d.ts

@@ -1,7 +1,6 @@
 export default class ListComponent extends Field {
     get isSelectURL(): boolean;
     get selectData(): any;
-    get dataReady(): any;
     get shouldLoad(): boolean;
     getTemplateKeys(): void;
     templateKeys: string[] | undefined;
@@ -11,9 +10,6 @@ export default class ListComponent extends Field {
     loadItems(): void;
     getOptionTemplate(data: any, value: any, index: any): any;
     itemTemplate(data: any, value: any, index: any): any;
-    set itemsLoaded(promise: any);
-    get itemsLoaded(): any;
-    _itemsLoaded: any;
     handleLoadingError(err: any): void;
     loading: boolean | undefined;
     networkError: boolean | undefined;

package/lib/mjs/components/_classes/list/ListComponent.js

@@ -21,16 +21,6 @@ export default class ListComponent extends Field {
         const selectData = _.get(this.root, 'submission.metadata.selectData', {});
         return _.get(selectData, this.path);
     }
-    get dataReady() {
-        // If the root submission has been set, and we are still not attached, then assume
-        // that our data is ready.
-        if (this.root &&
-            this.root.submissionSet &&
-            !this.attached) {
-            return Promise.resolve();
-        }
-        return this.itemsLoaded;
-    }
     get shouldLoad() {
         if (this.loadingError) {
             return false;
@@ -117,12 +107,6 @@ export default class ListComponent extends Field {
             return this.sanitize(JSON.stringify(data), this.shouldSanitizeValue);
         }
     }
-    get itemsLoaded() {
-        return this._itemsLoaded || Promise.resolve();
-    }
-    set itemsLoaded(promise) {
-        this._itemsLoaded = promise;
-    }
     handleLoadingError(err) {
         this.loading = false;
         if (err.networkError) {

package/lib/mjs/components/radio/Radio.d.ts

@@ -23,10 +23,10 @@ export default class RadioComponent extends ListComponent {
     get listData(): any;
     templateData: {} | undefined;
     triggerUpdate: ((...args: any[]) => any) | undefined;
+    itemsLoaded: Promise<any> | undefined;
     itemsLoadedResolve: ((value: any) => void) | undefined;
     optionsLoaded: boolean | undefined;
     loadedOptions: any[] | undefined;
-    beforeSubmit(): Promise<any>;
     render(): import("../_classes/field/Field").default;
     attach(element: any): Promise<void>;
     detach(element: any): void;

package/lib/mjs/components/radio/Radio.js

@@ -126,23 +126,12 @@ export default class RadioComponent extends ListComponent {
         this.itemsLoaded = new Promise((resolve) => {
             this.itemsLoadedResolve = resolve;
         });
-        this.optionsLoaded = !this.component.dataSrc || this.component.dataSrc === 'values';
+        this.optionsLoaded = false;
         this.loadedOptions = [];
-        if (!this.visible) {
-            this.itemsLoadedResolve();
-        }
         // Get the template keys for this radio component.
         this.getTemplateKeys();
     }
-    beforeSubmit() {
-        return new Promise(res => {
-            this.dataReady.then(() => res(true));
-        });
-    }
     render() {
-        if (!this.optionsLoaded) {
-            return super.render(this.renderTemplate('loader'));
-        }
         return super.render(this.renderTemplate('radio', {
             input: this.inputInfo,
             inline: this.component.inline,
@@ -253,22 +242,12 @@ export default class RadioComponent extends ListComponent {
             this.refs.input[index].checked = (inputValue === value.toString());
         }
     }
-    get shouldLoad() {
-        // do not load options if the value is empty in readOnly and we have options available in metadata
-        if (this.options.readOnly && this.isEmpty() && this.listData) {
-            return false;
-        }
-        return super.shouldLoad;
-    }
     loadItems(url, search, headers, options, method, body) {
         if (this.optionsLoaded) {
-            this.itemsLoadedResolve();
             return;
         }
         if (!this.shouldLoad && this.listData) {
             this.loadItemsFromMetadata();
-            this.itemsLoadedResolve();
-            this.optionsLoaded = true;
             return;
         }
         // Ensure we have a method and remove any body if method is get
@@ -299,7 +278,6 @@ export default class RadioComponent extends ListComponent {
             this.redraw();
         })
             .catch((err) => {
-            this.optionsLoaded = true;
             this.handleLoadingError(err);
         });
     }
@@ -340,7 +318,6 @@ export default class RadioComponent extends ListComponent {
             }
             _.set(submission.metadata.listData, this.path, listData);
         }
-        this.itemsLoadedResolve();
     }
     setSelectedClasses() {
         if (this.refs.wrapper) {

package/lib/mjs/components/select/Select.d.ts

@@ -54,6 +54,8 @@ export default class SelectComponent extends ListComponent {
     static savedValueTypes(schema: any): any[];
     templateData: {} | undefined;
     triggerUpdate: ((...args: any[]) => any) | undefined;
+    set itemsLoaded(promise: any);
+    get itemsLoaded(): any;
     itemsLoadedResolve: ((value: any) => void) | undefined;
     isFromSearch: boolean | undefined;
     searchServerCount: any;
@@ -63,6 +65,7 @@ export default class SelectComponent extends ListComponent {
     defaultDownloadedResources: any;
     activated: boolean | undefined;
     shouldPositionDropdown: any;
+    get dataReady(): any;
     get emptyValue(): {};
     get valueProperty(): any;
     get inputInfo(): any;
@@ -138,6 +141,7 @@ export default class SelectComponent extends ListComponent {
     lazyLoadInit: boolean | undefined;
     isInitApiCallNeeded(hasValue: any): any;
     setChoicesValue(value: any, hasPreviousValue: any, flags?: {}): void;
+    _itemsLoaded: any;
     validateValueAvailability(setting: any, value: any): boolean;
     /**
      * Performs required transformations on the initial value to use in selectOptions

package/lib/mjs/components/select/Select.js

@@ -150,6 +150,16 @@ export default class SelectComponent extends ListComponent {
         // Get the template keys for this select component.
         this.getTemplateKeys();
     }
+    get dataReady() {
+        // If the root submission has been set, and we are still not attached, then assume
+        // that our data is ready.
+        if (this.root &&
+            this.root.submissionSet &&
+            !this.attached) {
+            return Promise.resolve();
+        }
+        return this.itemsLoaded;
+    }
     get defaultSchema() {
         return SelectComponent.schema();
     }
@@ -1387,6 +1397,12 @@ export default class SelectComponent extends ListComponent {
             }
         }
     }
+    get itemsLoaded() {
+        return this._itemsLoaded || Promise.resolve();
+    }
+    set itemsLoaded(promise) {
+        this._itemsLoaded = promise;
+    }
     validateValueAvailability(setting, value) {
         if (!boolValue(setting) || !value) {
             return true;

package/lib/mjs/widgets/CalendarWidget.js

@@ -118,7 +118,7 @@ export default class CalendarWidget extends InputWidget {
             }
         };
         Formio.requireLibrary('flatpickr-css', 'flatpickr', [
-            { type: 'styles', src: `${Formio.cdn['flatpickr-formio']}/flatpickr.min.css` }
+            { type: 'styles', src: `${Formio.cdn['flatpickr']}/flatpickr.min.css` }
         ], true);
         if (this.component.shortcutButtons) {
             this.component.shortcutButtons = this.component.shortcutButtons.filter((btn) => btn.label && btn.onClick);
@@ -135,7 +135,7 @@ export default class CalendarWidget extends InputWidget {
             }
         })
             .then((ShortcutButtonsPlugin) => {
-            return Formio.requireLibrary('flatpickr', 'flatpickr', `${Formio.cdn['flatpickr-formio']}/flatpickr.min.js`, true)
+            return Formio.requireLibrary('flatpickr', 'flatpickr', `${Formio.cdn['flatpickr']}/flatpickr.min.js`, true)
                 .then((Flatpickr) => {
                 if (this.component.shortcutButtons?.length && ShortcutButtonsPlugin) {
                     this.initShortcutButtonsPlugin(ShortcutButtonsPlugin);
@@ -144,7 +144,7 @@ export default class CalendarWidget extends InputWidget {
                 if (this._input) {
                     const { locale } = this.settings;
                     if (locale && locale.length >= 2 && locale !== 'en') {
-                        return Formio.requireLibrary(`flatpickr-${locale}`, `flatpickr-${locale}`, `${Formio.cdn['flatpickr-formio']}/l10n/flatpickr-${locale}.js`, true).then(() => this.initFlatpickr(Flatpickr));
+                        return Formio.requireLibrary(`flatpickr-${locale}`, `flatpickr.l10ns.${locale}`, `${Formio.cdn['flatpickr']}/l10n/${locale}.js`, true).then(() => this.initFlatpickr(Flatpickr));
                     }
                     else {
                         this.initFlatpickr(Flatpickr);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5821.2452432",
+  "version": "5.0.0-dev.5822.ae2ec5b",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {