@formio/js 5.1.0-dev.6152.95f2394 → 5.1.0-dev.6155.8178240

package/lib/cjs/PDFBuilder.d.ts

@@ -51,5 +51,6 @@ export default class PDFBuilder extends WebformBuilder {
     onDropzoneDrop(e: any): boolean;
     dropEvent: any;
     onDragEnd(e: any): void;
+    repeatablePathsComps: any[] | undefined;
 }
 import WebformBuilder from './WebformBuilder';

package/lib/cjs/PDFBuilder.js

@@ -451,21 +451,21 @@ class PDFBuilder extends WebformBuilder_1.default {
         e.target.style.cursor = 'default';
     }
     highlightInvalidComponents() {
-        const repeatablePaths = this.findRepeatablePaths();
+        const repeatablePathsComps = this.findComponentsWithRepeatablePaths();
         // update elements which path was duplicated if any pathes have been changed
-        if (!lodash_1.default.isEqual(this.repeatablePaths, repeatablePaths)) {
-            (0, utils_1.eachComponent)(this.webform.getComponents(), (comp, path) => {
-                if (this.repeatablePaths.includes(path)) {
+        if (!lodash_1.default.isEqual(this.repeatablePathsComps, repeatablePathsComps)) {
+            (0, utils_1.eachComponent)(this.webform.getComponents(), (comp) => {
+                if (this.repeatablePathsComps.includes(comp.component)) {
                     this.webform.postMessage({ name: 'updateElement', data: comp.component });
                 }
             });
-            this.repeatablePaths = repeatablePaths;
+            this.repeatablePathsComps = repeatablePathsComps;
         }
-        if (!repeatablePaths.length) {
+        if (!repeatablePathsComps.length) {
             return;
         }
-        (0, utils_1.eachComponent)(this.webform.getComponents(), (comp, path) => {
-            if (this.repeatablePaths.includes(path)) {
+        (0, utils_1.eachComponent)(this.webform.getComponents(), (comp) => {
+            if (this.repeatablePathsComps.includes(comp)) {
                 this.webform.postMessage({
                     name: 'showBuilderErrors',
                     data: {

package/lib/cjs/WebformBuilder.d.ts

@@ -78,7 +78,7 @@ export default class WebformBuilder extends Component {
     replaceDoubleQuotes(data: any, fieldsToRemoveDoubleQuotes?: any[]): any;
     updateComponent(component: any, changed: any): void;
     originalDefaultValue: any;
-    findRepeatablePaths(): any[];
+    findComponentsWithRepeatablePaths(): any[];
     highlightInvalidComponents(): void;
     /**
      * Called when a new component is saved.

package/lib/cjs/WebformBuilder.js

@@ -1125,25 +1125,37 @@ class WebformBuilder extends Component_1.default {
         // Called when we update a component.
         this.emit('updateComponent', component);
     }
-    findRepeatablePaths() {
-        const repeatablePaths = [];
+    findComponentsWithRepeatablePaths() {
+        const repeatablePaths = {};
         const keys = new Map();
         (0, utils_1.eachComponent)(this.form.components, (comp, path, components, parent, paths) => {
+            var _a, _b;
+            const isRadioCheckbox = comp.type === 'checkbox' && comp.inputType === 'radio';
             if (keys.has(paths.dataPath)) {
-                repeatablePaths.push(paths.dataPath);
+                const onlyRadioCheckboxes = ((_a = repeatablePaths[paths.dataPath]) === null || _a === void 0 ? void 0 : _a.onlyRadioCheckboxes) === false ? false : isRadioCheckbox;
+                repeatablePaths[paths.dataPath] = {
+                    comps: [...(((_b = repeatablePaths[paths.dataPath]) === null || _b === void 0 ? void 0 : _b.comps) || []), keys.get(paths.dataPath), comp],
+                    onlyRadioCheckboxes,
+                };
             }
             else {
-                keys.set(paths.dataPath, true);
+                keys.set(paths.dataPath, comp);
             }
         }, true);
-        return repeatablePaths;
+        const componentsWithRepeatablePaths = [];
+        Object.keys(repeatablePaths).forEach((path) => {
+            const { comps, onlyRadioCheckboxes } = repeatablePaths[path];
+            if (!onlyRadioCheckboxes) {
+                componentsWithRepeatablePaths.push(...comps);
+            }
+        });
+        return componentsWithRepeatablePaths;
     }
     highlightInvalidComponents() {
-        const repeatablePaths = this.findRepeatablePaths();
+        const repeatablePathsComps = this.findComponentsWithRepeatablePaths();
         let hasInvalidComponents = false;
         this.webform.everyComponent((comp) => {
-            const path = comp.path;
-            if (repeatablePaths.includes(path)) {
+            if (repeatablePathsComps.includes(comp.component)) {
                 comp.setCustomValidity(this.t('apiKey', { key: comp.key }));
                 hasInvalidComponents = true;
             }

package/lib/cjs/components/button/Button.d.ts

@@ -7,7 +7,7 @@ export default class ButtonComponent extends Field {
         weight: number;
         schema: any;
     };
-    static savedValueTypes(schema: any): any;
+    static savedValueTypes(schema: any): string[];
     constructor(component: any, options: any, data: any);
     filesUploading: number;
     get inputInfo(): any;

package/lib/cjs/components/button/Button.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
 const Field_1 = __importDefault(require("../_classes/field/Field"));
 const Input_1 = __importDefault(require("../_classes/input/Input"));
-const formUtils_1 = require("../../utils/formUtils");
+const utils_1 = require("../../utils");
 class ButtonComponent extends Field_1.default {
     static schema(...extend) {
         return Input_1.default.schema({
@@ -35,7 +35,7 @@ class ButtonComponent extends Field_1.default {
         };
     }
     static savedValueTypes(schema) {
-        return (0, formUtils_1.getComponentSavedTypes)(schema) || [formUtils_1.componentValueTypes.boolean];
+        return (0, utils_1.getComponentSavedTypes)(schema) || [utils_1.componentValueTypes.boolean];
     }
     constructor(component, options, data) {
         super(component, options, data);
@@ -306,7 +306,7 @@ class ButtonComponent extends Field_1.default {
                 const form = this.getRoot();
                 const flattened = {};
                 const components = {};
-                (0, formUtils_1.eachComponent)(form.components, (componentWrapper, path) => {
+                (0, utils_1.eachComponent)(form.components, (componentWrapper, path) => {
                     const component = componentWrapper.component || componentWrapper;
                     flattened[path] = component;
                     components[component.key] = component;
@@ -447,7 +447,7 @@ class ButtonComponent extends Field_1.default {
         }, 100);
     }
     get oauthComponentPath() {
-        const pathArray = (0, formUtils_1.getArrayFromComponentPath)(this.path);
+        const pathArray = (0, utils_1.getArrayFromComponentPath)(this.path);
         return lodash_1.default.chain(pathArray).filter(pathPart => !lodash_1.default.isNumber(pathPart)).join('.').value();
     }
     focus() {

package/lib/cjs/utils/utils.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.translateHTMLTemplate = exports.getContextButtons = exports.getContextComponents = exports.observeOverload = exports.withSwitch = exports.firstNonNil = exports.unfold = exports.bootstrapVersion = exports.uniqueKey = exports.iterateKey = exports.delay = exports.fieldData = exports.getCurrencyAffixes = exports.getNumberDecimalLimit = exports.getNumberSeparators = exports.matchInputMask = exports.unmaskValue = exports.getInputMask = exports.convertFormatToMask = exports.convertFormatToDayjs = exports.convertFormatToFlatpickr = exports.getLocaleDateFormatInfo = exports.formatOffset = exports.formatDate = exports.dayjsDate = exports.shouldHandleTimezone = exports.offsetDate = exports.currentTimezone = exports.isValidDate = exports.getDateSetting = exports.guid = exports.uniqueName = exports.convertStringToHTMLElement = exports.unescapeHTML = exports.removeHTML = exports.setActionProperty = exports.checkTrigger = exports.checkCondition = exports.checkJsonConditional = exports.checkCustomConditional = exports.getComponentActualValue = exports.checkSimpleConditional = exports.checkCalculated = exports.isMongoId = exports.boolValue = exports.getScriptPlugin = exports.getElementRect = exports.getPropertyValue = exports.getRandomComponentId = exports.evaluate = void 0;
 exports.hasEncodedTimezone = exports.interpolateErrors = exports.getComponentSavedTypes = exports.componentValueTypes = exports.getFocusableElements = exports.isPromise = exports.getDataParentComponent = exports.getComponentPath = exports.getComponentPathWithoutIndicies = exports.getBrowserInfo = exports.getIEBrowserVersion = exports.round = exports.getStringFromComponentPath = exports.isChildOf = exports.getArrayFromComponentPath = exports.isInputComponent = exports.fastCloneDeep = exports.sanitize = void 0;
+/* global jQuery */
 const lodash_1 = __importDefault(require("lodash"));
 const moment_timezone_1 = __importDefault(require("moment-timezone/moment-timezone"));
 const jstimezonedetect_1 = __importDefault(require("jstimezonedetect"));
@@ -1056,6 +1057,9 @@ function bootstrapVersion(options) {
     if (options.bootstrap) {
         return options.bootstrap;
     }
+    if ((typeof jQuery === 'function') && (typeof jQuery().collapse === 'function')) {
+        return parseInt(jQuery.fn.collapse.Constructor.VERSION.split('.')[0], 10);
+    }
     if (window.bootstrap && window.bootstrap.Collapse) {
         return parseInt(window.bootstrap.Collapse.VERSION.split('.')[0], 10);
     }

package/lib/mjs/PDFBuilder.d.ts

@@ -51,5 +51,6 @@ export default class PDFBuilder extends WebformBuilder {
     onDropzoneDrop(e: any): boolean;
     dropEvent: any;
     onDragEnd(e: any): void;
+    repeatablePathsComps: any[] | undefined;
 }
 import WebformBuilder from './WebformBuilder';

package/lib/mjs/PDFBuilder.js

@@ -444,21 +444,21 @@ export default class PDFBuilder extends WebformBuilder {
         e.target.style.cursor = 'default';
     }
     highlightInvalidComponents() {
-        const repeatablePaths = this.findRepeatablePaths();
+        const repeatablePathsComps = this.findComponentsWithRepeatablePaths();
         // update elements which path was duplicated if any pathes have been changed
-        if (!_.isEqual(this.repeatablePaths, repeatablePaths)) {
-            eachComponent(this.webform.getComponents(), (comp, path) => {
-                if (this.repeatablePaths.includes(path)) {
+        if (!_.isEqual(this.repeatablePathsComps, repeatablePathsComps)) {
+            eachComponent(this.webform.getComponents(), (comp) => {
+                if (this.repeatablePathsComps.includes(comp.component)) {
                     this.webform.postMessage({ name: 'updateElement', data: comp.component });
                 }
             });
-            this.repeatablePaths = repeatablePaths;
+            this.repeatablePathsComps = repeatablePathsComps;
         }
-        if (!repeatablePaths.length) {
+        if (!repeatablePathsComps.length) {
             return;
         }
-        eachComponent(this.webform.getComponents(), (comp, path) => {
-            if (this.repeatablePaths.includes(path)) {
+        eachComponent(this.webform.getComponents(), (comp) => {
+            if (this.repeatablePathsComps.includes(comp)) {
                 this.webform.postMessage({
                     name: 'showBuilderErrors',
                     data: {

package/lib/mjs/WebformBuilder.d.ts

@@ -78,7 +78,7 @@ export default class WebformBuilder extends Component {
     replaceDoubleQuotes(data: any, fieldsToRemoveDoubleQuotes?: any[]): any;
     updateComponent(component: any, changed: any): void;
     originalDefaultValue: any;
-    findRepeatablePaths(): any[];
+    findComponentsWithRepeatablePaths(): any[];
     highlightInvalidComponents(): void;
     /**
      * Called when a new component is saved.

package/lib/mjs/WebformBuilder.js

@@ -1108,25 +1108,36 @@ export default class WebformBuilder extends Component {
         // Called when we update a component.
         this.emit('updateComponent', component);
     }
-    findRepeatablePaths() {
-        const repeatablePaths = [];
+    findComponentsWithRepeatablePaths() {
+        const repeatablePaths = {};
         const keys = new Map();
         eachComponent(this.form.components, (comp, path, components, parent, paths) => {
+            const isRadioCheckbox = comp.type === 'checkbox' && comp.inputType === 'radio';
             if (keys.has(paths.dataPath)) {
-                repeatablePaths.push(paths.dataPath);
+                const onlyRadioCheckboxes = repeatablePaths[paths.dataPath]?.onlyRadioCheckboxes === false ? false : isRadioCheckbox;
+                repeatablePaths[paths.dataPath] = {
+                    comps: [...(repeatablePaths[paths.dataPath]?.comps || []), keys.get(paths.dataPath), comp],
+                    onlyRadioCheckboxes,
+                };
             }
             else {
-                keys.set(paths.dataPath, true);
+                keys.set(paths.dataPath, comp);
             }
         }, true);
-        return repeatablePaths;
+        const componentsWithRepeatablePaths = [];
+        Object.keys(repeatablePaths).forEach((path) => {
+            const { comps, onlyRadioCheckboxes } = repeatablePaths[path];
+            if (!onlyRadioCheckboxes) {
+                componentsWithRepeatablePaths.push(...comps);
+            }
+        });
+        return componentsWithRepeatablePaths;
     }
     highlightInvalidComponents() {
-        const repeatablePaths = this.findRepeatablePaths();
+        const repeatablePathsComps = this.findComponentsWithRepeatablePaths();
         let hasInvalidComponents = false;
         this.webform.everyComponent((comp) => {
-            const path = comp.path;
-            if (repeatablePaths.includes(path)) {
+            if (repeatablePathsComps.includes(comp.component)) {
                 comp.setCustomValidity(this.t('apiKey', { key: comp.key }));
                 hasInvalidComponents = true;
             }

package/lib/mjs/components/button/Button.d.ts

@@ -7,7 +7,7 @@ export default class ButtonComponent extends Field {
         weight: number;
         schema: any;
     };
-    static savedValueTypes(schema: any): any;
+    static savedValueTypes(schema: any): string[];
     constructor(component: any, options: any, data: any);
     filesUploading: number;
     get inputInfo(): any;

package/lib/mjs/components/button/Button.js

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import Field from '../_classes/field/Field';
 import Input from '../_classes/input/Input';
-import { componentValueTypes, eachComponent, getArrayFromComponentPath, getComponentSavedTypes } from '../../utils/formUtils';
+import { componentValueTypes, eachComponent, getArrayFromComponentPath, getComponentSavedTypes } from '../../utils';
 export default class ButtonComponent extends Field {
     static schema(...extend) {
         return Input.schema({

package/lib/mjs/utils/utils.js

@@ -1,3 +1,4 @@
+/* global jQuery */
 import _ from 'lodash';
 import moment from 'moment-timezone/moment-timezone';
 import jtz from 'jstimezonedetect';
@@ -1005,6 +1006,9 @@ export function bootstrapVersion(options) {
     if (options.bootstrap) {
         return options.bootstrap;
     }
+    if ((typeof jQuery === 'function') && (typeof jQuery().collapse === 'function')) {
+        return parseInt(jQuery.fn.collapse.Constructor.VERSION.split('.')[0], 10);
+    }
     if (window.bootstrap && window.bootstrap.Collapse) {
         return parseInt(window.bootstrap.Collapse.VERSION.split('.')[0], 10);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.1.0-dev.6152.95f2394",
+  "version": "5.1.0-dev.6155.8178240",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {