react-survey-builder 1.0.83 → 1.0.84

package/lib/fieldset/{FieldSet.js → Fieldset.js}

@@ -39,7 +39,7 @@ var ComponentLegend = function ComponentLegend(_ref) {
     }
   });
 };
-var FieldSetBase = function FieldSetBase(_ref2) {
+var FieldsetBase = function FieldsetBase(_ref2) {
   var item = _ref2.item,
     controls = _ref2.controls,
     items = _ref2.items,
@@ -115,4 +115,4 @@ var FieldSetBase = function FieldSetBase(_ref2) {
     }));
   })));
 };
-export default FieldSetBase;
+export default FieldsetBase;

package/lib/fieldset/index.js

@@ -1,2 +1,2 @@
-import FieldSet from './FieldSet';
-export { FieldSet };
+import Fieldset from './Fieldset';
+export { Fieldset };

package/lib/form-fields.js

@@ -19,7 +19,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import SurveyElements, { Image, Checkboxes, Signature, Download, Camera, FileUpload, PhoneNumber, DatePicker, TextInput, EmailInput, NumberInput, TextArea, Dropdown, Tags } from './survey-elements';
 import { TwoColumnRow, ThreeColumnRow, MultiColumnRow } from './multi-column';
-import { FieldSet } from './fieldset';
+import { Fieldset } from './fieldset';
 import { Step } from './step';
 import CustomElement from './survey-elements/custom-element';
 import Registry from './stores/registry';
@@ -49,6 +49,7 @@ var ReactSurveyFormFields = function ReactSurveyFormFields(_ref) {
     _ref$hideLabels = _ref.hideLabels,
     hideLabels = _ref$hideLabels === void 0 ? false : _ref$hideLabels,
     variables = _ref.variables,
+    staticVariables = _ref.staticVariables,
     buttonClassName = _ref.buttonClassName,
     checkboxButtonClassName = _ref.checkboxButtonClassName,
     headerClassName = _ref.headerClassName,
@@ -281,7 +282,8 @@ var ReactSurveyFormFields = function ReactSurveyFormFields(_ref) {
         name: (_$dataItem$fieldName = $dataItem.fieldName) !== null && _$dataItem$fieldName !== void 0 ? _$dataItem$fieldName : $dataItem.name,
         key: "form_".concat($dataItem.id),
         item: $dataItem,
-        value: _getDefaultValue($dataItem)
+        defaultValue: _getDefaultValue($dataItem),
+        staticVariables: staticVariables
       });
     }
     return null;
@@ -296,7 +298,7 @@ var ReactSurveyFormFields = function ReactSurveyFormFields(_ref) {
       name: item.fieldName,
       key: "form_".concat(item.id),
       item: item,
-      value: _getDefaultValue(item),
+      defaultValue: _getDefaultValue(item),
       onChange: handleChange
     });
   };
