react-survey-builder 1.0.76 → 1.0.78

package/lib/form-steps.js

@@ -1,17 +1,14 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -41,6 +38,7 @@ var ReactSurveyFormSteps = function ReactSurveyFormSteps(_ref) {
     onSubmit = _ref.onSubmit,
     onChange = _ref.onChange,
     items = _ref.items,
+    activeStep = _ref.activeStep,
     _ref$submitButton = _ref.submitButton,
     submitButton = _ref$submitButton === void 0 ? false : _ref$submitButton,
     _ref$backButton = _ref.backButton,
@@ -56,6 +54,7 @@ var ReactSurveyFormSteps = function ReactSurveyFormSteps(_ref) {
     checkboxButtonClassName = _ref.checkboxButtonClassName,
     headerClassName = _ref.headerClassName,
     labelClassName = _ref.labelClassName,
+    paragraphClassName = _ref.paragraphClassName,
     formId = _ref.formId,
     methods = _ref.methods,
     _ref$print = _ref.print,
@@ -79,14 +78,6 @@ var ReactSurveyFormSteps = function ReactSurveyFormSteps(_ref) {
     _React$useState2 = _slicedToArray(_React$useState, 2),
     formAnswers = _React$useState2[0],
     setFormAnswers = _React$useState2[1];
-  var _React$useState3 = React.useState([]),
-    _React$useState4 = _slicedToArray(_React$useState3, 2),
-    steps = _React$useState4[0],
-    setSteps = _React$useState4[1];
-  var _React$useState5 = React.useState(null),
-    _React$useState6 = _slicedToArray(_React$useState5, 2),
-    activeStep = _React$useState6[0],
-    setActiveStep = _React$useState6[1];
   var _getDefaultValue = function _getDefaultValue($dataItem) {
     var defaultValue = answerData.current[$dataItem.fieldName];
     if ($dataItem.element === 'DatePicker') {
@@ -256,13 +247,13 @@ var ReactSurveyFormSteps = function ReactSurveyFormSteps(_ref) {
   };
   var validateForm = function validateForm() {
     var hasErrors = false;
-    var dataItems = items;
+    var $dataItems = _toConsumableArray(items);
     if (displayShort) {
-      dataItems = items.filter(function (i) {
+      $dataItems = $dataItems.filter(function (i) {
         return i.alternateForm === true;
       });
     }
-    dataItems.forEach(function (item) {
+    $dataItems.forEach(function (item) {
       if (_isIncorrect(item)) {
         if (methods) {
           methods.setError(item.fieldName, {
@@ -357,9 +348,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),
@@ -376,7 +368,8 @@ var ReactSurveyFormSteps = function ReactSurveyFormSteps(_ref) {
       key: "form_".concat(item.id),
       item: item,
       headerClassName: headerClassName,
-      labelClassName: labelClassName
+      labelClassName: labelClassName,
+      paragraphClassName: paragraphClassName
     });
   };
   var getCustomElement = function getCustomElement(item) {
@@ -453,106 +446,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 +491,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 +529,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 +583,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 +621,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,26 +653,26 @@ var ReactSurveyFormSteps = function ReactSurveyFormSteps(_ref) {
       default:
         return getSimpleElement(item);
     }
-  });
-  React.useMemo(function () {
-    if (isListNotEmpty(stepItems)) {
-      var surveySteps = stepItems.map(function (step, index) {
-        return _objectSpread(_objectSpread({}, step), {}, {
-          childQuestions: dataItems.filter(function (i) {
-            return step.id === i.parentId;
-          }),
-          completed: false,
-          answers: []
-        });
-      });
-      setSteps(surveySteps);
-      if (isListNotEmpty(surveySteps)) {
-        setActiveStep(surveySteps[0]);
-      } else {
-        setActiveStep(null);
-      }
+  };
+
+  //#endregion
+
+  var dataItems = activeStep ? [activeStep] : [];
+  if (displayShort) {
+    dataItems = activeStep ? [activeStep].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);
+  });
   var formProps = {};
   if (formId) {
     formProps.id = formId;
@@ -780,14 +681,8 @@ var ReactSurveyFormSteps = function ReactSurveyFormSteps(_ref) {
     className: "react-survey-builder-form"
   }, /*#__PURE__*/React.createElement(FormProvider, methods, /*#__PURE__*/React.createElement(Form, _extends({
     onSubmit: methods.handleSubmit(handleSubmit)
-  }, formProps), activeStep, /*#__PURE__*/React.createElement("div", {
+  }, formProps), stepItems, /*#__PURE__*/React.createElement("div", {
     className: buttonClassName ? buttonClassName : 'btn-toolbar'
-  }, !hideActions && handleRenderSubmit(), !hideActions && backAction && handleRenderBack(), /*#__PURE__*/React.createElement(Button, {
-    variant: "secondary",
-    onClick: onBackStep
-  }, "Back"), /*#__PURE__*/React.createElement(Button, {
-    variant: "primary",
-    onClick: onNextStep
-  }, "Next"))))));
+  }, !hideActions && handleRenderSubmit(), !hideActions && backAction && handleRenderBack())))));
 };
 export default ReactSurveyFormSteps;

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,
@@ -52,6 +53,7 @@ var ReactSurvey = function ReactSurvey(_ref) {
     checkboxButtonClassName = _ref.checkboxButtonClassName,
     headerClassName = _ref.headerClassName,
     labelClassName = _ref.labelClassName,
+    paragraphClassName = _ref.paragraphClassName,
     formId = _ref.formId,
     _ref$print = _ref.print,
     print = _ref$print === void 0 ? false : _ref$print;
@@ -356,9 +358,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),
@@ -375,7 +378,8 @@ var ReactSurvey = function ReactSurvey(_ref) {
       key: "form_".concat(item.id),
       item: item,
       headerClassName: headerClassName,
-      labelClassName: labelClassName
+      labelClassName: labelClassName,
+      paragraphClassName: paragraphClassName
     });
   };
   var getCustomElement = function getCustomElement(item) {
@@ -452,23 +456,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 +663,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,6 @@ 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]);
   return /*#__PURE__*/React.createElement("div", {
     style: _objectSpread({}, style),
     className: baseClasses
@@ -114,9 +75,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,