@pie-element/hotspot 5.4.3-next.41 → 5.4.3-next.54

package/src/hotspot/index.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import Typography from '@material-ui/core/Typography';
 import CorrectAnswerToggle from '@pie-lib/correct-answer-toggle';
-import {Collapsible, hasText, PreviewPrompt} from '@pie-lib/render-ui';
+import { Collapsible, hasText, PreviewPrompt } from '@pie-lib/render-ui';
 import { withStyles } from '@material-ui/core/styles';
 
 import Container from './container';
@@ -13,18 +13,15 @@ class HotspotComponent extends React.Component {
     this.state = {
       showCorrect: false,
       observer: null,
-      scale: 1
+      scale: 1,
     };
   }
 
   componentDidMount() {
     this.observer = new MutationObserver((mutations) => {
       mutations.forEach(() => {
-        const target = document.getElementById('question-container')?.style?.cssText
-        const zoom = target?.substring(
-          target.indexOf('--pie-zoom') + 11,
-          target.lastIndexOf('%')
-        );
+        const target = document.getElementById('question-container')?.style?.cssText;
+        const zoom = target?.substring(target.indexOf('--pie-zoom') + 11, target.lastIndexOf('%'));
 
         const zoomParsed = zoom?.replace(/\s/g, '');
         if (zoomParsed) {
@@ -32,7 +29,7 @@ class HotspotComponent extends React.Component {
           if (newScale !== this.state.scale) {
             this.setState({
               scale: parseFloat(zoomParsed) / 100,
-            })
+            });
           }
         } else if (!zoomParsed && this.state.scale !== 1) {
           this.setState({
@@ -44,7 +41,7 @@ class HotspotComponent extends React.Component {
 
     const target = document.getElementById('question-container');
     if (target) {
-      this.observer.observe(target, { attributes : true, attributeFilter : ['style'] })
+      this.observer.observe(target, { attributes: true, attributeFilter: ['style'] });
     }
   }
 
@@ -73,10 +70,10 @@ class HotspotComponent extends React.Component {
         rationale,
         teacherInstructions,
         strokeWidth,
-        responseCorrect
+        responseCorrect,
       },
       onSelectChoice,
-      classes
+      classes,
     } = this.props;
     const { showCorrect } = this.state;
     const isEvaluateMode = mode === 'evaluate';
@@ -92,25 +89,17 @@ class HotspotComponent extends React.Component {
           />
         )}
         {showCorrectAnswerToggle && <br />}
-        {
-          teacherInstructions && hasText(teacherInstructions) && (
-            <Collapsible
-              labels={{ hidden: 'Show Teacher Instructions', visible: 'Hide Teacher Instructions' }}
-              className={classes.collapsible}
-            >
-              <PreviewPrompt
-                className="prompt"
-                prompt={teacherInstructions}
-              />
-            </Collapsible>
-          )
-        }
+        {teacherInstructions && hasText(teacherInstructions) && (
+          <Collapsible
+            labels={{ hidden: 'Show Teacher Instructions', visible: 'Hide Teacher Instructions' }}
+            className={classes.collapsible}
+          >
+            <PreviewPrompt className="prompt" prompt={teacherInstructions} />
+          </Collapsible>
+        )}
 
         <Typography className={classes.prompt}>
-          <PreviewPrompt
-            className="prompt"
-            prompt={prompt}
-          />
+          <PreviewPrompt className="prompt" prompt={prompt} />
         </Typography>
 
         {imageUrl ? (
@@ -131,20 +120,11 @@ class HotspotComponent extends React.Component {
           />
         ) : null}
 
-        {
-          rationale && hasText(rationale) && (
-            <Collapsible
-              labels={{ hidden: 'Show Rationale', visible: 'Hide Rationale' }}
-              className={classes.collapsible}
-            >
-              <PreviewPrompt
-                className="prompt"
-                prompt={rationale}
-              />
-            </Collapsible>
-          )
-        }
-
+        {rationale && hasText(rationale) && (
+          <Collapsible labels={{ hidden: 'Show Rationale', visible: 'Hide Rationale' }} className={classes.collapsible}>
+            <PreviewPrompt className="prompt" prompt={rationale} />
+          </Collapsible>
+        )}
       </div>
     );
   }
@@ -154,21 +134,21 @@ HotspotComponent.propTypes = {
   classes: PropTypes.object,
   model: PropTypes.object.isRequired,
   onSelectChoice: PropTypes.func.isRequired,
-  session: PropTypes.object.isRequired
+  session: PropTypes.object.isRequired,
 };
 
 HotspotComponent.defaultProps = {
-  classes: {}
+  classes: {},
 };
 
-const styles = theme => ({
+const styles = (theme) => ({
   collapsible: {
     paddingTop: theme.spacing.unit * 2,
     paddingBottom: theme.spacing.unit * 2,
   },
   prompt: {
-    fontSize: 'inherit'
-  }
+    fontSize: 'inherit',
+  },
 });
 
 export default withStyles(styles)(HotspotComponent);

package/src/hotspot/polygon.jsx

@@ -14,10 +14,10 @@ class PolygonComponent extends React.Component {
   getPolygonCenter = (points) => {
     const x = points.map(({ x }) => x);
     const y = points.map(({ y }) => y);
-    const minX = Math.min.apply (null, x);
-    const maxX = Math.max.apply (null, x);
-    const minY = Math.min.apply (null, y);
-    const maxY = Math.max.apply (null, y);
+    const minX = Math.min.apply(null, x);
+    const maxX = Math.max.apply(null, x);
+    const minY = Math.min.apply(null, y);
+    const maxY = Math.max.apply(null, y);
     return [(minX + maxX) / 2, (minY + maxY) / 2];
   };
 
@@ -51,9 +51,11 @@ class PolygonComponent extends React.Component {
     document.body.style.cursor = 'default';
   };
 
-  getEvaluateOutlineColor = (isCorrect, markAsCorrect, outlineColor) => markAsCorrect ? 'green' : (isCorrect ? outlineColor : 'red')
+  getEvaluateOutlineColor = (isCorrect, markAsCorrect, outlineColor) =>
+    markAsCorrect ? 'green' : isCorrect ? outlineColor : 'red';
 
-  getOutlineWidth = (showCorrectEnabled, selected, markAsCorrect, strokeWidth) => markAsCorrect || (!markAsCorrect && !showCorrectEnabled && selected) ? strokeWidth : 0;
+  getOutlineWidth = (showCorrectEnabled, selected, markAsCorrect, strokeWidth) =>
+    markAsCorrect || (!markAsCorrect && !showCorrectEnabled && selected) ? strokeWidth : 0;
 
   render() {
     const {
@@ -68,7 +70,7 @@ class PolygonComponent extends React.Component {
       strokeWidth,
       scale,
       markAsCorrect,
-      showCorrectEnabled
+      showCorrectEnabled,
     } = this.props;
 
     const outlineColorParsed = isEvaluateMode
@@ -128,14 +130,7 @@ class PolygonComponent extends React.Component {
           onMouseLeave={this.handleMouseLeave}
           onMouseEnter={this.handleMouseEnter}
         />
-        {(isEvaluateMode && iconSrc) ? (
-          <Image
-            src={iconSrc}
-            x={iconX}
-            y={iconY}
-            tooltip={evaluateText}
-          />
-        ): null}
+        {isEvaluateMode && iconSrc ? <Image src={iconSrc} x={iconX} y={iconY} tooltip={evaluateText} /> : null}
       </Group>
     );
   }
@@ -145,7 +140,7 @@ const styles = () => ({
   base: {
     cursor: 'pointer',
     opacity: 0.5,
-    position: 'relative'
+    position: 'relative',
   },
 });
 
@@ -164,13 +159,13 @@ PolygonComponent.propTypes = {
   strokeWidth: PropTypes.number,
   scale: PropTypes.number,
   markAsCorrect: PropTypes.bool.isRequired,
-  showCorrectEnabled: PropTypes.bool.isRequired
+  showCorrectEnabled: PropTypes.bool.isRequired,
 };
 
 PolygonComponent.defaultProps = {
   evaluateText: null,
   strokeWidth: 5,
-  scale: 1
+  scale: 1,
 };
 
 export default withStyles(styles)(PolygonComponent);

package/src/hotspot/rectangle.jsx

@@ -32,9 +32,11 @@ class RectComponent extends React.Component {
     document.body.style.cursor = 'default';
   };
 
-  getEvaluateOutlineColor = (isCorrect, markAsCorrect, outlineColor) => markAsCorrect ? 'green' : (isCorrect ? outlineColor : 'red')
+  getEvaluateOutlineColor = (isCorrect, markAsCorrect, outlineColor) =>
+    markAsCorrect ? 'green' : isCorrect ? outlineColor : 'red';
 
-  getOutlineWidth = (showCorrectEnabled, selected, markAsCorrect, strokeWidth) => markAsCorrect || (!markAsCorrect && !showCorrectEnabled && selected) ? strokeWidth : 0;
+  getOutlineWidth = (showCorrectEnabled, selected, markAsCorrect, strokeWidth) =>
+    markAsCorrect || (!markAsCorrect && !showCorrectEnabled && selected) ? strokeWidth : 0;
 
   render() {
     const {
@@ -52,7 +54,7 @@ class RectComponent extends React.Component {
       strokeWidth,
       scale,
       markAsCorrect,
-      showCorrectEnabled
+      showCorrectEnabled,
     } = this.props;
 
     const outlineColorParsed = isEvaluateMode
@@ -61,8 +63,8 @@ class RectComponent extends React.Component {
 
     const outlineWidth = this.getOutlineWidth(showCorrectEnabled, selected, markAsCorrect, strokeWidth);
 
-    const iconX = (x + (width / 2)) - 10;
-    const iconY = (y + (height / 2)) - 10;
+    const iconX = x + width / 2 - 10;
+    const iconY = y + height / 2 - 10;
 
     // "Show Correct Answer" Enabled:
     //   - Correctly Selected: white checkmark in green circle
@@ -113,14 +115,7 @@ class RectComponent extends React.Component {
           x={x}
           y={y}
         />
-        {(isEvaluateMode && iconSrc) ? (
-          <Image
-            src={iconSrc}
-            x={iconX}
-            y={iconY}
-            tooltip={evaluateText}
-          />
-        ): null}
+        {isEvaluateMode && iconSrc ? <Image src={iconSrc} x={iconX} y={iconY} tooltip={evaluateText} /> : null}
       </Group>
     );
   }
@@ -130,7 +125,7 @@ const styles = () => ({
   base: {
     cursor: 'pointer',
     opacity: 0.5,
-    position: 'relative'
+    position: 'relative',
   },
 });
 
@@ -152,14 +147,14 @@ RectComponent.propTypes = {
   strokeWidth: PropTypes.number,
   scale: PropTypes.number,
   markAsCorrect: PropTypes.bool.isRequired,
-  showCorrectEnabled: PropTypes.bool.isRequired
+  showCorrectEnabled: PropTypes.bool.isRequired,
 };
 
 RectComponent.defaultProps = {
   isCorrect: false,
   evaluateText: null,
   strokeWidth: 5,
-  scale: 1
+  scale: 1,
 };
 
 export default withStyles(styles)(RectComponent);

package/src/index.js

@@ -1,10 +1,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { renderMath } from '@pie-lib/math-rendering';
-import {
-  SessionChangedEvent,
-  ModelSetEvent
-} from '@pie-framework/pie-player-events';
+import { SessionChangedEvent, ModelSetEvent } from '@pie-framework/pie-player-events';
 
 import HotspotComponent from './hotspot';
 import { updateSessionValue } from './session-updater';
@@ -13,13 +10,7 @@ export default class Hotspot extends HTMLElement {
   set model(m) {
     this._model = m;
 
-    this.dispatchEvent(
-      new ModelSetEvent(
-        this.tagName.toLowerCase(),
-        this.isComplete(),
-        !!this._model
-      )
-    );
+    this.dispatchEvent(new ModelSetEvent(this.tagName.toLowerCase(), this.isComplete(), !!this._model));
     this._render();
   }
 
@@ -28,9 +19,7 @@ export default class Hotspot extends HTMLElement {
       return false;
     }
 
-    return (
-      Array.isArray(this._session.answers) && this._session.answers.length > 0
-    );
+    return Array.isArray(this._session.answers) && this._session.answers.length > 0;
   }
 
   set session(s) {
@@ -49,9 +38,7 @@ export default class Hotspot extends HTMLElement {
   onSelectChoice(data) {
     updateSessionValue(this._session, this._model, data);
 
-    this.dispatchEvent(
-      new SessionChangedEvent(this.tagName.toLowerCase(), this.isComplete())
-    );
+    this.dispatchEvent(new SessionChangedEvent(this.tagName.toLowerCase(), this.isComplete()));
 
     this._render();
   }
@@ -65,7 +52,7 @@ export default class Hotspot extends HTMLElement {
       const el = React.createElement(HotspotComponent, {
         model: this._model,
         session: this._session,
-        onSelectChoice: this.onSelectChoice.bind(this)
+        onSelectChoice: this.onSelectChoice.bind(this),
       });
 
       ReactDOM.render(el, this, () => {

package/src/session-updater.js

@@ -4,7 +4,7 @@ export function updateSessionValue(session, model, data) {
   session.answers = session.answers || [];
 
   if (!selected) {
-    session.answers = session.answers.filter(answer => answer.id !== id);
+    session.answers = session.answers.filter((answer) => answer.id !== id);
   } else {
     const item = { id };
     if (multipleCorrect) {