react-survey-builder 1.0.76 → 1.0.77

package/lib/form-steps.js

@@ -357,9 +357,10 @@ var ReactSurveyFormSteps = function ReactSurveyFormSteps(_ref) {
     });
   };
   var getContainerElement = function getContainerElement(item, Element) {
-    var controls = item === null || item === void 0 ? void 0 : item.childItems.map(function (childItem) {
-      return childItem ? getInputElement(getDataItemById(childItem)) : /*#__PURE__*/React.createElement("div", null, "\xA0");
-    });
+    var _item$childItems;
+    var controls = isObjectNotEmpty(item) && isListNotEmpty(item.childItems) ? item === null || item === void 0 || (_item$childItems = item.childItems) === null || _item$childItems === void 0 ? void 0 : _item$childItems.map(function (childItem) {
+      return childItem ? getFieldElement(getDataItemById(childItem)) : /*#__PURE__*/React.createElement("div", null, "\xA0");
+    }) : [];
     return /*#__PURE__*/React.createElement(Element, {
       mutable: true,
       key: "form_".concat(item.id),
@@ -453,106 +454,14 @@ var ReactSurveyFormSteps = function ReactSurveyFormSteps(_ref) {
       className: "btn-cancel"
     }, backName);
   };
-
-  //#endregion
-
-  var onBackStep = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var oldStep, previousIndex;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            oldStep = steps.find(function (i) {
-              return i.id === id;
-            });
-            previousIndex = oldStep.index - 1;
-            setActiveStep(previousIndex > 0 ? steps[previousIndex] : null);
-          case 3:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function onBackStep() {
-      return _ref7.apply(this, arguments);
-    };
-  }();
-  var onNextStep = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var oldStep, clean, updatedSteps, nextStep;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            oldStep = isObjectNotEmpty(activeStep) ? _objectSpread({}, activeStep) : null;
-            if (!oldStep) {
-              _context2.next = 15;
-              break;
-            }
-            console.log(oldStep);
-            // validate childItems of step
-            _context2.next = 5;
-            return methods.trigger(oldStep.childQuestions.map(function (i) {
-              return i.name;
-            }), true);
-          case 5:
-            clean = _context2.sent;
-            console.log(clean);
-            if (!clean) {
-              _context2.next = 14;
-              break;
-            }
-            updatedSteps = updateRecord('id', _objectSpread(_objectSpread({}, oldStep), {}, {
-              completed: true,
-              answers: _collectFormData(oldStep.childQuestions, (methods === null || methods === void 0 ? void 0 : methods.getValues()) || [])
-            }), _toConsumableArray(steps));
-            setSteps(updatedSteps);
-
-            // get next incomplete survey
-            nextStep = steps.find(function (i) {
-              return i.completed === false;
-            });
-            if (nextStep !== undefined) {
-              setActiveStep(nextStep);
-            } else {
-              if (onFinishedSurveys) {
-                onFinishedSurveys();
-              }
-            }
-            _context2.next = 15;
-            break;
-          case 14:
-            return _context2.abrupt("return");
-          case 15:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2);
-    }));
-    return function onNextStep() {
-      return _ref8.apply(this, arguments);
-    };
-  }();
-  var dataItems = items ? _toConsumableArray(items) : [];
-  if (displayShort) {
-    dataItems = items ? _toConsumableArray(items).filter(function (i) {
-      return i.alternateForm === true;
-    }) : [];
-  }
-  dataItems.forEach(function (item) {
-    if (item && item.readOnly && item.variableKey && variables[item.variableKey]) {
-      answerData.current[item.fieldName] = variables[item.variableKey];
-    }
-  });
-  var stepItems = dataItems.filter(function (x) {
-    return !x.parentId && x.element === 'Step';
-  }).map(function (item) {
-    var _ref9, _ref10, _ref11;
+  var getFieldElement = function getFieldElement(item) {
+    var _ref7, _ref8, _ref9;
     if (!item) return null;
     item.fieldRules = getFieldRules(item);
     item.print = print !== null && print !== void 0 ? print : false;
-    item.readOnly = (_ref9 = readOnly || item.readOnly) !== null && _ref9 !== void 0 ? _ref9 : false;
-    item.hideLabel = (_ref10 = hideLabels || item.hideLabel) !== null && _ref10 !== void 0 ? _ref10 : false;
-    item.disabled = (_ref11 = readOnly || item.readOnly) !== null && _ref11 !== void 0 ? _ref11 : false;
+    item.readOnly = (_ref7 = readOnly || item.readOnly) !== null && _ref7 !== void 0 ? _ref7 : false;
+    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;
     switch (item.element) {
       case 'RadioButtons':
@@ -590,19 +499,19 @@ var ReactSurveyFormSteps = function ReactSurveyFormSteps(_ref) {
           defaultValue: _getDefaultValue(item),
           disabled: item.disabled,
           required: item.required,
-          render: function render(_ref12) {
-            var _ref12$field = _ref12.field,
-              _onChange3 = _ref12$field.onChange,
-              onBlur = _ref12$field.onBlur,
-              value = _ref12$field.value,
-              name = _ref12$field.name,
-              ref = _ref12$field.ref,
-              _ref12$fieldState = _ref12.fieldState,
-              invalid = _ref12$fieldState.invalid,
-              isTouched = _ref12$fieldState.isTouched,
-              isDirty = _ref12$fieldState.isDirty,
-              error = _ref12$fieldState.error,
-              formState = _ref12.formState;
+          render: function render(_ref10) {
+            var _ref10$field = _ref10.field,
+              _onChange3 = _ref10$field.onChange,
+              onBlur = _ref10$field.onBlur,
+              value = _ref10$field.value,
+              name = _ref10$field.name,
+              ref = _ref10$field.ref,
+              _ref10$fieldState = _ref10.fieldState,
+              invalid = _ref10$fieldState.invalid,
+              isTouched = _ref10$fieldState.isTouched,
+              isDirty = _ref10$fieldState.isDirty,
+              error = _ref10$fieldState.error,
+              formState = _ref10.formState;
             return /*#__PURE__*/React.createElement(Signature, {
               methods: methods,
               onBlur: onBlur,
@@ -628,19 +537,19 @@ var ReactSurveyFormSteps = function ReactSurveyFormSteps(_ref) {
           defaultValue: _optionsDefaultValue(item),
           disabled: item.disabled,
           required: item.required,
-          render: function render(_ref13) {
-            var _ref13$field = _ref13.field,
-              _onChange4 = _ref13$field.onChange,
-              onBlur = _ref13$field.onBlur,
-              value = _ref13$field.value,
-              name = _ref13$field.name,
-              ref = _ref13$field.ref,
-              _ref13$fieldState = _ref13.fieldState,
-              invalid = _ref13$fieldState.invalid,
-              isTouched = _ref13$fieldState.isTouched,
-              isDirty = _ref13$fieldState.isDirty,
-              error = _ref13$fieldState.error,
-              formState = _ref13.formState;
+          render: function render(_ref11) {
+            var _ref11$field = _ref11.field,
+              _onChange4 = _ref11$field.onChange,
+              onBlur = _ref11$field.onBlur,
+              value = _ref11$field.value,
+              name = _ref11$field.name,
+              ref = _ref11$field.ref,
+              _ref11$fieldState = _ref11.fieldState,
+              invalid = _ref11$fieldState.invalid,
+              isTouched = _ref11$fieldState.isTouched,
+              isDirty = _ref11$fieldState.isDirty,
+              error = _ref11$fieldState.error,
+              formState = _ref11.formState;
             return /*#__PURE__*/React.createElement(Checkboxes, {
               onBlur: onBlur,
               onChange: function onChange(e) {
@@ -682,19 +591,19 @@ var ReactSurveyFormSteps = function ReactSurveyFormSteps(_ref) {
           defaultValue: _getDefaultValue(item),
           disabled: item.disabled,
           required: item.required,
-          render: function render(_ref14) {
-            var _ref14$field = _ref14.field,
-              _onChange5 = _ref14$field.onChange,
-              onBlur = _ref14$field.onBlur,
-              value = _ref14$field.value,
-              name = _ref14$field.name,
-              ref = _ref14$field.ref,
-              _ref14$fieldState = _ref14.fieldState,
-              invalid = _ref14$fieldState.invalid,
-              isTouched = _ref14$fieldState.isTouched,
-              isDirty = _ref14$fieldState.isDirty,
-              error = _ref14$fieldState.error,
-              formState = _ref14.formState;
+          render: function render(_ref12) {
+            var _ref12$field = _ref12.field,
+              _onChange5 = _ref12$field.onChange,
+              onBlur = _ref12$field.onBlur,
+              value = _ref12$field.value,
+              name = _ref12$field.name,
+              ref = _ref12$field.ref,
+              _ref12$fieldState = _ref12.fieldState,
+              invalid = _ref12$fieldState.invalid,
+              isTouched = _ref12$fieldState.isTouched,
+              isDirty = _ref12$fieldState.isDirty,
+              error = _ref12$fieldState.error,
+              formState = _ref12.formState;
             return /*#__PURE__*/React.createElement(Camera, {
               onBlur: onBlur,
               onChange: function onChange(e) {
@@ -720,19 +629,19 @@ var ReactSurveyFormSteps = function ReactSurveyFormSteps(_ref) {
           defaultValue: _getDefaultValue(item),
           disabled: item.disabled,
           required: item.required,
-          render: function render(_ref15) {
-            var _ref15$field = _ref15.field,
-              _onChange6 = _ref15$field.onChange,
-              onBlur = _ref15$field.onBlur,
-              value = _ref15$field.value,
-              name = _ref15$field.name,
-              ref = _ref15$field.ref,
-              _ref15$fieldState = _ref15.fieldState,
-              invalid = _ref15$fieldState.invalid,
-              isTouched = _ref15$fieldState.isTouched,
-              isDirty = _ref15$fieldState.isDirty,
-              error = _ref15$fieldState.error,
-              formState = _ref15.formState;
+          render: function render(_ref13) {
+            var _ref13$field = _ref13.field,
+              _onChange6 = _ref13$field.onChange,
+              onBlur = _ref13$field.onBlur,
+              value = _ref13$field.value,
+              name = _ref13$field.name,
+              ref = _ref13$field.ref,
+              _ref13$fieldState = _ref13.fieldState,
+              invalid = _ref13$fieldState.invalid,
+              isTouched = _ref13$fieldState.isTouched,
+              isDirty = _ref13$fieldState.isDirty,
+              error = _ref13$fieldState.error,
+              formState = _ref13.formState;
             return /*#__PURE__*/React.createElement(FileUpload, {
               onBlur: onBlur,
               onChange: function onChange(e) {
@@ -752,6 +661,101 @@ var ReactSurveyFormSteps = function ReactSurveyFormSteps(_ref) {
       default:
         return getSimpleElement(item);
     }
+  };
+
+  //#endregion
+
+  var onBackStep = /*#__PURE__*/function () {
+    var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var oldStep, previousIndex;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            oldStep = steps.find(function (i) {
+              return i.id === id;
+            });
+            previousIndex = oldStep.index - 1;
+            setActiveStep(previousIndex > 0 ? steps[previousIndex] : null);
+          case 3:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function onBackStep() {
+      return _ref14.apply(this, arguments);
+    };
+  }();
+  var onNextStep = /*#__PURE__*/function () {
+    var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var oldStep, clean, updatedSteps, nextStep;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            oldStep = isObjectNotEmpty(activeStep) ? _objectSpread({}, activeStep) : null;
+            if (!oldStep) {
+              _context2.next = 15;
+              break;
+            }
+            console.log(oldStep);
+            // validate childItems of step
+            _context2.next = 5;
+            return methods.trigger(oldStep.childQuestions.map(function (i) {
+              return i.name;
+            }), true);
+          case 5:
+            clean = _context2.sent;
+            console.log(clean);
+            if (!clean) {
+              _context2.next = 14;
+              break;
+            }
+            updatedSteps = updateRecord('id', _objectSpread(_objectSpread({}, oldStep), {}, {
+              completed: true,
+              answers: _collectFormData(oldStep.childQuestions, (methods === null || methods === void 0 ? void 0 : methods.getValues()) || [])
+            }), _toConsumableArray(steps));
+            setSteps(updatedSteps);
+
+            // get next incomplete survey
+            nextStep = steps.find(function (i) {
+              return i.completed === false;
+            });
+            if (nextStep !== undefined) {
+              setActiveStep(nextStep);
+            } else {
+              if (onFinishedSurveys) {
+                onFinishedSurveys();
+              }
+            }
+            _context2.next = 15;
+            break;
+          case 14:
+            return _context2.abrupt("return");
+          case 15:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function onNextStep() {
+      return _ref15.apply(this, arguments);
+    };
+  }();
+  var dataItems = items ? _toConsumableArray(items) : [];
+  if (displayShort) {
+    dataItems = items ? _toConsumableArray(items).filter(function (i) {
+      return i.alternateForm === true;
+    }) : [];
+  }
+  dataItems.forEach(function (item) {
+    if (item && item.readOnly && item.variableKey && variables[item.variableKey]) {
+      answerData.current[item.fieldName] = variables[item.variableKey];
+    }
+  });
+  var stepItems = dataItems.filter(function (x) {
+    return !x.parentId && x.element === 'Step';
+  }).map(function (item) {
+    return getFieldElement(item);
   });
   React.useMemo(function () {
     if (isListNotEmpty(stepItems)) {

package/lib/form.js

@@ -25,6 +25,7 @@ import CustomElement from './survey-elements/custom-element';
 import Registry from './stores/registry';
 import { Button, Form } from 'react-bootstrap';
 import { Controller, FormProvider, useForm } from "react-hook-form";
+import { isListNotEmpty, isObjectNotEmpty } from './utils/objectUtils';
 var ReactSurvey = function ReactSurvey(_ref) {
   var _ref$validateForCorre = _ref.validateForCorrectness,
     validateForCorrectness = _ref$validateForCorre === void 0 ? false : _ref$validateForCorre,
@@ -356,9 +357,10 @@ var ReactSurvey = function ReactSurvey(_ref) {
     });
   };
   var getContainerElement = function getContainerElement(item, Element) {
-    var controls = item === null || item === void 0 ? void 0 : item.childItems.map(function (childItem) {
-      return childItem ? getInputElement(getDataItemById(childItem)) : /*#__PURE__*/React.createElement("div", null, "\xA0");
-    });
+    var _item$childItems;
+    var controls = isObjectNotEmpty(item) && isListNotEmpty(item.childItems) ? item === null || item === void 0 || (_item$childItems = item.childItems) === null || _item$childItems === void 0 ? void 0 : _item$childItems.map(function (childItem) {
+      return childItem ? getFieldElement(getDataItemById(childItem)) : /*#__PURE__*/React.createElement("div", null, "\xA0");
+    }) : [];
     return /*#__PURE__*/React.createElement(Element, {
       mutable: true,
       key: "form_".concat(item.id),
@@ -452,23 +454,7 @@ var ReactSurvey = function ReactSurvey(_ref) {
       className: "btn-cancel"
     }, backName);
   };
-
-  //#endregion
-
-  var dataItems = items ? _toConsumableArray(items) : [];
-  if (displayShort) {
-    dataItems = items ? _toConsumableArray(items).filter(function (i) {
-      return i.alternateForm === true;
-    }) : [];
-  }
-  dataItems.forEach(function (item) {
-    if (item && item.readOnly && item.variableKey && variables[item.variableKey]) {
-      answerData.current[item.fieldName] = variables[item.variableKey];
-    }
-  });
-  var fieldItems = dataItems.filter(function (x) {
-    return !x.parentId;
-  }).map(function (item) {
+  var getFieldElement = function getFieldElement(item) {
     var _ref7, _ref8, _ref9;
     if (!item) return null;
     item.fieldRules = getFieldRules(item);
@@ -675,6 +661,25 @@ var ReactSurvey = function ReactSurvey(_ref) {
       default:
         return getSimpleElement(item);
     }
+  };
+
+  //#endregion
+
+  var dataItems = items ? _toConsumableArray(items) : [];
+  if (displayShort) {
+    dataItems = items ? _toConsumableArray(items).filter(function (i) {
+      return i.alternateForm === true;
+    }) : [];
+  }
+  dataItems.forEach(function (item) {
+    if (item && item.readOnly && item.variableKey && variables[item.variableKey]) {
+      answerData.current[item.fieldName] = variables[item.variableKey];
+    }
+  });
+  var fieldItems = dataItems.filter(function (x) {
+    return !x.parentId;
+  }).map(function (item) {
+    return getFieldElement(item);
   });
   var formProps = {};
   if (formId) {

package/lib/index.js

@@ -89,11 +89,11 @@ var ReactSurveyBuilder = function ReactSurveyBuilder(_ref) {
   }, /*#__PURE__*/React.createElement(Toolbar, {
     toolbarTop: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("h3", null, surveyName !== null && surveyName !== void 0 ? surveyName : 'Preview')), /*#__PURE__*/React.createElement("div", {
       className: "d-grid gap-3 mb-3"
-    }, !!!saveAlways && /*#__PURE__*/React.createElement(Button, {
+    }, !!!saveAlways ? /*#__PURE__*/React.createElement(Button, {
       onClick: function onClick() {
         saveFormData();
       }
-    }, saveSurveyName || 'Save Survey'), previewSurveyBlock ? previewSurveyBlock : null)),
+    }, saveSurveyName || 'Save Survey') : null, previewSurveyBlock ? previewSurveyBlock : null)),
     showDescription: showDescription,
     items: toolbarItems,
     customItems: customToolbarItems
@@ -250,4 +250,4 @@ SurveyBuilders.ElementStore = store;
 SurveyBuilders.Registry = Registry;
 SurveyBuilders.cleanUpSurveyItems = cleanUpSurveyItems;
 export default SurveyBuilders;
-export { cleanUpSurveyItems, ReactSurveyBuilder, ReactSurveyGenerator, ReactSurveyFieldGenerator, store as ElementStore, Registry };
+export { cleanUpSurveyItems, ReactSurveyBuilder, ReactSurveyGenerator, ReactSurveyFieldGenerator, ReactSurveyStepGenerator, store as ElementStore, Registry };

package/lib/multi-column/dustbin.js

@@ -15,6 +15,7 @@ import ItemTypes from '../ItemTypes';
 import CustomElement from '../survey-elements/custom-element';
 import Registry from '../stores/registry';
 import store from '../stores/store';
+import { isListNotEmpty } from '../utils/objectUtils';
 function getCustomElement(item, props) {
   var _item$fieldName;
   if (!item.component || typeof item.component !== 'function') {
@@ -93,7 +94,7 @@ var Dustbin = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     col = _ref.col,
     getItemById = _ref.getItemById,
     otherProps = _objectWithoutProperties(_ref, _excluded);
-  var item = getItemById(items[col]);
+  var item = isListNotEmpty(items) ? getItemById(items[col]) : null;
   React.useImperativeHandle(ref, function () {
     return {
       onDrop: function onDrop(dropped) {

package/lib/step/Step.js

@@ -27,7 +27,6 @@ import { Col, Container, Row } from "react-bootstrap";
 import { isListNotEmpty, isObjectNotEmpty } from "../utils/objectUtils";
 var accepts = [ItemTypes.BOX, ItemTypes.CARD];
 var StepBase = function StepBase(_ref) {
-  var _item$conditional;
   var item = _ref.item,
     controls = _ref.controls,
     items = _ref.items,
@@ -45,14 +44,12 @@ var StepBase = function StepBase(_ref) {
   if (pageBreakBefore) {
     baseClasses += " alwaysbreak";
   }
-  var _React$useState = React.useState((_item$conditional = item === null || item === void 0 ? void 0 : item.conditional) !== null && _item$conditional !== void 0 ? _item$conditional : false),
+
+  // const [hidden, setHidden] = React.useState(item?.conditional ?? false);
+  var _React$useState = React.useState(isObjectNotEmpty(item) && isListNotEmpty(item === null || item === void 0 ? void 0 : item.childItems) ? _toConsumableArray(item === null || item === void 0 ? void 0 : item.childItems) : [null]),
     _React$useState2 = _slicedToArray(_React$useState, 2),
-    hidden = _React$useState2[0],
-    setHidden = _React$useState2[1];
-  var _React$useState3 = React.useState(isObjectNotEmpty(item) && isListNotEmpty(item === null || item === void 0 ? void 0 : item.childItems) ? _toConsumableArray(item === null || item === void 0 ? void 0 : item.childItems) : [null]),
-    _React$useState4 = _slicedToArray(_React$useState3, 2),
-    childItemIds = _React$useState4[0],
-    setChildItemIds = _React$useState4[1];
+    childItemIds = _React$useState2[0],
+    setChildItemIds = _React$useState2[1];
   var _onDropSuccess = function onDropSuccess(droppedIndex) {
     // let updatedItem = isObjectNotEmpty(item) ? { ...item } : {};
     // let existingChildItemIds = isListNotEmpty(updatedItem.childItems) ? [...updatedItem.childItems] : [null];
@@ -71,42 +68,42 @@ var StepBase = function StepBase(_ref) {
       setChildItemIds([null]);
     }
   }, [item]);
-  React.useEffect(function () {
-    // console.log('all items', items);
-    var hideStep = false;
-    if ((item === null || item === void 0 ? void 0 : item.conditional) === true) {
-      hideStep = true;
-      if (item.conditionalFieldName && item.conditionalFieldValue && answers !== undefined && answers !== null && answers.length > 0) {
-        var answerField = answers.find(function (i) {
-          return i.name === item.conditionalFieldName;
-        });
-        if (answerField !== undefined && (answerField === null || answerField === void 0 ? void 0 : answerField.value) !== undefined) {
-          if (Array.isArray(item.conditionalFieldValue)) {
-            if (Array.isArray(answerField === null || answerField === void 0 ? void 0 : answerField.value)) {
-              var match = item.conditionalFieldValue.some(function (i) {
-                return answerField.value.includes(i);
-              });
-              if (match) {
-                hideStep = false;
-              }
-            } else if (item.conditionalFieldValue.includes(answerField.value)) {
-              hideStep = false;
-            }
-          } else {
-            if (Array.isArray(answerField === null || answerField === void 0 ? void 0 : answerField.value)) {
-              var _match = answerField.value.includes(item.conditionalFieldValue);
-              if (_match) {
-                hideStep = false;
-              }
-            } else if (item.conditionalFieldValue === answerField.value) {
-              hideStep = false;
-            }
-          }
-        }
-      }
-    }
-    setHidden(hideStep);
-  }, [item, answers]);
+
+  // React.useEffect(() => {
+  // 	// console.log('all items', items);
+  // 	let hideStep = false;
+  // 	if (item?.conditional === true) {
+  // 		hideStep = true;
+  // 		if (item.conditionalFieldName && item.conditionalFieldValue && answers !== undefined && answers !== null && answers.length > 0) {
+  // 			const answerField = answers.find(i => i.name === item.conditionalFieldName);
+  // 			if (answerField !== undefined && answerField?.value !== undefined) {
+  // 				if (Array.isArray(item.conditionalFieldValue)) {
+  // 					if (Array.isArray(answerField?.value)) {
+  // 						let match = item.conditionalFieldValue.some(i => answerField.value.includes(i));
+  // 						if (match) {
+  // 							hideStep = false;
+  // 						}
+  // 					} else if (item.conditionalFieldValue.includes(answerField.value)) {
+  // 						hideStep = false;
+  // 					}
+  // 				} else {
+  // 					if (Array.isArray(answerField?.value)) {
+  // 						let match = answerField.value.includes(item.conditionalFieldValue);
+  // 						if (match) {
+  // 							hideStep = false;
+  // 						}
+  // 					} else if (item.conditionalFieldValue === answerField.value) {
+  // 						hideStep = false;
+  // 					}
+  // 				}
+  // 			}
+  // 		}
+  // 	}
+
+  // 	setHidden(hideStep);
+  // }, [item, answers]);
+
+  console.log('controls', controls);
   return /*#__PURE__*/React.createElement("div", {
     style: _objectSpread({}, style),
     className: baseClasses
@@ -114,9 +111,10 @@ var StepBase = function StepBase(_ref) {
     item: item,
     index: index,
     editModeOn: editModeOn,
-    setAsChild: setAsChild
-  }, otherProps)), /*#__PURE__*/React.createElement("fieldset", {
-    className: hidden ? 'w-100 d-none' : 'w-100'
+    setAsChild: setAsChild,
+    isStep: true
+  }, otherProps)), /*#__PURE__*/React.createElement("div", {
+    className: 'd-grid w-100'
   }, childItemIds === null || childItemIds === void 0 ? void 0 : childItemIds.map(function (childItemId, childItemIndex) {
     return /*#__PURE__*/React.createElement("div", {
       key: "".concat(childItemIndex, "_").concat(childItemId || "_")

package/lib/survey-elements/component-header.js

@@ -2,7 +2,10 @@ import React from 'react';
 import HeaderBar from './header-bar';
 var ComponentHeader = function ComponentHeader(_ref) {
   var item = _ref.item,
-    isFieldSet = _ref.isFieldSet,
+    _ref$isFieldSet = _ref.isFieldSet,
+    isFieldSet = _ref$isFieldSet === void 0 ? false : _ref$isFieldSet,
+    _ref$isStep = _ref.isStep,
+    isStep = _ref$isStep === void 0 ? false : _ref$isStep,
     index = _ref.index,
     editModeOn = _ref.editModeOn,
     setAsChild = _ref.setAsChild,
@@ -15,6 +18,7 @@ var ComponentHeader = function ComponentHeader(_ref) {
     className: "preview-page-break"
   }, "Page Break"), /*#__PURE__*/React.createElement(HeaderBar, {
     isFieldSet: isFieldSet,
+    isStep: isStep,
     editModeOn: editModeOn,
     item: item,
     index: index,

package/lib/survey-elements/header-bar.js

@@ -7,12 +7,14 @@ var HeaderBar = function HeaderBar(_ref) {
     editModeOn = _ref.editModeOn,
     onDestroy = _ref.onDestroy,
     setAsChild = _ref.setAsChild,
-    index = _ref.index;
+    index = _ref.index,
+    _ref$isStep = _ref.isStep,
+    isStep = _ref$isStep === void 0 ? false : _ref$isStep;
   return /*#__PURE__*/React.createElement(ButtonToolbar, {
     className: "d-flex toolbar-header align-items-center justify-content-between p-2"
   }, /*#__PURE__*/React.createElement(Badge, {
     bg: "secondary"
-  }, item.text), /*#__PURE__*/React.createElement("div", {
+  }, item.text, isStep ? ' ' + (Number(index) + 1) : '', isStep && (item === null || item === void 0 ? void 0 : item.conditional) === true ? ' (Conditional)' : ''), /*#__PURE__*/React.createElement("div", {
     className: "toolbar-header-buttons"
   }, item.element !== 'LineBreak' && /*#__PURE__*/React.createElement(Button, {
     variant: "default",

package/lib/survey-elements-edit.js

@@ -595,6 +595,7 @@ var SurveyElementsEdit = function SurveyElementsEdit(_ref2) {
     type: "checkbox",
     checked: thisCheckedConditional,
     value: true,
+    onBlur: onUpdateElement,
     onChange: function onChange(e) {
       editElementProp('conditional', 'checked', e);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-survey-builder",
-  "version": "1.0.76",
+  "version": "1.0.77",
   "description": "A complete survey builder for react.",
   "main": "lib/index.js",
   "types": "types/index.d.ts",

package/types/index.d.ts

@@ -141,6 +141,9 @@ export interface SurveyBuilderProps {
   saveAlways?: boolean;
   editMode?: boolean;
   renderEditForm?: (props: BaseElement) => React.ReactNode;
+  checkboxButtonClassName?: string;
+  headerClassName?: string;
+  labelClassName?: string;
 }
 
 export class ReactSurveyBuilder extends React.Component<SurveyBuilderProps> {}