@formio/js 5.0.0-dev.5594.b3f7e58 → 5.0.0-dev.5595.8e56e8f

package/lib/cjs/components/checkbox/Checkbox.js

@@ -179,8 +179,15 @@ class CheckBoxComponent extends Field_1.default {
         return value;
     }
     setValue(value, flags = {}) {
-        this.setCheckedState(value);
-        return super.setValue(value, flags);
+        if (this.setCheckedState(value) !== undefined ||
+            (!this.input && value !== undefined && (this.visible || this.conditionallyVisible() || !this.component.clearOnHide))) {
+            const changed = this.updateValue(value, flags);
+            if (this.isHtmlRenderMode() && flags && flags.fromSubmission && changed) {
+                this.redraw();
+            }
+            return changed;
+        }
+        return false;
     }
     getValueAsString(value) {
         const { name: componentName, value: componentValue } = this.component;

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

@@ -2,6 +2,5 @@ import comp1 from './comp1';
 import comp2 from './comp2';
 import comp3 from './comp3';
 import comp4 from './comp4';
-import comp5 from './comp5';
 import customDefaultComponent from './customDefaultComponent';
-export { comp1, comp2, comp3, comp4, comp5, customDefaultComponent };
+export { comp1, comp2, comp3, comp4, customDefaultComponent };

package/lib/cjs/components/checkbox/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.customDefaultComponent = exports.comp5 = exports.comp4 = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
+exports.customDefaultComponent = exports.comp4 = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
 const comp1_1 = __importDefault(require("./comp1"));
 exports.comp1 = comp1_1.default;
 const customDefaultComponent_1 = __importDefault(require("./customDefaultComponent"));
@@ -14,5 +14,3 @@ const comp3_1 = __importDefault(require("./comp3"));
 exports.comp3 = comp3_1.default;
 const comp4_1 = __importDefault(require("./comp4"));
 exports.comp4 = comp4_1.default;
-const comp5_1 = __importDefault(require("./comp5"));
-exports.comp5 = comp5_1.default;

package/lib/cjs/components/recaptcha/editForm/ReCaptcha.edit.display.d.ts

@@ -7,6 +7,9 @@ declare const _default: ({
         label: string;
         value: string;
     }[];
+    validate: {
+        required: boolean;
+    };
     weight: number;
     input?: undefined;
     dataSrc?: undefined;
@@ -28,6 +31,7 @@ declare const _default: ({
         custom(context: any): any[];
     };
     values?: undefined;
+    validate?: undefined;
     ignore?: undefined;
 } | {
     key: string;
@@ -36,6 +40,7 @@ declare const _default: ({
     tooltip?: undefined;
     type?: undefined;
     values?: undefined;
+    validate?: undefined;
     weight?: undefined;
     input?: undefined;
     dataSrc?: undefined;

package/lib/cjs/components/recaptcha/editForm/ReCaptcha.edit.display.js

@@ -17,6 +17,9 @@ exports.default = [
                 value: 'buttonClick'
             }
         ],
+        validate: {
+            required: true
+        },
         weight: 650
     },
     {

package/lib/mjs/components/checkbox/Checkbox.js

@@ -178,8 +178,15 @@ export default class CheckBoxComponent extends Field {
         return value;
     }
     setValue(value, flags = {}) {
-        this.setCheckedState(value);
-        return super.setValue(value, flags);
+        if (this.setCheckedState(value) !== undefined ||
+            (!this.input && value !== undefined && (this.visible || this.conditionallyVisible() || !this.component.clearOnHide))) {
+            const changed = this.updateValue(value, flags);
+            if (this.isHtmlRenderMode() && flags && flags.fromSubmission && changed) {
+                this.redraw();
+            }
+            return changed;
+        }
+        return false;
     }
     getValueAsString(value) {
         const { name: componentName, value: componentValue } = this.component;

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

@@ -2,6 +2,5 @@ import comp1 from './comp1';
 import comp2 from './comp2';
 import comp3 from './comp3';
 import comp4 from './comp4';
-import comp5 from './comp5';
 import customDefaultComponent from './customDefaultComponent';
-export { comp1, comp2, comp3, comp4, comp5, customDefaultComponent };
+export { comp1, comp2, comp3, comp4, customDefaultComponent };

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

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

package/lib/mjs/components/recaptcha/editForm/ReCaptcha.edit.display.d.ts

@@ -7,6 +7,9 @@ declare const _default: ({
         label: string;
         value: string;
     }[];
+    validate: {
+        required: boolean;
+    };
     weight: number;
     input?: undefined;
     dataSrc?: undefined;
@@ -28,6 +31,7 @@ declare const _default: ({
         custom(context: any): any[];
     };
     values?: undefined;
+    validate?: undefined;
     ignore?: undefined;
 } | {
     key: string;
@@ -36,6 +40,7 @@ declare const _default: ({
     tooltip?: undefined;
     type?: undefined;
     values?: undefined;
+    validate?: undefined;
     weight?: undefined;
     input?: undefined;
     dataSrc?: undefined;

package/lib/mjs/components/recaptcha/editForm/ReCaptcha.edit.display.js

@@ -15,6 +15,9 @@ export default [
                 value: 'buttonClick'
             }
         ],
+        validate: {
+            required: true
+        },
         weight: 650
     },
     {

package/package.json

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

package/lib/cjs/components/checkbox/fixtures/comp5.d.ts

@@ -1,34 +0,0 @@
-declare namespace _default {
-    let title: string;
-    let name: string;
-    let path: string;
-    let type: string;
-    let display: string;
-    let components: ({
-        label: string;
-        tableView: boolean;
-        validateWhenHidden: boolean;
-        key: string;
-        conditional: {
-            show: boolean;
-            conjunction: string;
-            conditions: {
-                component: string;
-                operator: string;
-            }[];
-        };
-        type: string;
-        input: boolean;
-        applyMaskOn?: undefined;
-    } | {
-        label: string;
-        applyMaskOn: string;
-        tableView: boolean;
-        key: string;
-        type: string;
-        input: boolean;
-        validateWhenHidden?: undefined;
-        conditional?: undefined;
-    })[];
-}
-export default _default;

package/lib/cjs/components/checkbox/fixtures/comp5.js

@@ -1,55 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
-    title: '7595',
-    name: '7595',
-    path: '7595',
-    type: 'form',
-    display: 'form',
-    components: [
-        {
-            label: 'Checkbox',
-            tableView: false,
-            validateWhenHidden: false,
-            key: 'checkboxBefore',
-            conditional: {
-                show: true,
-                conjunction: 'all',
-                conditions: [
-                    {
-                        component: 'textField',
-                        operator: 'isNotEmpty'
-                    }
-                ]
-            },
-            type: 'checkbox',
-            input: true
-        },
-        {
-            label: 'Text Field',
-            applyMaskOn: 'change',
-            tableView: true,
-            key: 'textField',
-            type: 'textfield',
-            input: true
-        },
-        {
-            label: 'Checkbox',
-            tableView: false,
-            validateWhenHidden: false,
-            key: 'checkboxAfter',
-            conditional: {
-                show: true,
-                conjunction: 'all',
-                conditions: [
-                    {
-                        component: 'textField',
-                        operator: 'isNotEmpty'
-                    }
-                ]
-            },
-            type: 'checkbox',
-            input: true
-        },
-    ]
-};

package/lib/mjs/components/checkbox/fixtures/comp5.d.ts

@@ -1,34 +0,0 @@
-declare namespace _default {
-    let title: string;
-    let name: string;
-    let path: string;
-    let type: string;
-    let display: string;
-    let components: ({
-        label: string;
-        tableView: boolean;
-        validateWhenHidden: boolean;
-        key: string;
-        conditional: {
-            show: boolean;
-            conjunction: string;
-            conditions: {
-                component: string;
-                operator: string;
-            }[];
-        };
-        type: string;
-        input: boolean;
-        applyMaskOn?: undefined;
-    } | {
-        label: string;
-        applyMaskOn: string;
-        tableView: boolean;
-        key: string;
-        type: string;
-        input: boolean;
-        validateWhenHidden?: undefined;
-        conditional?: undefined;
-    })[];
-}
-export default _default;

package/lib/mjs/components/checkbox/fixtures/comp5.js

@@ -1,53 +0,0 @@
-export default {
-    title: '7595',
-    name: '7595',
-    path: '7595',
-    type: 'form',
-    display: 'form',
-    components: [
-        {
-            label: 'Checkbox',
-            tableView: false,
-            validateWhenHidden: false,
-            key: 'checkboxBefore',
-            conditional: {
-                show: true,
-                conjunction: 'all',
-                conditions: [
-                    {
-                        component: 'textField',
-                        operator: 'isNotEmpty'
-                    }
-                ]
-            },
-            type: 'checkbox',
-            input: true
-        },
-        {
-            label: 'Text Field',
-            applyMaskOn: 'change',
-            tableView: true,
-            key: 'textField',
-            type: 'textfield',
-            input: true
-        },
-        {
-            label: 'Checkbox',
-            tableView: false,
-            validateWhenHidden: false,
-            key: 'checkboxAfter',
-            conditional: {
-                show: true,
-                conjunction: 'all',
-                conditions: [
-                    {
-                        component: 'textField',
-                        operator: 'isNotEmpty'
-                    }
-                ]
-            },
-            type: 'checkbox',
-            input: true
-        },
-    ]
-};