@formio/js 5.1.0-dev.6058.189ce78 → 5.1.0-dev.6059.845a6e3

package/lib/mjs/components/form/Form.js

@@ -97,7 +97,7 @@ export default class FormComponent extends Component {
         return this.createSubForm();
     }
     get dataReady() {
-        return this.subForm?.dataReady || this.subFormReady || Promise.resolve();
+        return this.subFormReady || Promise.resolve();
     }
     get defaultValue() {
         // Not not provide a default value unless the subform is ready so that it will initialize correctly.
@@ -211,7 +211,7 @@ export default class FormComponent extends Component {
     /* eslint-enable max-statements */
     render() {
         if (this.builderMode) {
-            return super.render(this.t(this.component.label || 'nestedForm'));
+            return super.render(this.component.label || 'Nested form');
         }
         const subform = this.subForm ? this.subForm.render() : this.renderTemplate('loading');
         return super.render(subform);
@@ -224,13 +224,13 @@ export default class FormComponent extends Component {
      */
     getValueAsString(value, options) {
         if (!value) {
-            return this.t('noDataProvided');
+            return 'No data provided';
         }
         if (!value.data && value._id) {
             return value._id;
         }
         if (!value.data || !Object.keys(value.data).length) {
-            return this.t('noDataProvided');
+            return 'No data provided';
         }
         if (options?.email) {
             let result = (`
@@ -648,7 +648,7 @@ export default class FormComponent extends Component {
                 : {};
             this.subForm.setUrl(submissionUrl, { ...this.options, ...options });
             this.subForm.loadSubmission().catch((err) => {
-                console.error(this.t('subformSubmissionLoadingError', { submissionId: submission._id }), err);
+                console.error(`Unable to load subform submission ${submission._id}:`, err);
             });
         }
         else {
@@ -663,9 +663,6 @@ export default class FormComponent extends Component {
      */
     onSetSubFormValue(submission, flags) {
         this.subForm.setValue(submission, flags);
-        if (flags?.fromSubmission) {
-            this.subForm.submissionReadyResolve(submission);
-        }
     }
     isEmpty(value = this.dataValue) {
         return value === null || _.isEqual(value, this.emptyValue) || (this.areAllComponentsEmpty(value?.data) && !value?._id);

package/lib/mjs/components/form/editForm/Form.edit.form.js

@@ -44,7 +44,7 @@ export default [
         },
         searchField: 'title__regex',
         template: '<span>{{ item._vid }}</span>',
-        valueProperty: 'revisionId',
+        valueProperty: '_id',
         authenticate: true,
         label: 'Form Revision',
         key: 'revision',
@@ -66,7 +66,7 @@ export default [
         input: true,
         weight: 20,
         key: 'reference',
-        label: 'Submit as reference',
-        tooltip: 'When "Submit as reference" is enabled, the form submission will be recorded against the Parent Form as well as the Child Form. When a submission recorded with "Submit as reference" is edited, the update is applied to each submission made against the Parent Form and Child Form.'
+        label: 'Save as reference',
+        tooltip: 'Using this option will save this field as a reference and link its value to the value of the origin record.'
     }
 ];

package/lib/mjs/components/hidden/Hidden.d.ts

@@ -10,6 +10,7 @@ export default class HiddenComponent extends Input {
     };
     get inputInfo(): any;
     labelIsHidden(): boolean;
+    get emptyValue(): string;
     setValue(value: any, flags?: {}): boolean;
 }
 import Input from '../_classes/input/Input';

package/lib/mjs/components/hidden/Hidden.js

@@ -43,7 +43,7 @@ export default class HiddenComponent extends Input {
         return true;
     }
     get emptyValue() {
-        return null;
+        return '';
     }
     setValue(value, flags = {}) {
         return this.updateValue(value, flags);

package/lib/mjs/components/number/Number.js

@@ -54,7 +54,7 @@ export default class NumberComponent extends Input {
         }
         else {
             if (this.component.thousandsSeparator || this.options.properties?.thousandsSeparator || this.options.thousandsSeparator) {
-                console.warn(this.t('noDelimiterSet'));
+                console.warn('In order for thousands separator to work properly, you must set the delimiter to true in the component json');
             }
             this.delimiter = '';
         }
@@ -168,21 +168,14 @@ export default class NumberComponent extends Input {
         if (typeof input === 'string') {
             input = input.split(this.delimiter).join('').replace(this.decimalSeparator, '.');
         }
-        let value;
-        if (!_.isNaN(input)) {
+        let value = parseFloat(input);
+        if (!_.isNaN(value)) {
             // Format scientific notation
-            if (/[0-9]+[eE]/.test(String(input))) {
-                // Convert to exponential notation will depend on the decimal limit set in the component
-                // Example: 1.23e-5 will be converted to 1.23e-5 if decimal limit is set to 2
-                // Example: 1.23e5 will be converted to 1.23e+5 if decimal limit is set to 2
-                // if decimal limit is 3, 1.23e5 will be converted to 1.230e+5
-                // if decimal limit is not set, 1.23e5 will be converted to 1.23000000000000000000e+5
-                value = parseFloat(input);
+            if (/e/i.test(String(value))) {
                 value = value.toExponential(this.decimalLimit);
             }
             else {
-                value = parseFloat(input);
-                value = !_.isNaN(value) ? String(value).replace('.', this.decimalSeparator) : null;
+                value = String(value).replace('.', this.decimalSeparator);
             }
         }
         else {

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

@@ -293,16 +293,6 @@ export default class RadioComponent extends ListComponent {
         if (method.toUpperCase() === 'GET') {
             body = null;
         }
-        const limit = this.component.limit || 100;
-        const skip = this.isScrollLoading ? this.selectOptions.length : 0;
-        // Allow for url interpolation.
-        url = this.sanitize(this.interpolate(url, {
-            formioBase: Formio.getBaseUrl(),
-            search,
-            limit,
-            skip,
-            page: Math.abs(Math.floor(skip / limit))
-        }), this.shouldSanitizeValue);
         // Set ignoreCache if it is
         options.ignoreCache = this.component.ignoreCache;
         // Make the request.

package/lib/mjs/components/recaptcha/ReCaptcha.js

@@ -47,7 +47,7 @@ export default class ReCaptchaComponent extends Component {
                 this.recaptchaApiReady = Formio.requireLibrary('googleRecaptcha', 'grecaptcha', recaptchaApiScriptUrl, true);
             }
             else {
-                console.warn(this.t('noSiteKey'));
+                console.warn('There is no Site Key specified in settings in form JSON');
             }
         }
     }
@@ -60,7 +60,7 @@ export default class ReCaptchaComponent extends Component {
     async verify(actionName) {
         const siteKey = _get(this.root.form, 'settings.recaptcha.siteKey');
         if (!siteKey) {
-            console.warn(this.t('noSiteKey'));
+            console.warn('There is no Site Key specified in settings in form JSON');
             return;
         }
         if (!this.recaptchaApiReady) {

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

@@ -126,6 +126,7 @@ export default class SelectComponent extends ListComponent {
     get isLoadingAvailable(): any;
     onScroll(): void;
     attachRefreshOnBlur(): void;
+    addPlaceholderItem(placeholderValue: any): void;
     update(): void;
     addCurrentChoices(values: any, items: any, keyValue: any): any;
     getValueAsString(data: any, options: any): any;

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

@@ -1,6 +1,7 @@
 import _ from 'lodash';
 import { Formio } from '../../Formio';
 import ListComponent from '../_classes/list/ListComponent';
+import Input from '../_classes/input/Input';
 import Form from '../../Form';
 import { getRandomComponentId, boolValue, isPromise, componentValueTypes, getComponentSavedTypes, isSelectResourceWithObjectValue, removeHTML } from '../../utils/utils';
 import Choices from '../../utils/ChoicesWrapper';
@@ -531,13 +532,13 @@ export default class SelectComponent extends ListComponent {
             skip,
         };
         // Allow for url interpolation.
-        url = this.sanitize(this.interpolate(url, {
+        url = this.interpolate(url, {
             formioBase: Formio.getBaseUrl(),
             search,
             limit,
             skip,
             page: Math.abs(Math.floor(skip / limit))
-        }), this.shouldSanitizeValue);
+        });
         // Add search capability.
         if (this.component.searchField && search) {
             const searchValue = Array.isArray(search)
@@ -594,7 +595,7 @@ export default class SelectComponent extends ListComponent {
             component: this.component,
             message: err.toString(),
         });
-        console.warn(this.t('loadResourcesError', { componentKey: this.key }));
+        console.warn(`Unable to load resources for ${this.key}`);
     }
     /**
      * Get the request headers for this select dropdown.
@@ -728,7 +729,7 @@ export default class SelectComponent extends ListComponent {
             }
         }
         else if (this.component.dataSrc === 'url' || this.component.dataSrc === 'resource') {
-            this.addOption('', `${this.t('loading')}...`);
+            this.addOption('', this.t('loading...'));
         }
     }
     get active() {
@@ -772,16 +773,16 @@ export default class SelectComponent extends ListComponent {
             removeItemButton: this.component.disabled ? false : _.get(this.component, 'removeItemButton', true),
             itemSelectText: '',
             classNames: {
-                containerOuter: ['choices', 'form-group', 'formio-choices'],
-                containerInner: this.transform('class', 'form-control ui fluid selection dropdown').split(' '),
+                containerOuter: 'choices form-group formio-choices',
+                containerInner: this.transform('class', 'form-control ui fluid selection dropdown')
             },
             addItemText: false,
             allowHTML: true,
             placeholder: !!this.component.placeholder,
             placeholderValue: placeholderValue,
-            noResultsText: this.t('noResultsFound'),
-            noChoicesText: this.t('noChoices'),
-            searchPlaceholderValue: this.t('typeToSearch'),
+            noResultsText: this.t('No results found'),
+            noChoicesText: this.t('No choices to choose from'),
+            searchPlaceholderValue: this.t('Type to search'),
             shouldSort: false,
             position: (this.component.dropdown || 'auto'),
             searchEnabled: useSearch,
@@ -801,7 +802,6 @@ export default class SelectComponent extends ListComponent {
                 }),
             valueComparer: _.isEqual,
             resetScrollPosition: false,
-            duplicateItemsAllowed: false,
             ...customOptions,
         };
     }
@@ -868,7 +868,7 @@ export default class SelectComponent extends ListComponent {
                 this.choices.containerOuter.element.setAttribute('tabIndex', '-1');
                 this.addEventListener(this.choices.containerOuter.element, 'focus', () => this.focusableElement.focus());
             }
-            this.addFocusBlurEvents(this.choices.input.element);
+            Input.prototype.addFocusBlurEvents.call(this, this.focusableElement);
             if (this.itemsFromUrl && !this.component.noRefreshOnScroll) {
                 this.scrollList = this.choices.choiceList.element;
                 this.addEventListener(this.scrollList, 'scroll', () => this.onScroll());
@@ -934,6 +934,12 @@ export default class SelectComponent extends ListComponent {
                 this.positionDropdown();
             });
         }
+        if (this.choices && choicesOptions.placeholderValue && this.choices._isSelectOneElement) {
+            this.addPlaceholderItem(choicesOptions.placeholderValue);
+            this.addEventListener(input, 'removeItem', () => {
+                this.addPlaceholderItem(choicesOptions.placeholderValue);
+            });
+        }
         // Add value options.
         this.addValueOptions();
         this.setChoicesValue(this.dataValue);
@@ -1019,6 +1025,20 @@ export default class SelectComponent extends ListComponent {
             });
         }
     }
+    addPlaceholderItem(placeholderValue) {
+        const items = this.choices._store.activeItems;
+        if (!items.length) {
+            this.choices._addItem({
+                value: '',
+                label: placeholderValue,
+                choiceId: 0,
+                groupId: -1,
+                customProperties: null,
+                placeholder: true,
+                keyCode: null
+            });
+        }
+    }
     /* eslint-enable max-statements */
     update() {
         if (this.component.dataSrc === 'custom') {
@@ -1199,7 +1219,7 @@ export default class SelectComponent extends ListComponent {
             return normalize[dataType]().value;
         }
         catch (err) {
-            console.warn(this.t('failedToNormalize'), err);
+            console.warn('Failed to normalize value', err);
             return value;
         }
     }
@@ -1395,7 +1415,7 @@ export default class SelectComponent extends ListComponent {
                         return (JSON.stringify(normalizedOptionValue) === JSON.stringify(value));
                     }
                     catch (err) {
-                        console.warn.error(this.t('failedToCompareItems'), err);
+                        console.warn.error('Error while comparing items', err);
                         return false;
                     }
                 };
@@ -1487,7 +1507,7 @@ export default class SelectComponent extends ListComponent {
     }
     asString(value, options = {}) {
         value = value ?? this.getValue();
-        if (options.modalPreview || this.inDataTable || options.email) {
+        if (options.modalPreview || this.inDataTable) {
             if (this.inDataTable) {
                 value = this.undoValueTyping(value);
             }

package/lib/mjs/components/select/editForm/Select.edit.data.d.ts

@@ -1099,7 +1099,6 @@ declare const _default: ({
     alwaysEnabled?: undefined;
 } | {
     key: string;
-    type: string;
     conditional: {
         json: {
             and: ({
@@ -1150,6 +1149,7 @@ declare const _default: ({
         };
     };
     data?: undefined;
+    type?: undefined;
     weight?: undefined;
     input?: undefined;
     label?: undefined;

package/lib/mjs/components/select/editForm/Select.edit.data.js

@@ -635,8 +635,8 @@ export default [
         input: true,
         weight: 25,
         key: 'reference',
-        label: 'Submit as reference',
-        tooltip: 'Using this option will submit this field as a reference id and link its value to the value of the origin record.',
+        label: 'Save as reference',
+        tooltip: 'Using this option will save this field as a reference and link its value to the value of the origin record.',
         conditional: {
             json: { '===': [{ var: 'data.dataSrc' }, 'resource'] },
         },
@@ -681,7 +681,6 @@ export default [
     },
     {
         key: 'selectData',
-        type: 'hidden',
         conditional: {
             json: {
                 and: [

package/lib/mjs/components/selectboxes/SelectBoxes.js

@@ -253,14 +253,14 @@ export default class SelectBoxesComponent extends RadioComponent {
                     this.setInputsDisabled(false);
                 }
                 if (!isValid && maxCount && count > maxCount) {
-                    const message = this.t(this.component.maxSelectedCountMessage || 'maxSelectItems', { maxCount });
+                    const message = this.t(this.component.maxSelectedCountMessage || 'You may only select up to {{maxCount}} items', { maxCount });
                     this.errors.push({ message });
                     this.setCustomValidity(message, dirty);
                     return false;
                 }
                 else if (!isValid && minCount && count < minCount) {
                     this.setInputsDisabled(false);
-                    const message = this.t(this.component.minSelectedCountMessage || 'minSelectItems', { minCount });
+                    const message = this.t(this.component.minSelectedCountMessage || 'You must select at least {{minCount}} items', { minCount });
                     this.errors.push({ message });
                     this.setCustomValidity(message, dirty);
                     return false;

package/lib/mjs/components/signature/Signature.d.ts

@@ -24,7 +24,7 @@ export default class SignatureComponent extends Input {
     checkSize(force: any, scale: any): void;
     signaturePad: SignaturePad | null | undefined;
     observer: any;
-    getValueAsString(value: any): string;
+    getValueAsString(value: any): "" | "Yes" | "No";
     focus(): void;
     setDataToSigaturePad(): void;
 }

package/lib/mjs/components/signature/Signature.js

@@ -156,9 +156,7 @@ export default class SignatureComponent extends Input {
             if (this.dataValue) {
                 this.setDataToSigaturePad();
             }
-            if (!this.disabled) {
-                this.showCanvas(true);
-            }
+            this.showCanvas(true);
         }
     }
     renderElement(value, index) {
@@ -174,7 +172,7 @@ export default class SignatureComponent extends Input {
         return this.renderModalPreview({
             previewText: this.dataValue ?
                 `<img src=${this.dataValue} ${this._referenceAttributeName}='openModal' style="width: 100%;height: 100%;" />` :
-                this.t('clickToSign')
+                this.t('Click to Sign')
         });
     }
     attach(element) {
@@ -242,7 +240,7 @@ export default class SignatureComponent extends Input {
         if (_.isUndefined(value) && this.inDataTable) {
             return '';
         }
-        return this.t(value ? 'yes' : 'no');
+        return value ? 'Yes' : 'No';
     }
     focus() {
         this.refs.padBody.focus();

package/lib/mjs/components/signature/editForm/Signature.edit.display.d.ts

@@ -7,6 +7,7 @@ declare const _default: ({
     placeholder: string;
     weight: number;
     conditional?: undefined;
+    customConditional?: undefined;
     ignore?: undefined;
 } | {
     type: string;
@@ -23,6 +24,7 @@ declare const _default: ({
         };
     };
     weight: number;
+    customConditional?: undefined;
     ignore?: undefined;
 } | {
     weight: number;
@@ -30,6 +32,9 @@ declare const _default: ({
     label: string;
     tooltip: string;
     key: string;
+    customConditional: ({ options }: {
+        options: any;
+    }) => boolean;
     input: boolean;
     placeholder?: undefined;
     conditional?: undefined;
@@ -44,5 +49,6 @@ declare const _default: ({
     placeholder?: undefined;
     weight?: undefined;
     conditional?: undefined;
+    customConditional?: undefined;
 })[];
 export default _default;

package/lib/mjs/components/signature/editForm/Signature.edit.display.js

@@ -37,6 +37,7 @@ export default [
         label: 'Keep Overlay Aspect Ratio',
         tooltip: 'If checked, the field will have the same aspect ratio as its preview.',
         key: 'keepOverlayRatio',
+        customConditional: ({ options }) => (options?.editForm?.display === 'pdf'),
         input: true
     },
     {

package/lib/mjs/components/survey/Survey.js

@@ -126,8 +126,8 @@ export default class SurveyComponent extends Field {
         <table border="1" style="width:100%">
           <thead>
             <tr>
-              <th>${this.t('surveyQuestion')}</th>
-              <th>${this.t('surveyQuestionValue')}</th>
+              <th>Question</th>
+              <th>Value</th>
             </tr>
           </thead>
           <tbody>

package/lib/mjs/components/tags/Tags.d.ts

@@ -24,4 +24,4 @@ export default class TagsComponent extends Input {
     getValueAsString(value: any): any;
 }
 import Input from '../_classes/input/Input';
-import Choices from 'choices.js';
+import Choices from '@formio/choices.js';

package/lib/mjs/components/tags/Tags.js

@@ -1,6 +1,6 @@
 import { componentValueTypes, getComponentSavedTypes } from '../../utils/utils';
 import Input from '../_classes/input/Input';
-import Choices from 'choices.js';
+import Choices from '@formio/choices.js';
 export default class TagsComponent extends Input {
     static schema(...extend) {
         return Input.schema({
@@ -127,7 +127,7 @@ export default class TagsComponent extends Input {
         const changed = super.setValue(value, flags);
         if (this.choices) {
             let dataValue = this.dataValue;
-            this.choices.clearStore();
+            this.choices.removeActiveItems();
             if (dataValue) {
                 if (typeof dataValue === 'string') {
                     dataValue = dataValue.split(this.delimiter).filter(result => result);

package/lib/mjs/components/textarea/TextArea.js

@@ -131,7 +131,7 @@ export default class TextAreaComponent extends TextFieldComponent {
                 case 'quill':
                     // Normalize the configurations for quill.
                     if (settings.hasOwnProperty('toolbarGroups') || settings.hasOwnProperty('toolbar')) {
-                        console.warn(this.t('needConfigurationForQuill'));
+                        console.warn('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.');
                         settings = this.wysiwygDefault.quill;
                     }
                     // Add the quill editor.
@@ -203,7 +203,7 @@ export default class TextAreaComponent extends TextFieldComponent {
     imageHandler(moduleInstance, range, files) {
         const quillInstance = moduleInstance.quill;
         if (!files || !files.length) {
-            console.warn(this.t('noFilesSelected'));
+            console.warn('No files selected');
             return;
         }
         quillInstance.enable(false);
@@ -228,7 +228,7 @@ export default class TextAreaComponent extends TextFieldComponent {
                 alt: JSON.stringify(requestData),
             }), Quill.sources.USER);
         }).catch(error => {
-            console.warn(this.t('quillImageUploadFailed'));
+            console.warn('Quill image upload failed');
             console.warn(error);
             quillInstance.enable(true);
         });
@@ -523,7 +523,7 @@ export default class TextAreaComponent extends TextFieldComponent {
                     }
                     this.element.scrollIntoView();
                 }).catch((err) => {
-                    console.warn(this.t('editorFocusError'), err);
+                    console.warn('An editor did not initialize properly when trying to focus:', err);
                 });
                 break;
             }
@@ -532,7 +532,7 @@ export default class TextAreaComponent extends TextFieldComponent {
                     this.editors[0].focus();
                     this.element.scrollIntoView();
                 }).catch((err) => {
-                    console.warn(this.t('editorFocusError'), err);
+                    console.warn('An editor did not initialize properly when trying to focus:', err);
                 });
                 break;
             }
@@ -540,7 +540,7 @@ export default class TextAreaComponent extends TextFieldComponent {
                 this.editorsReady[0]?.then(() => {
                     this.editors[0].focus();
                 }).catch((err) => {
-                    console.warn(this.t('editorFocusError'), err);
+                    console.warn('An editor did not initialize properly when trying to focus:', err);
                 });
                 break;
             }

package/lib/mjs/formio.form.js

@@ -12,7 +12,6 @@ import { Evaluator } from './utils/Evaluator';
 import Licenses from './licenses';
 import EventEmitter from './EventEmitter';
 import Webform from './Webform';
-import { I18n } from './utils/i18n';
 Formio.loadModules = (path = `${Formio.getApiUrl()}/externalModules.js`, name = 'externalModules') => {
     Formio.requireLibrary(name, name, path, true)
         .then((modules) => {
@@ -57,7 +56,6 @@ export function registerModule(mod, defaultFn = null, options = {}) {
             case 'templates':
                 for (const framework of Object.keys(mod.templates)) {
                     Formio.Templates.extendTemplate(framework, mod.templates[framework]);
-                    Formio.Templates.defaultTemplates = _.defaults(mod.templates[framework], Formio.Templates.defaultTemplates);
                 }
                 if (mod.templates[current]) {
                     Formio.Templates.current = mod.templates[current];
@@ -85,9 +83,6 @@ export function registerModule(mod, defaultFn = null, options = {}) {
             case 'evaluator':
                 Formio.Evaluator.registerEvaluator(mod.evaluator);
                 break;
-            case 'translations':
-                I18n.setDefaultTranslations(mod.translations);
-                break;
             case 'library':
                 options.license
                     ? Formio.Licenses.addLicense(mod.library, options.license)

package/lib/mjs/providers/storage/googleDrive.js

@@ -50,11 +50,10 @@ function googledrive(formio) {
                 xhr.send(fd);
             }));
         },
-        downloadFile(file, component) {
+        downloadFile(file) {
             const token = formio.getToken();
-            // Constructed the url with the fileId, fileName, displayImage, imageSize if applicable
             file.url =
-                `${formio.formUrl}/storage/gdrive?fileId=${file.id}&fileName=${file.originalName}${token ? `&x-jwt-token=${token}` : ''}${component.image ? '&displayImage=true' : ''}${component.imageSize ? `&imageSize=${component.imageSize}` : ''}`;
+                `${formio.formUrl}/storage/gdrive?fileId=${file.id}&fileName=${file.originalName}${token ? `&x-jwt-token=${token}` : ''}`;
             return Promise.resolve(file);
         },
         deleteFile: function deleteFile(fileInfo) {

package/lib/mjs/providers/storage/s3.js

@@ -75,7 +75,7 @@ function s3(formio) {
             const { changeMessage } = multipart;
             changeMessage('Completing AWS S3 multipart upload...');
             const token = formio.getToken();
-            const response = await XHR.fetch(`${formio.formUrl}/storage/s3/multipart/complete`, {
+            const response = await fetch(`${formio.formUrl}/storage/s3/multipart/complete`, {
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json',
@@ -96,7 +96,7 @@ function s3(formio) {
         abortMultipartUpload(serverResponse) {
             const { uploadId, key } = serverResponse;
             const token = formio.getToken();
-            XHR.fetch(`${formio.formUrl}/storage/s3/multipart/abort`, {
+            fetch(`${formio.formUrl}/storage/s3/multipart/abort`, {
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json',
@@ -113,7 +113,7 @@ function s3(formio) {
                 const start = i * partSize;
                 const end = (i + 1) * partSize;
                 const blob = i < urls.length ? file.slice(start, end) : file.slice(start);
-                const promise = XHR.fetch(urls[i], {
+                const promise = fetch(urls[i], {
                     method: 'PUT',
                     headers,
                     body: blob,

package/lib/mjs/providers/storage/xhr.d.ts

@@ -3,7 +3,6 @@ export default XHR;
 declare namespace XHR {
     function trim(text: any): any;
     function path(items: any): any;
-    function fetch(url: any, options: any): Promise<Response>;
     function upload(formio: any, type: any, xhrCallback: any, file: any, fileName: any, dir: any, progressCallback: any, groupPermissions: any, groupId: any, abortCallback: any, multipartOptions: any): Promise<any>;
     function makeXhrRequest(formio: any, xhrCallback: any, serverResponse: any, progressCallback: any, abortCallback: any): Promise<any>;
 }

package/lib/mjs/providers/storage/xhr.js

@@ -1,5 +1,4 @@
 import _trim from 'lodash/trim';
-import { Formio } from '../../Formio';
 export const setXhrHeaders = (formio, xhr) => {
     const { headers } = formio.options;
     if (headers) {
@@ -21,16 +20,12 @@ const XHR = {
     path(items) {
         return items.filter(item => !!item).map(XHR.trim).join('/');
     },
-    fetch(url, options) {
-        options = Formio.pluginAlter('requestOptions', options, url);
-        return fetch(url, options);
-    },
     async upload(formio, type, xhrCallback, file, fileName, dir, progressCallback, groupPermissions, groupId, abortCallback, multipartOptions) {
         // make request to Form.io server
         const token = formio.getToken();
         let response;
         try {
-            response = await XHR.fetch(`${formio.formUrl}/storage/${type}`, {
+            response = await fetch(`${formio.formUrl}/storage/${type}`, {
                 method: 'POST',
                 headers: {
                     'Accept': 'application/json',