@formio/js 5.0.0-dev.5676.625f434 → 5.0.0-dev.5680.d459cf5

package/lib/cjs/Formio.js

@@ -125,3 +125,4 @@ if (typeof global !== 'undefined') {
 if (typeof window !== 'undefined') {
     sdk_1.Formio.addToGlobal(window);
 }
+Embed_1.Formio._formioReady(sdk_1.Formio);

package/lib/cjs/Webform.d.ts

@@ -334,7 +334,7 @@ declare class Webform extends NestedDataComponent {
      * Sets the submission value
      * @param {object|null|undefined} submission - The submission to set.
      * @param {object|null|undefined} flags - Any flags to apply when setting the submission.
-     * @return {void}
+     * @returns {void}
      */
     onSetSubmission(submission: object | null | undefined, flags?: object | null | undefined): void;
     /**

package/lib/cjs/Webform.js

@@ -702,7 +702,7 @@ class Webform extends NestedDataComponent_1.default {
      * Sets the submission value
      * @param {object|null|undefined} submission - The submission to set.
      * @param {object|null|undefined} flags - Any flags to apply when setting the submission.
-     * @return {void}
+     * @returns {void}
      */
     onSetSubmission(submission, flags = {}) {
         this.submissionSet = true;
@@ -882,7 +882,9 @@ class Webform extends NestedDataComponent_1.default {
         this.addComponents();
         this.on("submitButton", (options) => {
             this.submit(false, options).catch((e) => {
-                options.instance.loading = false;
+                if (options === null || options === void 0 ? void 0 : options.instance) {
+                    options.instance.loading = false;
+                }
                 return e !== false && e !== undefined && console.log(e);
             });
         }, true);

package/lib/cjs/components/_classes/component/Component.d.ts

@@ -346,7 +346,7 @@ declare class Component extends Element {
     /**
      * Renders a modal preview template and returns the markup as a string
      * @param {object|null|undefined} ctx - The rendering context
-     * @return {string} - The modal preview markup
+     * @returns {string} - The modal preview markup
      */
     renderModalPreview(ctx: object | null | undefined): string;
     /**
@@ -372,7 +372,7 @@ declare class Component extends Element {
      * Creates the tooltip instance using tippy.js and returns it
      * @param {HTMLElement} tooltipEl - HTML element to attach the tooltip
      * @param {object|null|undefined} settings - tippy.js options
-     * @return {import('tippy.js').Tippy} - tippy.js instance
+     * @returns {import('tippy.js').Tippy} - tippy.js instance
      */
     createTooltip(tooltipEl: HTMLElement, settings?: object | null | undefined): import('tippy.js').Tippy;
     /**

package/lib/cjs/components/_classes/component/Component.js

@@ -1049,7 +1049,7 @@ class Component extends Element_1.default {
     /**
      * Renders a modal preview template and returns the markup as a string
      * @param {object|null|undefined} ctx - The rendering context
-     * @return {string} - The modal preview markup
+     * @returns {string} - The modal preview markup
      */
     renderModalPreview(ctx) {
         return this.renderTemplate('modalPreview', ctx || {});
@@ -1118,7 +1118,7 @@ class Component extends Element_1.default {
      * Creates the tooltip instance using tippy.js and returns it
      * @param {HTMLElement} tooltipEl - HTML element to attach the tooltip
      * @param {object|null|undefined} settings - tippy.js options
-     * @return {import('tippy.js').Tippy} - tippy.js instance
+     * @returns {import('tippy.js').Tippy} - tippy.js instance
      */
     createTooltip(tooltipEl, settings = {}) {
         const tooltipAttribute = tooltipEl.getAttribute('data-tooltip');
@@ -3388,10 +3388,6 @@ class Component extends Element_1.default {
                             const disabled = this.shouldDisabled;
                             // Change states which won't be recalculated during redrawing
                             if (this.visible !== visible) {
-                                // If the logic is triggered by an event and the action sets the hidden state then the original
-                                // component definition must be changed so that the components hidden state does not get flipped back by
-                                // the fieldLogic function
-                                this.originalComponent.hidden = !visible;
                                 this.visible = visible;
                             }
                             if (this.disabled !== disabled) {

package/lib/cjs/components/_classes/component/fixtures/index.d.ts

@@ -4,5 +4,4 @@ import comp3 from './comp3';
 import comp4 from './comp4';
 import comp5 from './comp5';
 import comp6 from './comp6';
-import comp7 from './comp7';
-export { comp1, comp2, comp3, comp4, comp5, comp6, comp7 };
+export { comp1, comp2, comp3, comp4, comp5, comp6 };

package/lib/cjs/components/_classes/component/fixtures/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.comp7 = exports.comp6 = exports.comp5 = exports.comp4 = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
+exports.comp6 = exports.comp5 = exports.comp4 = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
 const comp1_1 = __importDefault(require("./comp1"));
 exports.comp1 = comp1_1.default;
 const comp2_1 = __importDefault(require("./comp2"));
@@ -16,5 +16,3 @@ const comp5_1 = __importDefault(require("./comp5"));
 exports.comp5 = comp5_1.default;
 const comp6_1 = __importDefault(require("./comp6"));
 exports.comp6 = comp6_1.default;
-const comp7_1 = __importDefault(require("./comp7"));
-exports.comp7 = comp7_1.default;

package/lib/cjs/components/_classes/input/Input.js

@@ -234,11 +234,33 @@ class Input extends Multivalue_1.default {
         this.addFocusBlurEvents(element);
         if (this.options.submitOnEnter) {
             this.addEventListener(element, 'keypress', (event) => {
+                var _a;
                 const key = event.keyCode || event.which;
                 if (key === 13) {
                     event.preventDefault();
                     event.stopPropagation();
-                    this.emit('submitButton');
+                    let submitButton = null;
+                    if ((_a = this.root) === null || _a === void 0 ? void 0 : _a.everyComponent) {
+                        this.root.everyComponent((component) => {
+                            if ((component === null || component === void 0 ? void 0 : component.component.type) === 'button' &&
+                                (component === null || component === void 0 ? void 0 : component.component.action) === 'submit') {
+                                submitButton = component;
+                                return false;
+                            }
+                        });
+                    }
+                    const options = {};
+                    if (submitButton) {
+                        options.instance = submitButton;
+                        options.component = submitButton.component;
+                        options.noValidate = this.component.state === 'draft';
+                        options.state = this.component.state || 'submitted';
+                        submitButton.loading = true;
+                        this.emit('submitButton', options);
+                    }
+                    else {
+                        this.emit('submitButton', options);
+                    }
                 }
             });
         }

package/lib/cjs/components/editgrid/EditGrid.js

@@ -88,7 +88,7 @@ class EditGridComponent extends NestedArrayComponent_1.default {
       {% if (!instance.options.readOnly && !instance.disabled) { %}
         <div class="col-sm-2">
           <div class="btn-group pull-right">
-            <button class="btn btn-default btn-light btn-sm editRow"><i class="{{ iconClass('pen-fill') }}"></i></button>
+            <button class="btn btn-default btn-light btn-sm editRow"><i class="{{ iconClass('edit') }}"></i></button>
             {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}
               <button class="btn btn-danger btn-sm removeRow"><i class="{{ iconClass('trash') }}"></i></button>
             {% } %}
@@ -109,7 +109,7 @@ class EditGridComponent extends NestedArrayComponent_1.default {
         {% if (!instance.options.readOnly && !instance.disabled) { %}
           <td class="editgrid-table-column">
             <div class="btn-group">
-              <button class="btn btn-default btn-light btn-sm editRow" aria-label="{{ t('Edit row') }}"><i class="{{ iconClass('pen-fill') }}"></i></button>
+              <button class="btn btn-default btn-light btn-sm editRow" aria-label="{{ t('Edit row') }}"><i class="{{ iconClass('edit') }}"></i></button>
               {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}
               <button class="btn btn-danger btn-sm removeRow" aria-label="{{ t('Remove row') }}"><i class="{{ iconClass('trash') }}"></i></button>
               {% } %}

package/lib/cjs/components/form/Form.d.ts

@@ -94,7 +94,7 @@ export default class FormComponent extends Component {
      * Sets the subform value
      * @param {object|null|undefined} submission - The submission to set.
      * @param {object|null|undefined} flags - Any flags to apply when setting the submission.
-     * @return {void}
+     * @returns {void}
      */
     onSetSubFormValue(submission: object | null | undefined, flags: object | null | undefined): void;
     areAllComponentsEmpty(data: any): boolean;

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

@@ -656,7 +656,7 @@ class FormComponent extends Component_1.default {
      * Sets the subform value
      * @param {object|null|undefined} submission - The submission to set.
      * @param {object|null|undefined} flags - Any flags to apply when setting the submission.
-     * @return {void}
+     * @returns {void}
      */
     onSetSubFormValue(submission, flags) {
         this.subForm.setValue(submission, flags);

package/lib/mjs/Formio.js

@@ -118,4 +118,5 @@ if (typeof global !== 'undefined') {
 if (typeof window !== 'undefined') {
     FormioCore.addToGlobal(window);
 }
+FormioEmbed._formioReady(FormioCore);
 export { FormioCore as Formio };

package/lib/mjs/Webform.d.ts

@@ -334,7 +334,7 @@ declare class Webform extends NestedDataComponent {
      * Sets the submission value
      * @param {object|null|undefined} submission - The submission to set.
      * @param {object|null|undefined} flags - Any flags to apply when setting the submission.
-     * @return {void}
+     * @returns {void}
      */
     onSetSubmission(submission: object | null | undefined, flags?: object | null | undefined): void;
     /**

package/lib/mjs/Webform.js

@@ -700,7 +700,7 @@ export default class Webform extends NestedDataComponent {
      * Sets the submission value
      * @param {object|null|undefined} submission - The submission to set.
      * @param {object|null|undefined} flags - Any flags to apply when setting the submission.
-     * @return {void}
+     * @returns {void}
      */
     onSetSubmission(submission, flags = {}) {
         this.submissionSet = true;
@@ -886,7 +886,9 @@ export default class Webform extends NestedDataComponent {
         this.addComponents();
         this.on("submitButton", (options) => {
             this.submit(false, options).catch((e) => {
-                options.instance.loading = false;
+                if (options?.instance) {
+                    options.instance.loading = false;
+                }
                 return e !== false && e !== undefined && console.log(e);
             });
         }, true);

package/lib/mjs/components/_classes/component/Component.d.ts

@@ -346,7 +346,7 @@ declare class Component extends Element {
     /**
      * Renders a modal preview template and returns the markup as a string
      * @param {object|null|undefined} ctx - The rendering context
-     * @return {string} - The modal preview markup
+     * @returns {string} - The modal preview markup
      */
     renderModalPreview(ctx: object | null | undefined): string;
     /**
@@ -372,7 +372,7 @@ declare class Component extends Element {
      * Creates the tooltip instance using tippy.js and returns it
      * @param {HTMLElement} tooltipEl - HTML element to attach the tooltip
      * @param {object|null|undefined} settings - tippy.js options
-     * @return {import('tippy.js').Tippy} - tippy.js instance
+     * @returns {import('tippy.js').Tippy} - tippy.js instance
      */
     createTooltip(tooltipEl: HTMLElement, settings?: object | null | undefined): import('tippy.js').Tippy;
     /**

package/lib/mjs/components/_classes/component/Component.js

@@ -1016,7 +1016,7 @@ export default class Component extends Element {
     /**
      * Renders a modal preview template and returns the markup as a string
      * @param {object|null|undefined} ctx - The rendering context
-     * @return {string} - The modal preview markup
+     * @returns {string} - The modal preview markup
      */
     renderModalPreview(ctx) {
         return this.renderTemplate('modalPreview', ctx || {});
@@ -1084,7 +1084,7 @@ export default class Component extends Element {
      * Creates the tooltip instance using tippy.js and returns it
      * @param {HTMLElement} tooltipEl - HTML element to attach the tooltip
      * @param {object|null|undefined} settings - tippy.js options
-     * @return {import('tippy.js').Tippy} - tippy.js instance
+     * @returns {import('tippy.js').Tippy} - tippy.js instance
      */
     createTooltip(tooltipEl, settings = {}) {
         const tooltipAttribute = tooltipEl.getAttribute('data-tooltip');
@@ -3361,10 +3361,6 @@ export default class Component extends Element {
                             const disabled = this.shouldDisabled;
                             // Change states which won't be recalculated during redrawing
                             if (this.visible !== visible) {
-                                // If the logic is triggered by an event and the action sets the hidden state then the original
-                                // component definition must be changed so that the components hidden state does not get flipped back by
-                                // the fieldLogic function
-                                this.originalComponent.hidden = !visible;
                                 this.visible = visible;
                             }
                             if (this.disabled !== disabled) {

package/lib/mjs/components/_classes/component/fixtures/index.d.ts

@@ -4,5 +4,4 @@ import comp3 from './comp3';
 import comp4 from './comp4';
 import comp5 from './comp5';
 import comp6 from './comp6';
-import comp7 from './comp7';
-export { comp1, comp2, comp3, comp4, comp5, comp6, comp7 };
+export { comp1, comp2, comp3, comp4, comp5, comp6 };

package/lib/mjs/components/_classes/component/fixtures/index.js

@@ -4,5 +4,4 @@ import comp3 from './comp3';
 import comp4 from './comp4';
 import comp5 from './comp5';
 import comp6 from './comp6';
-import comp7 from './comp7';
-export { comp1, comp2, comp3, comp4, comp5, comp6, comp7 };
+export { comp1, comp2, comp3, comp4, comp5, comp6 };

package/lib/mjs/components/_classes/input/Input.js

@@ -233,7 +233,28 @@ export default class Input extends Multivalue {
                 if (key === 13) {
                     event.preventDefault();
                     event.stopPropagation();
-                    this.emit('submitButton');
+                    let submitButton = null;
+                    if (this.root?.everyComponent) {
+                        this.root.everyComponent((component) => {
+                            if (component?.component.type === 'button' &&
+                                component?.component.action === 'submit') {
+                                submitButton = component;
+                                return false;
+                            }
+                        });
+                    }
+                    const options = {};
+                    if (submitButton) {
+                        options.instance = submitButton;
+                        options.component = submitButton.component;
+                        options.noValidate = this.component.state === 'draft';
+                        options.state = this.component.state || 'submitted';
+                        submitButton.loading = true;
+                        this.emit('submitButton', options);
+                    }
+                    else {
+                        this.emit('submitButton', options);
+                    }
                 }
             });
         }

package/lib/mjs/components/editgrid/EditGrid.js

@@ -83,7 +83,7 @@ export default class EditGridComponent extends NestedArrayComponent {
       {% if (!instance.options.readOnly && !instance.disabled) { %}
         <div class="col-sm-2">
           <div class="btn-group pull-right">
-            <button class="btn btn-default btn-light btn-sm editRow"><i class="{{ iconClass('pen-fill') }}"></i></button>
+            <button class="btn btn-default btn-light btn-sm editRow"><i class="{{ iconClass('edit') }}"></i></button>
             {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}
               <button class="btn btn-danger btn-sm removeRow"><i class="{{ iconClass('trash') }}"></i></button>
             {% } %}
@@ -104,7 +104,7 @@ export default class EditGridComponent extends NestedArrayComponent {
         {% if (!instance.options.readOnly && !instance.disabled) { %}
           <td class="editgrid-table-column">
             <div class="btn-group">
-              <button class="btn btn-default btn-light btn-sm editRow" aria-label="{{ t('Edit row') }}"><i class="{{ iconClass('pen-fill') }}"></i></button>
+              <button class="btn btn-default btn-light btn-sm editRow" aria-label="{{ t('Edit row') }}"><i class="{{ iconClass('edit') }}"></i></button>
               {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}
               <button class="btn btn-danger btn-sm removeRow" aria-label="{{ t('Remove row') }}"><i class="{{ iconClass('trash') }}"></i></button>
               {% } %}

package/lib/mjs/components/form/Form.d.ts

@@ -94,7 +94,7 @@ export default class FormComponent extends Component {
      * Sets the subform value
      * @param {object|null|undefined} submission - The submission to set.
      * @param {object|null|undefined} flags - Any flags to apply when setting the submission.
-     * @return {void}
+     * @returns {void}
      */
     onSetSubFormValue(submission: object | null | undefined, flags: object | null | undefined): void;
     areAllComponentsEmpty(data: any): boolean;

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

@@ -646,7 +646,7 @@ export default class FormComponent extends Component {
      * Sets the subform value
      * @param {object|null|undefined} submission - The submission to set.
      * @param {object|null|undefined} flags - Any flags to apply when setting the submission.
-     * @return {void}
+     * @returns {void}
      */
     onSetSubFormValue(submission, flags) {
         this.subForm.setValue(submission, flags);

package/package.json

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

package/lib/cjs/components/_classes/component/fixtures/comp7.d.ts

@@ -1,84 +0,0 @@
-declare namespace _default {
-    let components: ({
-        label: string;
-        action: string;
-        showValidations: boolean;
-        tableView: boolean;
-        key: string;
-        type: string;
-        event: string;
-        input: boolean;
-        theme?: undefined;
-        collapsible?: undefined;
-        hidden?: undefined;
-        logic?: undefined;
-        collapsed?: undefined;
-        components?: undefined;
-        applyMaskOn?: undefined;
-    } | {
-        label: string;
-        action: string;
-        showValidations: boolean;
-        theme: string;
-        tableView: boolean;
-        key: string;
-        type: string;
-        event: string;
-        input: boolean;
-        collapsible?: undefined;
-        hidden?: undefined;
-        logic?: undefined;
-        collapsed?: undefined;
-        components?: undefined;
-        applyMaskOn?: undefined;
-    } | {
-        collapsible: boolean;
-        hidden: boolean;
-        key: string;
-        logic: {
-            name: string;
-            trigger: {
-                type: string;
-                event: string;
-            };
-            actions: {
-                name: string;
-                type: string;
-                property: {
-                    label: string;
-                    value: string;
-                    type: string;
-                };
-                state: boolean;
-            }[];
-        }[];
-        type: string;
-        label: string;
-        collapsed: boolean;
-        input: boolean;
-        tableView: boolean;
-        components: never[];
-        action?: undefined;
-        showValidations?: undefined;
-        event?: undefined;
-        theme?: undefined;
-        applyMaskOn?: undefined;
-    } | {
-        label: string;
-        applyMaskOn: string;
-        tableView: boolean;
-        key: string;
-        type: string;
-        input: boolean;
-        action?: undefined;
-        showValidations?: undefined;
-        event?: undefined;
-        theme?: undefined;
-        collapsible?: undefined;
-        hidden?: undefined;
-        logic?: undefined;
-        collapsed?: undefined;
-        components?: undefined;
-    })[];
-}
-export default _default;

package/lib/cjs/components/_classes/component/fixtures/comp7.js

@@ -1,86 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
-    components: [
-        {
-            "label": "Show",
-            "action": "event",
-            "showValidations": false,
-            "tableView": false,
-            "key": "show",
-            "type": "button",
-            "event": "show",
-            "input": true
-        },
-        {
-            "label": "Hide",
-            "action": "event",
-            "showValidations": false,
-            "theme": "danger",
-            "tableView": false,
-            "key": "hide",
-            "type": "button",
-            "event": "hide",
-            "input": true
-        },
-        {
-            "collapsible": true,
-            "hidden": true,
-            "key": "panel",
-            "logic": [
-                {
-                    "name": "ShowPanel",
-                    "trigger": {
-                        "type": "event",
-                        "event": "show"
-                    },
-                    "actions": [
-                        {
-                            "name": "Show",
-                            "type": "property",
-                            "property": {
-                                "label": "Hidden",
-                                "value": "hidden",
-                                "type": "boolean"
-                            },
-                            "state": false
-                        }
-                    ]
-                },
-                {
-                    "name": "HidePanel",
-                    "trigger": {
-                        "type": "event",
-                        "event": "hide"
-                    },
-                    "actions": [
-                        {
-                            "name": "Hide",
-                            "type": "property",
-                            "property": {
-                                "label": "Hidden",
-                                "value": "hidden",
-                                "type": "boolean"
-                            },
-                            "state": true
-                        }
-                    ]
-                }
-            ],
-            "type": "panel",
-            "label": "Panel",
-            "collapsed": false,
-            "input": false,
-            "tableView": false,
-            "components": []
-        },
-        {
-            "label": "Text Field",
-            "applyMaskOn": "change",
-            "tableView": true,
-            "key": "textField1",
-            "type": "textfield",
-            "input": true
-        }
-    ]
-};

package/lib/mjs/components/_classes/component/fixtures/comp7.d.ts

@@ -1,84 +0,0 @@
-declare namespace _default {
-    let components: ({
-        label: string;
-        action: string;
-        showValidations: boolean;
-        tableView: boolean;
-        key: string;
-        type: string;
-        event: string;
-        input: boolean;
-        theme?: undefined;
-        collapsible?: undefined;
-        hidden?: undefined;
-        logic?: undefined;
-        collapsed?: undefined;
-        components?: undefined;
-        applyMaskOn?: undefined;
-    } | {
-        label: string;
-        action: string;
-        showValidations: boolean;
-        theme: string;
-        tableView: boolean;
-        key: string;
-        type: string;
-        event: string;
-        input: boolean;
-        collapsible?: undefined;
-        hidden?: undefined;
-        logic?: undefined;
-        collapsed?: undefined;
-        components?: undefined;
-        applyMaskOn?: undefined;
-    } | {
-        collapsible: boolean;
-        hidden: boolean;
-        key: string;
-        logic: {
-            name: string;
-            trigger: {
-                type: string;
-                event: string;
-            };
-            actions: {
-                name: string;
-                type: string;
-                property: {
-                    label: string;
-                    value: string;
-                    type: string;
-                };
-                state: boolean;
-            }[];
-        }[];
-        type: string;
-        label: string;
-        collapsed: boolean;
-        input: boolean;
-        tableView: boolean;
-        components: never[];
-        action?: undefined;
-        showValidations?: undefined;
-        event?: undefined;
-        theme?: undefined;
-        applyMaskOn?: undefined;
-    } | {
-        label: string;
-        applyMaskOn: string;
-        tableView: boolean;
-        key: string;
-        type: string;
-        input: boolean;
-        action?: undefined;
-        showValidations?: undefined;
-        event?: undefined;
-        theme?: undefined;
-        collapsible?: undefined;
-        hidden?: undefined;
-        logic?: undefined;
-        collapsed?: undefined;
-        components?: undefined;
-    })[];
-}
-export default _default;