@@ -454,6 +456,7 @@ var ReactSurveyFormFields = function ReactSurveyFormFields(_ref) {
     item.hideLabel = (_ref8 = hideLabels || item.hideLabel) !== null && _ref8 !== void 0 ? _ref8 : false;
     item.disabled = (_ref9 = readOnly || item.readOnly) !== null && _ref9 !== void 0 ? _ref9 : false;
     item.mutable = true;
+    item.staticVariables = staticVariables;
     switch (item.element) {
       case 'RadioButtons':
       case 'Range':
@@ -479,8 +482,8 @@ var ReactSurveyFormFields = function ReactSurveyFormFields(_ref) {
         return getContainerElement(item, TwoColumnRow);
       case 'Step':
         return getContainerElement(item, Step);
-      case 'FieldSet':
-        return getContainerElement(item, FieldSet);
+      case 'Fieldset':
+        return getContainerElement(item, Fieldset);
       case 'Signature':
         return /*#__PURE__*/React.createElement(Controller, {
           key: "form_".concat(item.id),

package/lib/form-steps.js

@@ -19,7 +19,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import SurveyElements, { Image, Checkboxes, Signature, Download, Camera, FileUpload, PhoneNumber, DatePicker, TextInput, EmailInput, NumberInput, TextArea, Dropdown, Tags } from './survey-elements';
 import { TwoColumnRow, ThreeColumnRow, MultiColumnRow } from './multi-column';
-import { FieldSet } from './fieldset';
+import { Fieldset } from './fieldset';
 import { Step } from './step';
 import CustomElement from './survey-elements/custom-element';
 import Registry from './stores/registry';
@@ -50,6 +50,7 @@ var ReactSurveyFormSteps = function ReactSurveyFormSteps(_ref) {
     _ref$hideLabels = _ref.hideLabels,
     hideLabels = _ref$hideLabels === void 0 ? false : _ref$hideLabels,
     variables = _ref.variables,
+    staticVariables = _ref.staticVariables,
     buttonClassName = _ref.buttonClassName,
     checkboxButtonClassName = _ref.checkboxButtonClassName,
     headerClassName = _ref.headerClassName,
@@ -283,7 +284,8 @@ var ReactSurveyFormSteps = function ReactSurveyFormSteps(_ref) {
         name: (_$dataItem$fieldName = $dataItem.fieldName) !== null && _$dataItem$fieldName !== void 0 ? _$dataItem$fieldName : $dataItem.name,
         key: "form_".concat($dataItem.id),
         item: $dataItem,
-        value: _getDefaultValue($dataItem)
+        defaultValue: _getDefaultValue($dataItem),
+        staticVariables: staticVariables
       });
     }
     return null;
@@ -298,7 +300,7 @@ var ReactSurveyFormSteps = function ReactSurveyFormSteps(_ref) {
       name: item.fieldName,
       key: "form_".concat(item.id),
       item: item,
-      value: _getDefaultValue(item),
+      defaultValue: _getDefaultValue(item),
       onChange: handleChange
     });
   };
@@ -456,6 +458,7 @@ var ReactSurveyFormSteps = function ReactSurveyFormSteps(_ref) {
     item.hideLabel = (_ref8 = hideLabels || item.hideLabel) !== null && _ref8 !== void 0 ? _ref8 : false;
     item.disabled = (_ref9 = readOnly || item.readOnly) !== null && _ref9 !== void 0 ? _ref9 : false;
     item.mutable = true;
+    item.staticVariables = staticVariables;
     switch (item.element) {
       case 'RadioButtons':
       case 'Range':
@@ -481,8 +484,8 @@ var ReactSurveyFormSteps = function ReactSurveyFormSteps(_ref) {
         return getContainerElement(item, TwoColumnRow);
       case 'Step':
         return getContainerElement(item, Step);
-      case 'FieldSet':
-        return getContainerElement(item, FieldSet);
+      case 'Fieldset':
+        return getContainerElement(item, Fieldset);
       case 'Signature':
         return /*#__PURE__*/React.createElement(Controller, {
           key: "form_".concat(item.id),

package/lib/form.js

@@ -19,7 +19,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import SurveyElements, { Image, Checkboxes, Signature, Download, Camera, FileUpload, PhoneNumber, DatePicker, TextInput, EmailInput, NumberInput, TextArea } from './survey-elements';
 import { TwoColumnRow, ThreeColumnRow, MultiColumnRow } from './multi-column';
-import { FieldSet } from './fieldset';
+import { Fieldset } from './fieldset';
 import { Step } from './step';
 import CustomElement from './survey-elements/custom-element';
 import Registry from './stores/registry';
@@ -49,6 +49,7 @@ var ReactSurvey = function ReactSurvey(_ref) {
     _ref$hideLabels = _ref.hideLabels,
     hideLabels = _ref$hideLabels === void 0 ? false : _ref$hideLabels,
     variables = _ref.variables,
+    staticVariables = _ref.staticVariables,
     buttonClassName = _ref.buttonClassName,
     checkboxButtonClassName = _ref.checkboxButtonClassName,
     headerClassName = _ref.headerClassName,
@@ -291,7 +292,8 @@ var ReactSurvey = function ReactSurvey(_ref) {
         name: (_$dataItem$fieldName = $dataItem.fieldName) !== null && _$dataItem$fieldName !== void 0 ? _$dataItem$fieldName : $dataItem.name,
         key: "form_".concat($dataItem.id),
         item: $dataItem,
-        value: _getDefaultValue($dataItem)
+        defaultValue: _getDefaultValue($dataItem),
+        staticVariables: staticVariables
       });
     }
     return null;
@@ -307,7 +309,7 @@ var ReactSurvey = function ReactSurvey(_ref) {
       name: (_item$fieldName = item.fieldName) !== null && _item$fieldName !== void 0 ? _item$fieldName : item.name,
       key: "form_".concat(item.id),
       item: item,
-      value: _getDefaultValue(item),
+      defaultValue: _getDefaultValue(item),
       onChange: handleChange
     });
   };
@@ -465,6 +467,7 @@ var ReactSurvey = function ReactSurvey(_ref) {
     item.hideLabel = (_ref8 = hideLabels || item.hideLabel) !== null && _ref8 !== void 0 ? _ref8 : false;
     item.disabled = (_ref9 = readOnly || item.readOnly) !== null && _ref9 !== void 0 ? _ref9 : false;
     item.mutable = true;
+    item.staticVariables = staticVariables;
     switch (item.element) {
       case 'RadioButtons':
       case 'Range':
@@ -490,8 +493,8 @@ var ReactSurvey = function ReactSurvey(_ref) {
         return getContainerElement(item, TwoColumnRow);
       case 'Step':
         return getContainerElement(item, Step);
-      case 'FieldSet':
-        return getContainerElement(item, FieldSet);
+      case 'Fieldset':
+        return getContainerElement(item, Fieldset);
       case 'Signature':
         return /*#__PURE__*/React.createElement(Controller, {
           key: "form_".concat(item.id),

package/lib/index.js

@@ -38,6 +38,11 @@ var ReactSurveyBuilder = function ReactSurveyBuilder(_ref) {
     previewSurveyBlock = _ref$previewSurveyBlo === void 0 ? null : _ref$previewSurveyBlo,
     renderEditForm = _ref.renderEditForm,
     variables = _ref.variables,
+    staticVariables = _ref.staticVariables,
+    checkboxButtonClassName = _ref.checkboxButtonClassName,
+    headerClassName = _ref.headerClassName,
+    labelClassName = _ref.labelClassName,
+    paragraphClassName = _ref.paragraphClassName,
     onPost = _ref.onPost,
     onLoad = _ref.onLoad,
     url = _ref.url,
@@ -78,11 +83,16 @@ var ReactSurveyBuilder = function ReactSurveyBuilder(_ref) {
     editMode: editMode,
     setEditMode: setEditMode,
     variables: variables,
+    staticVariables: staticVariables,
     registry: Registry,
     editElement: editElement,
     setEditElement: setEditElement,
     renderEditForm: renderEditForm,
-    saveAlways: saveAlways
+    saveAlways: saveAlways,
+    checkboxButtonClassName: checkboxButtonClassName,
+    headerClassName: headerClassName,
+    labelClassName: labelClassName,
+    paragraphClassName: paragraphClassName
   })), /*#__PURE__*/React.createElement(Col, {
     xs: 3,
     className: "overflow-hidden h-100"

package/lib/multi-column/dustbin.js

@@ -42,7 +42,7 @@ var getElement = function getElement(item, props) {
   if (item.custom) {
     return getCustomElement(item, props);
   }
-  console.log('getDustbinElement', item);
+  // console.log('getDustbinElement', item);
   var Element = SurveyElements[item.element || item.key];
   return /*#__PURE__*/React.createElement(Element, _extends({}, props, {
     id: item.id,
@@ -98,7 +98,7 @@ var Dustbin = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   React.useImperativeHandle(ref, function () {
     return {
       onDrop: function onDrop(dropped) {
-        console.log("dropped item", dropped);
+        // console.log("dropped item", dropped);
         var item = dropped.item;
         if (item) {
           if (onDropSuccess) {
@@ -135,17 +135,18 @@ export default DropTarget(function (props) {
   return props.accepts;
 }, {
   drop: function drop(props, monitor, component) {
-    console.log('droptargetprops', props);
+    // console.log('droptargetprops', props)
     if (!component) {
       return;
     }
 
-    // //Do nothing whith busy dustbin
+    // //Do nothing with busy dustbin
     // if(props.items[props.col]) return;
     // Allow swap column if target and source are in same multi column row
     var isBusy = !!props.items[props.col];
     var item = monitor.getItem();
-    console.log('dustbin', props, item, isBusy);
+
+    // console.log('dustbin', props, item, isBusy);
 
     // Do nothing when moving the box inside the same column
     if (props.col === item.col && props.items[props.col] === item.id) return;
@@ -157,11 +158,16 @@ export default DropTarget(function (props) {
       //store.dispatch('deleteLastItem');
       return;
     }
+
+    // do not allow an existing child to be dropped in the dropzone as it will duplicate the child with the same id for both instances
+    if ((props.item.element === 'Fieldset' || props.item.element === 'Step') && isListNotEmpty(props.item.childItems) && item.col === props.item.childItems.length) {
+      return;
+    }
     if (!isContainer(item)) {
       component.onDrop(item);
-      console.log("calling on Drop from 137", item);
+      // console.log("calling on Drop from 137", item)
       if (item.item && typeof props.setAsChild === 'function') {
-        console.log('setAsChild function being called');
+        // console.log('setAsChild function being called');
         var isNew = !item.item.id;
         var $dataItem = isNew ? item.onCreate(item.item) : item.item;
         props.setAsChild(props.item, $dataItem, isNew, item.index, props.col, isBusy);

package/lib/preview.js

@@ -42,6 +42,12 @@ var Preview = function Preview(_ref) {
     setEditElement = _ref.setEditElement,
     _ref$variables = _ref.variables,
     variables = _ref$variables === void 0 ? {} : _ref$variables,
+    _ref$staticVariables = _ref.staticVariables,
+    staticVariables = _ref$staticVariables === void 0 ? {} : _ref$staticVariables,
+    checkboxButtonClassName = _ref.checkboxButtonClassName,
+    headerClassName = _ref.headerClassName,
+    labelClassName = _ref.labelClassName,
+    paragraphClassName = _ref.paragraphClassName,
     url = _ref.url,
     saveUrl = _ref.saveUrl,
     _ref$saveAlways = _ref.saveAlways,
@@ -137,8 +143,14 @@ var Preview = function Preview(_ref) {
     }
     if (!(child.col !== undefined && child.col !== col && item.childItems[col])) {
       // No child was assigned yet in both source and target.
+      console.log('No child was assigned yet in both source and target.');
       return false;
     }
+
+    // if ((item.element === 'Fieldset' || item.element === 'Step') && isListNotEmpty(item.childItems) && child.col === item.childItems.length) {
+    // 	return false;
+    // }
+
     var oldItems = _toConsumableArray(items);
     var oldId = item.childItems[col];
     var oldItem = oldItems.find(function (i) {
@@ -167,12 +179,17 @@ var Preview = function Preview(_ref) {
   };
   var setAsChild = function setAsChild(item, child, childIsNew, childIndex, col, isBusy) {
     // console.log('saveAsChild', item, child, childIsNew, childIndex, col, isBusy);
+
     if (swapChildren(item, child, col)) {
       return;
     }
     if (isBusy) {
       return;
     }
+    if (isListNotEmpty(item.childItems) && child.col !== undefined && col === item.childItems.length) {
+      // console.log('Cannot drop in the dropzone');
+      return;
+    }
     var oldItems = _toConsumableArray(items);
 
     // eslint-disable-next-line no-param-reassign
@@ -247,7 +264,7 @@ var Preview = function Preview(_ref) {
       var updatedItem = _objectSpread({}, item);
       // for multi-column containers, set back to null
       // for fieldsets and steps, delete it
-      if (updatedItem.element === 'FieldSet' || updatedItem.element === 'Step') {
+      if (updatedItem.element === 'Fieldset' || updatedItem.element === 'Step') {
         updatedItem.childItems.splice(col, 1);
       } else {
         updatedItem.childItems[col] = null;
@@ -275,7 +292,7 @@ var Preview = function Preview(_ref) {
 
       // for multi-column containers, set back to null
       // for fieldsets and steps, delete it
-      if (updatedParent.element === 'FieldSet' || updatedParent.element === 'Step') {
+      if (updatedParent.element === 'Fieldset' || updatedParent.element === 'Step') {
         updatedParent.childItems.splice(oldItem.col, 1);
       } else {
         updatedParent.childItems[oldItem.col] = null;
@@ -348,6 +365,11 @@ var Preview = function Preview(_ref) {
       key: item.id,
       sortData: item.id,
       item: _objectSpread(_objectSpread({}, item), {}, {
+        staticVariables: staticVariables,
+        checkboxButtonClassName: checkboxButtonClassName,
+        headerClassName: headerClassName,
+        labelClassName: labelClassName,
+        paragraphClassName: paragraphClassName,
         mutable: false,
         readOnly: false,
         print: false

package/lib/sortable-form-elements.js

@@ -2,7 +2,7 @@ import SortableElement from './sortable-element';
 import PlaceHolder from './survey-place-holder';
 import BaseSurveyElements from './survey-elements';
 import { TwoColumnRow, ThreeColumnRow, MultiColumnRow } from './multi-column';
-import { FieldSet } from './fieldset';
+import { Fieldset } from './fieldset';
 import { Step } from './step';
 import CustomElement from './survey-elements/custom-element';
 var Header = BaseSurveyElements.Header,
@@ -55,7 +55,7 @@ SortableFormElements.Camera = SortableElement(Camera);
 SortableFormElements.FileUpload = SortableElement(FileUpload);
 SortableFormElements.Range = SortableElement(Range);
 SortableFormElements.PlaceHolder = SortableElement(PlaceHolder);
-SortableFormElements.FieldSet = SortableElement(FieldSet);
+SortableFormElements.Fieldset = SortableElement(Fieldset);
 SortableFormElements.TwoColumnRow = SortableElement(TwoColumnRow);
 SortableFormElements.ThreeColumnRow = SortableElement(ThreeColumnRow);
 SortableFormElements.MultiColumnRow = SortableElement(MultiColumnRow);