@pie-lib/drag 2.0.3 → 2.0.4

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.4](https://github.com/pie-framework/pie-lib/compare/@pie-lib/drag@2.0.3...@pie-lib/drag@2.0.4) (2022-12-19)
+
+
+### Bug Fixes
+
+* **drag,categorize:** drag an answer choice elsewhere after it has been placed in a category-PD-1995 ([d32015b](https://github.com/pie-framework/pie-lib/commit/d32015b31d50b45851df2f27ad517eeaad8ae511))
+
+
+
+
+
 ## [2.0.3](https://github.com/pie-framework/pie-lib/compare/@pie-lib/drag@2.0.2...@pie-lib/drag@2.0.3) (2022-12-06)
 
 

package/lib/choice.js

@@ -31,6 +31,8 @@ var _grey = _interopRequireDefault(require("@material-ui/core/colors/grey"));
 
 var _reactDnd = require("react-dnd");
 
+var _uidContext = require("./uid-context");
+
 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 { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
@@ -89,17 +91,37 @@ var choiceSource = {
     return !props.disabled;
   },
   beginDrag: function beginDrag(props) {
-    return props;
+    var out = {
+      choiceId: props.choice.id,
+      from: props.category.id,
+      alternateResponseIndex: props.alternateResponseIndex,
+      choiceIndex: props.choiceIndex
+    };
+    return out;
+  },
+  endDrag: function endDrag(props, monitor) {
+    if (!monitor.didDrop()) {
+      var item = monitor.getItem();
+
+      if (item.from) {
+        props.onRemoveChoice(item);
+      }
+    }
   }
 };
 var styledChoice = (0, _styles.withStyles)(styles)(Choice);
-
-var _default = (0, _reactDnd.DragSource)(DRAG_TYPE, choiceSource, function (connect, monitor) {
+var DraggableChoice = (0, _reactDnd.DragSource)(function (_ref) {
+  var uid = _ref.uid;
+  return uid;
+}, choiceSource, function (connect, monitor) {
   return {
     connectDragSource: connect.dragSource(),
+    connectDragPreview: connect.dragPreview(),
     isDragging: monitor.isDragging()
   };
 })(styledChoice);
 
+var _default = (0, _uidContext.withUid)(DraggableChoice);
+
 exports["default"] = _default;
 //# sourceMappingURL=choice.js.map

package/lib/choice.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/choice.jsx"],"names":["DRAG_TYPE","Choice","props","classes","className","children","connectDragSource","choice","React","Component","PropTypes","object","isRequired","string","oneOfType","arrayOf","node","func","styles","theme","backgroundColor","border","grey","padding","spacing","unit","minHeight","choiceSource","canDrag","disabled","beginDrag","styledChoice","connect","monitor","dragSource","isDragging"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AAEA;;;;;;AAEO,IAAMA,SAAS,GAAG,QAAlB;;;IAEMC,M;;;;;;;;;;;;WAUX,kBAAS;AACP,wBAA4D,KAAKC,KAAjE;AAAA,UAAQC,OAAR,eAAQA,OAAR;AAAA,UAAiBC,SAAjB,eAAiBA,SAAjB;AAAA,UAA4BC,QAA5B,eAA4BA,QAA5B;AAAA,UAAsCC,iBAAtC,eAAsCA,iBAAtC;AAEA,aAAOA,iBAAiB,eAAC;AAAK,QAAA,SAAS,EAAE,4BAAWH,OAAO,CAACI,MAAnB,EAA2BH,SAA3B;AAAhB,SAAwDC,QAAxD,CAAD,CAAxB;AACD;;;EAdyBG,kBAAMC,S;;;iCAArBR,M,eACQ;AACjBE,EAAAA,OAAO,EAAEO,sBAAUC,MAAV,CAAiBC,UADT;AAEjBR,EAAAA,SAAS,EAAEM,sBAAUG,MAFJ;AAGjBR,EAAAA,QAAQ,EAAEK,sBAAUI,SAAV,CAAoB,CAACJ,sBAAUK,OAAV,CAAkBL,sBAAUM,IAA5B,CAAD,EAAoCN,sBAAUM,IAA9C,CAApB,CAHO;AAIjBV,EAAAA,iBAAiB,EAAEI,sBAAUO,IAAV,CAAeL;AAJjB,C;iCADRX,M,kBAQW,E;;AASxB,IAAMiB,MAAM,GAAG,SAATA,MAAS,CAACC,KAAD;AAAA,SAAY;AACzBZ,IAAAA,MAAM,EAAE;AACNa,MAAAA,eAAe,EAAE,OADX;AAENC,MAAAA,MAAM,sBAAeC,iBAAK,GAAL,CAAf,CAFA;AAGNC,MAAAA,OAAO,EAAEJ,KAAK,CAACK,OAAN,CAAcC,IAHjB;AAINC,MAAAA,SAAS,EAAE;AAJL;AADiB,GAAZ;AAAA,CAAf;;AASA,IAAMC,YAAY,GAAG;AACnBC,EAAAA,OADmB,mBACX1B,KADW,EACJ;AACb,WAAO,CAACA,KAAK,CAAC2B,QAAd;AACD,GAHkB;AAInBC,EAAAA,SAJmB,qBAIT5B,KAJS,EAIF;AACf,WAAOA,KAAP;AACD;AANkB,CAArB;AASA,IAAM6B,YAAY,GAAG,wBAAWb,MAAX,EAAmBjB,MAAnB,CAArB;;eAEe,0BAAWD,SAAX,EAAsB2B,YAAtB,EAAoC,UAACK,OAAD,EAAUC,OAAV;AAAA,SAAuB;AACxE3B,IAAAA,iBAAiB,EAAE0B,OAAO,CAACE,UAAR,EADqD;AAExEC,IAAAA,UAAU,EAAEF,OAAO,CAACE,UAAR;AAF4D,GAAvB;AAAA,CAApC,EAGXJ,YAHW,C","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { withStyles } from '@material-ui/core/styles';\nimport classNames from 'classnames';\nimport grey from '@material-ui/core/colors/grey';\n\nimport { DragSource } from 'react-dnd';\n\nexport const DRAG_TYPE = 'CHOICE';\n\nexport class Choice extends React.Component {\n  static propTypes = {\n    classes: PropTypes.object.isRequired,\n    className: PropTypes.string,\n    children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),\n    connectDragSource: PropTypes.func.isRequired,\n  };\n\n  static defaultProps = {};\n\n  render() {\n    const { classes, className, children, connectDragSource } = this.props;\n\n    return connectDragSource(<div className={classNames(classes.choice, className)}>{children}</div>);\n  }\n}\n\nconst styles = (theme) => ({\n  choice: {\n    backgroundColor: 'white',\n    border: `solid 1px ${grey[400]}`,\n    padding: theme.spacing.unit,\n    minHeight: '30px',\n  },\n});\n\nconst choiceSource = {\n  canDrag(props) {\n    return !props.disabled;\n  },\n  beginDrag(props) {\n    return props;\n  },\n};\n\nconst styledChoice = withStyles(styles)(Choice);\n\nexport default DragSource(DRAG_TYPE, choiceSource, (connect, monitor) => ({\n  connectDragSource: connect.dragSource(),\n  isDragging: monitor.isDragging(),\n}))(styledChoice);\n"],"file":"choice.js"}
+{"version":3,"sources":["../src/choice.jsx"],"names":["DRAG_TYPE","Choice","props","classes","className","children","connectDragSource","choice","React","Component","PropTypes","object","isRequired","string","oneOfType","arrayOf","node","func","styles","theme","backgroundColor","border","grey","padding","spacing","unit","minHeight","choiceSource","canDrag","disabled","beginDrag","out","choiceId","id","from","category","alternateResponseIndex","choiceIndex","endDrag","monitor","didDrop","item","getItem","onRemoveChoice","styledChoice","DraggableChoice","uid","connect","dragSource","connectDragPreview","dragPreview","isDragging"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AAEA;;AACA;;;;;;AAEO,IAAMA,SAAS,GAAG,QAAlB;;;IAEMC,M;;;;;;;;;;;;WAUX,kBAAS;AACP,wBAA4D,KAAKC,KAAjE;AAAA,UAAQC,OAAR,eAAQA,OAAR;AAAA,UAAiBC,SAAjB,eAAiBA,SAAjB;AAAA,UAA4BC,QAA5B,eAA4BA,QAA5B;AAAA,UAAsCC,iBAAtC,eAAsCA,iBAAtC;AAEA,aAAOA,iBAAiB,eAAC;AAAK,QAAA,SAAS,EAAE,4BAAWH,OAAO,CAACI,MAAnB,EAA2BH,SAA3B;AAAhB,SAAwDC,QAAxD,CAAD,CAAxB;AACD;;;EAdyBG,kBAAMC,S;;;iCAArBR,M,eACQ;AACjBE,EAAAA,OAAO,EAAEO,sBAAUC,MAAV,CAAiBC,UADT;AAEjBR,EAAAA,SAAS,EAAEM,sBAAUG,MAFJ;AAGjBR,EAAAA,QAAQ,EAAEK,sBAAUI,SAAV,CAAoB,CAACJ,sBAAUK,OAAV,CAAkBL,sBAAUM,IAA5B,CAAD,EAAoCN,sBAAUM,IAA9C,CAApB,CAHO;AAIjBV,EAAAA,iBAAiB,EAAEI,sBAAUO,IAAV,CAAeL;AAJjB,C;iCADRX,M,kBAQW,E;;AASxB,IAAMiB,MAAM,GAAG,SAATA,MAAS,CAACC,KAAD;AAAA,SAAY;AACzBZ,IAAAA,MAAM,EAAE;AACNa,MAAAA,eAAe,EAAE,OADX;AAENC,MAAAA,MAAM,sBAAeC,iBAAK,GAAL,CAAf,CAFA;AAGNC,MAAAA,OAAO,EAAEJ,KAAK,CAACK,OAAN,CAAcC,IAHjB;AAINC,MAAAA,SAAS,EAAE;AAJL;AADiB,GAAZ;AAAA,CAAf;;AASA,IAAMC,YAAY,GAAG;AACnBC,EAAAA,OADmB,mBACX1B,KADW,EACJ;AACb,WAAO,CAACA,KAAK,CAAC2B,QAAd;AACD,GAHkB;AAInBC,EAAAA,SAJmB,qBAIT5B,KAJS,EAIF;AACf,QAAM6B,GAAG,GAAG;AACVC,MAAAA,QAAQ,EAAE9B,KAAK,CAACK,MAAN,CAAa0B,EADb;AAEVC,MAAAA,IAAI,EAAEhC,KAAK,CAACiC,QAAN,CAAeF,EAFX;AAGVG,MAAAA,sBAAsB,EAAElC,KAAK,CAACkC,sBAHpB;AAIVC,MAAAA,WAAW,EAAEnC,KAAK,CAACmC;AAJT,KAAZ;AAMA,WAAON,GAAP;AACD,GAZkB;AAcnBO,EAAAA,OAAO,EAAE,iBAACpC,KAAD,EAAQqC,OAAR,EAAoB;AAC3B,QAAI,CAACA,OAAO,CAACC,OAAR,EAAL,EAAwB;AACtB,UAAMC,IAAI,GAAGF,OAAO,CAACG,OAAR,EAAb;;AACA,UAAID,IAAI,CAACP,IAAT,EAAe;AACbhC,QAAAA,KAAK,CAACyC,cAAN,CAAqBF,IAArB;AACD;AACF;AACF;AArBkB,CAArB;AAwBA,IAAMG,YAAY,GAAG,wBAAW1B,MAAX,EAAmBjB,MAAnB,CAArB;AAEA,IAAM4C,eAAe,GAAG,0BACtB;AAAA,MAAGC,GAAH,QAAGA,GAAH;AAAA,SAAaA,GAAb;AAAA,CADsB,EAEtBnB,YAFsB,EAGtB,UAACoB,OAAD,EAAUR,OAAV;AAAA,SAAuB;AACrBjC,IAAAA,iBAAiB,EAAEyC,OAAO,CAACC,UAAR,EADE;AAErBC,IAAAA,kBAAkB,EAAEF,OAAO,CAACG,WAAR,EAFC;AAGrBC,IAAAA,UAAU,EAAEZ,OAAO,CAACY,UAAR;AAHS,GAAvB;AAAA,CAHsB,EAQtBP,YARsB,CAAxB;;eAUe,yBAAQC,eAAR,C","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { withStyles } from '@material-ui/core/styles';\nimport classNames from 'classnames';\nimport grey from '@material-ui/core/colors/grey';\n\nimport { DragSource } from 'react-dnd';\nimport { withUid } from './uid-context';\n\nexport const DRAG_TYPE = 'CHOICE';\n\nexport class Choice extends React.Component {\n  static propTypes = {\n    classes: PropTypes.object.isRequired,\n    className: PropTypes.string,\n    children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),\n    connectDragSource: PropTypes.func.isRequired,\n  };\n\n  static defaultProps = {};\n\n  render() {\n    const { classes, className, children, connectDragSource } = this.props;\n\n    return connectDragSource(<div className={classNames(classes.choice, className)}>{children}</div>);\n  }\n}\n\nconst styles = (theme) => ({\n  choice: {\n    backgroundColor: 'white',\n    border: `solid 1px ${grey[400]}`,\n    padding: theme.spacing.unit,\n    minHeight: '30px',\n  },\n});\n\nconst choiceSource = {\n  canDrag(props) {\n    return !props.disabled;\n  },\n  beginDrag(props) {\n    const out = {\n      choiceId: props.choice.id,\n      from: props.category.id,\n      alternateResponseIndex: props.alternateResponseIndex,\n      choiceIndex: props.choiceIndex,\n    };\n    return out;\n  },\n\n  endDrag: (props, monitor) => {\n    if (!monitor.didDrop()) {\n      const item = monitor.getItem();\n      if (item.from) {\n        props.onRemoveChoice(item);\n      }\n    }\n  },\n};\n\nconst styledChoice = withStyles(styles)(Choice);\n\nconst DraggableChoice = DragSource(\n  ({ uid }) => uid,\n  choiceSource,\n  (connect, monitor) => ({\n    connectDragSource: connect.dragSource(),\n    connectDragPreview: connect.dragPreview(),\n    isDragging: monitor.isDragging(),\n  }),\n)(styledChoice);\n\nexport default withUid(DraggableChoice);\n"],"file":"choice.js"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pie-lib/drag",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "",
   "main": "lib/index.js",
   "module": "src/index.js",
@@ -17,5 +17,5 @@
   "scripts": {},
   "author": "",
   "license": "ISC",
-  "gitHead": "b841a72572f13280f45541fbd4a05d6ddc115737"
+  "gitHead": "b26d56c7bb2ddddd23b4c018ac81c418afed443e"
 }

package/src/choice.jsx

@@ -5,6 +5,7 @@ import classNames from 'classnames';
 import grey from '@material-ui/core/colors/grey';
 
 import { DragSource } from 'react-dnd';
+import { withUid } from './uid-context';
 
 export const DRAG_TYPE = 'CHOICE';
 
@@ -39,13 +40,35 @@ const choiceSource = {
     return !props.disabled;
   },
   beginDrag(props) {
-    return props;
+    const out = {
+      choiceId: props.choice.id,
+      from: props.category.id,
+      alternateResponseIndex: props.alternateResponseIndex,
+      choiceIndex: props.choiceIndex,
+    };
+    return out;
+  },
+
+  endDrag: (props, monitor) => {
+    if (!monitor.didDrop()) {
+      const item = monitor.getItem();
+      if (item.from) {
+        props.onRemoveChoice(item);
+      }
+    }
   },
 };
 
 const styledChoice = withStyles(styles)(Choice);
 
-export default DragSource(DRAG_TYPE, choiceSource, (connect, monitor) => ({
-  connectDragSource: connect.dragSource(),
-  isDragging: monitor.isDragging(),
-}))(styledChoice);
+const DraggableChoice = DragSource(
+  ({ uid }) => uid,
+  choiceSource,
+  (connect, monitor) => ({
+    connectDragSource: connect.dragSource(),
+    connectDragPreview: connect.dragPreview(),
+    isDragging: monitor.isDragging(),
+  }),
+)(styledChoice);
+
+export default withUid(DraggableChoice);