@formio/js 5.0.0-dev.5661.22d0f16 → 5.0.0-dev.5664.1af299f

package/lib/cjs/components/datagrid/DataGrid.d.ts

@@ -61,6 +61,15 @@ export default class DataGridComponent extends NestedArrayComponent {
     loadRefs(element: any, refs: any): void;
     dragula: any;
     getComponentsContainer(): any;
+    /**
+     * Reorder values in array based on the old and new position
+     * @param {any} valuesArr - An array of values.
+     * @param {number} oldPosition - The index of the value in array before reordering.
+     * @param {number} newPosition - The index of the value in array after reordering.
+     * @param {boolean|any} movedBelow - Whether or not the value is moved below.
+     * @returns {void}
+     */
+    reorderValues(valuesArr: any, oldPosition: number, newPosition: number, movedBelow: boolean | any): void;
     onReorder(element: any, _target: any, _source: any, sibling: any): void;
     focusOnNewRowElement(row: any): void;
     addRow(): void;

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

@@ -7,6 +7,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const NestedArrayComponent_1 = __importDefault(require("../_classes/nestedarray/NestedArrayComponent"));
 const utils_1 = require("../../utils/utils");
 const Components_1 = require("../Components");
+const dragula_1 = __importDefault(require("dragula"));
 class DataGridComponent extends NestedArrayComponent_1.default {
     static schema(...extend) {
         return NestedArrayComponent_1.default.schema({
@@ -281,34 +282,32 @@ class DataGridComponent extends NestedArrayComponent_1.default {
             this.refs[`${this.datagridKey}-row`].forEach((row, index) => {
                 row.dragInfo = { index };
             });
-            if (this.root.dragulaLib) {
-                this.dragula = this.root.dragulaLib([this.refs[`${this.datagridKey}-tbody`]], {
-                    moves: (_draggedElement, _oldParent, clickedElement) => {
-                        const clickedElementKey = clickedElement.getAttribute('data-key');
-                        const oldParentKey = _oldParent.getAttribute('data-key');
-                        //Check if the clicked button belongs to that container, if false, it belongs to the nested container
-                        if (oldParentKey === clickedElementKey) {
-                            return clickedElement.classList.contains('formio-drag-button');
-                        }
-                    }
-                }).on('drop', this.onReorder.bind(this));
-                this.dragula.on('cloned', (el, original) => {
-                    if (el && el.children && original && original.children) {
-                        lodash_1.default.each(original.children, (child, index) => {
-                            const styles = getComputedStyle(child, null);
-                            if (styles.cssText !== '') {
-                                el.children[index].style.cssText = styles.cssText;
-                            }
-                            else {
-                                const cssText = Object.values(styles).reduce((css, propertyName) => {
-                                    return `${css}${propertyName}:${styles.getPropertyValue(propertyName)};`;
-                                }, '');
-                                el.children[index].style.cssText = cssText;
-                            }
-                        });
+            this.dragula = (0, dragula_1.default)([this.refs[`${this.datagridKey}-tbody`]], {
+                moves: (_draggedElement, _oldParent, clickedElement) => {
+                    const clickedElementKey = clickedElement.getAttribute('data-key');
+                    const oldParentKey = _oldParent.getAttribute('data-key');
+                    //Check if the clicked button belongs to that container, if false, it belongs to the nested container
+                    if (oldParentKey === clickedElementKey) {
+                        return clickedElement.classList.contains('formio-drag-button');
                     }
-                });
-            }
+                }
+            }).on('drop', this.onReorder.bind(this));
+            this.dragula.on('cloned', (el, original) => {
+                if (el && el.children && original && original.children) {
+                    lodash_1.default.each(original.children, (child, index) => {
+                        const styles = getComputedStyle(child, null);
+                        if (styles.cssText !== '') {
+                            el.children[index].style.cssText = styles.cssText;
+                        }
+                        else {
+                            const cssText = Object.values(styles).reduce((css, propertyName) => {
+                                return `${css}${propertyName}:${styles.getPropertyValue(propertyName)};`;
+                            }, '');
+                            el.children[index].style.cssText = cssText;
+                        }
+                    });
+                }
+            });
         }
         this.refs[`${this.datagridKey}-addRow`].forEach((addButton) => {
             this.addEventListener(addButton, 'click', this.addRow.bind(this));
@@ -336,6 +335,24 @@ class DataGridComponent extends NestedArrayComponent_1.default {
     getComponentsContainer() {
         return this.component.components;
     }
+    /**
+     * Reorder values in array based on the old and new position
+     * @param {any} valuesArr - An array of values.
+     * @param {number} oldPosition - The index of the value in array before reordering.
+     * @param {number} newPosition - The index of the value in array after reordering.
+     * @param {boolean|any} movedBelow - Whether or not the value is moved below.
+     * @returns {void}
+     */
+    reorderValues(valuesArr, oldPosition, newPosition, movedBelow) {
+        if (!lodash_1.default.isArray(valuesArr) || lodash_1.default.isEmpty(valuesArr)) {
+            return;
+        }
+        const draggedRowData = valuesArr[oldPosition];
+        //insert element at new position
+        valuesArr.splice(newPosition, 0, draggedRowData);
+        //remove element from old position (if was moved above, after insertion it's at +1 index)
+        valuesArr.splice(movedBelow ? oldPosition : oldPosition + 1, 1);
+    }
     onReorder(element, _target, _source, sibling) {
         if (!element.dragInfo || (sibling && !sibling.dragInfo)) {
             console.warn('There is no Drag Info available for either dragged or sibling element');
@@ -346,11 +363,9 @@ class DataGridComponent extends NestedArrayComponent_1.default {
         const newPosition = sibling ? sibling.dragInfo.index : this.dataValue.length;
         const movedBelow = newPosition > oldPosition;
         const dataValue = (0, utils_1.fastCloneDeep)(this.dataValue);
-        const draggedRowData = dataValue[oldPosition];
-        //insert element at new position
-        dataValue.splice(newPosition, 0, draggedRowData);
-        //remove element from old position (if was moved above, after insertion it's at +1 index)
-        dataValue.splice(movedBelow ? oldPosition : oldPosition + 1, 1);
+        this.reorderValues(dataValue, oldPosition, newPosition, movedBelow);
+        //reorder select data
+        this.reorderValues(lodash_1.default.get(this.root, `submission.metadata.selectData.${this.path}`, []), oldPosition, newPosition, movedBelow);
         //need to re-build rows to re-calculate indexes and other indexed fields for component instance (like rows for ex.)
         this.setValue(dataValue, { isReordered: true });
         this.rebuild();

package/lib/cjs/components/datagrid/fixtures/comp-with-reorder.d.ts

@@ -0,0 +1,100 @@
+declare namespace _default {
+    export { form };
+    export { submission };
+}
+export default _default;
+declare namespace form {
+    let _id: string;
+    let title: string;
+    let name: string;
+    let path: string;
+    let type: string;
+    let display: string;
+    let components: ({
+        label: string;
+        reorder: boolean;
+        addAnotherPosition: string;
+        layoutFixed: boolean;
+        enableRowGroups: boolean;
+        initEmpty: boolean;
+        tableView: boolean;
+        defaultValue: {
+            select: string;
+        }[];
+        key: string;
+        type: string;
+        input: boolean;
+        components: {
+            label: string;
+            widget: string;
+            tableView: boolean;
+            dataSrc: string;
+            data: {
+                resource: string;
+            };
+            dataType: string;
+            valueProperty: string;
+            template: string;
+            validate: {
+                select: boolean;
+            };
+            key: string;
+            type: string;
+            searchField: string;
+            limit: number;
+            noRefreshOnScroll: boolean;
+            addResource: boolean;
+            reference: boolean;
+            input: boolean;
+        }[];
+        disableOnInvalid?: undefined;
+    } | {
+        type: string;
+        label: string;
+        key: string;
+        disableOnInvalid: boolean;
+        input: boolean;
+        tableView: boolean;
+        reorder?: undefined;
+        addAnotherPosition?: undefined;
+        layoutFixed?: undefined;
+        enableRowGroups?: undefined;
+        initEmpty?: undefined;
+        defaultValue?: undefined;
+        components?: undefined;
+    })[];
+    let created: string;
+    let modified: string;
+    let machineName: string;
+}
+declare namespace submission {
+    let form_1: string;
+    export { form_1 as form };
+    export namespace metadata {
+        namespace selectData {
+            let dataGrid: {
+                select: {
+                    data: {
+                        number: number;
+                    };
+                };
+            }[];
+        }
+    }
+    export namespace data {
+        let dataGrid_1: {
+            select: string;
+        }[];
+        export { dataGrid_1 as dataGrid };
+        export let dataTable: never[];
+        export let submit: boolean;
+    }
+    let _id_1: string;
+    export { _id_1 as _id };
+    export let project: string;
+    export let state: string;
+    let created_1: string;
+    export { created_1 as created };
+    let modified_1: string;
+    export { modified_1 as modified };
+}

package/lib/cjs/components/datagrid/fixtures/comp-with-reorder.js

@@ -0,0 +1,139 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const form = {
+    _id: '66742f4146717b98a9fa280f',
+    title: 'test reorder',
+    name: 'testReorder',
+    path: 'testreorder',
+    type: 'form',
+    display: 'form',
+    components: [
+        {
+            label: 'Data Grid',
+            reorder: true,
+            addAnotherPosition: 'bottom',
+            layoutFixed: false,
+            enableRowGroups: false,
+            initEmpty: false,
+            tableView: false,
+            defaultValue: [
+                {
+                    select: '',
+                },
+            ],
+            key: 'dataGrid',
+            type: 'datagrid',
+            input: true,
+            components: [
+                {
+                    label: 'Select',
+                    widget: 'choicesjs',
+                    tableView: true,
+                    dataSrc: 'resource',
+                    data: {
+                        resource: '66742ee946717b98a9fa1b0b',
+                    },
+                    dataType: 'string',
+                    valueProperty: 'data.textField',
+                    template: '<span>{{ item.data.number }}</span>',
+                    validate: {
+                        select: false,
+                    },
+                    key: 'select',
+                    type: 'select',
+                    searchField: 'data.textField__regex',
+                    limit: 10,
+                    noRefreshOnScroll: false,
+                    addResource: false,
+                    reference: false,
+                    input: true,
+                },
+            ],
+        },
+        {
+            type: 'button',
+            label: 'Submit',
+            key: 'submit',
+            disableOnInvalid: true,
+            input: true,
+            tableView: false,
+        },
+    ],
+    created: '2024-06-20T13:31:45.177Z',
+    modified: '2024-06-25T10:32:46.577Z',
+    machineName: 'tifwklexhyrgxbr:testReorder',
+};
+const submission = {
+    form: '66742f4146717b98a9fa280f',
+    metadata: {
+        selectData: {
+            dataGrid: [
+                {
+                    select: {
+                        data: {
+                            number: 1,
+                        },
+                    },
+                },
+                {
+                    select: {
+                        data: {
+                            number: 2,
+                        },
+                    },
+                },
+                {
+                    select: {
+                        data: {
+                            number: 3,
+                        },
+                    },
+                },
+                {
+                    select: {
+                        data: {
+                            number: 4,
+                        },
+                    },
+                },
+                {
+                    select: {
+                        data: {
+                            number: 5,
+                        },
+                    },
+                },
+            ],
+        },
+    },
+    data: {
+        dataGrid: [
+            {
+                select: '11',
+            },
+            {
+                select: '22',
+            },
+            {
+                select: '33',
+            },
+            {
+                select: '44',
+            },
+            {
+                select: '55',
+            },
+        ],
+        dataTable: [],
+        submit: true,
+    },
+    _id: '667ab5ee6a69739703d30def',
+    project: '65df46bc93bcfaa231f3db1c',
+    state: 'submitted',
+    created: '2024-06-25T12:19:58.626Z',
+    modified: '2024-06-25T12:19:58.627Z',
+};
+exports.default = {
+    form,
+    submission,
+};

package/lib/cjs/components/datagrid/fixtures/index.d.ts

@@ -15,4 +15,5 @@ import modalWithRequiredFields from './comp-modal-with-required-fields';
 import withAllowCalculateOverride from './comp-with-allow-calculate-override';
 import twoWithAllowCalculatedOverride from './two-comp-with-allow-calculate-override';
 import withCheckboxes from './comp-with-checkboxes';
-export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, withCollapsibleRowGroups, withConditionalFieldsAndValidations, withDefValue, withLogic, withRowGroupsAndDefValue, modalWithRequiredFields, withAllowCalculateOverride, twoWithAllowCalculatedOverride, withCheckboxes };
+import withReorder from './comp-with-reorder';
+export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, withCollapsibleRowGroups, withConditionalFieldsAndValidations, withDefValue, withLogic, withRowGroupsAndDefValue, modalWithRequiredFields, withAllowCalculateOverride, twoWithAllowCalculatedOverride, withCheckboxes, withReorder };

package/lib/cjs/components/datagrid/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.withCheckboxes = exports.twoWithAllowCalculatedOverride = exports.withAllowCalculateOverride = exports.modalWithRequiredFields = exports.withRowGroupsAndDefValue = exports.withLogic = exports.withDefValue = exports.withConditionalFieldsAndValidations = exports.withCollapsibleRowGroups = exports.comp8 = exports.comp7 = exports.comp6 = exports.comp5 = exports.comp4 = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
+exports.withReorder = exports.withCheckboxes = exports.twoWithAllowCalculatedOverride = exports.withAllowCalculateOverride = exports.modalWithRequiredFields = exports.withRowGroupsAndDefValue = exports.withLogic = exports.withDefValue = exports.withConditionalFieldsAndValidations = exports.withCollapsibleRowGroups = exports.comp8 = exports.comp7 = 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"));
@@ -38,3 +38,5 @@ const two_comp_with_allow_calculate_override_1 = __importDefault(require("./two-
 exports.twoWithAllowCalculatedOverride = two_comp_with_allow_calculate_override_1.default;
 const comp_with_checkboxes_1 = __importDefault(require("./comp-with-checkboxes"));
 exports.withCheckboxes = comp_with_checkboxes_1.default;
+const comp_with_reorder_1 = __importDefault(require("./comp-with-reorder"));
+exports.withReorder = comp_with_reorder_1.default;

package/lib/cjs/components/day/Day.d.ts

@@ -35,7 +35,7 @@ export default class DayComponent extends Field {
             id: string;
             class: string;
             type: string;
-            placeholder: any;
+            placeholder: string;
             step: number;
             min: any;
             max: any;

package/lib/cjs/components/day/Day.js

@@ -124,7 +124,7 @@ class DayComponent extends Field_1.default {
                 id: `${this.component.key}-${name}`,
                 class: `form-control ${this.transform('class', `formio-day-component-${name}`)}`,
                 type: this.component.fields[name].type === 'select' ? 'select' : 'number',
-                placeholder: this.component.fields[name].placeholder,
+                placeholder: this.t(this.component.fields[name].placeholder),
                 step: 1,
                 min,
                 max,

package/lib/cjs/components/day/fixtures/comp7.d.ts

@@ -0,0 +1,109 @@
+declare namespace _default {
+    let components: ({
+        type: string;
+        key: string;
+        label: string;
+        placeholder: string;
+        input: boolean;
+        applyMaskOn?: undefined;
+        tableView?: undefined;
+        hideInputLabels?: undefined;
+        inputsLabelPosition?: undefined;
+        useLocaleSettings?: undefined;
+        fields?: undefined;
+        defaultValue?: undefined;
+        values?: undefined;
+        questions?: undefined;
+        action?: undefined;
+        theme?: undefined;
+    } | {
+        label: string;
+        placeholder: string;
+        applyMaskOn: string;
+        tableView: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        hideInputLabels?: undefined;
+        inputsLabelPosition?: undefined;
+        useLocaleSettings?: undefined;
+        fields?: undefined;
+        defaultValue?: undefined;
+        values?: undefined;
+        questions?: undefined;
+        action?: undefined;
+        theme?: undefined;
+    } | {
+        label: string;
+        hideInputLabels: boolean;
+        inputsLabelPosition: string;
+        useLocaleSettings: boolean;
+        tableView: boolean;
+        fields: {
+            day: {
+                placeholder: string;
+                hide: boolean;
+            };
+            month: {
+                type: string;
+                placeholder: string;
+                hide: boolean;
+            };
+            year: {
+                placeholder: string;
+                hide: boolean;
+            };
+        };
+        key: string;
+        type: string;
+        input: boolean;
+        defaultValue: string;
+        placeholder?: undefined;
+        applyMaskOn?: undefined;
+        values?: undefined;
+        questions?: undefined;
+        action?: undefined;
+        theme?: undefined;
+    } | {
+        type: string;
+        key: string;
+        label: string;
+        values: {
+            label: string;
+            value: string;
+        }[];
+        questions: {
+            label: string;
+            value: string;
+        }[];
+        placeholder?: undefined;
+        input?: undefined;
+        applyMaskOn?: undefined;
+        tableView?: undefined;
+        hideInputLabels?: undefined;
+        inputsLabelPosition?: undefined;
+        useLocaleSettings?: undefined;
+        fields?: undefined;
+        defaultValue?: undefined;
+        action?: undefined;
+        theme?: undefined;
+    } | {
+        type: string;
+        action: string;
+        label: string;
+        theme: string;
+        key?: undefined;
+        placeholder?: undefined;
+        input?: undefined;
+        applyMaskOn?: undefined;
+        tableView?: undefined;
+        hideInputLabels?: undefined;
+        inputsLabelPosition?: undefined;
+        useLocaleSettings?: undefined;
+        fields?: undefined;
+        defaultValue?: undefined;
+        values?: undefined;
+        questions?: undefined;
+    })[];
+}
+export default _default;

package/lib/cjs/components/day/fixtures/comp7.js

@@ -0,0 +1,109 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    components: [
+        {
+            type: 'textfield',
+            key: 'firstName',
+            label: 'First Name',
+            placeholder: 'Enter your first name',
+            input: true
+        }, {
+            "label": "Day",
+            "placeholder": "Day",
+            "applyMaskOn": "change",
+            "tableView": true,
+            "key": "day2",
+            "type": "textfield",
+            "input": true
+        }, {
+            "label": "Month",
+            "placeholder": "Month",
+            "applyMaskOn": "change",
+            "tableView": true,
+            "key": "month2",
+            "type": "textfield",
+            "input": true
+        }, {
+            "label": "Year",
+            "placeholder": "Year",
+            "applyMaskOn": "change",
+            "tableView": true,
+            "key": "year2",
+            "type": "textfield",
+            "input": true
+        },
+        {
+            "label": "Day",
+            "hideInputLabels": false,
+            "inputsLabelPosition": "top",
+            "useLocaleSettings": false,
+            "tableView": false,
+            "fields": {
+                "day": {
+                    "placeholder": "Day",
+                    "hide": false
+                },
+                "month": {
+                    "type": "number",
+                    "placeholder": "Month",
+                    "hide": false
+                },
+                "year": {
+                    "placeholder": "Year",
+                    "hide": false
+                }
+            },
+            "key": "day",
+            "type": "day",
+            "input": true,
+            "defaultValue": "00/00/0000"
+        },
+        {
+            type: 'textfield',
+            key: 'lastName',
+            label: 'Last Name',
+            placeholder: 'Enter your last name',
+            input: true
+        },
+        {
+            type: 'survey',
+            key: 'questions',
+            label: 'Survey',
+            values: [
+                {
+                    label: 'Great',
+                    value: 'great'
+                },
+                {
+                    label: 'Good',
+                    value: 'good'
+                },
+                {
+                    label: 'Poor',
+                    value: 'poor'
+                }
+            ],
+            questions: [
+                {
+                    label: 'How would you rate the Form.io platform?',
+                    value: 'howWouldYouRateTheFormIoPlatform'
+                },
+                {
+                    label: 'How was Customer Support?',
+                    value: 'howWasCustomerSupport'
+                },
+                {
+                    label: 'Overall Experience?',
+                    value: 'overallExperience'
+                }
+            ]
+        },
+        {
+            type: 'button',
+            action: 'submit',
+            label: 'Submit',
+            theme: 'primary'
+        }
+    ]
+};

package/lib/cjs/components/day/fixtures/index.d.ts

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

package/lib/cjs/components/day/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.comp6 = exports.comp5 = exports.comp4 = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
+exports.comp7 = 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,3 +16,5 @@ 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/mjs/components/datagrid/DataGrid.d.ts

@@ -61,6 +61,15 @@ export default class DataGridComponent extends NestedArrayComponent {
     loadRefs(element: any, refs: any): void;
     dragula: any;
     getComponentsContainer(): any;
+    /**
+     * Reorder values in array based on the old and new position
+     * @param {any} valuesArr - An array of values.
+     * @param {number} oldPosition - The index of the value in array before reordering.
+     * @param {number} newPosition - The index of the value in array after reordering.
+     * @param {boolean|any} movedBelow - Whether or not the value is moved below.
+     * @returns {void}
+     */
+    reorderValues(valuesArr: any, oldPosition: number, newPosition: number, movedBelow: boolean | any): void;
     onReorder(element: any, _target: any, _source: any, sibling: any): void;
     focusOnNewRowElement(row: any): void;
     addRow(): void;