@pie-lib/mask-markup 2.1.0-next.31 → 2.1.0-next.33

package/lib/drag-in-the-blank.js

@@ -115,6 +115,11 @@ var DragInTheBlank = exports["default"] = /*#__PURE__*/function (_React$Componen
       var _this$props = _this.props,
         onChange = _this$props.onChange,
         value = _this$props.value;
+
+      // Always reset the active drag item state, even if drop is invalid
+      _this.setState({
+        activeDragItem: null
+      });
       if (!over || !active || !onChange) {
         return;
       }
@@ -123,29 +128,25 @@ var DragInTheBlank = exports["default"] = /*#__PURE__*/function (_React$Componen
       if ((draggedData === null || draggedData === void 0 ? void 0 : draggedData.type) === 'MaskBlank' && dropData !== null && dropData !== void 0 && (_dropData$accepts = dropData.accepts) !== null && _dropData$accepts !== void 0 && _dropData$accepts.includes('MaskBlank')) {
         var draggedItem = draggedData;
         var targetId = dropData.id;
-
-        // drop from choice to blank (placing choice into response)
-        if (draggedItem.fromChoice === true) {
-          var newValue = _objectSpread({}, value);
-          newValue[targetId] = draggedItem.choice.id;
-          onChange(newValue);
-        } else if (dropData.toChoiceBoard === true) {
-          // handle drop from blank to choice board (removal from blank)
-          var _newValue = _objectSpread({}, value);
-          delete _newValue[draggedItem.id];
-          onChange(_newValue);
-        }
-        // handle drop from blank to blank (changing position)
-        else if (draggedItem.id !== targetId) {
+        if (dropData.toChoiceBoard === true) {
+          if (!draggedItem.fromChoice && draggedItem.id) {
+            var newValue = _objectSpread({}, value);
+            delete newValue[draggedItem.id];
+            onChange(newValue);
+          }
+        } else if (draggedItem.fromChoice === true) {
+          if (targetId && targetId !== 'drag-in-the-blank-droppable') {
+            var _newValue = _objectSpread({}, value);
+            _newValue[targetId] = draggedItem.choice.id;
+            onChange(_newValue);
+          }
+        } else if (draggedItem.id && draggedItem.id !== targetId) {
           var _newValue2 = _objectSpread({}, value);
           _newValue2[targetId] = draggedItem.choice.id;
           delete _newValue2[draggedItem.id];
           onChange(_newValue2);
         }
       }
-      _this.setState({
-        activeDragItem: null
-      });
     });
     (0, _defineProperty2["default"])(_this, "getPositionDirection", function (choicePosition) {
       var flexDirection;
@@ -239,7 +240,7 @@ var DragInTheBlank = exports["default"] = /*#__PURE__*/function (_React$Componen
         isDragging: !!this.state.activeDragItem
       }), /*#__PURE__*/_react["default"].createElement(_core.DragOverlay, {
         style: {
-          pointerEvents: "none"
+          pointerEvents: 'none'
         }
       }, this.renderDragOverlay())));
     }

package/lib/drag-in-the-blank.js.map

