@formio/js 5.4.2 → 5.4.3

package/lib/mjs/components/file/File.js

@@ -42,6 +42,7 @@ export default class FileComponent extends Field {
             fileMinSize: '0KB',
             fileMaxSize: '1GB',
             uploadOnly: false,
+            options: {},
         }, ...extend);
     }
     static get builderInfo() {
@@ -109,7 +110,7 @@ export default class FileComponent extends Field {
         return [];
     }
     getValueAsString(value, options) {
-        if (options?.review && !this.component.uploadOnly) {
+        if (options?.review && !this.component.uploadOnly && !options?.pdf) {
             return _.map(value, (val, index) => {
                 return `<a href="${val.url || '#'}" target="_blank" data-path='${this.path}' data-fileindex='${index}'>${val.originalName}</a>`;
             }).join(', ');
@@ -633,7 +634,9 @@ export default class FileComponent extends Field {
             originalName: escapedFileName,
             fileKey: this.component.fileKey || 'file',
             storage: this.component.storage,
-            options: this.component.options,
+            options: this.component.storage === 'url'
+                ? (this.component.urlRequestOptions || this.component.options)
+                : this.component.options,
             file,
             size: file.size,
             status: 'info',
@@ -862,7 +865,9 @@ export default class FileComponent extends Field {
         }
     }
     async deleteFile(fileInfo) {
-        const { options = {} } = this.component;
+        const options = this.component.storage === 'url'
+            ? (this.component.urlRequestOptions || this.component.options || {})
+            : (this.component.options || {});
         if (fileInfo &&
             ['url', 'indexeddb', 's3', 'azure', 'googledrive'].includes(this.component.storage)) {
             const { fileService } = this;
@@ -990,7 +995,7 @@ export default class FileComponent extends Field {
                         ? response
                         : response.type === 'abort'
                             ? this.t('requestAborted')
-                            : response.toString();
+                            : response.message || response.toString();
                 this.emit('fileUploadingEnd', Promise.reject(response));
                 this.emit(_.get(response, 'type') === 'abort' ? 'fileUploadCanceled' : 'fileUploadError', {
                     fileToSync,
@@ -1054,7 +1059,9 @@ export default class FileComponent extends Field {
         }
     }
     getFile(fileInfo) {
-        const { options = {} } = this.component;
+        const options = this.component.storage === 'url'
+            ? (this.component.urlRequestOptions || this.component.options || {})
+            : (this.component.options || {});
         const { fileService } = this;
         if (!fileService) {
             return alert(this.t('noFileService'));

package/lib/mjs/components/file/editForm/File.edit.file.d.ts

@@ -131,11 +131,10 @@ declare const _default: ({
     values?: undefined;
 } | {
     type: string;
-    input: boolean;
     key: string;
     label: string;
     weight: number;
-    placeholder: string;
+    input: boolean;
     conditional: {
         json: {
             in: (string[] | {
@@ -145,12 +144,19 @@ declare const _default: ({
             '=='?: undefined;
         };
     };
+    components: {
+        type: string;
+        input: boolean;
+        key: string;
+        label: string;
+        placeholder: string;
+    }[];
+    placeholder?: undefined;
     tooltip?: undefined;
     valueProperty?: undefined;
     dataSrc?: undefined;
     data?: undefined;
     tableView?: undefined;
-    components?: undefined;
     rows?: undefined;
     editor?: undefined;
     as?: undefined;

package/lib/mjs/components/file/editForm/File.edit.file.js

@@ -79,30 +79,11 @@ export default [
         },
     },
     {
-        type: 'textfield',
-        input: true,
-        key: 'options.indexeddb',
-        label: 'Database',
+        type: 'container',
+        key: 'options',
+        label: 'IndexedDB options',
         weight: 10,
-        placeholder: 'Enter the indexeddb database name',
-        conditional: {
-            json: {
-                in: [
-                    {
-                        var: 'data.storage',
-                    },
-                    ['indexeddb'],
-                ],
-            },
-        },
-    },
-    {
-        type: 'textfield',
         input: true,
-        label: 'Table',
-        key: 'options.indexeddbTable',
-        weight: 10,
-        placeholder: 'Enter the name for indexeddb table',
         conditional: {
             json: {
                 in: [
@@ -113,10 +94,26 @@ export default [
                 ],
             },
         },
+        components: [
+            {
+                type: 'textfield',
+                input: true,
+                key: 'indexeddb',
+                label: 'Database',
+                placeholder: 'Enter the indexeddb database name',
+            },
+            {
+                type: 'textfield',
+                input: true,
+                key: 'indexeddbTable',
+                label: 'Table',
+                placeholder: 'Enter the name for indexeddb table',
+            },
+        ],
     },
     {
         type: 'textarea',
-        key: 'options',
+        key: 'urlRequestOptions',
         label: 'Custom request options',
         tooltip: 'Pass your custom xhr options(optional)',
         rows: 5,

package/lib/mjs/components/html/HTML.d.ts

@@ -12,7 +12,7 @@ export default class HTMLComponent extends Component {
     get content(): any;
     get singleTags(): string[];
     checkRefreshOn(changed: any): void;
-    renderContent(): any;
+    renderContent(content?: any): any;
     render(): string;
     get dataReady(): any;
     attach(element: any): Promise<void>;

package/lib/mjs/components/html/HTML.js

@@ -66,7 +66,7 @@ export default class HTMLComponent extends Component {
             this.setContent(this.element, this.renderContent());
         }
     }
-    renderContent() {
+    renderContent(content = this.content) {
         const submission = _.get(this.root, 'submission', {});
         return this.renderTemplate('html', {
             component: this.component,
@@ -82,23 +82,25 @@ export default class HTMLComponent extends Component {
                     }),
                 };
             }),
-            content: this.content,
+            content,
             singleTags: this.singleTags,
         });
     }
     render() {
-        return super.render(this.renderContent());
+        return super.render(this.renderContent(''));
     }
     get dataReady() {
         return this.root?.submissionReady || Promise.resolve();
     }
     attach(element) {
         this.loadRefs(element, { html: 'single' });
-        this.dataReady.then(() => {
+        const setHtmlContent = () => {
             if (this.refs.html) {
                 this.setContent(this.refs.html, this.content);
             }
-        });
+        };
+        setHtmlContent();
+        this.dataReady.then(setHtmlContent);
         return super.attach(element);
     }
 }

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

@@ -185,7 +185,11 @@ export default class NumberComponent extends Input {
             return null;
         }
         const val = this.refs.input[index].value;
-        return val && val !== '-_' ? this.parseNumber(val) : null;
+        const result = val && val !== '-_' ? this.parseNumber(val) : null;
+        if (_.isNaN(result)) {
+            return null;
+        }
+        return result;
     }
     setValueAt(index, value, flags = {}) {
         return super.setValueAt(index, this.formatValue(this.parseValue(value)), flags);

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

@@ -343,6 +343,16 @@ export default class RadioComponent extends ListComponent {
     }
     setItems(items) {
         const listData = [];
+        // If the items is a string, then parse as JSON.
+        if (typeof items == 'string') {
+            try {
+                items = JSON.parse(items);
+            }
+            catch (err) {
+                console.warn(err.message);
+                items = [];
+            }
+        }
         items?.forEach((item, i) => {
             const valueAtProperty = _.get(item, this.component.valueProperty);
             this.loadedOptions[i] = {

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

@@ -45,19 +45,21 @@ export default class SignatureComponent extends Input {
         super.init();
         this.currentWidth = 0;
         this.scale = 1;
-        if (!this.component.width) {
-            this.component.width = '100%';
-        }
-        if (!this.component.height) {
-            this.component.height = '200px';
-        }
-        if (this.component.keepOverlayRatio &&
-            this.options.pdf &&
-            this.component.overlay?.width &&
-            this.component.overlay?.height) {
-            this.ratio = this.component.overlay?.width / this.component.overlay?.height;
-            this.component.width = '100%';
-            this.component.height = 'auto';
+        if (this.options?.inFormBuilder) {
+            if (!this.component.width) {
+                this.component.width = '100%';
+            }
+            if (!this.component.height) {
+                this.component.height = '200px';
+            }
+            if (this.component.keepOverlayRatio &&
+                this.options.pdf &&
+                this.component.overlay?.width &&
+                this.component.overlay?.height) {
+                this.ratio = this.component.overlay?.width / this.component.overlay?.height;
+                this.component.width = '100%';
+                this.component.height = 'auto';
+            }
         }
     }
     get emptyValue() {

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

@@ -6,7 +6,7 @@ declare const _default: ({
     tooltip: string;
     placeholder: string;
     weight: number;
-    conditional?: undefined;
+    customConditional?: undefined;
     ignore?: undefined;
 } | {
     type: string;
@@ -15,13 +15,7 @@ declare const _default: ({
     label: string;
     tooltip: string;
     placeholder: string;
-    conditional: {
-        json: {
-            '!': {
-                var: string;
-            }[];
-        };
-    };
+    customConditional: (context: any) => boolean;
     weight: number;
     ignore?: undefined;
 } | {
@@ -32,7 +26,7 @@ declare const _default: ({
     key: string;
     input: boolean;
     placeholder?: undefined;
-    conditional?: undefined;
+    customConditional?: undefined;
     ignore?: undefined;
 } | {
     key: string;
@@ -43,6 +37,6 @@ declare const _default: ({
     tooltip?: undefined;
     placeholder?: undefined;
     weight?: undefined;
-    conditional?: undefined;
+    customConditional?: undefined;
 })[];
 export default _default;

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

@@ -15,10 +15,9 @@ export default [
         label: 'Width',
         tooltip: 'The width of the signature area.',
         placeholder: 'Width',
-        conditional: {
-            json: {
-                '!': [{ var: 'data.keepOverlayRatio' }],
-            },
+        customConditional: (context) => {
+            const isPdf = context.options?.editForm?.display === 'pdf';
+            return isPdf ? !context.data?.keepOverlayRatio : true;
         },
         weight: 50,
     },
@@ -29,10 +28,9 @@ export default [
         label: 'Height',
         tooltip: 'The height of the signature area.',
         placeholder: 'Height',
-        conditional: {
-            json: {
-                '!': [{ var: 'data.keepOverlayRatio' }],
-            },
+        customConditional: (context) => {
+            const isPdf = context.options?.editForm?.display === 'pdf';
+            return isPdf ? !context.data?.keepOverlayRatio : true;
         },
         weight: 51,
     },

package/lib/mjs/package.json

@@ -1,5 +1,5 @@
 {
     "type": "module",
-    "version": "5.4.2"
+    "version": "5.4.3"
     
 }

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

@@ -61,21 +61,30 @@ function indexeddb() {
             });
         },
         downloadFile(file, options) {
+            const opts = options?.options || options || {};
+            const dbName = opts.indexeddb;
+            const tableName = opts.indexeddbTable;
+            if (!dbName || !tableName) {
+                return Promise.reject(new Error('IndexedDB storage options (indexeddb, indexeddbTable) are required for download'));
+            }
             return new Promise((resolve) => {
-                const request = indexedDB.open(options.indexeddb);
+                const request = indexedDB.open(dbName);
                 request.onsuccess = function (event) {
                     const db = event.target.result;
                     resolve(db);
                 };
             }).then((db) => {
                 return new Promise((resolve, reject) => {
-                    const trans = db.transaction([options.indexeddbTable], 'readonly');
-                    const store = trans.objectStore(options.indexeddbTable).get(file.id);
+                    const trans = db.transaction(tableName, 'readonly');
+                    const store = trans.objectStore(tableName).get(file.id);
                     store.onsuccess = () => {
                         trans.oncomplete = () => {
                             const result = store.result;
-                            const dbFile = new File([store.result.data], file.name, {
-                                type: store.result.type,
+                            if (!result || !result.data) {
+                                return reject(new Error('File not found in IndexedDB'));
+                            }
+                            const dbFile = new File([result.data], file.name, {
+                                type: result.type,
                             });
                             const reader = new FileReader();
                             reader.onload = (event) => {

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

@@ -64,8 +64,19 @@ function url(formio) {
                     reject(xhr.response || 'Unable to upload file');
                 }
             };
-            xhr.onerror = () => reject(xhr);
-            xhr.onabort = () => reject(xhr);
+            xhr.onerror = () => {
+                xhr.message =
+                    xhr.status >= 400
+                        ? `${xhr.status} ${xhr.statusText || ''}`.trim()
+                        : xhr.statusText && xhr.statusText.trim()
+                            ? xhr.statusText.trim()
+                            : 'Unable to upload file';
+                return reject(xhr);
+            };
+            xhr.onabort = () => {
+                xhr.type = 'abort';
+                return reject(xhr);
+            };
             let requestUrl = url + (url.indexOf('?') > -1 ? '&' : '?');
             for (const key in query) {
                 requestUrl += `${key}=${query[key]}&`;

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

@@ -24,7 +24,7 @@ const XHR = {
             .join('/');
     },
     async upload(formio, type, xhrCallback, file, fileName, dir, progressCallback, groupPermissions, groupId, abortCallback, multipartOptions) {
-        // Use makeRequest so portal plugins (e.g. x-remote-token) are applied.
+        // Use makeRequest so portal plugins (e.g. x-remote-token) are applied. GOTCHA(G-FJS05)
         let serverResponse;
         try {
             serverResponse = await formio.makeRequest('file', `${formio.formUrl}/storage/${type}`, 'POST', {

package/lib/mjs/templates/index.d.ts

@@ -43,6 +43,7 @@ declare namespace _default {
         iconClass: (iconset: "fa" | "bi", name: string, spinning: boolean) => string;
         cssClasses: {
             'border-default': string;
+            'sr-only': string;
             'formio-tab-panel-active': string;
             'formio-tab-link-active': string;
             'formio-tab-link-container-active': string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.4.2",
+  "version": "5.4.3",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -89,7 +89,7 @@
     "tippy.js": "^6.3.7",
     "uuid": "^9.0.0",
     "vanilla-picker": "^2.12.3",
-    "@formio/bootstrap": "^4.0.2",
+    "@formio/bootstrap": "^4.0.3",
     "@formio/core": "^2.7.1"
   },
   "devDependencies": {