@formio/js 5.0.0-dev.5772.7636454 → 5.0.0-dev.5777.4ccabb1

package/lib/cjs/PDFBuilder.js

@@ -403,6 +403,7 @@ class PDFBuilder extends WebformBuilder_1.default {
         return false;
     }
     onDragEnd(e) {
+        var _a;
         // IMPORTANT - must retrieve offsets BEFORE disabling the dropzone - offsets will
         // reflect absolute positioning if accessed after the target element is hidden
         const iframeRect = this.webform.refs.iframeContainer.getBoundingClientRect();
@@ -435,7 +436,7 @@ class PDFBuilder extends WebformBuilder_1.default {
             lodash_1.default.merge(schema, info);
         }
         // Set a unique key for this component.
-        builder_1.default.uniquify([this.webform._form], schema);
+        builder_1.default.uniquify(((_a = this.webform._form) === null || _a === void 0 ? void 0 : _a.components) || [], schema);
         this.webform._form.components.push(schema);
         schema.overlay = {
             top: layerY ? (layerY - this.itemOffsetY + HEIGHT) : (e.clientY - iframeRect.top - (this.itemOffsetY - HEIGHT) * 2),

package/lib/cjs/components/_classes/multivalue/Multivalue.d.ts

@@ -1,6 +1,5 @@
 export default class Multivalue extends Field {
     get addAnother(): string;
-    useWrapper(): any;
     /**
      * @returns {Field} - The created field.
      */

package/lib/cjs/components/_classes/multivalue/Multivalue.js

@@ -6,12 +6,40 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Field_1 = __importDefault(require("../field/Field"));
 const lodash_1 = __importDefault(require("lodash"));
 class Multivalue extends Field_1.default {
-    get dataValue() {
-        const parent = super.dataValue;
-        if (!parent && this.component.multiple) {
-            return [];
+    /**
+     * Normalize values coming into updateValue.
+     * @param {*} value - The value to normalize before setting.
+     * @returns {*} - The normalized value.
+     */
+    normalizeValue(value) {
+        if (this.component.multiple) {
+            if (Array.isArray(value)) {
+                if (value.length === 0) {
+                    return [this.emptyValue];
+                }
+                if (this.component.storeas === 'array') {
+                    return super.normalizeValue([value]);
+                }
+                return super.normalizeValue(value);
+            }
+            else {
+                return super.normalizeValue(value == null ? [this.emptyValue] : [value]);
+            }
+        }
+        else {
+            if (Array.isArray(value) && this.component.storeas !== 'array') {
+                if (this.component.storeas === 'string') {
+                    return super.normalizeValue(value.join(this.delimiter || ''));
+                }
+                return super.normalizeValue(value[0] || this.emptyValue);
+            }
+            else {
+                return super.normalizeValue(value);
+            }
         }
-        return parent;
+    }
+    get dataValue() {
+        return super.dataValue;
     }
     set dataValue(value) {
         super.dataValue = value;
@@ -31,30 +59,20 @@ class Multivalue extends Field_1.default {
     get addAnother() {
         return this.t(this.component.addAnother || 'Add Another');
     }
-    useWrapper() {
-        return this.component.hasOwnProperty('multiple') && this.component.multiple;
-    }
     /**
      * @returns {Field} - The created field.
      */
     render() {
-        // If single value field.
-        if (!this.useWrapper()) {
-            return super.render(`<div ${this._referenceAttributeName}="element">
-          ${this.renderElement(this.component.type !== 'hidden' ? this.dataValue : '')}
-        </div>`);
-        }
-        // Make sure dataValue is in the correct array format.
-        let dataValue = this.dataValue;
-        if (!Array.isArray(dataValue)) {
-            dataValue = dataValue ? [dataValue] : [];
-        }
-        // If multiple value field.
-        return super.render(this.renderTemplate('multiValueTable', {
-            rows: dataValue.map(this.renderRow.bind(this)).join(''),
-            disabled: this.disabled,
-            addAnother: this.addAnother,
-        }));
+        let dataValue = this.normalizeValue(this.dataValue);
+        return this.component.hasOwnProperty('multiple') && this.component.multiple
+            ? super.render(this.renderTemplate('multiValueTable', {
+                rows: dataValue.map(this.renderRow.bind(this)).join(''),
+                disabled: this.disabled,
+                addAnother: this.addAnother,
+            }))
+            : super.render(`<div ${this._referenceAttributeName}="element">
+            ${this.renderElement(this.component.type !== 'hidden' ? dataValue : '')}
+          </div>`);
     }
     renderElement() {
         return '';

package/lib/cjs/components/datagrid/DataGrid.js

@@ -436,7 +436,7 @@ class DataGridComponent extends NestedArrayComponent_1.default {
     }
     removeRow(index) {
         const makeEmpty = index === 0 && this.rows.length === 1;
-        const flags = { isReordered: !makeEmpty, resetValue: makeEmpty };
+        const flags = { isReordered: !makeEmpty, resetValue: makeEmpty, modified: true };
         this.splice(index, flags);
         this.emit('dataGridDeleteRow', { index });
         const [row] = this.rows.splice(index, 1);

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

@@ -118,12 +118,12 @@ class TagsComponent extends Input_1.default {
     }
     normalizeValue(value) {
         if (this.component.storeas === 'string' && Array.isArray(value)) {
-            return value.join(this.delimiter);
+            return super.normalizeValue(value.join(this.delimiter));
         }
         else if (this.component.storeas === 'array' && typeof value === 'string') {
-            return value.split(this.delimiter).filter(result => result);
+            return super.normalizeValue(value.split(this.delimiter).filter(result => result));
         }
-        return value;
+        return super.normalizeValue(value);
     }
     setValue(value, flags = {}) {
         const changed = super.setValue(value, flags);

package/lib/mjs/PDFBuilder.js

@@ -429,7 +429,7 @@ export default class PDFBuilder extends WebformBuilder {
             _.merge(schema, info);
         }
         // Set a unique key for this component.
-        BuilderUtils.uniquify([this.webform._form], schema);
+        BuilderUtils.uniquify(this.webform._form?.components || [], schema);
         this.webform._form.components.push(schema);
         schema.overlay = {
             top: layerY ? (layerY - this.itemOffsetY + HEIGHT) : (e.clientY - iframeRect.top - (this.itemOffsetY - HEIGHT) * 2),

package/lib/mjs/components/_classes/multivalue/Multivalue.d.ts

@@ -1,6 +1,5 @@
 export default class Multivalue extends Field {
     get addAnother(): string;
-    useWrapper(): any;
     /**
      * @returns {Field} - The created field.
      */

package/lib/mjs/components/_classes/multivalue/Multivalue.js

@@ -1,12 +1,40 @@
 import Field from '../field/Field';
 import _ from 'lodash';
 export default class Multivalue extends Field {
-    get dataValue() {
-        const parent = super.dataValue;
-        if (!parent && this.component.multiple) {
-            return [];
+    /**
+     * Normalize values coming into updateValue.
+     * @param {*} value - The value to normalize before setting.
+     * @returns {*} - The normalized value.
+     */
+    normalizeValue(value) {
+        if (this.component.multiple) {
+            if (Array.isArray(value)) {
+                if (value.length === 0) {
+                    return [this.emptyValue];
+                }
+                if (this.component.storeas === 'array') {
+                    return super.normalizeValue([value]);
+                }
+                return super.normalizeValue(value);
+            }
+            else {
+                return super.normalizeValue(value == null ? [this.emptyValue] : [value]);
+            }
+        }
+        else {
+            if (Array.isArray(value) && this.component.storeas !== 'array') {
+                if (this.component.storeas === 'string') {
+                    return super.normalizeValue(value.join(this.delimiter || ''));
+                }
+                return super.normalizeValue(value[0] || this.emptyValue);
+            }
+            else {
+                return super.normalizeValue(value);
+            }
         }
-        return parent;
+    }
+    get dataValue() {
+        return super.dataValue;
     }
     set dataValue(value) {
         super.dataValue = value;
@@ -26,30 +54,20 @@ export default class Multivalue extends Field {
     get addAnother() {
         return this.t(this.component.addAnother || 'Add Another');
     }
-    useWrapper() {
-        return this.component.hasOwnProperty('multiple') && this.component.multiple;
-    }
     /**
      * @returns {Field} - The created field.
      */
     render() {
-        // If single value field.
-        if (!this.useWrapper()) {
-            return super.render(`<div ${this._referenceAttributeName}="element">
-          ${this.renderElement(this.component.type !== 'hidden' ? this.dataValue : '')}
-        </div>`);
-        }
-        // Make sure dataValue is in the correct array format.
-        let dataValue = this.dataValue;
-        if (!Array.isArray(dataValue)) {
-            dataValue = dataValue ? [dataValue] : [];
-        }
-        // If multiple value field.
-        return super.render(this.renderTemplate('multiValueTable', {
-            rows: dataValue.map(this.renderRow.bind(this)).join(''),
-            disabled: this.disabled,
-            addAnother: this.addAnother,
-        }));
+        let dataValue = this.normalizeValue(this.dataValue);
+        return this.component.hasOwnProperty('multiple') && this.component.multiple
+            ? super.render(this.renderTemplate('multiValueTable', {
+                rows: dataValue.map(this.renderRow.bind(this)).join(''),
+                disabled: this.disabled,
+                addAnother: this.addAnother,
+            }))
+            : super.render(`<div ${this._referenceAttributeName}="element">
+            ${this.renderElement(this.component.type !== 'hidden' ? dataValue : '')}
+          </div>`);
     }
     renderElement() {
         return '';

package/lib/mjs/components/datagrid/DataGrid.js

@@ -432,7 +432,7 @@ export default class DataGridComponent extends NestedArrayComponent {
     }
     removeRow(index) {
         const makeEmpty = index === 0 && this.rows.length === 1;
-        const flags = { isReordered: !makeEmpty, resetValue: makeEmpty };
+        const flags = { isReordered: !makeEmpty, resetValue: makeEmpty, modified: true };
         this.splice(index, flags);
         this.emit('dataGridDeleteRow', { index });
         const [row] = this.rows.splice(index, 1);

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

@@ -116,12 +116,12 @@ export default class TagsComponent extends Input {
     }
     normalizeValue(value) {
         if (this.component.storeas === 'string' && Array.isArray(value)) {
-            return value.join(this.delimiter);
+            return super.normalizeValue(value.join(this.delimiter));
         }
         else if (this.component.storeas === 'array' && typeof value === 'string') {
-            return value.split(this.delimiter).filter(result => result);
+            return super.normalizeValue(value.split(this.delimiter).filter(result => result));
         }
-        return value;
+        return super.normalizeValue(value);
     }
     setValue(value, flags = {}) {
         const changed = super.setValue(value, flags);

package/package.json

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