@formio/js 5.0.0-rc.66 → 5.0.0-rc.68

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>
               {% } %}
@@ -1079,7 +1079,8 @@ export default class EditGridComponent extends NestedArrayComponent {
             return false;
         }
         else if (rowsEditing && this.saveEditMode && !this.component.openWhenEmpty) {
-            this.setCustomValidity(this.t(this.errorMessage('unsavedRowsError')), dirty);
+            this._errors = this.setCustomValidity(this.t(this.errorMessage('unsavedRowsError')), dirty);
+            errors.push(...this._errors);
             return false;
         }
         const message = this.invalid || this.invalidMessage(data, dirty, false, row);

package/lib/mjs/components/editgrid/fixtures/comp16.d.ts

@@ -0,0 +1,52 @@
+declare namespace _default {
+    let type: string;
+    let display: string;
+    let components: ({
+        title: string;
+        breadcrumbClickable: boolean;
+        buttonSettings: {
+            previous: boolean;
+            cancel: boolean;
+            next: boolean;
+        };
+        collapsible: boolean;
+        tableView: boolean;
+        key: string;
+        type: string;
+        label: string;
+        input: boolean;
+        components: {
+            label: string;
+            tableView: boolean;
+            rowDrafts: boolean;
+            key: string;
+            type: string;
+            input: boolean;
+            components: {
+                label: string;
+                tableView: boolean;
+                key: string;
+                type: string;
+                input: boolean;
+                alwaysEnabled: boolean;
+            }[];
+            alwaysEnabled: boolean;
+        }[];
+        alwaysEnabled: boolean;
+        showValidations?: undefined;
+    } | {
+        label: string;
+        showValidations: boolean;
+        alwaysEnabled: boolean;
+        tableView: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        title?: undefined;
+        breadcrumbClickable?: undefined;
+        buttonSettings?: undefined;
+        collapsible?: undefined;
+        components?: undefined;
+    })[];
+}
+export default _default;

package/lib/mjs/components/editgrid/fixtures/comp16.js

@@ -0,0 +1,69 @@
+export default {
+    type: 'form',
+    display: 'wizard',
+    components: [
+        {
+            title: 'Page 1',
+            breadcrumbClickable: true,
+            buttonSettings: {
+                previous: true,
+                cancel: true,
+                next: true
+            },
+            collapsible: false,
+            tableView: false,
+            key: 'page3',
+            type: 'panel',
+            label: 'Page 2',
+            input: false,
+            components: [
+                {
+                    label: 'Edit Grid',
+                    tableView: true,
+                    rowDrafts: false,
+                    key: 'editGrid',
+                    type: 'editgrid',
+                    input: true,
+                    components: [
+                        {
+                            label: 'Text Field',
+                            tableView: true,
+                            key: 'textField',
+                            type: 'textfield',
+                            input: true,
+                            alwaysEnabled: false
+                        }
+                    ],
+                    alwaysEnabled: false
+                }
+            ],
+            alwaysEnabled: false
+        },
+        {
+            title: 'Page 2',
+            breadcrumbClickable: true,
+            buttonSettings: {
+                previous: true,
+                cancel: true,
+                next: true
+            },
+            collapsible: false,
+            tableView: false,
+            key: 'page2',
+            type: 'panel',
+            label: 'Page 1',
+            input: false,
+            alwaysEnabled: false,
+            components: []
+        },
+        {
+            label: 'Submit',
+            showValidations: false,
+            alwaysEnabled: false,
+            tableView: false,
+            key: 'submit',
+            type: 'button',
+            input: true
+        }
+    ]
+};

package/lib/mjs/components/editgrid/fixtures/index.d.ts

@@ -7,6 +7,7 @@ import comp12 from './comp12';
 import comp13 from './comp13';
 import comp14 from './comp14';
 import comp15 from './comp15';
+import comp16 from './comp16';
 import comp4 from './comp4';
 import comp5 from './comp5';
 import comp6 from './comp6';
@@ -16,4 +17,4 @@ import comp9 from './comp9';
 import compOpenWhenEmpty from './comp-openWhenEmpty';
 import withOpenWhenEmptyAndConditions from './comp-with-conditions-and-openWhenEmpty';
 import compWithCustomDefaultValue from './comp-with-custom-default-value';
-export { comp1, comp2, comp3, comp10, comp11, comp12, comp13, comp14, comp15, comp4, comp5, comp6, comp7, comp8, comp9, compOpenWhenEmpty, withOpenWhenEmptyAndConditions, compWithCustomDefaultValue };
+export { comp1, comp2, comp3, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp4, comp5, comp6, comp7, comp8, comp9, compOpenWhenEmpty, withOpenWhenEmptyAndConditions, compWithCustomDefaultValue };

package/lib/mjs/components/editgrid/fixtures/index.js

@@ -13,7 +13,8 @@ import comp12 from './comp12';
 import comp13 from './comp13';
 import comp14 from './comp14';
 import comp15 from './comp15';
+import comp16 from './comp16';
 import withOpenWhenEmptyAndConditions from './comp-with-conditions-and-openWhenEmpty';
 import compOpenWhenEmpty from './comp-openWhenEmpty';
 import compWithCustomDefaultValue from './comp-with-custom-default-value';
-export { comp1, comp2, comp3, comp10, comp11, comp12, comp13, comp14, comp15, comp4, comp5, comp6, comp7, comp8, comp9, compOpenWhenEmpty, withOpenWhenEmptyAndConditions, compWithCustomDefaultValue };
+export { comp1, comp2, comp3, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp4, comp5, comp6, comp7, comp8, comp9, compOpenWhenEmpty, withOpenWhenEmptyAndConditions, compWithCustomDefaultValue };

package/lib/mjs/translations/en.d.ts

@@ -74,5 +74,8 @@ declare namespace _default {
     let apiKey: string;
     let typeRemaining: string;
     let typeCount: string;
+    let requiredDayField: string;
+    let requiredMonthField: string;
+    let requiredYearField: string;
 }
 export default _default;

package/lib/mjs/translations/en.js

@@ -73,5 +73,8 @@ export default {
     reCaptchaTokenNotSpecifiedError: 'ReCAPTCHA: Token is not specified in submission',
     apiKey: 'API Key is not unique: {{key}}',
     typeRemaining: '{{ remaining }} {{ type }} remaining.',
-    typeCount: '{{ count }} {{ type }}'
+    typeCount: '{{ count }} {{ type }}',
+    requiredDayField: '{{ field }} is required',
+    requiredMonthField: '{{ field }} is required',
+    requiredYearField: '{{ field }} is required'
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-rc.66",
+  "version": "5.0.0-rc.68",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -81,7 +81,7 @@
   "dependencies": {
     "@formio/bootstrap": "3.0.0-rc.36",
     "@formio/choices.js": "^10.2.1",
-    "@formio/core": "2.2.0-rc.4",
+    "@formio/core": "2.2.0-rc.6",
     "@formio/text-mask-addons": "^3.8.0-formio.2",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",