@@ -1 +1 @@
-{"version":3,"file":"drag-in-the-blank.js","names":["_react","_interopRequireDefault","require","_propTypes","_drag","_core","_choices","_choice","_blank","_withMask","_callSuper","t","o","e","_getPrototypeOf2","_possibleConstructorReturn2","_isNativeReflectConstruct","Reflect","construct","constructor","apply","Boolean","prototype","valueOf","call","ownKeys","r","Object","keys","getOwnPropertySymbols","filter","getOwnPropertyDescriptor","enumerable","push","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","Masked","withMask","props","node","data","onChange","_node$data","dataset","component","disabled","duplicates","correctResponse","feedback","showCorrectAnswer","emptyResponseAreaWidth","emptyResponseAreaHeight","instanceId","isDragging","choiceId","id","choice","choices","find","c","createElement","key","concat","type","correct","newData","undefined","DragInTheBlank","exports","_React$Component","_this","_classCallCheck2","event","_active$data","active","current","setState","activeDragItem","state","_dropData$accepts","over","_this$props","value","draggedData","dropData","accepts","includes","draggedItem","targetId","fromChoice","newValue","toChoiceBoard","choicePosition","flexDirection","justifyContent","alignItems","_inherits2","_createClass2","render","_this2","_this$props2","markup","choicesPosition","layout","style","display","minWidth","getPositionDirection","DragProvider","onDragStart","handleDragStart","onDragEnd","handleDragEnd","collisionDetection","closestCenter","ref","rootRef","elementType","DragOverlay","pointerEvents","renderDragOverlay","React","Component","PropTypes","string","object","array","func","bool","oneOfType","number"],"sources":["../src/drag-in-the-blank.jsx"],"sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { DragProvider } from '@pie-lib/drag';\nimport { DragOverlay, closestCenter } from '@dnd-kit/core';\n\nimport Choices from './choices';\nimport Choice from './choices/choice';\nimport Blank from './components/blank';\nimport { withMask } from './with-mask';\n\nconst Masked = withMask('blank', (props) => (node, data, onChange) => {\n  const dataset = node.data?.dataset || {};\n  if (dataset.component === 'blank') {\n    // eslint-disable-next-line react/prop-types\n    const {\n      disabled,\n      duplicates,\n      correctResponse,\n      feedback,\n      showCorrectAnswer,\n      emptyResponseAreaWidth,\n      emptyResponseAreaHeight,\n      instanceId,\n      isDragging\n    } = props;\n    const choiceId = showCorrectAnswer ? correctResponse[dataset.id] : data[dataset.id];\n    // eslint-disable-next-line react/prop-types\n    const choice = choiceId && props.choices.find((c) => c.id === choiceId);\n\n    return (\n      <Blank\n        key={`${node.type}-${dataset.id}`}\n        correct={showCorrectAnswer || (feedback && feedback[dataset.id])}\n        disabled={disabled}\n        duplicates={duplicates}\n        choice={choice}\n        id={dataset.id}\n        emptyResponseAreaWidth={emptyResponseAreaWidth}\n        emptyResponseAreaHeight={emptyResponseAreaHeight}\n        onChange={(id, choiceId) => {\n          const newData = { ...data };\n          if (choiceId === undefined) {\n            delete newData[id];\n          } else {\n            newData[id] = choiceId;\n          }\n          onChange(newData);\n        }}\n        instanceId={instanceId}\n        isDragging={isDragging}\n      />\n    );\n  }\n});\n\nexport default class DragInTheBlank extends React.Component {\n  constructor(props) {\n    super(props);\n    this.state = {\n      activeDragItem: null,\n    };\n  }\n\n  static propTypes = {\n    markup: PropTypes.string,\n    layout: PropTypes.object,\n    choicesPosition: PropTypes.string,\n    choices: PropTypes.array,\n    value: PropTypes.object,\n    onChange: PropTypes.func,\n    duplicates: PropTypes.bool,\n    disabled: PropTypes.bool,\n    feedback: PropTypes.object,\n    correctResponse: PropTypes.object,\n    showCorrectAnswer: PropTypes.bool,\n    emptyResponseAreaWidth: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),\n    emptyResponseAreaHeight: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),\n    instanceId: PropTypes.string,\n  };\n\n  static defaultProps = {\n    instanceId: 'drag-in-the-blank',\n  };\n\n  handleDragStart = (event) => {\n    const { active } = event;\n\n    if (active?.data?.current) {\n      this.setState({\n        activeDragItem: active.data.current,\n      });\n    }\n  };\n\n  renderDragOverlay = () => {\n    const { activeDragItem } = this.state;\n    if (!activeDragItem) return null;\n\n    if (activeDragItem.type === 'MaskBlank') {\n      return (\n        <Choice\n          disabled={activeDragItem.disabled}\n          choice={activeDragItem.choice}\n          instanceId={activeDragItem.instanceId}\n        />\n      );\n    }\n\n    return null;\n  };\n\n  handleDragEnd = (event) => {\n    const { active, over } = event;\n    const { onChange, value } = this.props;\n\n    if (!over || !active || !onChange) {\n      return;\n    }\n\n    const draggedData = active.data.current;\n    const dropData = over.data.current;\n\n    if (draggedData?.type === 'MaskBlank' && dropData?.accepts?.includes('MaskBlank')) {\n      const draggedItem = draggedData;\n      const targetId = dropData.id;\n\n      // drop from choice to blank (placing choice into response)\n      if (draggedItem.fromChoice === true) {\n        const newValue = { ...value };\n        newValue[targetId] = draggedItem.choice.id;\n        onChange(newValue);\n      } else if (dropData.toChoiceBoard === true) {\n        // handle drop from blank to choice board (removal from blank)\n        const newValue = { ...value };\n        delete newValue[draggedItem.id];\n        onChange(newValue);\n      }\n      // handle drop from blank to blank (changing position)\n      else if (draggedItem.id !== targetId) {\n        const newValue = { ...value };\n        newValue[targetId] = draggedItem.choice.id;\n        delete newValue[draggedItem.id];\n        onChange(newValue);\n      }\n    }\n    this.setState({ activeDragItem: null });\n  };\n\n  getPositionDirection = (choicePosition) => {\n    let flexDirection;\n    let justifyContent;\n    let alignItems;\n\n    switch (choicePosition) {\n      case 'left':\n        flexDirection = 'row';\n        alignItems = 'center';\n        break;\n      case 'right':\n        flexDirection = 'row-reverse';\n        justifyContent = 'flex-end';\n        alignItems = 'center';\n        break;\n      case 'below':\n        flexDirection = 'column-reverse';\n        break;\n      default:\n        // above\n        flexDirection = 'column';\n        break;\n    }\n\n    return { flexDirection, justifyContent, alignItems };\n  };\n\n  render() {\n    const {\n      markup,\n      duplicates,\n      value,\n      onChange,\n      choicesPosition,\n      choices,\n      correctResponse,\n      disabled,\n      feedback,\n      showCorrectAnswer,\n      emptyResponseAreaWidth,\n      emptyResponseAreaHeight,\n      layout,\n      instanceId\n    } = this.props;\n\n    const choicePosition = choicesPosition || 'below';\n    const style = { display: 'flex', minWidth: '100px', ...this.getPositionDirection(choicePosition) };\n\n    return (\n      <DragProvider\n        onDragStart={this.handleDragStart}\n        onDragEnd={this.handleDragEnd}\n        collisionDetection={closestCenter}\n      >\n        <div ref={(ref) => (this.rootRef = ref)} style={style}>\n          <Choices\n            choicePosition={choicePosition}\n            choices={choices}\n            value={value}\n            duplicates={duplicates}\n            disabled={disabled}\n            instanceId={instanceId}\n          />\n          <Masked\n            elementType=\"drag-in-the-blank\"\n            markup={markup}\n            layout={layout}\n            value={value}\n            choices={choices}\n            onChange={onChange}\n            disabled={disabled}\n            duplicates={duplicates}\n            feedback={feedback}\n            correctResponse={correctResponse}\n            showCorrectAnswer={showCorrectAnswer}\n            emptyResponseAreaWidth={emptyResponseAreaWidth}\n            emptyResponseAreaHeight={emptyResponseAreaHeight}\n            instanceId={instanceId}\n            isDragging={!!this.state.activeDragItem}\n          />\n          <DragOverlay style={{ pointerEvents: \"none\" }}>\n            {this.renderDragOverlay()}\n          </DragOverlay>\n        </div>\n      </DragProvider>\n    );\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"drag-in-the-blank.js","names":["_react","_interopRequireDefault","require","_propTypes","_drag","_core","_choices","_choice","_blank","_withMask","_callSuper","t","o","e","_getPrototypeOf2","_possibleConstructorReturn2","_isNativeReflectConstruct","Reflect","construct","constructor","apply","Boolean","prototype","valueOf","call","ownKeys","r","Object","keys","getOwnPropertySymbols","filter","getOwnPropertyDescriptor","enumerable","push","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","Masked","withMask","props","node","data","onChange","_node$data","dataset","component","disabled","duplicates","correctResponse","feedback","showCorrectAnswer","emptyResponseAreaWidth","emptyResponseAreaHeight","instanceId","isDragging","choiceId","id","choice","choices","find","c","createElement","key","concat","type","correct","newData","undefined","DragInTheBlank","exports","_React$Component","_this","_classCallCheck2","event","_active$data","active","current","setState","activeDragItem","state","_dropData$accepts","over","_this$props","value","draggedData","dropData","accepts","includes","draggedItem","targetId","toChoiceBoard","fromChoice","newValue","choicePosition","flexDirection","justifyContent","alignItems","_inherits2","_createClass2","render","_this2","_this$props2","markup","choicesPosition","layout","style","display","minWidth","getPositionDirection","DragProvider","onDragStart","handleDragStart","onDragEnd","handleDragEnd","collisionDetection","closestCenter","ref","rootRef","elementType","DragOverlay","pointerEvents","renderDragOverlay","React","Component","PropTypes","string","object","array","func","bool","oneOfType","number"],"sources":["../src/drag-in-the-blank.jsx"],"sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { DragProvider } from '@pie-lib/drag';\nimport { DragOverlay, closestCenter } from '@dnd-kit/core';\n\nimport Choices from './choices';\nimport Choice from './choices/choice';\nimport Blank from './components/blank';\nimport { withMask } from './with-mask';\n\nconst Masked = withMask('blank', (props) => (node, data, onChange) => {\n  const dataset = node.data?.dataset || {};\n  if (dataset.component === 'blank') {\n    // eslint-disable-next-line react/prop-types\n    const {\n      disabled,\n      duplicates,\n      correctResponse,\n      feedback,\n      showCorrectAnswer,\n      emptyResponseAreaWidth,\n      emptyResponseAreaHeight,\n      instanceId,\n      isDragging,\n    } = props;\n    const choiceId = showCorrectAnswer ? correctResponse[dataset.id] : data[dataset.id];\n    // eslint-disable-next-line react/prop-types\n    const choice = choiceId && props.choices.find((c) => c.id === choiceId);\n\n    return (\n      <Blank\n        key={`${node.type}-${dataset.id}`}\n        correct={showCorrectAnswer || (feedback && feedback[dataset.id])}\n        disabled={disabled}\n        duplicates={duplicates}\n        choice={choice}\n        id={dataset.id}\n        emptyResponseAreaWidth={emptyResponseAreaWidth}\n        emptyResponseAreaHeight={emptyResponseAreaHeight}\n        onChange={(id, choiceId) => {\n          const newData = { ...data };\n          if (choiceId === undefined) {\n            delete newData[id];\n          } else {\n            newData[id] = choiceId;\n          }\n          onChange(newData);\n        }}\n        instanceId={instanceId}\n        isDragging={isDragging}\n      />\n    );\n  }\n});\n\nexport default class DragInTheBlank extends React.Component {\n  constructor(props) {\n    super(props);\n    this.state = {\n      activeDragItem: null,\n    };\n  }\n\n  static propTypes = {\n    markup: PropTypes.string,\n    layout: PropTypes.object,\n    choicesPosition: PropTypes.string,\n    choices: PropTypes.array,\n    value: PropTypes.object,\n    onChange: PropTypes.func,\n    duplicates: PropTypes.bool,\n    disabled: PropTypes.bool,\n    feedback: PropTypes.object,\n    correctResponse: PropTypes.object,\n    showCorrectAnswer: PropTypes.bool,\n    emptyResponseAreaWidth: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),\n    emptyResponseAreaHeight: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),\n    instanceId: PropTypes.string,\n  };\n\n  static defaultProps = {\n    instanceId: 'drag-in-the-blank',\n  };\n\n  handleDragStart = (event) => {\n    const { active } = event;\n\n    if (active?.data?.current) {\n      this.setState({\n        activeDragItem: active.data.current,\n      });\n    }\n  };\n\n  renderDragOverlay = () => {\n    const { activeDragItem } = this.state;\n    if (!activeDragItem) return null;\n\n    if (activeDragItem.type === 'MaskBlank') {\n      return (\n        <Choice\n          disabled={activeDragItem.disabled}\n          choice={activeDragItem.choice}\n          instanceId={activeDragItem.instanceId}\n        />\n      );\n    }\n\n    return null;\n  };\n\n  handleDragEnd = (event) => {\n    const { active, over } = event;\n    const { onChange, value } = this.props;\n\n    // Always reset the active drag item state, even if drop is invalid\n    this.setState({ activeDragItem: null });\n\n    if (!over || !active || !onChange) {\n      return;\n    }\n\n    const draggedData = active.data.current;\n    const dropData = over.data.current;\n\n    if (draggedData?.type === 'MaskBlank' && dropData?.accepts?.includes('MaskBlank')) {\n      const draggedItem = draggedData;\n      const targetId = dropData.id;\n\n      if (dropData.toChoiceBoard === true) {\n        if (!draggedItem.fromChoice && draggedItem.id) {\n          const newValue = { ...value };\n          delete newValue[draggedItem.id];\n          onChange(newValue);\n        }\n      } else if (draggedItem.fromChoice === true) {\n        if (targetId && targetId !== 'drag-in-the-blank-droppable') {\n          const newValue = { ...value };\n          newValue[targetId] = draggedItem.choice.id;\n          onChange(newValue);\n        }\n      } else if (draggedItem.id && draggedItem.id !== targetId) {\n        const newValue = { ...value };\n        newValue[targetId] = draggedItem.choice.id;\n        delete newValue[draggedItem.id];\n        onChange(newValue);\n      }\n    }\n  };\n\n  getPositionDirection = (choicePosition) => {\n    let flexDirection;\n    let justifyContent;\n    let alignItems;\n\n    switch (choicePosition) {\n      case 'left':\n        flexDirection = 'row';\n        alignItems = 'center';\n        break;\n      case 'right':\n        flexDirection = 'row-reverse';\n        justifyContent = 'flex-end';\n        alignItems = 'center';\n        break;\n      case 'below':\n        flexDirection = 'column-reverse';\n        break;\n      default:\n        // above\n        flexDirection = 'column';\n        break;\n    }\n\n    return { flexDirection, justifyContent, alignItems };\n  };\n\n  render() {\n    const {\n      markup,\n      duplicates,\n      value,\n      onChange,\n      choicesPosition,\n      choices,\n      correctResponse,\n      disabled,\n      feedback,\n      showCorrectAnswer,\n      emptyResponseAreaWidth,\n      emptyResponseAreaHeight,\n      layout,\n      instanceId,\n    } = this.props;\n\n    const choicePosition = choicesPosition || 'below';\n    const style = { display: 'flex', minWidth: '100px', ...this.getPositionDirection(choicePosition) };\n\n    return (\n      <DragProvider\n        onDragStart={this.handleDragStart}\n        onDragEnd={this.handleDragEnd}\n        collisionDetection={closestCenter}\n      >\n        <div ref={(ref) => (this.rootRef = ref)} style={style}>\n          <Choices\n            choicePosition={choicePosition}\n            choices={choices}\n            value={value}\n            duplicates={duplicates}\n            disabled={disabled}\n            instanceId={instanceId}\n          />\n          <Masked\n            elementType=\"drag-in-the-blank\"\n            markup={markup}\n            layout={layout}\n            value={value}\n            choices={choices}\n            onChange={onChange}\n            disabled={disabled}\n            duplicates={duplicates}\n            feedback={feedback}\n            correctResponse={correctResponse}\n            showCorrectAnswer={showCorrectAnswer}\n            emptyResponseAreaWidth={emptyResponseAreaWidth}\n            emptyResponseAreaHeight={emptyResponseAreaHeight}\n            instanceId={instanceId}\n            isDragging={!!this.state.activeDragItem}\n          />\n          <DragOverlay style={{ pointerEvents: 'none' }}>{this.renderDragOverlay()}</DragOverlay>\n        </div>\n      </DragProvider>\n    );\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pie-lib/mask-markup",
-  "version": "2.1.0-next.31+ee98d7e6",
+  "version": "2.1.0-next.33+5ac4536d",
   "description": "",
   "main": "lib/index.js",
   "module": "src/index.js",
@@ -13,7 +13,7 @@
     "@mui/icons-material": "^7.3.4",
     "@mui/material": "^7.3.4",
     "@pie-lib/drag": "^3.1.0-next.5",
-    "@pie-lib/editable-html-tip-tap": "^1.1.0-next.31+ee98d7e6",
+    "@pie-lib/editable-html-tip-tap": "^1.1.0-next.6",
     "@pie-lib/math-rendering": "^4.1.0-next.4",
     "@pie-lib/render-ui": "^5.1.0-next.5",
     "classnames": "^2.2.6",
@@ -27,5 +27,5 @@
   "keywords": [],
   "author": "",
   "license": "ISC",
-  "gitHead": "ee98d7e68ff3e5c6586294d991408caf6952586d"
+  "gitHead": "5ac4536d8312c1ea2ba282a3bfc54a417be154af"
 }

package/src/drag-in-the-blank.jsx

@@ -21,7 +21,7 @@ const Masked = withMask('blank', (props) => (node, data, onChange) => {
       emptyResponseAreaWidth,
       emptyResponseAreaHeight,
       instanceId,
-      isDragging
+      isDragging,
     } = props;
     const choiceId = showCorrectAnswer ? correctResponse[dataset.id] : data[dataset.id];
     // eslint-disable-next-line react/prop-types
@@ -113,6 +113,9 @@ export default class DragInTheBlank extends React.Component {
     const { active, over } = event;
     const { onChange, value } = this.props;
 
+    // Always reset the active drag item state, even if drop is invalid
+    this.setState({ activeDragItem: null });
+
     if (!over || !active || !onChange) {
       return;
     }
@@ -124,26 +127,25 @@ export default class DragInTheBlank extends React.Component {
       const draggedItem = draggedData;
       const targetId = dropData.id;
 
-      // drop from choice to blank (placing choice into response)
-      if (draggedItem.fromChoice === true) {
-        const newValue = { ...value };
-        newValue[targetId] = draggedItem.choice.id;
-        onChange(newValue);
-      } else if (dropData.toChoiceBoard === true) {
-        // handle drop from blank to choice board (removal from blank)
-        const newValue = { ...value };
-        delete newValue[draggedItem.id];
-        onChange(newValue);
-      }
-      // handle drop from blank to blank (changing position)
-      else if (draggedItem.id !== targetId) {
+      if (dropData.toChoiceBoard === true) {
+        if (!draggedItem.fromChoice && draggedItem.id) {
+          const newValue = { ...value };
+          delete newValue[draggedItem.id];
+          onChange(newValue);
+        }
+      } else if (draggedItem.fromChoice === true) {
+        if (targetId && targetId !== 'drag-in-the-blank-droppable') {
+          const newValue = { ...value };
+          newValue[targetId] = draggedItem.choice.id;
+          onChange(newValue);
+        }
+      } else if (draggedItem.id && draggedItem.id !== targetId) {
         const newValue = { ...value };
         newValue[targetId] = draggedItem.choice.id;
         delete newValue[draggedItem.id];
         onChange(newValue);
       }
     }
-    this.setState({ activeDragItem: null });
   };
 
   getPositionDirection = (choicePosition) => {
@@ -188,7 +190,7 @@ export default class DragInTheBlank extends React.Component {
       emptyResponseAreaWidth,
       emptyResponseAreaHeight,
       layout,
-      instanceId
+      instanceId,
     } = this.props;
 
     const choicePosition = choicesPosition || 'below';
@@ -226,9 +228,7 @@ export default class DragInTheBlank extends React.Component {
             instanceId={instanceId}
             isDragging={!!this.state.activeDragItem}
           />
-          <DragOverlay style={{ pointerEvents: "none" }}>
-            {this.renderDragOverlay()}
-          </DragOverlay>
+          <DragOverlay style={{ pointerEvents: 'none' }}>{this.renderDragOverlay()}</DragOverlay>
         </div>
       </DragProvider>
     );