react-survey-builder 1.0.72 → 1.0.73

package/lib/multi-column/MultiColumnRow.js

@@ -1,119 +1,108 @@
 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); }
-var _excluded = ["item", "className"],
+var _excluded = ["controls", "item", "items", "editModeOn", "getItemById", "setAsChild", "removeChild", "seq", "className", "index", "style"],
   _excluded2 = ["item", "className"],
-  _excluded3 = ["item"];
+  _excluded3 = ["item", "className"],
+  _excluded4 = ["item"];
 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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } } return target; }
 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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 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 _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } } return target; }
 /* eslint-disable camelcase */
 import React from 'react';
 import ComponentHeader from '../survey-elements/component-header';
 import ComponentLabel from '../survey-elements/component-label';
 import Dustbin from './dustbin';
 import ItemTypes from '../ItemTypes';
-import { Row } from 'react-bootstrap/esm';
+import { Row } from 'react-bootstrap';
 var accepts = [ItemTypes.BOX, ItemTypes.CARD];
-var MultiColumnRowBase = /*#__PURE__*/function (_React$Component) {
-  function MultiColumnRowBase() {
-    _classCallCheck(this, MultiColumnRowBase);
-    return _callSuper(this, MultiColumnRowBase, arguments);
-  }
-  _inherits(MultiColumnRowBase, _React$Component);
-  return _createClass(MultiColumnRowBase, [{
-    key: "render",
-    value: function render() {
-      var _this$props = this.props,
-        controls = _this$props.controls,
-        item = _this$props.item,
-        editModeOn = _this$props.editModeOn,
-        getItemById = _this$props.getItemById,
-        setAsChild = _this$props.setAsChild,
-        removeChild = _this$props.removeChild,
-        seq = _this$props.seq,
-        className = _this$props.className,
-        index = _this$props.index;
-      var childItems = item.childItems,
-        pageBreakBefore = item.pageBreakBefore;
-      var baseClasses = 'SortableItem rfb-item';
-      if (pageBreakBefore) {
-        baseClasses += ' alwaysbreak';
-      }
-      return /*#__PURE__*/React.createElement("div", {
-        style: _objectSpread({}, this.props.style),
-        className: baseClasses
-      }, /*#__PURE__*/React.createElement(ComponentHeader, this.props), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(ComponentLabel, this.props), /*#__PURE__*/React.createElement(Row, null, childItems.map(function (x, i) {
-        return /*#__PURE__*/React.createElement("div", {
-          key: "".concat(i, "_").concat(x || '_'),
-          className: className
-        }, controls ? controls[i] : /*#__PURE__*/React.createElement(Dustbin, {
-          style: {
-            width: '100%'
-          },
-          item: item,
-          accepts: accepts,
-          items: childItems,
-          col: i,
-          parentIndex: index,
-          editModeOn: editModeOn,
-          _onDestroy: function _onDestroy() {
-            return removeChild(item, i);
-          },
-          getItemById: getItemById,
-          setAsChild: setAsChild,
-          seq: seq
-        }));
-      }))));
-    }
-  }]);
-}(React.Component);
-var TwoColumnRow = function TwoColumnRow(_ref) {
-  var item = _ref.item,
+var MultiColumnRowBase = function MultiColumnRowBase(_ref) {
+  var controls = _ref.controls,
+    item = _ref.item,
+    items = _ref.items,
+    editModeOn = _ref.editModeOn,
+    getItemById = _ref.getItemById,
+    setAsChild = _ref.setAsChild,
+    removeChild = _ref.removeChild,
+    seq = _ref.seq,
     className = _ref.className,
-    rest = _objectWithoutProperties(_ref, _excluded);
+    index = _ref.index,
+    style = _ref.style,
+    otherProps = _objectWithoutProperties(_ref, _excluded);
+  var childItems = item.childItems,
+    pageBreakBefore = item.pageBreakBefore;
+  var baseClasses = 'SortableItem rfb-item';
+  if (pageBreakBefore) {
+    baseClasses += ' alwaysbreak';
+  }
+  return /*#__PURE__*/React.createElement("div", {
+    style: _objectSpread({}, style),
+    className: baseClasses
+  }, /*#__PURE__*/React.createElement(ComponentHeader, _extends({
+    item: item,
+    isFieldSet: false,
+    index: index,
+    editModeOn: editModeOn,
+    setAsChild: setAsChild
+  }, otherProps)), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(ComponentLabel, _extends({
+    item: item
+  }, otherProps)), /*#__PURE__*/React.createElement(Row, null, childItems.map(function (childItemId, childItemIndex) {
+    return /*#__PURE__*/React.createElement("div", {
+      key: "".concat(childItemIndex, "_").concat(childItemId || '_'),
+      className: className
+    }, controls ? controls[childItemIndex] : /*#__PURE__*/React.createElement(Dustbin, {
+      style: {
+        width: '100%'
+      },
+      item: item,
+      accepts: accepts,
+      items: childItems,
+      col: childItemIndex,
+      parentIndex: index,
+      editModeOn: editModeOn,
+      _onDestroy: function _onDestroy() {
+        removeChild(item, childItemIndex);
+      },
+      getItemById: getItemById,
+      setAsChild: setAsChild,
+      seq: seq
+    }));
+  }))));
+};
+var TwoColumnRow = function TwoColumnRow(_ref2) {
+  var item = _ref2.item,
+    className = _ref2.className,
+    rest = _objectWithoutProperties(_ref2, _excluded2);
   var classNameVal = className || 'col-md-6';
   if (!item.childItems) {
     // eslint-disable-next-line no-param-reassign
     item.childItems = [null, null];
-    item.isContainer = true;
   }
   return /*#__PURE__*/React.createElement(MultiColumnRowBase, _extends({}, rest, {
     className: classNameVal,
     item: item
   }));
 };
