@pie-element/hotspot 6.3.2-next.9 → 6.4.1-next.5

package/configure/src/hotspot-container.jsx

@@ -1,13 +1,14 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import classNames from 'classnames';
 import { withStyles } from '@material-ui/core/styles/index';
 import Help from '@material-ui/icons/Help';
+import classNames from 'classnames';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import Button from './button';
+import { CircleButton } from './buttons/circle';
+import { PolygonButton } from './buttons/polygon';
+import { RectangleButton } from './buttons/rectangle';
 
 import Drawable from './hotspot-drawable';
-import { RectangleButton } from './buttons/rectangle';
-import { PolygonButton } from './buttons/polygon';
-import Button from './button';
 import UploadControl from './upload-control';
 import { getAllShapes, groupShapes } from './utils';
 
@@ -191,6 +192,12 @@ export class Container extends Component {
             >
               <PolygonButton isActive={selectedShape === 'polygon'} />
             </div>
+            {/*<div*/}
+            {/*  onClick={() => this.setState({ selectedShape: selectedShape === 'circle' ? 'none' : 'circle' })}*/}
+            {/*  className={classes.buttonShape}*/}
+            {/*>*/}
+            {/*  <CircleButton isActive={selectedShape === 'circle'} />*/}
+            {/*</div>*/}
 
             {imageUrl && (
               <UploadControl

package/configure/src/hotspot-drawable.jsx

@@ -6,6 +6,7 @@ import { withStyles } from '@material-ui/core/styles/index';
 
 import Rectangle from './hotspot-rectangle';
 import Polygon from './hotspot-polygon';
+import Circle from './hotspot-circle';
 import { updateImageDimensions, getUpdatedShapes } from './utils';
 import RectangleShape from './shapes/rectagle';
 import CircleShape from './shapes/circle';
@@ -14,16 +15,12 @@ const IMAGE_MAX_WIDTH = 800;
 
 export class Drawable extends React.Component {
   static getDerivedStateFromProps(nextProps, prevState) {
-    let dimensions = nextProps.dimensions;
-
-    if (prevState && prevState.resizing) {
-      dimensions = prevState.dimensions;
+    // Update the state only if the props have changed
+    if (nextProps.shapes !== prevState.shapes) {
+      return { shapes: nextProps.shapes };
     }
 
-    return {
-      ...prevState,
-      dimensions: dimensions,
-    };
+    return null;
   }
 
   constructor(props) {
@@ -165,10 +162,7 @@ export class Drawable extends React.Component {
     const { shapes, onUpdateShapes } = this.props;
     const newShapes = shapes.map((shape) => {
       if (shape.id === id) {
-        return {
-          ...shape,
-          ...updatedProps,
-        };
+        return { ...shape, ...updatedProps };
       }
       return shape;
     });
@@ -349,12 +343,28 @@ export class Drawable extends React.Component {
         >
           <Layer>
             {shapesToUse.map((shape, i) => {
-              const Tag = shape.group === 'polygons' ? Polygon : Rectangle;
+              let Tag;
+              switch (shape.group) {
+                case 'rectangles':
+                  Tag = Rectangle;
+                  break;
+                case 'circles':
+                  Tag = Circle;
+                  break;
+                case 'polygons':
+                  Tag = Polygon;
+                  break;
+                default:
+                  return null;
+              }
+
               return (
                 <Tag
                   correct={shape.correct}
                   isDrawing={isDrawing}
-                  height={shape.height}
+                  {...(shape.group === 'circles'
+                    ? { radius: shape.radius }
+                    : { height: shape.height, width: shape.width })}
                   hotspotColor={hotspotColor}
                   id={shape.id}
                   key={i}
@@ -365,11 +375,11 @@ export class Drawable extends React.Component {
                   width={shape.width}
                   x={shape.x}
                   y={shape.y}
-                  points={shape.points}
+                  {...(shape.group === 'polygons' ? { points: shape.points } : {})}
                   strokeWidth={strokeWidth}
                   imageHeight={heightFromState || height}
                   imageWidth={widthFromState || width}
-                  addPolygonPoint={(e) => this.addPolygonPoint(e)}
+                  {...(shape.group === 'polygons' ? { addPolygonPoint: (e) => this.addPolygonPoint(e) } : {})}
                 />
               );
             })}

package/configure/src/hotspot-polygon.jsx

@@ -223,14 +223,7 @@ class PolComponent extends React.Component {
             />
           ))}
         {!this.state.isDragging && this.state.hovered && (
-          <DeleteWidget
-            x={x}
-            y={y}
-            id={id}
-            handleWidgetClick={this.handleDelete}
-            points={points}
-            outlineColor={outlineColor}
-          />
+          <DeleteWidget x={x} y={y} id={id} handleWidgetClick={this.handleDelete} points={points} />
         )}
       </Group>
     );

package/configure/src/hotspot-rectangle.jsx

@@ -96,15 +96,7 @@ class RectComponent extends React.Component {
           y={y}
         />
         {!this.state.isDragging && this.state.hovered && (
-          <DeleteWidget
-            id={id}
-            height={height}
-            width={width}
-            x={x}
-            y={y}
-            outlineColor={outlineColor}
-            handleWidgetClick={this.handleDelete}
-          />
+          <DeleteWidget id={id} height={height} width={width} x={x} y={y} handleWidgetClick={this.handleDelete} />
         )}
         {this.state.hovered && (
           <Transformer

package/configure/src/index.js

@@ -60,7 +60,7 @@ export default class HotspotConfigure extends HTMLElement {
 
       // check if the language is already included in the languageChoices.options array
       // and if not, then add it.
-      if (!this._configuration.languageChoices.options.find(option => option.value === this._model.language)) {
+      if (!this._configuration.languageChoices.options.find((option) => option.value === this._model.language)) {
         this._configuration.languageChoices.options.push({
           value: this._model.language,
           label: this._model.language,
@@ -94,10 +94,11 @@ export default class HotspotConfigure extends HTMLElement {
     const _model = m;
 
     if (propertyType === 'multipleCorrect') {
-      const { rectangles = [], polygons = [] } = _model.shapes || {};
+      const { rectangles = [], polygons = [], circles = [] } = _model.shapes || {};
 
       _model.shapes.rectangles = rectangles.map((shape) => ({ ...shape, correct: false }));
       _model.shapes.polygons = polygons.map((shape) => ({ ...shape, correct: false }));
+      _model.shapes.circles = circles.map((shape) => ({ ...shape, correct: false }));
     }
 
     this.onModelChanged(_model);

package/configure/src/shapes/circle.js

@@ -14,7 +14,7 @@ export default class CircleShape {
     newShapes.push(newCircle);
 
     return {
-      newShapes,
+      shapes: newShapes,
       isDrawing: true,
       isDrawingShapeId: newCircle.id,
     };
@@ -25,21 +25,32 @@ export default class CircleShape {
 
     if (currentShapeIndex !== -1) {
       const currentShape = state.shapes[currentShapeIndex];
-      const updatedShapes = [...props.shapes];
 
+      // Check if the shape is a valid circle (has more than 0 radius) before finalizing
       if (currentShape.radius > 0) {
-        updatedShapes.push(currentShape);
-
         return {
+          ...state,
           isDrawing: false,
           stateShapes: false,
           isDrawingShapeId: undefined,
-          shapes: updatedShapes,
+        };
+      } else {
+        return {
+          ...state,
+          isDrawing: false,
+          stateShapes: false,
+          isDrawingShapeId: undefined,
+          shapes: state.shapes.filter((shape) => shape.id !== state.isDrawingShapeId),
         };
       }
     }
 
-    return state;
+    return {
+      ...state,
+      isDrawing: false,
+      stateShapes: false,
+      isDrawingShapeId: undefined,
+    };
   }
 
   static handleMouseMove(state, e) {
@@ -52,9 +63,10 @@ export default class CircleShape {
       if (resizingShapeIndex !== -1) {
         const resizingShape = tempShapes[resizingShapeIndex];
 
-        resizingShape.radius = Math.sqrt(
-          Math.pow(e.evt.layerX - resizingShape.x, 2) + Math.pow(e.evt.layerY - resizingShape.y, 2),
-        );
+        // Calculate radius based on mouse position
+        const dx = e.evt.layerX - resizingShape.x;
+        const dy = e.evt.layerY - resizingShape.y;
+        resizingShape.radius = Math.sqrt(dx * dx + dy * dy);
 
         return {
           shapes: tempShapes,

package/configure/src/utils.js

@@ -41,6 +41,13 @@ const getUpdatedRectangle = (initialDim, nextDim, shape) => ({
   y: getDelta(initialDim.height, nextDim.height, shape.y),
 });
 
+const getUpdatedCircles = (initialDim, nextDim, shape) => ({
+  ...shape,
+  radius: getDelta(initialDim.radius, nextDim.radius, shape.radius),
+  x: getDelta(initialDim.width, nextDim.width, shape.x),
+  y: getDelta(initialDim.height, nextDim.height, shape.y),
+});
+
 const getUpdatedPlygon = (initialDim, nextDim, shape) => ({
   ...shape,
   points: shape.points.map((point) => ({
@@ -61,6 +68,10 @@ const getUpdatedShapes = (initialDim, nextDim, shapes) => {
     if (shape.group === 'polygons') {
       return getUpdatedPlygon(initialDim, nextDim, shape);
     }
+
+    if (shape.group === 'circles') {
+      return getUpdatedCircles(initialDim, nextDim, shape);
+    }
   });
 };
 
@@ -102,6 +113,7 @@ const groupShapes = (shapesArray) => {
   const shapesMap = {
     rectangles: [],
     polygons: [],
+    circles: [],
   };
 
   if (shapesArray.length) {

package/controller/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.2.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/hotspot-controller@4.1.4...@pie-element/hotspot-controller@4.2.0) (2024-01-23)
+
+
+### Bug Fixes
+
+* update to pie-lib/pie-toolbox 1.5.4 for PD-3387, PD-3384, PD-3383, PD-3392 ([2278f9a](https://github.com/pie-framework/pie-elements/commit/2278f9a3fdf1bc89ab590f240d926a857339179e))
+* update to pie-lib/pie-toolbox 1.5.5 for PD-3392 ([d4286e0](https://github.com/pie-framework/pie-elements/commit/d4286e08a060a73e6de098f87173baaaa88cc997))
+
+
+### Features
+
+* display and validate circles PD-1446 ([d42e74e](https://github.com/pie-framework/pie-elements/commit/d42e74e449c531c14cfe1fa0957154bcb3adbfd7))
+
+
+
+
+
 ## [4.1.4](https://github.com/pie-framework/pie-elements/compare/@pie-element/hotspot-controller@4.1.3...@pie-element/hotspot-controller@4.1.4) (2024-01-15)
 
 

package/controller/lib/index.js

@@ -125,7 +125,9 @@ var getScore = function getScore(config, session) {
   var _config$shapes$rectan = _config$shapes.rectangles,
       rectangles = _config$shapes$rectan === void 0 ? [] : _config$shapes$rectan,
       _config$shapes$polygo = _config$shapes.polygons,
-      polygons = _config$shapes$polygo === void 0 ? [] : _config$shapes$polygo;
+      polygons = _config$shapes$polygo === void 0 ? [] : _config$shapes$polygo,
+      _config$shapes$circle = _config$shapes.circles,
+      circles = _config$shapes$circle === void 0 ? [] : _config$shapes$circle;
 
   var partialScoringEnabled = _controllerUtils.partialScoring.enabled(config, env);
 
@@ -135,7 +137,7 @@ var getScore = function getScore(config, session) {
 
   var correctAnswers = 0;
   var selectedChoices = 0;
-  var choices = [].concat((0, _toConsumableArray2["default"])(rectangles), (0, _toConsumableArray2["default"])(polygons));
+  var choices = [].concat((0, _toConsumableArray2["default"])(rectangles), (0, _toConsumableArray2["default"])(polygons), (0, _toConsumableArray2["default"])(circles));
   var correctChoices = choices.filter(function (choice) {
     return choice.correct;
   });
@@ -207,12 +209,15 @@ var createCorrectResponseSession = function createCorrectResponseSession(questio
       _question$shapes = _question$shapes === void 0 ? {} : _question$shapes;
       var _question$shapes$rect = _question$shapes.rectangles,
           rectangles = _question$shapes$rect === void 0 ? [] : _question$shapes$rect,
+          _question$shapes$circ = _question$shapes.circles,
+          circles = _question$shapes$circ === void 0 ? [] : _question$shapes$circ,
           _question$shapes$poly = _question$shapes.polygons,
           polygons = _question$shapes$poly === void 0 ? {} : _question$shapes$poly;
       var rectangleCorrect = returnShapesCorrect(rectangles);
       var polygonsCorrect = returnShapesCorrect(polygons);
+      var circlesCorrect = returnShapesCorrect(circles);
       resolve({
-        answers: [].concat((0, _toConsumableArray2["default"])(rectangleCorrect), (0, _toConsumableArray2["default"])(polygonsCorrect)),
+        answers: [].concat((0, _toConsumableArray2["default"])(rectangleCorrect), (0, _toConsumableArray2["default"])(polygonsCorrect), (0, _toConsumableArray2["default"])(circlesCorrect)),
         id: '1'
       });
     } else {

package/controller/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.js"],"names":["log","normalize","question","defaults","model","session","env","normalizedQuestion","imageUrl","dimensions","hotspotColor","multipleCorrect","outlineColor","partialScoring","prompt","shapes","language","rectangles","polygons","Promise","resolve","out","disabled","mode","map","index","rectProps","polyProps","responseCorrect","undefined","role","rationale","rationaleEnabled","teacherInstructions","teacherInstructionsEnabled","promptEnabled","strokeWidth","createDefaultModel","getScore","config","answers","partialScoringEnabled","enabled","correctAnswers","selectedChoices","choices","correctChoices","filter","choice","correct","forEach","shape","selected","answer","id","correctlySelected","extraAnswers","length","total","str","toFixed","parseFloat","outcome","score","empty","returnShapesCorrect","i","push","createCorrectResponseSession","rectangleCorrect","polygonsCorrect","validate","minShapes","maxShapes","maxSelections","errors","allShapes","Object","values","reduce","acc","nbOfSelections","nbOfShapes","shapesError","selectionsError"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AAEA;;AAEA;;;;;;;;;AAEA,IAAMA,GAAG,GAAG,uBAAM,iCAAN,CAAZ;;AAEO,IAAMC,SAAS,GAAG,SAAZA,SAAY,CAACC,QAAD;AAAA,yCACpBC,oBADoB,GAEpBD,QAFoB;AAAA,CAAlB;;;;AAKA,SAASE,KAAT,CAAeF,QAAf,EAAyBG,OAAzB,EAAkCC,GAAlC,EAAuC;AAC5C,MAAMC,kBAAkB,GAAGN,SAAS,CAACC,QAAD,CAApC;AACA,MAAQM,QAAR,GACED,kBADF,CAAQC,QAAR;AAAA,MAAkBC,UAAlB,GACEF,kBADF,CAAkBE,UAAlB;AAAA,MAA8BC,YAA9B,GACEH,kBADF,CAA8BG,YAA9B;AAAA,MAA4CC,eAA5C,GACEJ,kBADF,CAA4CI,eAA5C;AAAA,MAA6DC,YAA7D,GACEL,kBADF,CAA6DK,YAA7D;AAAA,MAA2EC,cAA3E,GACEN,kBADF,CAA2EM,cAA3E;AAAA,MAA2FC,MAA3F,GACEP,kBADF,CAA2FO,MAA3F;AAAA,MAAmGC,MAAnG,GACER,kBADF,CAAmGQ,MAAnG;AAAA,MAA2GC,QAA3G,GACET,kBADF,CAA2GS,QAA3G;;AAEA,aAAiCD,MAAM,IAAI,EAA3C;AAAA,MAAQE,UAAR,QAAQA,UAAR;AAAA,MAAoBC,QAApB,QAAoBA,QAApB;;AAEA,SAAO,IAAIC,OAAJ,CAAY,UAACC,OAAD,EAAa;AAC9B,QAAMC,GAAG,GAAG;AACVC,MAAAA,QAAQ,EAAEhB,GAAG,CAACiB,IAAJ,KAAa,QADb;AAEVA,MAAAA,IAAI,EAAEjB,GAAG,CAACiB,IAFA;AAGVd,MAAAA,UAAU,EAAVA,UAHU;AAIVD,MAAAA,QAAQ,EAARA,QAJU;AAKVI,MAAAA,YAAY,EAAZA,YALU;AAMVF,MAAAA,YAAY,EAAZA,YANU;AAOVC,MAAAA,eAAe,EAAfA,eAPU;AAQVE,MAAAA,cAAc,EAAdA,cARU;AASVG,MAAAA,QAAQ,EAARA,QATU;AAUVD,MAAAA,MAAM,kCACDA,MADC;AAEJ;AACAE,QAAAA,UAAU,EAAE,CAACA,UAAU,IAAI,EAAf,EAAmBO,GAAnB,CAAuB;AAAA,cAAGC,KAAH,SAAGA,KAAH;AAAA,cAAaC,SAAb;AAAA,mCAAmCA,SAAnC;AAAA,SAAvB,CAHR;AAIJ;AACAR,QAAAA,QAAQ,EAAE,CAACA,QAAQ,IAAI,EAAb,EAAiBM,GAAjB,CAAqB;AAAA,cAAGC,KAAH,SAAGA,KAAH;AAAA,cAAaE,SAAb;AAAA,mCAAmCA,SAAnC;AAAA,SAArB;AALN,QAVI;AAiBVC,MAAAA,eAAe,EAAEtB,GAAG,CAACiB,IAAJ,KAAa,UAAb,GAA0B,8BAAkBhB,kBAAlB,EAAsCF,OAAtC,CAA1B,GAA2EwB;AAjBlF,KAAZ;;AAoBA,QAAIvB,GAAG,CAACwB,IAAJ,KAAa,YAAb,KAA8BxB,GAAG,CAACiB,IAAJ,KAAa,MAAb,IAAuBjB,GAAG,CAACiB,IAAJ,KAAa,UAAlE,CAAJ,EAAmF;AACjFF,MAAAA,GAAG,CAACU,SAAJ,GAAgBxB,kBAAkB,CAACyB,gBAAnB,GAAsCzB,kBAAkB,CAACwB,SAAzD,GAAqE,IAArF;AACAV,MAAAA,GAAG,CAACY,mBAAJ,GAA0B1B,kBAAkB,CAAC2B,0BAAnB,GACtB3B,kBAAkB,CAAC0B,mBADG,GAEtB,IAFJ;AAGD,KALD,MAKO;AACLZ,MAAAA,GAAG,CAACU,SAAJ,GAAgB,IAAhB;AACAV,MAAAA,GAAG,CAACY,mBAAJ,GAA0B,IAA1B;AACD;;AAEDZ,IAAAA,GAAG,CAACP,MAAJ,GAAaP,kBAAkB,CAAC4B,aAAnB,GAAmCrB,MAAnC,GAA4C,IAAzD;AACAO,IAAAA,GAAG,CAACe,WAAJ,GAAkB7B,kBAAkB,CAAC6B,WAArC,CAhC8B,CAkC9B;;AACAhB,IAAAA,OAAO,CAACC,GAAD,CAAP;AACD,GApCM,CAAP;AAqCD;;AAEM,IAAMgB,kBAAkB,GAAG,SAArBA,kBAAqB;AAAA,MAACjC,KAAD,uEAAS,EAAT;AAAA,SAChC,IAAIe,OAAJ,CAAY,UAACC,OAAD,EAAa;AACvBA,IAAAA,OAAO,iCACFjB,oBADE,GAEFC,KAFE,EAAP;AAID,GALD,CADgC;AAAA,CAA3B;;;;AAQP,IAAMkC,QAAQ,GAAG,SAAXA,QAAW,CAACC,MAAD,EAASlC,OAAT,EAA+B;AAAA,MAAbC,GAAa,uEAAP,EAAO;;AAC9C,cAAoBD,OAAO,IAAI,EAA/B;AAAA,MAAQmC,OAAR,SAAQA,OAAR;;AAEA,MAAI,CAACD,MAAM,CAACxB,MAAR,IAAmB,CAACwB,MAAM,CAACxB,MAAP,CAAcE,UAAf,IAA6B,CAACsB,MAAM,CAACxB,MAAP,CAAcG,QAAnE,EAA8E;AAC5E,WAAO,CAAP;AACD;;AAED,uBAA4DqB,MAA5D,CAAQxB,MAAR;AAAA,+CAAqD,EAArD;AAAA,6CAAkBE,UAAlB;AAAA,MAAkBA,UAAlB,sCAA+B,EAA/B;AAAA,6CAAmCC,QAAnC;AAAA,MAAmCA,QAAnC,sCAA8C,EAA9C;;AACA,MAAMuB,qBAAqB,GAAG5B,gCAAe6B,OAAf,CAAuBH,MAAvB,EAA+BjC,GAA/B,CAA9B;;AAEA,MAAI,CAACmC,qBAAL,EAA4B;AAC1B,WAAO,8BAAkBF,MAAlB,EAA0BlC,OAA1B,IAAqC,CAArC,GAAyC,CAAhD;AACD;;AAED,MAAIsC,cAAc,GAAG,CAArB;AACA,MAAIC,eAAe,GAAG,CAAtB;AAEA,MAAMC,OAAO,iDAAO5B,UAAP,uCAAsBC,QAAtB,EAAb;AAEA,MAAM4B,cAAc,GAAGD,OAAO,CAACE,MAAR,CAAe,UAACC,MAAD;AAAA,WAAYA,MAAM,CAACC,OAAnB;AAAA,GAAf,CAAvB;AAEAJ,EAAAA,OAAO,CAACK,OAAR,CAAgB,UAACC,KAAD,EAAW;AACzB,QAAMC,QAAQ,GAAGZ,OAAO,IAAIA,OAAO,CAACO,MAAR,CAAe,UAACM,MAAD;AAAA,aAAYA,MAAM,CAACC,EAAP,KAAcH,KAAK,CAACG,EAAhC;AAAA,KAAf,EAAmD,CAAnD,CAA5B;AACA,QAAMC,iBAAiB,GAAGJ,KAAK,CAACF,OAAN,IAAiBG,QAA3C;;AAEA,QAAIA,QAAJ,EAAc;AACZR,MAAAA,eAAe,IAAI,CAAnB;AACD;;AAED,QAAIW,iBAAJ,EAAuB;AACrBZ,MAAAA,cAAc,IAAI,CAAlB;AACD;AACF,GAXD;AAaA,MAAMa,YAAY,GAAGZ,eAAe,GAAGE,cAAc,CAACW,MAAjC,GAA0Cb,eAAe,GAAGE,cAAc,CAACW,MAA3E,GAAoF,CAAzG;AAEA,MAAMC,KAAK,GAAGZ,cAAc,CAACW,MAAf,KAA0B,CAA1B,GAA8B,CAA9B,GAAkCX,cAAc,CAACW,MAA/D;AACA,MAAME,GAAG,GAAG,CAAC,CAAChB,cAAc,GAAGa,YAAlB,IAAkCE,KAAnC,EAA0CE,OAA1C,CAAkD,CAAlD,CAAZ;AAEA,SAAOD,GAAG,GAAG,CAAN,GAAU,CAAV,GAAcE,UAAU,CAACF,GAAD,CAA/B;AACD,CAxCD;;AA0CO,SAASG,OAAT,CAAiBvB,MAAjB,EAAyBlC,OAAzB,EAA4C;AAAA,MAAVC,GAAU,uEAAJ,EAAI;AACjD,SAAO,IAAIa,OAAJ,CAAY,UAACC,OAAD,EAAa;AAC9BpB,IAAAA,GAAG,CAAC,YAAD,CAAH;;AAEA,QAAI,CAACK,OAAD,IAAY,yBAAQA,OAAR,CAAhB,EAAkC;AAChCe,MAAAA,OAAO,CAAC;AAAE2C,QAAAA,KAAK,EAAE,CAAT;AAAYC,QAAAA,KAAK,EAAE;AAAnB,OAAD,CAAP;AACD;;AAED,QAAI3D,OAAO,CAACmC,OAAZ,EAAqB;AACnB,UAAMuB,KAAK,GAAGzB,QAAQ,CAACC,MAAD,EAASlC,OAAT,EAAkBC,GAAlB,CAAtB;AACAc,MAAAA,OAAO,CAAC;AAAE2C,QAAAA,KAAK,EAALA;AAAF,OAAD,CAAP;AACD,KAHD,MAGO;AACL3C,MAAAA,OAAO,CAAC;AAAE2C,QAAAA,KAAK,EAAE,CAAT;AAAYC,QAAAA,KAAK,EAAE;AAAnB,OAAD,CAAP;AACD;AACF,GAbM,CAAP;AAcD;;AAED,IAAMC,mBAAmB,GAAG,SAAtBA,mBAAsB,CAAClD,MAAD,EAAY;AACtC,MAAIyB,OAAO,GAAG,EAAd;AAEAzB,EAAAA,MAAM,CAACmC,OAAP,CAAe,UAACgB,CAAD,EAAO;AACpB,QAAQjB,OAAR,GAAwBiB,CAAxB,CAAQjB,OAAR;AAAA,QAAiBK,EAAjB,GAAwBY,CAAxB,CAAiBZ,EAAjB;;AACA,QAAIL,OAAJ,EAAa;AACXT,MAAAA,OAAO,CAAC2B,IAAR,CAAa;AAAEb,QAAAA,EAAE,EAAFA;AAAF,OAAb;AACD;AACF,GALD;AAMA,SAAOd,OAAP;AACD,CAVD;;AAYO,IAAM4B,4BAA4B,GAAG,SAA/BA,4BAA+B,CAAClE,QAAD,EAAWI,GAAX,EAAmB;AAC7D,SAAO,IAAIa,OAAJ,CAAY,UAACC,OAAD,EAAa;AAC9B,QAAId,GAAG,CAACiB,IAAJ,KAAa,UAAb,IAA2BjB,GAAG,CAACwB,IAAJ,KAAa,YAA5C,EAA0D;AACxD,6BAA4D5B,QAA5D,CAAQa,MAAR;AAAA,uDAAqD,EAArD;AAAA,mDAAkBE,UAAlB;AAAA,UAAkBA,UAAlB,sCAA+B,EAA/B;AAAA,mDAAmCC,QAAnC;AAAA,UAAmCA,QAAnC,sCAA8C,EAA9C;AAEA,UAAMmD,gBAAgB,GAAGJ,mBAAmB,CAAChD,UAAD,CAA5C;AACA,UAAMqD,eAAe,GAAGL,mBAAmB,CAAC/C,QAAD,CAA3C;AAEAE,MAAAA,OAAO,CAAC;AACNoB,QAAAA,OAAO,gDAAM6B,gBAAN,uCAA2BC,eAA3B,EADD;AAENhB,QAAAA,EAAE,EAAE;AAFE,OAAD,CAAP;AAID,KAVD,MAUO;AACLlC,MAAAA,OAAO,CAAC,IAAD,CAAP;AACD;AACF,GAdM,CAAP;AAeD,CAhBM;;;;AAkBA,IAAMmD,QAAQ,GAAG,SAAXA,QAAW,GAA6B;AAAA,MAA5BnE,KAA4B,uEAApB,EAAoB;AAAA,MAAhBmC,MAAgB,uEAAP,EAAO;AACnD,MAAQxB,MAAR,GAAmBX,KAAnB,CAAQW,MAAR;AACA,0BAAoDwB,MAApD,CAAQiC,SAAR;AAAA,MAAQA,SAAR,kCAAoB,CAApB;AAAA,MAAuBC,SAAvB,GAAoDlC,MAApD,CAAuBkC,SAAvB;AAAA,MAAkCC,aAAlC,GAAoDnC,MAApD,CAAkCmC,aAAlC;AACA,MAAMC,MAAM,GAAG,EAAf;AAEA,MAAMC,SAAS,GAAGC,MAAM,CAACC,MAAP,CAAc/D,MAAM,IAAI,EAAxB,EAA4BgE,MAA5B,CAAmC,UAACC,GAAD,EAAM7B,KAAN;AAAA,yDAAoB6B,GAApB,uCAA4B7B,KAA5B;AAAA,GAAnC,EAAuE,EAAvE,CAAlB;AAEA,MAAM8B,cAAc,GAAG,CAACL,SAAS,IAAI,EAAd,EAAkBG,MAAlB,CAAyB,UAACC,GAAD,EAAM7B,KAAN;AAAA,WAAiBA,KAAK,CAACF,OAAN,GAAgB+B,GAAG,GAAG,CAAtB,GAA0BA,GAA3C;AAAA,GAAzB,EAA0E,CAA1E,CAAvB;AAEA,MAAME,UAAU,GAAG,CAACN,SAAS,IAAI,EAAd,EAAkBnB,MAArC;;AAEA,MAAIyB,UAAU,GAAGV,SAAjB,EAA4B;AAC1BG,IAAAA,MAAM,CAACQ,WAAP,sCAAiDX,SAAjD;AACD,GAFD,MAEO,IAAIU,UAAU,GAAGT,SAAjB,EAA4B;AACjCE,IAAAA,MAAM,CAACQ,WAAP,0BAAqCV,SAArC;AACD;;AAED,MAAIQ,cAAc,GAAG,CAArB,EAAwB;AACtBN,IAAAA,MAAM,CAACS,eAAP,GAAyB,4CAAzB;AACD,GAFD,MAEO,IAAIH,cAAc,GAAGP,aAArB,EAAoC;AACzCC,IAAAA,MAAM,CAACS,eAAP,0BAAyCV,aAAzC;AACD;;AAED,SAAOC,MAAP;AACD,CAxBM","sourcesContent":["import debug from 'debug';\nimport isEmpty from 'lodash/isEmpty';\nimport { partialScoring } from '@pie-lib/pie-toolbox/controller-utils';\n\nimport { isResponseCorrect } from './utils';\n\nimport defaults from './defaults';\n\nconst log = debug('pie-elements:hotspot:controller');\n\nexport const normalize = (question) => ({\n  ...defaults,\n  ...question,\n});\n\nexport function model(question, session, env) {\n  const normalizedQuestion = normalize(question);\n  const { imageUrl, dimensions, hotspotColor, multipleCorrect, outlineColor, partialScoring, prompt, shapes, language } =\n    normalizedQuestion;\n  const { rectangles, polygons } = shapes || {};\n\n  return new Promise((resolve) => {\n    const out = {\n      disabled: env.mode !== 'gather',\n      mode: env.mode,\n      dimensions,\n      imageUrl,\n      outlineColor,\n      hotspotColor,\n      multipleCorrect,\n      partialScoring,\n      language,\n      shapes: {\n        ...shapes,\n        // eslint-disable-next-line no-unused-vars\n        rectangles: (rectangles || []).map(({ index, ...rectProps }) => ({ ...rectProps })),\n        // eslint-disable-next-line no-unused-vars\n        polygons: (polygons || []).map(({ index, ...polyProps }) => ({ ...polyProps })),\n      },\n      responseCorrect: env.mode === 'evaluate' ? isResponseCorrect(normalizedQuestion, session) : undefined,\n    };\n\n    if (env.role === 'instructor' && (env.mode === 'view' || env.mode === 'evaluate')) {\n      out.rationale = normalizedQuestion.rationaleEnabled ? normalizedQuestion.rationale : null;\n      out.teacherInstructions = normalizedQuestion.teacherInstructionsEnabled\n        ? normalizedQuestion.teacherInstructions\n        : null;\n    } else {\n      out.rationale = null;\n      out.teacherInstructions = null;\n    }\n\n    out.prompt = normalizedQuestion.promptEnabled ? prompt : null;\n    out.strokeWidth = normalizedQuestion.strokeWidth;\n\n    // console.log(out);\n    resolve(out);\n  });\n}\n\nexport const createDefaultModel = (model = {}) =>\n  new Promise((resolve) => {\n    resolve({\n      ...defaults,\n      ...model,\n    });\n  });\n\nconst getScore = (config, session, env = {}) => {\n  const { answers } = session || {};\n\n  if (!config.shapes || (!config.shapes.rectangles && !config.shapes.polygons)) {\n    return 0;\n  }\n\n  const { shapes: { rectangles = [], polygons = [] } = {} } = config;\n  const partialScoringEnabled = partialScoring.enabled(config, env);\n\n  if (!partialScoringEnabled) {\n    return isResponseCorrect(config, session) ? 1 : 0;\n  }\n\n  let correctAnswers = 0;\n  let selectedChoices = 0;\n\n  const choices = [...rectangles, ...polygons];\n\n  const correctChoices = choices.filter((choice) => choice.correct);\n\n  choices.forEach((shape) => {\n    const selected = answers && answers.filter((answer) => answer.id === shape.id)[0];\n    const correctlySelected = shape.correct && selected;\n\n    if (selected) {\n      selectedChoices += 1;\n    }\n\n    if (correctlySelected) {\n      correctAnswers += 1;\n    }\n  });\n\n  const extraAnswers = selectedChoices > correctChoices.length ? selectedChoices - correctChoices.length : 0;\n\n  const total = correctChoices.length === 0 ? 1 : correctChoices.length;\n  const str = ((correctAnswers - extraAnswers) / total).toFixed(2);\n\n  return str < 0 ? 0 : parseFloat(str);\n};\n\nexport function outcome(config, session, env = {}) {\n  return new Promise((resolve) => {\n    log('outcome...');\n\n    if (!session || isEmpty(session)) {\n      resolve({ score: 0, empty: true });\n    }\n\n    if (session.answers) {\n      const score = getScore(config, session, env);\n      resolve({ score });\n    } else {\n      resolve({ score: 0, empty: true });\n    }\n  });\n}\n\nconst returnShapesCorrect = (shapes) => {\n  let answers = [];\n\n  shapes.forEach((i) => {\n    const { correct, id } = i;\n    if (correct) {\n      answers.push({ id });\n    }\n  });\n  return answers;\n};\n\nexport const createCorrectResponseSession = (question, env) => {\n  return new Promise((resolve) => {\n    if (env.mode !== 'evaluate' && env.role === 'instructor') {\n      const { shapes: { rectangles = [], polygons = {} } = {} } = question;\n\n      const rectangleCorrect = returnShapesCorrect(rectangles);\n      const polygonsCorrect = returnShapesCorrect(polygons);\n\n      resolve({\n        answers: [...rectangleCorrect, ...polygonsCorrect],\n        id: '1',\n      });\n    } else {\n      resolve(null);\n    }\n  });\n};\n\nexport const validate = (model = {}, config = {}) => {\n  const { shapes } = model;\n  const { minShapes = 2, maxShapes, maxSelections } = config;\n  const errors = {};\n\n  const allShapes = Object.values(shapes || {}).reduce((acc, shape) => [...acc, ...shape], []);\n\n  const nbOfSelections = (allShapes || []).reduce((acc, shape) => (shape.correct ? acc + 1 : acc), 0);\n\n  const nbOfShapes = (allShapes || []).length;\n\n  if (nbOfShapes < minShapes) {\n    errors.shapesError = `There should be at least ${minShapes} shapes defined.`;\n  } else if (nbOfShapes > maxShapes) {\n    errors.shapesError = `No more than ${maxShapes} shapes should be defined.`;\n  }\n\n  if (nbOfSelections < 1) {\n    errors.selectionsError = 'There should be at least 1 shape selected.';\n  } else if (nbOfSelections > maxSelections) {\n    errors.selectionsError = `No more than ${maxSelections} shapes should be selected.`;\n  }\n\n  return errors;\n};\n"],"file":"index.js"}
+{"version":3,"sources":["../src/index.js"],"names":["log","normalize","question","defaults","model","session","env","normalizedQuestion","imageUrl","dimensions","hotspotColor","multipleCorrect","outlineColor","partialScoring","prompt","shapes","language","rectangles","polygons","Promise","resolve","out","disabled","mode","map","index","rectProps","polyProps","responseCorrect","undefined","role","rationale","rationaleEnabled","teacherInstructions","teacherInstructionsEnabled","promptEnabled","strokeWidth","createDefaultModel","getScore","config","answers","circles","partialScoringEnabled","enabled","correctAnswers","selectedChoices","choices","correctChoices","filter","choice","correct","forEach","shape","selected","answer","id","correctlySelected","extraAnswers","length","total","str","toFixed","parseFloat","outcome","score","empty","returnShapesCorrect","i","push","createCorrectResponseSession","rectangleCorrect","polygonsCorrect","circlesCorrect","validate","minShapes","maxShapes","maxSelections","errors","allShapes","Object","values","reduce","acc","nbOfSelections","nbOfShapes","shapesError","selectionsError"],"mappings":"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","sourcesContent":["import debug from 'debug';\nimport isEmpty from 'lodash/isEmpty';\nimport { partialScoring } from '@pie-lib/pie-toolbox/controller-utils';\n\nimport { isResponseCorrect } from './utils';\n\nimport defaults from './defaults';\n\nconst log = debug('pie-elements:hotspot:controller');\n\nexport const normalize = (question) => ({\n  ...defaults,\n  ...question,\n});\n\nexport function model(question, session, env) {\n  const normalizedQuestion = normalize(question);\n  const {\n    imageUrl,\n    dimensions,\n    hotspotColor,\n    multipleCorrect,\n    outlineColor,\n    partialScoring,\n    prompt,\n    shapes,\n    language,\n  } = normalizedQuestion;\n  const { rectangles, polygons } = shapes || {};\n\n  return new Promise((resolve) => {\n    const out = {\n      disabled: env.mode !== 'gather',\n      mode: env.mode,\n      dimensions,\n      imageUrl,\n      outlineColor,\n      hotspotColor,\n      multipleCorrect,\n      partialScoring,\n      language,\n      shapes: {\n        ...shapes,\n        // eslint-disable-next-line no-unused-vars\n        rectangles: (rectangles || []).map(({ index, ...rectProps }) => ({ ...rectProps })),\n        // eslint-disable-next-line no-unused-vars\n        polygons: (polygons || []).map(({ index, ...polyProps }) => ({ ...polyProps })),\n      },\n      responseCorrect: env.mode === 'evaluate' ? isResponseCorrect(normalizedQuestion, session) : undefined,\n    };\n\n    if (env.role === 'instructor' && (env.mode === 'view' || env.mode === 'evaluate')) {\n      out.rationale = normalizedQuestion.rationaleEnabled ? normalizedQuestion.rationale : null;\n      out.teacherInstructions = normalizedQuestion.teacherInstructionsEnabled\n        ? normalizedQuestion.teacherInstructions\n        : null;\n    } else {\n      out.rationale = null;\n      out.teacherInstructions = null;\n    }\n\n    out.prompt = normalizedQuestion.promptEnabled ? prompt : null;\n    out.strokeWidth = normalizedQuestion.strokeWidth;\n\n    // console.log(out);\n    resolve(out);\n  });\n}\n\nexport const createDefaultModel = (model = {}) =>\n  new Promise((resolve) => {\n    resolve({\n      ...defaults,\n      ...model,\n    });\n  });\n\nconst getScore = (config, session, env = {}) => {\n  const { answers } = session || {};\n\n  if (!config.shapes || (!config.shapes.rectangles && !config.shapes.polygons)) {\n    return 0;\n  }\n\n  const { shapes: { rectangles = [], polygons = [], circles = [] } = {} } = config;\n  const partialScoringEnabled = partialScoring.enabled(config, env);\n\n  if (!partialScoringEnabled) {\n    return isResponseCorrect(config, session) ? 1 : 0;\n  }\n\n  let correctAnswers = 0;\n  let selectedChoices = 0;\n\n  const choices = [...rectangles, ...polygons, ...circles];\n\n  const correctChoices = choices.filter((choice) => choice.correct);\n\n  choices.forEach((shape) => {\n    const selected = answers && answers.filter((answer) => answer.id === shape.id)[0];\n    const correctlySelected = shape.correct && selected;\n\n    if (selected) {\n      selectedChoices += 1;\n    }\n\n    if (correctlySelected) {\n      correctAnswers += 1;\n    }\n  });\n\n  const extraAnswers = selectedChoices > correctChoices.length ? selectedChoices - correctChoices.length : 0;\n\n  const total = correctChoices.length === 0 ? 1 : correctChoices.length;\n  const str = ((correctAnswers - extraAnswers) / total).toFixed(2);\n\n  return str < 0 ? 0 : parseFloat(str);\n};\n\nexport function outcome(config, session, env = {}) {\n  return new Promise((resolve) => {\n    log('outcome...');\n\n    if (!session || isEmpty(session)) {\n      resolve({ score: 0, empty: true });\n    }\n\n    if (session.answers) {\n      const score = getScore(config, session, env);\n      resolve({ score });\n    } else {\n      resolve({ score: 0, empty: true });\n    }\n  });\n}\n\nconst returnShapesCorrect = (shapes) => {\n  let answers = [];\n\n  shapes.forEach((i) => {\n    const { correct, id } = i;\n    if (correct) {\n      answers.push({ id });\n    }\n  });\n  return answers;\n};\n\nexport const createCorrectResponseSession = (question, env) => {\n  return new Promise((resolve) => {\n    if (env.mode !== 'evaluate' && env.role === 'instructor') {\n      const { shapes: { rectangles = [], circles = [], polygons = {} } = {} } = question;\n\n      const rectangleCorrect = returnShapesCorrect(rectangles);\n      const polygonsCorrect = returnShapesCorrect(polygons);\n      const circlesCorrect = returnShapesCorrect(circles);\n\n      resolve({\n        answers: [...rectangleCorrect, ...polygonsCorrect, ...circlesCorrect],\n        id: '1',\n      });\n    } else {\n      resolve(null);\n    }\n  });\n};\n\nexport const validate = (model = {}, config = {}) => {\n  const { shapes } = model;\n  const { minShapes = 2, maxShapes, maxSelections } = config;\n  const errors = {};\n\n  const allShapes = Object.values(shapes || {}).reduce((acc, shape) => [...acc, ...shape], []);\n\n  const nbOfSelections = (allShapes || []).reduce((acc, shape) => (shape.correct ? acc + 1 : acc), 0);\n\n  const nbOfShapes = (allShapes || []).length;\n\n  if (nbOfShapes < minShapes) {\n    errors.shapesError = `There should be at least ${minShapes} shapes defined.`;\n  } else if (nbOfShapes > maxShapes) {\n    errors.shapesError = `No more than ${maxShapes} shapes should be defined.`;\n  }\n\n  if (nbOfSelections < 1) {\n    errors.selectionsError = 'There should be at least 1 shape selected.';\n  } else if (nbOfSelections > maxSelections) {\n    errors.selectionsError = `No more than ${maxSelections} shapes should be selected.`;\n  }\n\n  return errors;\n};\n"],"file":"index.js"}

package/controller/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pie-element/hotspot-controller",
   "private": true,
-  "version": "4.1.4",
+  "version": "4.2.0",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -11,7 +11,7 @@
   "main": "lib/index.js",
   "module": "src/index.js",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "1.5.2",
+    "@pie-lib/pie-toolbox": "1.5.6",
     "debug": "^4.1.1",
     "lodash": "^4.17.15"
   }

package/controller/src/index.js

@@ -15,8 +15,17 @@ export const normalize = (question) => ({
 
 export function model(question, session, env) {
   const normalizedQuestion = normalize(question);
-  const { imageUrl, dimensions, hotspotColor, multipleCorrect, outlineColor, partialScoring, prompt, shapes, language } =
-    normalizedQuestion;
+  const {
+    imageUrl,
+    dimensions,
+    hotspotColor,
+    multipleCorrect,
+    outlineColor,
+    partialScoring,
+    prompt,
+    shapes,
+    language,
+  } = normalizedQuestion;
   const { rectangles, polygons } = shapes || {};
 
   return new Promise((resolve) => {
@@ -73,7 +82,7 @@ const getScore = (config, session, env = {}) => {
     return 0;
   }
 
-  const { shapes: { rectangles = [], polygons = [] } = {} } = config;
+  const { shapes: { rectangles = [], polygons = [], circles = [] } = {} } = config;
   const partialScoringEnabled = partialScoring.enabled(config, env);
 
   if (!partialScoringEnabled) {
@@ -83,7 +92,7 @@ const getScore = (config, session, env = {}) => {
   let correctAnswers = 0;
   let selectedChoices = 0;
 
-  const choices = [...rectangles, ...polygons];
+  const choices = [...rectangles, ...polygons, ...circles];
 
   const correctChoices = choices.filter((choice) => choice.correct);
 
@@ -140,13 +149,14 @@ const returnShapesCorrect = (shapes) => {
 export const createCorrectResponseSession = (question, env) => {
   return new Promise((resolve) => {
     if (env.mode !== 'evaluate' && env.role === 'instructor') {
-      const { shapes: { rectangles = [], polygons = {} } = {} } = question;
+      const { shapes: { rectangles = [], circles = [], polygons = {} } = {} } = question;
 
       const rectangleCorrect = returnShapesCorrect(rectangles);
       const polygonsCorrect = returnShapesCorrect(polygons);
+      const circlesCorrect = returnShapesCorrect(circles);
 
       resolve({
-        answers: [...rectangleCorrect, ...polygonsCorrect],
+        answers: [...rectangleCorrect, ...polygonsCorrect, ...circlesCorrect],
         id: '1',
       });
     } else {

package/lib/hotspot/circle.js

@@ -0,0 +1,191 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _reactKonva = require("react-konva");
+
+var _styles = require("@material-ui/core/styles");
+
+var _icons = require("@pie-lib/pie-toolbox/icons");
+
+var _icons2 = require("./icons");
+
+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; } }
+
+var CircleComponent = /*#__PURE__*/function (_React$Component) {
+  (0, _inherits2["default"])(CircleComponent, _React$Component);
+
+  var _super = _createSuper(CircleComponent);
+
+  function CircleComponent(props) {
+    var _this;
+
+    (0, _classCallCheck2["default"])(this, CircleComponent);
+    _this = _super.call(this, props);
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "handleClick", function (e) {
+      var _this$props = _this.props,
+          onClick = _this$props.onClick,
+          id = _this$props.id,
+          selected = _this$props.selected,
+          disabled = _this$props.disabled;
+
+      if (!disabled) {
+        e.cancelBubble = true;
+        onClick({
+          id: id,
+          selected: !selected
+        });
+      }
+    });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "handleMouseEnter", function () {
+      var disabled = _this.props.disabled;
+
+      if (!disabled) {
+        document.body.style.cursor = 'pointer';
+      }
+    });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "handleMouseLeave", function () {
+      document.body.style.cursor = 'default';
+    });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getEvaluateOutlineColor", function (isCorrect, markAsCorrect, outlineColor) {
+      return markAsCorrect ? 'green' : isCorrect ? outlineColor : 'red';
+    });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getOutlineWidth", function (showCorrectEnabled, selected, markAsCorrect, strokeWidth) {
+      return markAsCorrect || !markAsCorrect && !showCorrectEnabled && selected ? strokeWidth : 0;
+    });
+    return _this;
+  }
+
+  (0, _createClass2["default"])(CircleComponent, [{
+    key: "render",
+    value: function render() {
+      var _this$props2 = this.props,
+          classes = _this$props2.classes,
+          radius = _this$props2.radius,
+          hotspotColor = _this$props2.hotspotColor,
+          isCorrect = _this$props2.isCorrect,
+          isEvaluateMode = _this$props2.isEvaluateMode,
+          outlineColor = _this$props2.outlineColor,
+          selected = _this$props2.selected,
+          x = _this$props2.x,
+          y = _this$props2.y,
+          evaluateText = _this$props2.evaluateText,
+          strokeWidth = _this$props2.strokeWidth,
+          scale = _this$props2.scale,
+          markAsCorrect = _this$props2.markAsCorrect,
+          showCorrectEnabled = _this$props2.showCorrectEnabled;
+      var outlineColorParsed = isEvaluateMode ? this.getEvaluateOutlineColor(isCorrect, markAsCorrect, outlineColor) : outlineColor;
+      var outlineWidth = this.getOutlineWidth(showCorrectEnabled, selected, markAsCorrect, strokeWidth);
+      var iconX = x - 10;
+      var iconY = y - 10; // Adjust position for the icon
+
+      var iconSrc;
+
+      if (showCorrectEnabled) {
+        if (selected && isCorrect || !selected && !isCorrect) {
+          iconSrc = _icons2.faCorrect;
+        }
+      } else {
+        if (selected) {
+          if (isCorrect) {
+            iconSrc = _icons2.faCorrect;
+          } else {
+            iconSrc = _icons2.faWrong;
+          }
+        } else if (!isCorrect) {
+          iconSrc = _icons2.faWrong;
+        }
+      }
+
+      return /*#__PURE__*/_react["default"].createElement(_reactKonva.Group, {
+        scaleX: scale,
+        scaleY: scale
+      }, /*#__PURE__*/_react["default"].createElement(_reactKonva.Circle, {
+        classes: classes.base,
+        radius: radius,
+        fill: hotspotColor,
+        onClick: this.handleClick,
+        onTap: this.handleClick,
+        draggable: false,
+        stroke: outlineColorParsed,
+        strokeWidth: outlineWidth,
+        onMouseLeave: this.handleMouseLeave,
+        onMouseEnter: this.handleMouseEnter,
+        x: x,
+        y: y
+      }), isEvaluateMode && iconSrc ? /*#__PURE__*/_react["default"].createElement(_icons.ImageComponent, {
+        src: iconSrc,
+        x: iconX,
+        y: iconY,
+        tooltip: evaluateText
+      }) : null);
+    }
+  }]);
+  return CircleComponent;
+}(_react["default"].Component);
+
+var styles = function styles() {
+  return {
+    base: {
+      cursor: 'pointer',
+      opacity: 0.5,
+      position: 'relative'
+    }
+  };
+};
+
+CircleComponent.propTypes = {
+  classes: _propTypes["default"].object.isRequired,
+  radius: _propTypes["default"].number.isRequired,
+  hotspotColor: _propTypes["default"].string.isRequired,
+  id: _propTypes["default"].string.isRequired,
+  isCorrect: _propTypes["default"].oneOfType([_propTypes["default"].bool, _propTypes["default"].string]),
+  isEvaluateMode: _propTypes["default"].bool.isRequired,
+  disabled: _propTypes["default"].bool.isRequired,
+  onClick: _propTypes["default"].func.isRequired,
+  outlineColor: _propTypes["default"].string.isRequired,
+  selected: _propTypes["default"].bool.isRequired,
+  x: _propTypes["default"].number.isRequired,
+  y: _propTypes["default"].number.isRequired,
+  evaluateText: _propTypes["default"].string,
+  strokeWidth: _propTypes["default"].number,
+  scale: _propTypes["default"].number,
+  markAsCorrect: _propTypes["default"].bool.isRequired,
+  showCorrectEnabled: _propTypes["default"].bool.isRequired
+};
+CircleComponent.defaultProps = {
+  isCorrect: false,
+  evaluateText: null,
+  strokeWidth: 5,
+  scale: 1
+};
+
+var _default = (0, _styles.withStyles)(styles)(CircleComponent);
+
+exports["default"] = _default;
+//# sourceMappingURL=circle.js.map