@pie-element/categorize 6.5.19-next.85 → 6.6.1-beta.587

package/configure/lib/design/categories/choice-preview.js

@@ -33,13 +33,13 @@ var _drag = require("@pie-lib/drag");
 
 var _IconButton = _interopRequireDefault(require("@material-ui/core/IconButton"));
 
-var _Delete = _interopRequireDefault(require("@material-ui/icons/Delete"));
+var _RemoveCircleOutline = _interopRequireDefault(require("@material-ui/icons/RemoveCircleOutline"));
 
 var _renderUi = require("@pie-lib/render-ui");
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 var ChoicePreview = /*#__PURE__*/function (_React$Component) {
   (0, _inherits2["default"])(ChoicePreview, _React$Component);
@@ -68,20 +68,33 @@ var ChoicePreview = /*#__PURE__*/function (_React$Component) {
   (0, _createClass2["default"])(ChoicePreview, [{
     key: "render",
     value: function render() {
+      var _this2 = this;
+
       var _this$props2 = this.props,
+          alternateResponseIndex = _this$props2.alternateResponseIndex,
+          category = _this$props2.category,
           classes = _this$props2.classes,
           className = _this$props2.className,
-          choice = _this$props2.choice;
+          choice = _this$props2.choice,
+          choiceIndex = _this$props2.choiceIndex;
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: (0, _classnames["default"])(classes.choicePreview, className)
-      }, /*#__PURE__*/_react["default"].createElement(_drag.Choice, null, /*#__PURE__*/_react["default"].createElement(_renderUi.HtmlAndMath, {
-        html: choice.content
+      }, choice ? /*#__PURE__*/_react["default"].createElement(_drag.Choice, {
+        alternateResponseIndex: alternateResponseIndex,
+        category: category,
+        choice: choice,
+        choiceIndex: choiceIndex,
+        onRemoveChoice: function onRemoveChoice() {
+          return _this2["delete"]();
+        }
+      }, /*#__PURE__*/_react["default"].createElement(_renderUi.HtmlAndMath, {
+        html: choice === null || choice === void 0 ? void 0 : choice.content
       }), /*#__PURE__*/_react["default"].createElement(_IconButton["default"], {
         color: "secondary",
         "aria-label": "delete",
         className: classes["delete"],
         onClick: this["delete"]
-      }, /*#__PURE__*/_react["default"].createElement(_Delete["default"], null))));
+      }, /*#__PURE__*/_react["default"].createElement(_RemoveCircleOutline["default"], null))) : null);
     }
   }]);
   return ChoicePreview;