-var ThreeColumnRow = function ThreeColumnRow(_ref2) {
-  var item = _ref2.item,
-    className = _ref2.className,
-    rest = _objectWithoutProperties(_ref2, _excluded2);
+var ThreeColumnRow = function ThreeColumnRow(_ref3) {
+  var item = _ref3.item,
+    className = _ref3.className,
+    rest = _objectWithoutProperties(_ref3, _excluded3);
   var classNameVal = className || 'col-md-4';
   if (!item.childItems) {
     // eslint-disable-next-line no-param-reassign
     item.childItems = [null, null, null];
-    item.isContainer = true;
   }
   return /*#__PURE__*/React.createElement(MultiColumnRowBase, _extends({}, rest, {
     className: classNameVal,
     item: item
   }));
 };
-var MultiColumnRow = function MultiColumnRow(_ref3) {
-  var item = _ref3.item,
-    rest = _objectWithoutProperties(_ref3, _excluded3);
+var MultiColumnRow = function MultiColumnRow(_ref4) {
+  var item = _ref4.item,
+    rest = _objectWithoutProperties(_ref4, _excluded4);
   var colCount = item.colCount || 4;
   var classNameVal = item.className || (colCount === 4 ? 'col-md-3' : 'col');
   if (!item.childItems) {
@@ -123,7 +112,6 @@ var MultiColumnRow = function MultiColumnRow(_ref3) {
     }, function (v, i) {
       return null;
     });
-    item.isContainer = true;
   }
   return /*#__PURE__*/React.createElement(MultiColumnRowBase, _extends({}, rest, {
     className: classNameVal,

package/lib/multi-column/dustbin.js

@@ -1,7 +1,13 @@
 var _excluded = ["onDropSuccess", "seq", "draggedItem", "parentIndex", "canDrop", "isOver", "isOverCurrent", "connectDropTarget", "items", "col", "getItemById"];
+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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } } return target; }
 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 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); }
 import React from 'react';
 import { DropTarget } from 'react-dnd';
 import SurveyElements from '../survey-elements';