package/configure/lib/design/categories/choice-preview.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/design/categories/choice-preview.jsx"],"names":["ChoicePreview","props","onDelete","choice","classes","className","choicePreview","content","React","Component","PropTypes","object","isRequired","string","func","styles","position","right","top"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;IAEaA,a;;;;;;;;;;;;;;;+FASF,YAAM;AAAA,wBACgB,MAAKC,KADrB;AAAA,UACLC,QADK,eACLA,QADK;AAAA,UACKC,MADL,eACKA,MADL;AAEbD,MAAAA,QAAQ,CAACC,MAAD,CAAR;AACD,K;;;;;;WAED,kBAAS;AAAA,yBACgC,KAAKF,KADrC;AAAA,UACCG,OADD,gBACCA,OADD;AAAA,UACUC,SADV,gBACUA,SADV;AAAA,UACqBF,MADrB,gBACqBA,MADrB;AAEP,0BACE;AAAK,QAAA,SAAS,EAAE,4BAAWC,OAAO,CAACE,aAAnB,EAAkCD,SAAlC;AAAhB,sBACE,gCAAC,YAAD,qBACE,gCAAC,qBAAD;AAAa,QAAA,IAAI,EAAEF,MAAM,CAACI;AAA1B,QADF,eAEE,gCAAC,sBAAD;AACE,QAAA,KAAK,EAAC,WADR;AAEE,sBAAW,QAFb;AAGE,QAAA,SAAS,EAAEH,OAAO,UAHpB;AAIE,QAAA,OAAO,EAAE;AAJX,sBAME,gCAAC,kBAAD,OANF,CAFF,CADF,CADF;AAeD;;;EA/BgCI,kBAAMC,S;;;iCAA5BT,a,eACQ;AACjBI,EAAAA,OAAO,EAAEM,sBAAUC,MAAV,CAAiBC,UADT;AAEjBP,EAAAA,SAAS,EAAEK,sBAAUG,MAFJ;AAGjBV,EAAAA,MAAM,EAAEO,sBAAUC,MAAV,CAAiBC,UAHR;AAIjBV,EAAAA,QAAQ,EAAEQ,sBAAUI,IAAV,CAAeF;AAJR,C;iCADRZ,a,kBAOW,E;;AA0BxB,IAAMe,MAAM,GAAG,SAATA,MAAS;AAAA,SAAO;AACpBT,IAAAA,aAAa,EAAE;AACbU,MAAAA,QAAQ,EAAE;AADG,KADK;AAIpB,cAAQ;AACNA,MAAAA,QAAQ,EAAE,UADJ;AAENC,MAAAA,KAAK,EAAE,CAFD;AAGNC,MAAAA,GAAG,EAAE;AAHC;AAJY,GAAP;AAAA,CAAf;;eAUe,wBAAWH,MAAX,EAAmBf,aAAnB,C","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { withStyles } from '@material-ui/core/styles';\nimport classNames from 'classnames';\nimport { Choice } from '@pie-lib/drag';\nimport IconButton from '@material-ui/core/IconButton';\nimport Delete from '@material-ui/icons/Delete';\nimport { HtmlAndMath } from '@pie-lib/render-ui';\n\nexport class ChoicePreview extends React.Component {\n  static propTypes = {\n    classes: PropTypes.object.isRequired,\n    className: PropTypes.string,\n    choice: PropTypes.object.isRequired,\n    onDelete: PropTypes.func.isRequired\n  };\n  static defaultProps = {};\n\n  delete = () => {\n    const { onDelete, choice } = this.props;\n    onDelete(choice);\n  };\n\n  render() {\n    const { classes, className, choice } = this.props;\n    return (\n      <div className={classNames(classes.choicePreview, className)}>\n        <Choice>\n          <HtmlAndMath html={choice.content} />\n          <IconButton\n            color=\"secondary\"\n            aria-label=\"delete\"\n            className={classes.delete}\n            onClick={this.delete}\n          >\n            <Delete />\n          </IconButton>\n        </Choice>\n      </div>\n    );\n  }\n}\nconst styles = () => ({\n  choicePreview: {\n    position: 'relative'\n  },\n  delete: {\n    position: 'absolute',\n    right: 0,\n    top: 0\n  }\n});\nexport default withStyles(styles)(ChoicePreview);\n"],"file":"choice-preview.js"}
+{"version":3,"sources":["../../../src/design/categories/choice-preview.jsx"],"names":["ChoicePreview","props","onDelete","choice","alternateResponseIndex","category","classes","className","choiceIndex","choicePreview","content","React","Component","PropTypes","object","isRequired","string","func","styles","position","right","top"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;IAEaA,a;;;;;;;;;;;;;;;+FASF,YAAM;AACb,wBAA6B,MAAKC,KAAlC;AAAA,UAAQC,QAAR,eAAQA,QAAR;AAAA,UAAkBC,MAAlB,eAAkBA,MAAlB;AACAD,MAAAA,QAAQ,CAACC,MAAD,CAAR;AACD,K;;;;;;WAED,kBAAS;AAAA;;AACP,yBAAsF,KAAKF,KAA3F;AAAA,UAAQG,sBAAR,gBAAQA,sBAAR;AAAA,UAAgCC,QAAhC,gBAAgCA,QAAhC;AAAA,UAA0CC,OAA1C,gBAA0CA,OAA1C;AAAA,UAAmDC,SAAnD,gBAAmDA,SAAnD;AAAA,UAA8DJ,MAA9D,gBAA8DA,MAA9D;AAAA,UAAsEK,WAAtE,gBAAsEA,WAAtE;AACA,0BACE;AAAK,QAAA,SAAS,EAAE,4BAAWF,OAAO,CAACG,aAAnB,EAAkCF,SAAlC;AAAhB,SACGJ,MAAM,gBACL,gCAAC,YAAD;AAAQ,QAAA,sBAAsB,EAAEC,sBAAhC;AAAwD,QAAA,QAAQ,EAAEC,QAAlE;AAA4E,QAAA,MAAM,EAAEF,MAApF;AAA4F,QAAA,WAAW,EAAEK,WAAzG;AAAsH,QAAA,cAAc,EAAE;AAAA,iBAAM,MAAI,UAAJ,EAAN;AAAA;AAAtI,sBACE,gCAAC,qBAAD;AAAa,QAAA,IAAI,EAAEL,MAAF,aAAEA,MAAF,uBAAEA,MAAM,CAAEO;AAA3B,QADF,eAEE,gCAAC,sBAAD;AAAY,QAAA,KAAK,EAAC,WAAlB;AAA8B,sBAAW,QAAzC;AAAkD,QAAA,SAAS,EAAEJ,OAAO,UAApE;AAA6E,QAAA,OAAO,EAAE;AAAtF,sBACE,gCAAC,+BAAD,OADF,CAFF,CADK,GAOH,IARN,CADF;AAYD;;;EA5BgCK,kBAAMC,S;;;iCAA5BZ,a,eACQ;AACjBM,EAAAA,OAAO,EAAEO,sBAAUC,MAAV,CAAiBC,UADT;AAEjBR,EAAAA,SAAS,EAAEM,sBAAUG,MAFJ;AAGjBb,EAAAA,MAAM,EAAEU,sBAAUC,MAAV,CAAiBC,UAHR;AAIjBb,EAAAA,QAAQ,EAAEW,sBAAUI,IAAV,CAAeF;AAJR,C;iCADRf,a,kBAOW,E;;AAuBxB,IAAMkB,MAAM,GAAG,SAATA,MAAS;AAAA,SAAO;AACpBT,IAAAA,aAAa,EAAE;AACbU,MAAAA,QAAQ,EAAE;AADG,KADK;AAIpB,cAAQ;AACNA,MAAAA,QAAQ,EAAE,UADJ;AAENC,MAAAA,KAAK,EAAE,CAFD;AAGNC,MAAAA,GAAG,EAAE;AAHC;AAJY,GAAP;AAAA,CAAf;;eAUe,wBAAWH,MAAX,EAAmBlB,aAAnB,C","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { withStyles } from '@material-ui/core/styles';\nimport classNames from 'classnames';\nimport { Choice } from '@pie-lib/drag';\nimport IconButton from '@material-ui/core/IconButton';\nimport RemoveCircleOutlineIcon from '@material-ui/icons/RemoveCircleOutline';\nimport { HtmlAndMath } from '@pie-lib/render-ui';\n\nexport class ChoicePreview extends React.Component {\n  static propTypes = {\n    classes: PropTypes.object.isRequired,\n    className: PropTypes.string,\n    choice: PropTypes.object.isRequired,\n    onDelete: PropTypes.func.isRequired,\n  };\n  static defaultProps = {};\n\n  delete = () => {\n    const { onDelete, choice } = this.props;\n    onDelete(choice);\n  };\n\n  render() {\n    const { alternateResponseIndex, category, classes, className, choice, choiceIndex } = this.props;\n    return (\n      <div className={classNames(classes.choicePreview, className)}>\n        {choice ? (\n          <Choice alternateResponseIndex={alternateResponseIndex} category={category} choice={choice} choiceIndex={choiceIndex} onRemoveChoice={() => this.delete()}>\n            <HtmlAndMath html={choice?.content} />\n            <IconButton color=\"secondary\" aria-label=\"delete\" className={classes.delete} onClick={this.delete}>\n              <RemoveCircleOutlineIcon />\n            </IconButton>\n          </Choice>\n        ) : null}\n      </div>\n    );\n  }\n}\nconst styles = () => ({\n  choicePreview: {\n    position: 'relative',\n  },\n  delete: {\n    position: 'absolute',\n    right: 0,\n    top: 0,\n  },\n});\nexport default withStyles(styles)(ChoicePreview);\n"],"file":"choice-preview.js"}

package/configure/lib/design/categories/droppable-placeholder.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.spec = exports.DroppablePlaceHolder = void 0;
+exports.spec = exports["default"] = exports.DroppablePlaceHolder = void 0;
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
@@ -37,7 +37,7 @@ var _debug = _interopRequireDefault(require("debug"));
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 var log = (0, _debug["default"])('@pie-element:categorize:configure');
 var Helper = (0, _styles.withStyles)(function () {
@@ -59,12 +59,17 @@ var Helper = (0, _styles.withStyles)(function () {
 });
 
 var Previews = function Previews(_ref2) {
-  var choices = _ref2.choices,
+  var alternateResponseIndex = _ref2.alternateResponseIndex,
+      category = _ref2.category,
+      choices = _ref2.choices,
       onDeleteChoice = _ref2.onDeleteChoice;
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, choices.map(function (c, index) {
-    return /*#__PURE__*/_react["default"].createElement(_choicePreview["default"], {
+    return c && /*#__PURE__*/_react["default"].createElement(_choicePreview["default"], {
+      alternateResponseIndex: alternateResponseIndex,
+      category: category,
       choice: c,
       key: index,
+      choiceIndex: index,
       onDelete: function onDelete(choice) {
         return onDeleteChoice(choice, index);
       }
@@ -73,6 +78,8 @@ var Previews = function Previews(_ref2) {
 };
 
 Previews.propTypes = {
+  alternateResponseIndex: _propTypes["default"].number,
+  category: _propTypes["default"].object,
   choices: _propTypes["default"].array,
   onDeleteChoice: _propTypes["default"].func
 };
@@ -91,7 +98,9 @@ var DroppablePlaceHolder = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var _this$props = this.props,
+          alternateResponseIndex = _this$props.alternateResponseIndex,
           isOver = _this$props.isOver,
+          category = _this$props.category,
           choices = _this$props.choices,
           classes = _this$props.classes,
           className = _this$props.className,
@@ -103,6 +112,8 @@ var DroppablePlaceHolder = /*#__PURE__*/function (_React$Component) {
         isOver: isOver,
         className: classes.placeHolder
       }, (choices || []).length === 0 ? /*#__PURE__*/_react["default"].createElement(Helper, null) : /*#__PURE__*/_react["default"].createElement(Previews, {
+        alternateResponseIndex: alternateResponseIndex,
+        category: category,
         choices: choices,
         onDeleteChoice: onDeleteChoice
       }))));
@@ -113,11 +124,14 @@ var DroppablePlaceHolder = /*#__PURE__*/function (_React$Component) {
 
 exports.DroppablePlaceHolder = DroppablePlaceHolder;
 (0, _defineProperty2["default"])(DroppablePlaceHolder, "propTypes", {
+  alternateResponseIndex: _propTypes["default"].number,
+  category: _propTypes["default"].object,
   classes: _propTypes["default"].object.isRequired,
   className: _propTypes["default"].string,
   connectDropTarget: _propTypes["default"].func.isRequired,
   choices: _propTypes["default"].array,
   onDropChoice: _propTypes["default"].func.isRequired,
+  onMoveChoice: _propTypes["default"].func,
   isOver: _propTypes["default"].bool,
   onDeleteChoice: _propTypes["default"].func,
   categoryId: _propTypes["default"].string.isRequired
@@ -142,7 +156,13 @@ var spec = {
   drop: function drop(props, monitor) {
     log('[drop] props: ', props);
     var item = monitor.getItem();
-    props.onDropChoice(item, props.categoryId);
+
+    if (item.from && item.alternateResponseIndex === props.alternateResponseIndex) {
+      props.onMoveChoice(item.choiceId, item.from, props.categoryId, item.choiceIndex, item.alternateResponseIndex);
+    } else if (!item.from) {
+      // avoid dropping choice when user tries to move it to an alternate with other index
+      props.onDropChoice(item, props.categoryId);
+    }
   },
   canDrop: function canDrop(props
   /*, monitor*/

package/configure/lib/design/categories/droppable-placeholder.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/design/categories/droppable-placeholder.jsx"],"names":["log","Helper","helper","display","alignItems","fontSize","color","width","height","classes","Previews","choices","onDeleteChoice","map","c","index","choice","propTypes","PropTypes","array","func","DroppablePlaceHolder","props","isOver","className","connectDropTarget","droppablePlaceholder","placeHolder","length","React","Component","object","isRequired","string","onDropChoice","bool","categoryId","styles","minHeight","Styled","spec","drop","monitor","item","getItem","canDrop","disabled","WithTarget","uid","connect","dropTarget","withUid"],"mappings":"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","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { withStyles } from '@material-ui/core/styles';\nimport classNames from 'classnames';\nimport ChoicePreview from './choice-preview';\nimport { DropTarget } from 'react-dnd';\nimport { uid, PlaceHolder } from '@pie-lib/drag';\nimport debug from 'debug';\n\nconst log = debug('@pie-element:categorize:configure');\n\nconst Helper = withStyles(() => ({\n  helper: {\n    display: 'flex',\n    alignItems: 'center',\n    fontSize: '12px',\n    color: 'rgba(0,0,0,0.4)',\n    width: '100%',\n    height: '100%'\n  }\n}))(({ classes }) => (\n  <div className={classes.helper}>Drag your correct answers here</div>\n));\n\nconst Previews = ({ choices, onDeleteChoice }) => (\n  <React.Fragment>\n    {choices.map((c, index) => (\n      <ChoicePreview\n        choice={c}\n        key={index}\n        onDelete={choice => onDeleteChoice(choice, index)}\n      />\n    ))}\n  </React.Fragment>\n);\n\nPreviews.propTypes = {\n  choices: PropTypes.array,\n  onDeleteChoice: PropTypes.func\n};\n\nexport class DroppablePlaceHolder extends React.Component {\n  static propTypes = {\n    classes: PropTypes.object.isRequired,\n    className: PropTypes.string,\n    connectDropTarget: PropTypes.func.isRequired,\n    choices: PropTypes.array,\n    onDropChoice: PropTypes.func.isRequired,\n    isOver: PropTypes.bool,\n    onDeleteChoice: PropTypes.func,\n    categoryId: PropTypes.string.isRequired\n  };\n\n  static defaultProps = {};\n  render() {\n    const {\n      isOver,\n      choices,\n      classes,\n      className,\n      connectDropTarget,\n      onDeleteChoice\n    } = this.props;\n\n    return connectDropTarget(\n      <div className={classNames(classes.droppablePlaceholder, className)}>\n        <PlaceHolder isOver={isOver} className={classes.placeHolder}>\n          {(choices || []).length === 0 ? (\n            <Helper />\n          ) : (\n            <Previews choices={choices} onDeleteChoice={onDeleteChoice} />\n          )}\n        </PlaceHolder>\n      </div>\n    );\n  }\n}\nconst styles = () => ({\n  droppablePlaceholder: {\n    minHeight: '100px'\n  },\n  placeHolder: {\n    width: '100%',\n    minHeight: '100px',\n    height: 'auto'\n  }\n});\n\nconst Styled = withStyles(styles)(DroppablePlaceHolder);\n\nexport const spec = {\n  drop: (props, monitor) => {\n    log('[drop] props: ', props);\n    const item = monitor.getItem();\n    props.onDropChoice(item, props.categoryId);\n  },\n  canDrop: (props /*, monitor*/) => {\n    return !props.disabled;\n  }\n};\n\nconst WithTarget = DropTarget(({ uid }) => uid, spec, (connect, monitor) => ({\n  connectDropTarget: connect.dropTarget(),\n  isOver: monitor.isOver()\n}))(Styled);\n\nexport default uid.withUid(WithTarget);\n"],"file":"droppable-placeholder.js"}
+{"version":3,"sources":["../../../src/design/categories/droppable-placeholder.jsx"],"names":["log","Helper","helper","display","alignItems","fontSize","color","width","height","classes","Previews","alternateResponseIndex","category","choices","onDeleteChoice","map","c","index","choice","propTypes","PropTypes","number","object","array","func","DroppablePlaceHolder","props","isOver","className","connectDropTarget","droppablePlaceholder","placeHolder","length","React","Component","isRequired","string","onDropChoice","onMoveChoice","bool","categoryId","styles","minHeight","Styled","spec","drop","monitor","item","getItem","from","choiceId","choiceIndex","canDrop","disabled","WithTarget","uid","connect","dropTarget","withUid"],"mappings":"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","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { withStyles } from '@material-ui/core/styles';\nimport classNames from 'classnames';\nimport ChoicePreview from './choice-preview';\nimport { DropTarget } from 'react-dnd';\nimport { uid, PlaceHolder } from '@pie-lib/drag';\nimport debug from 'debug';\n\nconst log = debug('@pie-element:categorize:configure');\n\nconst Helper = withStyles(() => ({\n  helper: {\n    display: 'flex',\n    alignItems: 'center',\n    fontSize: '12px',\n    color: 'rgba(0,0,0,0.4)',\n    width: '100%',\n    height: '100%',\n  },\n}))(({ classes }) => <div className={classes.helper}>Drag your correct answers here</div>);\n\nconst Previews = ({ alternateResponseIndex, category, choices, onDeleteChoice }) => (\n  <React.Fragment>\n    {choices.map(\n      (c, index) =>\n        c && (\n          <ChoicePreview\n            alternateResponseIndex={alternateResponseIndex}\n            category={category}\n            choice={c}\n            key={index}\n            choiceIndex={index}\n            onDelete={(choice) => onDeleteChoice(choice, index)}\n          />\n        ),\n    )}\n  </React.Fragment>\n);\n\nPreviews.propTypes = {\n  alternateResponseIndex: PropTypes.number,\n  category: PropTypes.object,\n  choices: PropTypes.array,\n  onDeleteChoice: PropTypes.func,\n};\n\nexport class DroppablePlaceHolder extends React.Component {\n  static propTypes = {\n    alternateResponseIndex: PropTypes.number,\n    category: PropTypes.object,\n    classes: PropTypes.object.isRequired,\n    className: PropTypes.string,\n    connectDropTarget: PropTypes.func.isRequired,\n    choices: PropTypes.array,\n    onDropChoice: PropTypes.func.isRequired,\n    onMoveChoice: PropTypes.func,\n    isOver: PropTypes.bool,\n    onDeleteChoice: PropTypes.func,\n    categoryId: PropTypes.string.isRequired,\n  };\n\n  static defaultProps = {};\n  render() {\n    const { alternateResponseIndex, isOver, category, choices, classes, className, connectDropTarget, onDeleteChoice } =\n      this.props;\n\n    return connectDropTarget(\n      <div className={classNames(classes.droppablePlaceholder, className)}>\n        <PlaceHolder isOver={isOver} className={classes.placeHolder}>\n          {(choices || []).length === 0 ? (\n            <Helper />\n          ) : (\n            <Previews\n              alternateResponseIndex={alternateResponseIndex}\n              category={category}\n              choices={choices}\n              onDeleteChoice={onDeleteChoice}\n            />\n          )}\n        </PlaceHolder>\n      </div>,\n    );\n  }\n}\nconst styles = () => ({\n  droppablePlaceholder: {\n    minHeight: '100px',\n  },\n  placeHolder: {\n    width: '100%',\n    minHeight: '100px',\n    height: 'auto',\n  },\n});\n\nconst Styled = withStyles(styles)(DroppablePlaceHolder);\n\nexport const spec = {\n  drop: (props, monitor) => {\n    log('[drop] props: ', props);\n    const item = monitor.getItem();\n\n    if (item.from && item.alternateResponseIndex === props.alternateResponseIndex) {\n      props.onMoveChoice(item.choiceId, item.from, props.categoryId, item.choiceIndex, item.alternateResponseIndex);\n    } else if (!item.from){\n      // avoid dropping choice when user tries to move it to an alternate with other index\n      props.onDropChoice(item, props.categoryId);\n    }\n  },\n  canDrop: (props /*, monitor*/) => {\n    return !props.disabled;\n  },\n};\n\nconst WithTarget = DropTarget(\n  ({ uid }) => uid,\n  spec,\n  (connect, monitor) => ({\n    connectDropTarget: connect.dropTarget(),\n    isOver: monitor.isOver(),\n  }),\n)(Styled);\n\nexport default uid.withUid(WithTarget);\n"],"file":"droppable-placeholder.js"}

package/configure/lib/design/categories/index.js

@@ -39,15 +39,23 @@ var _editableHtml = _interopRequireDefault(require("@pie-lib/editable-html"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _Info = _interopRequireDefault(require("@material-ui/icons/Info"));
+
+var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip"));
+
+var _categorize = require("@pie-lib/categorize");
+
 var _category = _interopRequireDefault(require("./category"));
 
 var _header = _interopRequireDefault(require("../header"));
 
-var _categorize = require("@pie-lib/categorize");
+var _utils = require("../../utils");
+
+var _RowLabel = require("./RowLabel");
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 var styles = function styles(theme) {
   return {
@@ -73,32 +81,20 @@ var styles = function styles(theme) {
     },
     rowLabelHolder: {
       width: '100%'
+    },
+    tooltip: {
+      fontSize: '12px',
+      whiteSpace: 'pre',
+      maxWidth: '500px'
+    },
+    errorText: {
+      fontSize: '12px',
+      color: 'red',
+      padding: '5px 0'
     }
   };
 };
 
-var RowLabel = (0, _styles.withStyles)(styles)(function (_ref) {
-  var categoriesPerRow = _ref.categoriesPerRow,
-      classes = _ref.classes,
-      markup = _ref.markup,
-      imageSupport = _ref.imageSupport,
-      onChange = _ref.onChange;
-  return /*#__PURE__*/_react["default"].createElement("div", {
-    style: {
-      gridColumn: "1/".concat(categoriesPerRow + 1),
-      width: '100%'
-    }
-  }, /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
-    className: classes.text
-  }, "Row Label"), /*#__PURE__*/_react["default"].createElement(_editableHtml["default"], {
-    className: classes.rowLabelHolder,
-    markup: markup,
-    onChange: onChange,
-    imageSupport: imageSupport,
-    nonEmpty: false
-  }));
-});
-
 var Categories = /*#__PURE__*/function (_React$Component) {
   (0, _inherits2["default"])(Categories, _React$Component);
 
@@ -114,17 +110,13 @@ var Categories = /*#__PURE__*/function (_React$Component) {
     }
 
     _this = _super.call.apply(_super, [this].concat(args));
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "changeCategoryColumns", function (event) {
-      var numberValue = parseInt(event.target.value, 10);
-
-      if (numberValue && numberValue >= 1 && numberValue <= 4) {
-        _this.props.onModelChanged({
-          categoriesPerRow: numberValue
-        });
-      }
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "state", {
+      focusedEl: null
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "add", function () {
-      var model = _this.props.model;
+      var _this$props = _this.props,
+          model = _this$props.model,
+          oldCategories = _this$props.categories;
       var categoriesPerRow = model.categoriesPerRow;
 
       var id = _configUi.choiceUtils.firstAvailableIndex(model.categories.map(function (a) {
@@ -142,15 +134,24 @@ var Categories = /*#__PURE__*/function (_React$Component) {
         rowLabels.push('');
       }
 
-      _this.props.onModelChanged({
-        rowLabels: rowLabels,
-        categories: model.categories.concat([data])
+      _this.setState({
+        focusedEl: oldCategories.length
+      }, function () {
+        _this.props.onModelChanged({
+          rowLabels: rowLabels,
+          categories: model.categories.concat([data])
+        });
+      });
+    });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "deleteFocusedEl", function () {
+      _this.setState({
+        focusedEl: null
       });
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "delete", function (category) {
-      var _this$props = _this.props,
-          model = _this$props.model,
-          onModelChanged = _this$props.onModelChanged;
+      var _this$props2 = _this.props,
+          model = _this$props2.model,
+          onModelChanged = _this$props2.onModelChanged;
       var index = model.categories.findIndex(function (a) {
         return a.id === category.id;
       });
@@ -175,24 +176,68 @@ var Categories = /*#__PURE__*/function (_React$Component) {
         });
       }
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "addChoiceToCategory", function (choice, categoryId) {
-      var _this$props2 = _this.props,
-          model = _this$props2.model,
-          onModelChanged = _this$props2.onModelChanged;
-      var correctResponse = (0, _categorize.moveChoiceToCategory)(choice.id, undefined, categoryId, 0, model.correctResponse);
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "addChoiceToCategory", function (addedChoice, categoryId) {
+      var _this$props3 = _this.props,
+          model = _this$props3.model,
+          onModelChanged = _this$props3.onModelChanged;
+
+      var _ref = model || {},
+          _ref$choices = _ref.choices,
+          choices = _ref$choices === void 0 ? [] : _ref$choices,
+          _ref$correctResponse = _ref.correctResponse,
+          correctResponse = _ref$correctResponse === void 0 ? [] : _ref$correctResponse;
+
+      var choice = (choices || []).find(function (choice) {
+        return choice.id === addedChoice.id;
+      });
+      correctResponse = (0, _categorize.moveChoiceToCategory)(addedChoice.id, undefined, categoryId, 0, model.correctResponse); // if multiplePlacements not allowed, ensure the consistency in the other categories
+
+      if (choice.categoryCount !== 0) {
+        correctResponse = (0, _categorize.verifyAllowMultiplePlacements)(addedChoice, categoryId, correctResponse);
+      }
+
       onModelChanged({
         correctResponse: correctResponse
       });
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "deleteChoiceFromCategory", function (category, choice, choiceIndex) {
-      var _this$props3 = _this.props,
-          model = _this$props3.model,
-          onModelChanged = _this$props3.onModelChanged;
+      var _this$props4 = _this.props,
+          model = _this$props4.model,
+          onModelChanged = _this$props4.onModelChanged;
       var correctResponse = (0, _categorize.removeChoiceFromCategory)(choice.id, category.id, choiceIndex, model.correctResponse);
       onModelChanged({
         correctResponse: correctResponse
       });
     });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "moveChoice", function (choiceId, from, to, choiceIndex) {
+      var _this$props5 = _this.props,
+          model = _this$props5.model,
+          onModelChanged = _this$props5.onModelChanged;
+
+      var _ref2 = model || {},
+          choices = _ref2.choices,
+          _ref2$correctResponse = _ref2.correctResponse,
+          correctResponse = _ref2$correctResponse === void 0 ? [] : _ref2$correctResponse;
+
+      var choice = (choices || []).find(function (choice) {
+        return choice.id === choiceId;
+      });
+
+      if (to === from || !choice) {
+        return;
+      }
+
+      if (choice.categoryCount !== 0) {
+        correctResponse = (0, _categorize.moveChoiceToCategory)(choice.id, from, to, choiceIndex, correctResponse);
+        correctResponse = (0, _categorize.verifyAllowMultiplePlacements)(choice, to, correctResponse);
+      } else if (choice.categoryCount === 0) {
+        correctResponse = (0, _categorize.moveChoiceToCategory)(choice.id, undefined, to, 0, correctResponse);
+      }
+
+      onModelChanged({
+        correctResponse: correctResponse
+      });
+    });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "changeRowLabel", function (val, index) {
       var model = _this.props.model;
       var rowLabels = model.rowLabels;
@@ -216,71 +261,110 @@ var Categories = /*#__PURE__*/function (_React$Component) {
     value: function render() {
       var _this2 = this;
 
-      var _this$props4 = this.props,
-          model = _this$props4.model,
-          classes = _this$props4.classes,
-          className = _this$props4.className,
-          categories = _this$props4.categories,
-          imageSupport = _this$props4.imageSupport;
+      var _this$props6 = this.props,
+          model = _this$props6.model,
+          classes = _this$props6.classes,
+          className = _this$props6.className,
+          categories = _this$props6.categories,
+          imageSupport = _this$props6.imageSupport,
+          uploadSoundSupport = _this$props6.uploadSoundSupport,
+          toolbarOpts = _this$props6.toolbarOpts,
+          spellCheck = _this$props6.spellCheck,
+          configuration = _this$props6.configuration,
+          defaultImageMaxHeight = _this$props6.defaultImageMaxHeight,
+          defaultImageMaxWidth = _this$props6.defaultImageMaxWidth;
       var categoriesPerRow = model.categoriesPerRow,
-          rowLabels = model.rowLabels;
+          rowLabels = model.rowLabels,
+          errors = model.errors;
+
+      var _ref3 = errors || {},
+          associationError = _ref3.associationError,
+          categoriesError = _ref3.categoriesError,
+          categoriesErrors = _ref3.categoriesErrors;
+
+      var _ref4 = configuration || {},
+          maxCategories = _ref4.maxCategories,
+          _ref4$maxImageWidth = _ref4.maxImageWidth,
+          maxImageWidth = _ref4$maxImageWidth === void 0 ? {} : _ref4$maxImageWidth,
+          _ref4$maxImageHeight = _ref4.maxImageHeight,
+          maxImageHeight = _ref4$maxImageHeight === void 0 ? {} : _ref4$maxImageHeight;
+
       var holderStyle = {
         gridTemplateColumns: "repeat(".concat(categoriesPerRow, ", 1fr)")
       };
-      var lastRowLabelIndex = parseInt((categories.length - 1) / categoriesPerRow);
+      var validationMessage = (0, _utils.generateValidationMessage)(configuration);
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: (0, _classnames["default"])(classes.categories, className)
       }, /*#__PURE__*/_react["default"].createElement(_header["default"], {
         label: "Categories",
         buttonLabel: "ADD A CATEGORY",
-        onAdd: this.add
-      }), /*#__PURE__*/_react["default"].createElement("div", {
-        className: classes.row
-      }, /*#__PURE__*/_react["default"].createElement(_TextField["default"], {
-        label: "Categories per row",
-        type: "number",
-        inputProps: {
-          min: 1,
-          max: 4
-        },
-        value: categoriesPerRow,
-        onChange: this.changeCategoryColumns
-      })), /*#__PURE__*/_react["default"].createElement("div", {
+        onAdd: this.add,
+        info: /*#__PURE__*/_react["default"].createElement(_Tooltip["default"], {
+          classes: {
+            tooltip: classes.tooltip
+          },
+          disableFocusListener: true,
+          disableTouchListener: true,
+          placement: 'right',
+          title: validationMessage
+        }, /*#__PURE__*/_react["default"].createElement(_Info["default"], {
+          fontSize: 'small',
+          color: 'primary',
+          style: {
+            marginLeft: '5px'
+          }
+        })),
+        buttonDisabled: maxCategories && categories && maxCategories === categories.length
+      }), associationError && /*#__PURE__*/_react["default"].createElement("div", {
+        className: classes.errorText
+      }, associationError), categoriesError && /*#__PURE__*/_react["default"].createElement("div", {
+        className: classes.errorText
+      }, categoriesError), /*#__PURE__*/_react["default"].createElement("div", {
         className: classes.categoriesHolder,
         style: holderStyle
       }, categories.map(function (category, index) {
-        var hasRowLabel = index > 1 && index % categoriesPerRow === 0;
-        var rowIndex = parseInt(index / (categoriesPerRow + 1));
+        var hasRowLabel = index % categoriesPerRow === 0;
+        var rowIndex = index / categoriesPerRow;
         return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, {
           key: index
-        }, hasRowLabel && /*#__PURE__*/_react["default"].createElement(RowLabel, {
+        }, hasRowLabel && /*#__PURE__*/_react["default"].createElement(_RowLabel.RowLabel, {
           categoriesPerRow: categoriesPerRow,
+          disabled: false,
           rowIndex: rowIndex,
           markup: rowLabels[rowIndex] || '',
           onChange: function onChange(val) {
             return _this2.changeRowLabel(val, rowIndex);
           },
-          imageSupport: imageSupport
+          imageSupport: imageSupport,
+          toolbarOpts: toolbarOpts,
+          spellCheck: spellCheck,
+          maxImageWidth: maxImageWidth && maxImageWidth.rowLabel || defaultImageMaxWidth,
+          maxImageHeight: maxImageHeight && maxImageHeight.rowLabel || defaultImageMaxHeight,
+          uploadSoundSupport: uploadSoundSupport
         }), /*#__PURE__*/_react["default"].createElement(_category["default"], {
           imageSupport: imageSupport,
+          focusedEl: _this2.state.focusedEl,
+          deleteFocusedEl: _this2.deleteFocusedEl,
+          index: index,
           category: category,
+          error: categoriesErrors && categoriesErrors[category.id],
           onChange: _this2.change,
           onDelete: function onDelete() {
             return _this2["delete"](category);
           },
           onAddChoice: _this2.addChoiceToCategory,
+          onMoveChoice: function onMoveChoice(choiceId, from, to, choiceIndex) {
+            return _this2.moveChoice(choiceId, from, to, choiceIndex);
+          },
+          toolbarOpts: toolbarOpts,
+          spellCheck: spellCheck,
           onDeleteChoice: function onDeleteChoice(choice, choiceIndex) {
             return _this2.deleteChoiceFromCategory(category, choice, choiceIndex);
-          }
+          },
+          maxImageWidth: maxImageWidth && maxImageWidth.categoryLabel || defaultImageMaxWidth,
+          maxImageHeight: maxImageHeight && maxImageHeight.categoryLabel || defaultImageMaxHeight,
+          uploadSoundSupport: uploadSoundSupport
         }));
-      }), /*#__PURE__*/_react["default"].createElement(RowLabel, {
-        categoriesPerRow: categoriesPerRow,
-        rowIndex: lastRowLabelIndex,
-        markup: rowLabels[lastRowLabelIndex] || '',
-        onChange: function onChange(val) {
-          return _this2.changeRowLabel(val, lastRowLabelIndex);
-        },
-        imageSupport: imageSupport
       })));
     }
   }]);
@@ -293,11 +377,17 @@ exports.Categories = Categories;
     add: _propTypes["default"].func.isRequired,
     "delete": _propTypes["default"].func.isRequired
   }),
+  uploadSoundSupport: _propTypes["default"].shape({
+    add: _propTypes["default"].func.isRequired,
+    "delete": _propTypes["default"].func.isRequired
+  }),
   classes: _propTypes["default"].object.isRequired,
   className: _propTypes["default"].string,
   categories: _propTypes["default"].array,
   onModelChanged: _propTypes["default"].func,
-  model: _propTypes["default"].object.isRequired
+  model: _propTypes["default"].object.isRequired,
+  configuration: _propTypes["default"].object.isRequired,
+  toolbarOpts: _propTypes["default"].object
 });
 
 var _default = (0, _styles.withStyles)(styles)(Categories);