@@ -10,6 +16,7 @@ import CustomElement from '../survey-elements/custom-element';
 import Registry from '../stores/registry';
 import store from '../stores/store';
 function getCustomElement(item, props) {
+  var _item$fieldName;
   if (!item.component || typeof item.component !== 'function') {
     item.component = Registry.get(item.key);
     if (!item.component) {
@@ -19,23 +26,38 @@ function getCustomElement(item, props) {
   return /*#__PURE__*/React.createElement(CustomElement, _extends({}, props, {
     mutable: false,
     key: "form_".concat(item.id),
-    item: item
+    id: item.id,
+    name: (_item$fieldName = item.fieldName) !== null && _item$fieldName !== void 0 ? _item$fieldName : item.name,
+    item: _objectSpread(_objectSpread({}, item), {}, {
+      mutable: false,
+      readOnly: false,
+      print: false
+    })
   }));
 }
-function getElement(item, props) {
+var getElement = function getElement(item, props) {
+  var _item$fieldName2;
   if (!item) return null;
   if (item.custom) {
     return getCustomElement(item, props);
   }
+  console.log('getDustbinElement', item);
   var Element = SurveyElements[item.element || item.key];
   return /*#__PURE__*/React.createElement(Element, _extends({}, props, {
+    id: item.id,
     key: "form_".concat(item.id),
-    item: item
+    name: (_item$fieldName2 = item.fieldName) !== null && _item$fieldName2 !== void 0 ? _item$fieldName2 : item.name,
+    mutable: false,
+    item: _objectSpread(_objectSpread({}, item), {}, {
+      mutable: false,
+      readOnly: false,
+      print: false
+    })
   }));
-}
-function getStyle(backgroundColor) {
+};
+var getStyle = function getStyle(backgroundColor) {
   return {
-    border: '1px solid rgba(0,0,0,0.2)',
+    border: '1px dashed rgba(0,0,0,0.2)',
     minHeight: '2rem',
     minWidth: '7rem',
     width: '100%',
@@ -43,10 +65,10 @@ function getStyle(backgroundColor) {
     padding: 0,
     "float": 'left'
   };
-}
-function isContainer($containerItem) {
-  if ($containerItem.itemType !== ItemTypes.CARD) {
-    var item = $containerItem.item;
+};
+var isContainer = function isContainer(containerItem) {
+  if (containerItem.itemType !== ItemTypes.CARD) {
+    var item = containerItem.item;
     if (item) {
       if (item.isContainer) {
         return true;
@@ -57,7 +79,7 @@ function isContainer($containerItem) {
     }
   }
   return false;
-}
+};
 var Dustbin = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var onDropSuccess = _ref.onDropSuccess,
     seq = _ref.seq,
@@ -70,21 +92,23 @@ var Dustbin = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     items = _ref.items,
     col = _ref.col,
     getItemById = _ref.getItemById,
-    rest = _objectWithoutProperties(_ref, _excluded);
+    otherProps = _objectWithoutProperties(_ref, _excluded);
   var item = getItemById(items[col]);
   React.useImperativeHandle(ref, function () {
     return {
       onDrop: function onDrop(dropped) {
-        console.log("dropped ites");
+        console.log("dropped item", dropped);
         var item = dropped.item;
         if (item) {
-          onDropSuccess && onDropSuccess();
+          if (onDropSuccess) {
+            onDropSuccess();
+          }
           store.dispatch('deleteLastItem');
         }
       }
     };
   }, []);
-  var element = getElement(item, rest);
+  var element = getElement(item, otherProps);
   var sameCard = draggedItem ? draggedItem.index === parentIndex : false;
 
   // console.log('dragIndex:',draggedItem?.index)
@@ -99,12 +123,18 @@ var Dustbin = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   // console.log('sameCard, canDrop', sameCard, canDrop);
   return connectDropTarget( /*#__PURE__*/React.createElement("div", {
     style: !sameCard ? getStyle(backgroundColor) : getStyle('rgba(0, 0, 0, .03')
-  }, !element && /*#__PURE__*/React.createElement("span", null, "Drop your element here "), element));
+  }, !element && /*#__PURE__*/React.createElement("div", {
+    className: "w-100 text-center",
+    style: {
+      margin: 20
+    }
+  }, "Drop your element here "), element));
 });
 export default DropTarget(function (props) {
   return props.accepts;
 }, {
   drop: function drop(props, monitor, component) {
+    console.log('droptargetprops', props);
     if (!component) {
       return;
     }
@@ -114,22 +144,26 @@ export default DropTarget(function (props) {
     // 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);
 
     // Do nothing when moving the box inside the same column
     if (props.col === item.col && props.items[props.col] === item.id) return;
 
     // Do not allow replace component other than both items in same multi column row
     if (item.col === undefined && props.items[props.col]) {
-      store.dispatch('resetLastItem');
+      //store.dispatch('resetLastItem');
+      //console.log('dropping item in dustbin');
+      //store.dispatch('deleteLastItem');
       return;
     }
     if (!isContainer(item)) {
       component.onDrop(item);
       console.log("calling on Drop from 137", item);
       if (item.item && typeof props.setAsChild === 'function') {
+        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, props.col, isBusy);
+        props.setAsChild(props.item, $dataItem, isNew, item.index, props.col, isBusy);
       }
     }
   }