@pie-element/graphing 8.1.0 → 8.2.0-mui-update.0

package/configure/lib/correct-response.js

@@ -1,601 +1,490 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.Tools = exports.CorrectResponse = void 0;
-
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
-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"));
-
+exports.default = exports.Tools = exports.CorrectResponse = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var React = _interopRequireWildcard(require("react"));
-
 var _reactDom = _interopRequireDefault(require("react-dom"));
-
-var _classnames = _interopRequireDefault(require("classnames"));
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
-
-var _styles = require("@material-ui/core/styles");
-
+var _styles = require("@mui/material/styles");
 var _graphing = require("@pie-lib/graphing");
-
 var _configUi = require("@pie-lib/config-ui");
-
 var _mathRendering = require("@pie-lib/math-rendering");
-
-var _Delete = _interopRequireDefault(require("@material-ui/icons/Delete"));
-
+var _Delete = _interopRequireDefault(require("@mui/icons-material/Delete"));
 var _lodash = require("lodash");
-
-var _core = require("@material-ui/core");
-
-var _Info = _interopRequireDefault(require("@material-ui/icons/Info"));
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-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 styles = function styles(theme) {
-  return {
-    column: {
-      flex: 1
-    },
-    graphingTools: {
-      color: theme.palette.grey['A200']
-    },
-    availableTools: {
-      marginTop: theme.spacing.unit,
-      display: 'flex',
-      flexWrap: 'wrap'
-    },
-    availableTool: {
-      cursor: 'pointer',
-      margin: theme.spacing.unit,
-      padding: theme.spacing.unit,
-      border: "2px solid ".concat(theme.palette.common.white),
-      textTransform: 'capitalize',
-      '&:hover': {
-        color: theme.palette.grey[800]
-      }
-    },
-    selectedTool: {
-      background: theme.palette.grey['A100'],
-      border: "2px solid ".concat(theme.palette.grey['A200'])
-    },
-    container: {
-      border: "2px solid ".concat(theme.palette.grey['A200']),
-      borderRadius: '4px',
-      padding: "0 ".concat(theme.spacing.unit * 4, "px ").concat(theme.spacing.unit * 2, "px"),
-      background: theme.palette.grey[50]
-    },
-    button: {
-      margin: "".concat(theme.spacing.unit * 2.5, "px 0"),
-      cursor: 'pointer',
-      background: theme.palette.grey[200],
-      padding: theme.spacing.unit * 1.5,
-      width: 'fit-content',
-      borderRadius: '4px',
-      '&:hover': {
-        background: theme.palette.grey['A100']
-      }
-    },
-    responseTitle: {
-      display: 'flex',
-      alignItems: 'center',
-      marginTop: theme.spacing.unit * 2.5
-    },
-    iconButton: {
-      marginLeft: '6px',
-      color: theme.palette.grey[600],
-      '&:hover': {
-        cursor: 'pointer',
-        color: theme.palette.common.black
-      }
-    },
-    name: {
-      marginBottom: theme.spacing.unit / 2
-    },
-    tooltip: {
-      fontSize: theme.typography.fontSize - 2,
-      whiteSpace: 'pre',
-      maxWidth: '500px'
-    },
-    subtitleText: {
-      marginTop: theme.spacing.unit * 1.5,
-      marginBottom: theme.spacing.unit
-    },
-    toolsHeader: {
-      display: 'flex',
-      alignItems: 'center',
-      justifyContent: 'space-between'
-    },
-    defaultTool: {
-      display: 'flex',
-      alignItems: 'center',
-      width: '300px'
-    },
-    defaultToolSelect: {
-      marginLeft: theme.spacing.unit,
-      textTransform: 'uppercase',
-      color: theme.palette.grey[800]
-    },
-    menuItem: {
-      textTransform: 'uppercase'
-    },
-    noDefaultTool: {
-      padding: theme.spacing.unit / 2
-    },
-    error: {
-      color: theme.palette.error.main
-    },
-    errorMessage: {
-      fontSize: theme.typography.fontSize - 2,
-      color: theme.palette.error.main,
-      marginTop: theme.spacing.unit
-    },
-    graphError: {
-      border: "2px solid ".concat(theme.palette.error.main)
-    }
-  };
-};
-
-var Tools = function Tools(_ref) {
-  var classes = _ref.classes,
-      availableTools = _ref.availableTools,
-      defaultTool = _ref.defaultTool,
-      hasErrors = _ref.hasErrors,
-      toolbarTools = _ref.toolbarTools,
-      toggleToolBarTool = _ref.toggleToolBarTool,
-      onDefaultToolChange = _ref.onDefaultToolChange;
-  var allTools = availableTools || [];
-  var isLabelAvailable = allTools.includes('label');
-  var toolbarToolsNoLabel = (toolbarTools || []).filter(function (tool) {
-    return tool !== 'label';
-  });
-
+var _material = require("@mui/material");
+var _Info = _interopRequireDefault(require("@mui/icons-material/Info"));
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+// custom grey values close to old v3 accents
+const GREY_A100 = '#D5D5D5';
+const GREY_A200 = '#AAAAAA';
+const GraphingTools = (0, _styles.styled)('div')(({
+  theme
+}) => ({
+  color: GREY_A200
+}));
+const Button = (0, _styles.styled)('div')(({
+  theme
+}) => ({
+  margin: `${theme.spacing(2.5)} 0`,
+  cursor: 'pointer',
+  background: theme.palette.grey[200],
+  padding: theme.spacing(1.5),
+  width: 'fit-content',
+  borderRadius: '4px',
+  '&:hover': {
+    background: GREY_A100
+  }
+}));
+const AvailableTools = (0, _styles.styled)('div')(({
+  theme
+}) => ({
+  marginTop: theme.spacing(1),
+  display: 'flex',
+  flexWrap: 'wrap'
+}));
+const AvailableTool = (0, _styles.styled)('div')(({
+  theme
+}) => ({
+  cursor: 'pointer',
+  margin: theme.spacing(1),
+  padding: theme.spacing(1),
+  border: `2px solid ${theme.palette.common.white}`,
+  textTransform: 'capitalize',
+  '&:hover': {
+    color: theme.palette.grey[800]
+  }
+}));
+const SelectedTool = (0, _styles.styled)(AvailableTool)(({
+  theme
+}) => ({
+  background: GREY_A100,
+  border: `2px solid ${GREY_A200}`
+}));
+const ResponseTitle = (0, _styles.styled)('div')(({
+  theme
+}) => ({
+  display: 'flex',
+  alignItems: 'center',
+  marginTop: theme.spacing(2.5)
+}));
+const IconButton = (0, _styles.styled)('div')(({
+  theme
+}) => ({
+  marginLeft: '6px',
+  color: theme.palette.grey[600],
+  '&:hover': {
+    cursor: 'pointer',
+    color: theme.palette.common.black
+  }
+}));
+const Name = (0, _styles.styled)('div')(({
+  theme
+}) => ({
+  marginBottom: theme.spacing(0.5)
+}));
+const StyledTooltip = (0, _styles.styled)(({
+  className,
+  ...props
+}) => /*#__PURE__*/React.createElement(_material.Tooltip, (0, _extends2.default)({}, props, {
+  classes: {
+    tooltip: className
+  }
+})))(({
+  theme
+}) => ({
+  '& .MuiTooltip-tooltip': {
+    fontSize: theme.typography.fontSize - 2,
+    whiteSpace: 'pre',
+    maxWidth: '500px'
+  }
+}));
+const SubtitleText = (0, _styles.styled)(_material.Typography)(({
+  theme
+}) => ({
+  marginTop: theme.spacing(1.5),
+  marginBottom: theme.spacing(1)
+}));
+const ToolsHeader = (0, _styles.styled)('div')({
+  display: 'flex',
+  alignItems: 'center',
+  justifyContent: 'space-between'
+});
+const DefaultTool = (0, _styles.styled)('div')(({
+  theme
+}) => ({
+  display: 'flex',
+  alignItems: 'center',
+  width: '300px'
+}));
+const DefaultToolSelect = (0, _styles.styled)(_material.Select)(({
+  theme
+}) => ({
+  marginLeft: theme.spacing(1),
+  textTransform: 'uppercase',
+  color: theme.palette.grey[800]
+}));
+const StyledMenuItem = (0, _styles.styled)(_material.MenuItem)({
+  textTransform: 'uppercase'
+});
+const ErrorMessage = (0, _styles.styled)('div')(({
+  theme
+}) => ({
+  fontSize: theme.typography.fontSize - 2,
+  color: theme.palette.error.main,
+  marginTop: theme.spacing(1)
+}));
+const Tools = ({
+  availableTools,
+  defaultTool,
+  hasErrors,
+  toolbarTools,
+  toggleToolBarTool,
+  onDefaultToolChange
+}) => {
+  let allTools = availableTools || [];
+  const isLabelAvailable = allTools.includes('label');
+  const toolbarToolsNoLabel = (toolbarTools || []).filter(tool => tool !== 'label');
   if (isLabelAvailable) {
     // label has to be placed at the end of the list
-    var allToolsNoLabel = allTools.filter(function (tool) {
-      return tool !== 'label';
-    });
-    allTools = [].concat((0, _toConsumableArray2["default"])(allToolsNoLabel), ['label']);
+    const allToolsNoLabel = allTools.filter(tool => tool !== 'label');
+    allTools = [...allToolsNoLabel, 'label'];
   }
-
-  return /*#__PURE__*/React.createElement("div", {
-    className: classes.graphingTools
-  }, /*#__PURE__*/React.createElement("div", {
-    className: classes.toolsHeader
-  }, /*#__PURE__*/React.createElement("span", null, "GRAPHING TOOLS"), toolbarToolsNoLabel.length > 0 && /*#__PURE__*/React.createElement("div", {
-    className: classes.defaultTool
-  }, /*#__PURE__*/React.createElement("span", null, "Default graphing tool:"), /*#__PURE__*/React.createElement(_core.Select, {
-    className: classes.defaultToolSelect,
+  return /*#__PURE__*/React.createElement(GraphingTools, null, /*#__PURE__*/React.createElement(ToolsHeader, null, /*#__PURE__*/React.createElement("span", null, "GRAPHING TOOLS"), toolbarToolsNoLabel.length > 0 && /*#__PURE__*/React.createElement(DefaultTool, null, /*#__PURE__*/React.createElement("span", null, "Default graphing tool:"), /*#__PURE__*/React.createElement(DefaultToolSelect, {
+    variant: "standard",
     onChange: onDefaultToolChange,
     value: defaultTool,
-    disableUnderline: true
-  }, toolbarToolsNoLabel.map(function (tool, index) {
-    return /*#__PURE__*/React.createElement(_core.MenuItem, {
-      key: index,
-      className: classes.menuItem,
-      value: tool
-    }, tool);
-  })))), /*#__PURE__*/React.createElement("div", {
-    className: classes.availableTools
-  }, allTools.map(function (tool) {
-    var selected = toolbarTools.find(function (t) {
-      return t === tool;
-    });
-    return /*#__PURE__*/React.createElement("div", {
-      key: tool,
-      className: (0, _classnames["default"])(classes.availableTool, selected && classes.selectedTool, hasErrors && tool !== 'label' && classes.error),
-      onClick: function onClick() {
-        return toggleToolBarTool(tool);
+    disableUnderline: true,
+    MenuProps: {
+      transitionDuration: {
+        enter: 225,
+        exit: 195
       }
+    }
+  }, toolbarToolsNoLabel.map((tool, index) => /*#__PURE__*/React.createElement(StyledMenuItem, {
+    key: index,
+    value: tool
+  }, tool))))), /*#__PURE__*/React.createElement(AvailableTools, null, allTools.map(tool => {
+    const selected = toolbarTools.find(t => t === tool);
+    const ToolComponent = selected ? SelectedTool : AvailableTool;
+    return /*#__PURE__*/React.createElement(ToolComponent, {
+      key: tool,
+      style: {
+        ...(hasErrors && tool !== 'label' && {
+          color: 'red'
+        })
+      },
+      onClick: () => toggleToolBarTool(tool)
     }, tool.toUpperCase());
   })));
 };
-
 exports.Tools = Tools;
 Tools.propTypes = {
-  classes: _propTypes["default"].object.isRequired,
-  toolbarTools: _propTypes["default"].arrayOf(_propTypes["default"].string),
-  toggleToolBarTool: _propTypes["default"].func,
-  availableTools: _propTypes["default"].array,
-  defaultTool: _propTypes["default"].string,
-  hasErrors: _propTypes["default"].number,
-  onDefaultToolChange: _propTypes["default"].func
+  toolbarTools: _propTypes.default.arrayOf(_propTypes.default.string),
+  toggleToolBarTool: _propTypes.default.func,
+  availableTools: _propTypes.default.array,
+  defaultTool: _propTypes.default.string,
+  hasErrors: _propTypes.default.number,
+  onDefaultToolChange: _propTypes.default.func
 };
-
-var CorrectResponse = /*#__PURE__*/function (_React$Component) {
-  (0, _inherits2["default"])(CorrectResponse, _React$Component);
-
-  var _super = _createSuper(CorrectResponse);
-
-  function CorrectResponse() {
-    var _this;
-
-    (0, _classCallCheck2["default"])(this, CorrectResponse);
-
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    _this = _super.call.apply(_super, [this].concat(args));
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "state", {
+class CorrectResponse extends React.Component {
+  constructor(...args) {
+    super(...args);
+    (0, _defineProperty2.default)(this, "state", {
       dialog: {
         open: false
       }
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "handleAlertDialog", function (open, callback) {
-      return _this.setState({
-        dialog: {
-          open: open
-        }
-      }, callback);
-    });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "changeMarks", function (key, marks) {
-      var _this$props = _this.props,
-          model = _this$props.model,
-          onChange = _this$props.onChange;
-      (0, _lodash.set)(model, "answers.".concat(key, ".marks"), marks);
+    (0, _defineProperty2.default)(this, "handleAlertDialog", (open, callback) => this.setState({
+      dialog: {
+        open
+      }
+    }, callback));
+    (0, _defineProperty2.default)(this, "changeMarks", (key, marks) => {
+      const {
+        model,
+        onChange
+      } = this.props;
+      (0, _lodash.set)(model, `answers.${key}.marks`, marks);
       onChange(model);
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "filterMarks", function (tool) {
-      var answers = _this.props.model.answers;
-      return Object.entries(answers || {}).reduce(function (object, _ref2) {
-        var _ref3 = (0, _slicedToArray2["default"])(_ref2, 2),
-            key = _ref3[0],
-            answer = _ref3[1];
-
-        object[key] = _objectSpread(_objectSpread({}, answer), {}, {
-          marks: (answer.marks || []).filter(function (mark) {
-            return mark.type !== tool;
-          })
-        });
+    (0, _defineProperty2.default)(this, "filterMarks", tool => {
+      const {
+        model: {
+          answers
+        }
+      } = this.props;
+      return Object.entries(answers || {}).reduce((object, [key, answer]) => {
+        object[key] = {
+          ...answer,
+          marks: (answer.marks || []).filter(mark => mark.type !== tool)
+        };
         return object;
       }, {});
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "changeToolbarTools", function (toolbarTools) {
-      var _this$props2 = _this.props,
-          model = _this$props2.model,
-          onChange = _this$props2.onChange;
+    (0, _defineProperty2.default)(this, "changeToolbarTools", toolbarTools => {
+      const {
+        model,
+        onChange
+      } = this.props;
       model.toolbarTools = toolbarTools;
       onChange(model);
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "updateModel", function (props) {
-      var _this$props3 = _this.props,
-          model = _this$props3.model,
-          onChange = _this$props3.onChange;
-      onChange(_objectSpread(_objectSpread({}, model), props));
-    });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "toggleToolBarTool", function (tool) {
-      var _this$props$model = _this.props.model,
-          defaultTool = _this$props$model.defaultTool,
-          toolbarTools = _this$props$model.toolbarTools,
-          _this$props$model$ans = _this$props$model.answers,
-          answers = _this$props$model$ans === void 0 ? {} : _this$props$model$ans;
-      var updatedToolbarTools = (0, _toConsumableArray2["default"])(toolbarTools);
-      var newDefaultTool = defaultTool;
-      var index = toolbarTools.findIndex(function (t) {
-        return tool === t;
+    (0, _defineProperty2.default)(this, "updateModel", props => {
+      const {
+        model,
+        onChange
+      } = this.props;
+      onChange({
+        ...model,
+        ...props
       });
-
+    });
+    (0, _defineProperty2.default)(this, "toggleToolBarTool", tool => {
+      const {
+        model: {
+          defaultTool,
+          toolbarTools,
+          answers = {}
+        }
+      } = this.props;
+      const updatedToolbarTools = [...toolbarTools];
+      let newDefaultTool = defaultTool;
+      const index = toolbarTools.findIndex(t => tool === t);
       if (index >= 0) {
-        var updatedAnswers = _this.filterMarks(tool);
-
+        const updatedAnswers = this.filterMarks(tool);
         updatedToolbarTools.splice(index, 1);
-
         if (tool === defaultTool) {
-          var toolbarToolsNoLabel = (updatedToolbarTools || []).filter(function (tool) {
-            return tool !== 'label';
-          });
+          const toolbarToolsNoLabel = (updatedToolbarTools || []).filter(tool => tool !== 'label');
           newDefaultTool = toolbarToolsNoLabel.length && toolbarToolsNoLabel[0] || '';
         }
-
         if (!(0, _lodash.isEqual)(answers, updatedAnswers)) {
-          _this.setState({
+          this.setState({
             dialog: {
               open: true,
               title: 'Warning',
-              text: "Correct answer includes one or more ".concat(tool, " objects and all of them will be deleted."),
-              onConfirm: function onConfirm() {
-                return _this.handleAlertDialog(false, _this.updateModel({
-                  toolbarTools: updatedToolbarTools,
-                  answers: updatedAnswers,
-                  defaultTool: newDefaultTool
-                }));
-              },
-              onClose: function onClose() {
-                return _this.handleAlertDialog(false);
-              }
+              text: `Correct answer includes one or more ${tool} objects and all of them will be deleted.`,
+              onConfirm: () => this.handleAlertDialog(false, this.updateModel({
+                toolbarTools: updatedToolbarTools,
+                answers: updatedAnswers,
+                defaultTool: newDefaultTool
+              })),
+              onClose: () => this.handleAlertDialog(false)
             }
           });
-
           return;
         }
       } else {
         updatedToolbarTools.push(tool);
-
         if (defaultTool === '' && tool !== 'label') {
           newDefaultTool = tool;
         }
       }
-
-      _this.updateModel({
+      this.updateModel({
         toolbarTools: updatedToolbarTools,
         defaultTool: newDefaultTool
       });
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onDefaultToolChange", function (event) {
-      var value = event.target.value;
-
-      _this.updateModel({
+    (0, _defineProperty2.default)(this, "onDefaultToolChange", event => {
+      const {
+        value
+      } = event.target;
+      this.updateModel({
         defaultTool: value
       });
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "addAlternateResponse", function () {
-      var _this$props4 = _this.props,
-          model = _this$props4.model,
-          onChange = _this$props4.onChange;
-
-      var _ref4 = model || {},
-          answers = _ref4.answers;
-
-      var answersKeys = Object.keys(answers || {});
-      (0, _lodash.set)(model, "answers.".concat("alternate".concat(answersKeys.length)), {
-        name: "Alternate ".concat(answersKeys.length),
+    (0, _defineProperty2.default)(this, "addAlternateResponse", () => {
+      const {
+        model,
+        onChange
+      } = this.props;
+      const {
+        answers
+      } = model || {};
+      const answersKeys = Object.keys(answers || {});
+      (0, _lodash.set)(model, `answers.${`alternate${answersKeys.length}`}`, {
+        name: `Alternate ${answersKeys.length}`,
         marks: []
       });
       onChange(model);
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "deleteAlternateResponse", function (answerKey, answer) {
-      var _this$props5 = _this.props,
-          model = _this$props5.model,
-          onChange = _this$props5.onChange;
-
-      var _ref5 = model || {},
-          answers = _ref5.answers;
-
-      var _ref6 = answer || {},
-          _ref6$marks = _ref6.marks,
-          marks = _ref6$marks === void 0 ? [] : _ref6$marks,
-          name = _ref6.name;
-
-      var deleteAnswer = function deleteAnswer() {
-        delete answers[answerKey]; // rebuild answers based on new alternate positions after deletion
-
-        var newAnswers = Object.entries(answers).reduce(function (acc, currentValue, index) {
-          var _currentValue = (0, _slicedToArray2["default"])(currentValue, 2),
-              key = _currentValue[0],
-              value = _currentValue[1];
-
-          var newAnswer = key === 'correctAnswer' ? _objectSpread(_objectSpread({}, acc), {}, (0, _defineProperty2["default"])({}, key, value)) : _objectSpread(_objectSpread({}, acc), {}, (0, _defineProperty2["default"])({}, 'alternate' + index, _objectSpread(_objectSpread({}, value), {}, {
-            name: "Alternate ".concat(index)
-          })));
+    (0, _defineProperty2.default)(this, "deleteAlternateResponse", (answerKey, answer) => {
+      const {
+        model,
+        onChange
+      } = this.props;
+      const {
+        answers
+      } = model || {};
+      const {
+        marks = [],
+        name
+      } = answer || {};
+      const deleteAnswer = () => {
+        delete answers[answerKey];
+        // rebuild answers based on new alternate positions after deletion
+        const newAnswers = Object.entries(answers).reduce((acc, currentValue, index) => {
+          const [key, value] = currentValue;
+          const newAnswer = key === 'correctAnswer' ? {
+            ...acc,
+            [key]: value
+          } : {
+            ...acc,
+            ['alternate' + index]: {
+              ...value,
+              name: `Alternate ${index}`
+            }
+          };
           return newAnswer;
         }, {});
-        onChange(_objectSpread(_objectSpread({}, model), {}, {
+        onChange({
+          ...model,
           answers: newAnswers
-        }));
+        });
       };
-
       if (marks.length) {
-        _this.setState({
+        this.setState({
           dialog: {
             open: true,
             title: 'Warning',
-            text: "".concat(name, " includes one or more shapes and the entire response will be deleted."),
-            onConfirm: function onConfirm() {
-              return _this.handleAlertDialog(false, deleteAnswer);
-            },
-            onClose: function onClose() {
-              return _this.handleAlertDialog(false);
-            }
+            text: `${name} includes one or more shapes and the entire response will be deleted.`,
+            onConfirm: () => this.handleAlertDialog(false, deleteAnswer),
+            onClose: () => this.handleAlertDialog(false)
           }
         });
-
         return;
       }
-
       deleteAnswer();
     });
-    return _this;
   }
-
-  (0, _createClass2["default"])(CorrectResponse, [{
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      try {
-        // eslint-disable-next-line react/no-find-dom-node
-        var domNode = _reactDom["default"].findDOMNode(this);
-
-        (0, _mathRendering.renderMath)(domNode);
-      } catch (e) {
-        // Added try-catch block to handle "Unable to find node on an unmounted component" error from tests, thrown because of the usage of shallow
-        console.error('DOM not mounted');
-      }
+  componentDidMount() {
+    try {
+      // eslint-disable-next-line react/no-find-dom-node
+      const domNode = _reactDom.default.findDOMNode(this);
+      (0, _mathRendering.renderMath)(domNode);
+    } catch (e) {
+      // Added try-catch block to handle "Unable to find node on an unmounted component" error from tests, thrown because of the usage of shallow
+      console.error('DOM not mounted');
     }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this2 = this;
-
-      var _this$props6 = this.props,
-          availableTools = _this$props6.availableTools,
-          classes = _this$props6.classes,
-          errors = _this$props6.errors,
-          model = _this$props6.model,
-          _this$props6$mathMlOp = _this$props6.mathMlOptions,
-          mathMlOptions = _this$props6$mathMlOp === void 0 ? {} : _this$props6$mathMlOp,
-          removeIncompleteTool = _this$props6.removeIncompleteTool;
-      var dialog = this.state.dialog;
-
-      var _ref7 = model || {},
-          _ref7$answers = _ref7.answers,
-          answers = _ref7$answers === void 0 ? {} : _ref7$answers,
-          arrows = _ref7.arrows,
-          backgroundMarks = _ref7.backgroundMarks,
-          coordinatesOnHover = _ref7.coordinatesOnHover,
-          defaultTool = _ref7.defaultTool,
-          domain = _ref7.domain,
-          _ref7$graph = _ref7.graph,
-          graph = _ref7$graph === void 0 ? {} : _ref7$graph,
-          labels = _ref7.labels,
-          labelsEnabled = _ref7.labelsEnabled,
-          range = _ref7.range,
-          title = _ref7.title,
-          titleEnabled = _ref7.titleEnabled,
-          toolbarTools = _ref7.toolbarTools;
-
-      var _ref8 = errors || {},
-          _ref8$correctAnswerEr = _ref8.correctAnswerErrors,
-          correctAnswerErrors = _ref8$correctAnswerEr === void 0 ? {} : _ref8$correctAnswerEr,
-          toolbarToolsError = _ref8.toolbarToolsError;
-
-      return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_core.Typography, {
-        component: "div",
-        variant: "subheading"
-      }, "Define Tool Set and Correct Response"), /*#__PURE__*/React.createElement(_core.Typography, {
-        component: "div",
-        variant: "body1",
-        className: classes.subtitleText
-      }, "Use this interface to choose which graphing tools students will be able to use, and to define the correct answer"), /*#__PURE__*/React.createElement(Tools, {
-        classes: classes,
-        availableTools: availableTools,
-        defaultTool: defaultTool,
-        hasErrors: !!toolbarToolsError,
-        onDefaultToolChange: this.onDefaultToolChange,
-        toggleToolBarTool: this.toggleToolBarTool,
-        toolbarTools: toolbarTools
-      }), toolbarToolsError && /*#__PURE__*/React.createElement("div", {
-        className: classes.errorMessage
-      }, toolbarToolsError), Object.entries(answers || {}).map(function (_ref9) {
-        var _ref10 = (0, _slicedToArray2["default"])(_ref9, 2),
-            key = _ref10[0],
-            answer = _ref10[1];
-
-        var _ref11 = answer || {},
-            _ref11$marks = _ref11.marks,
-            marks = _ref11$marks === void 0 ? [] : _ref11$marks,
-            name = _ref11.name;
-
-        return /*#__PURE__*/React.createElement(React.Fragment, {
-          key: "correct-response-graph-".concat(name)
-        }, /*#__PURE__*/React.createElement("div", {
-          className: classes.responseTitle
-        }, /*#__PURE__*/React.createElement("div", {
-          className: classes.name
-        }, name), key === 'correctAnswer' && /*#__PURE__*/React.createElement(_core.Tooltip, {
-          classes: {
-            tooltip: classes.tooltip
-          },
-          disableFocusListener: true,
-          disableTouchListener: true,
-          placement: 'right',
-          title: 'At least 1 graph object should be defined.'
-        }, /*#__PURE__*/React.createElement(_Info["default"], {
-          fontSize: 'small',
-          color: 'primary',
-          style: {
-            marginLeft: '8px',
-            marginBottom: 'auto'
-          }
-        })), key !== 'correctAnswer' && /*#__PURE__*/React.createElement(_Delete["default"], {
-          className: classes.iconButton,
-          onClick: function onClick() {
-            return _this2.deleteAlternateResponse(key, answer);
-          }
-        })), /*#__PURE__*/React.createElement(_graphing.GraphContainer, {
-          className: correctAnswerErrors[key] && classes.graphError,
-          axesSettings: {
-            includeArrows: arrows
-          },
-          backgroundMarks: backgroundMarks.filter(function (mark) {
-            return !mark.building;
-          }),
-          coordinatesOnHover: coordinatesOnHover,
-          disabledLabels: true,
-          disabledTitle: true,
-          domain: domain,
-          draggableTools: key === 'correctAnswer',
-          labels: labels,
-          marks: marks,
-          onChangeMarks: function onChangeMarks(newMarks) {
-            return _this2.changeMarks(key, newMarks);
-          },
-          range: range,
-          showLabels: labelsEnabled,
-          showTitle: titleEnabled,
-          size: {
-            width: graph.width,
-            height: graph.height
-          },
-          title: title,
-          toolbarTools: toolbarTools,
-          onChangeTools: function onChangeTools(toolbarTools) {
-            return _this2.updateModel({
-              toolbarTools: toolbarTools
-            });
-          },
-          mathMlOptions: mathMlOptions,
-          removeIncompleteTool: removeIncompleteTool,
-          limitLabeling: true
-        }), correctAnswerErrors[key] && /*#__PURE__*/React.createElement("div", {
-          className: classes.errorMessage
-        }, correctAnswerErrors[key]));
-      }), /*#__PURE__*/React.createElement("div", {
-        className: classes.button,
-        onClick: this.addAlternateResponse
-      }, "ADD ALTERNATE"), /*#__PURE__*/React.createElement(_configUi.AlertDialog, {
-        open: dialog.open,
-        title: dialog.title,
-        text: dialog.text,
-        onClose: dialog.onClose,
-        onConfirm: dialog.onConfirm
-      }));
-    }
-  }]);
-  return CorrectResponse;
-}(React.Component);
-
+  }
+  render() {
+    const {
+      availableTools,
+      errors,
+      model,
+      mathMlOptions = {},
+      removeIncompleteTool
+    } = this.props;
+    const {
+      dialog
+    } = this.state;
+    const {
+      answers = {},
+      arrows,
+      backgroundMarks,
+      coordinatesOnHover,
+      defaultTool,
+      domain,
+      graph = {},
+      labels,
+      labelsEnabled,
+      range,
+      title,
+      titleEnabled,
+      toolbarTools
+    } = model || {};
+    const {
+      correctAnswerErrors = {},
+      toolbarToolsError
+    } = errors || {};
+    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_material.Typography, {
+      component: "div",
+      variant: "h6"
+    }, "Define Tool Set and Correct Response"), /*#__PURE__*/React.createElement(SubtitleText, {
+      component: "div",
+      variant: "body1"
+    }, "Use this interface to choose which graphing tools students will be able to use, and to define the correct answer"), /*#__PURE__*/React.createElement(Tools, {
+      availableTools: availableTools,
+      defaultTool: defaultTool,
+      hasErrors: !!toolbarToolsError,
+      onDefaultToolChange: this.onDefaultToolChange,
+      toggleToolBarTool: this.toggleToolBarTool,
+      toolbarTools: toolbarTools
+    }), toolbarToolsError && /*#__PURE__*/React.createElement(ErrorMessage, null, toolbarToolsError), Object.entries(answers || {}).map(([key, answer]) => {
+      const {
+        marks = [],
+        name
+      } = answer || {};
+      return /*#__PURE__*/React.createElement(React.Fragment, {
+        key: `correct-response-graph-${name}`
+      }, /*#__PURE__*/React.createElement(ResponseTitle, null, /*#__PURE__*/React.createElement(Name, null, name), key === 'correctAnswer' && /*#__PURE__*/React.createElement(StyledTooltip, {
+        disableFocusListener: true,
+        disableTouchListener: true,
+        placement: 'right',
+        title: 'At least 1 graph object should be defined.'
+      }, /*#__PURE__*/React.createElement(_Info.default, {
+        fontSize: 'small',
+        color: 'primary',
+        style: {
+          marginLeft: '8px',
+          marginBottom: 'auto'
+        }
+      })), key !== 'correctAnswer' && /*#__PURE__*/React.createElement(IconButton, {
+        onClick: () => this.deleteAlternateResponse(key, answer)
+      }, /*#__PURE__*/React.createElement(_Delete.default, null))), /*#__PURE__*/React.createElement(_graphing.GraphContainer, {
+        style: correctAnswerErrors[key] && {
+          border: '2px solid red'
+        },
+        axesSettings: {
+          includeArrows: arrows
+        },
+        backgroundMarks: backgroundMarks.filter(mark => !mark.building),
+        coordinatesOnHover: coordinatesOnHover,
+        disabledLabels: true,
+        disabledTitle: true,
+        domain: domain,
+        draggableTools: key === 'correctAnswer',
+        labels: labels,
+        marks: marks,
+        onChangeMarks: newMarks => this.changeMarks(key, newMarks),
+        range: range,
+        showLabels: labelsEnabled,
+        showTitle: titleEnabled,
+        size: {
+          width: graph.width,
+          height: graph.height
+        },
+        title: title,
+        toolbarTools: toolbarTools,
+        onChangeTools: toolbarTools => this.updateModel({
+          toolbarTools
+        }),
+        mathMlOptions: mathMlOptions,
+        removeIncompleteTool: removeIncompleteTool,
+        limitLabeling: true
+      }), correctAnswerErrors[key] && /*#__PURE__*/React.createElement(ErrorMessage, null, correctAnswerErrors[key]));
+    }), /*#__PURE__*/React.createElement(Button, {
+      onClick: this.addAlternateResponse
+    }, "ADD ALTERNATE"), /*#__PURE__*/React.createElement(_configUi.AlertDialog, {
+      open: dialog.open,
+      title: dialog.title,
+      text: dialog.text,
+      onClose: dialog.onClose,
+      onConfirm: dialog.onConfirm
+    }));
+  }
+}
 exports.CorrectResponse = CorrectResponse;
-(0, _defineProperty2["default"])(CorrectResponse, "propTypes", {
-  availableTools: _propTypes["default"].array,
-  classes: _propTypes["default"].object.isRequired,
-  errors: _propTypes["default"].object,
-  model: _propTypes["default"].object.isRequired,
-  onChange: _propTypes["default"].func.isRequired,
-  toolbarTools: _propTypes["default"].arrayOf(_propTypes["default"].String)
+(0, _defineProperty2.default)(CorrectResponse, "propTypes", {
+  availableTools: _propTypes.default.array,
+  errors: _propTypes.default.object,
+  model: _propTypes.default.object.isRequired,
+  onChange: _propTypes.default.func.isRequired,
+  toolbarTools: _propTypes.default.arrayOf(_propTypes.default.String)
 });
-
-var _default = (0, _styles.withStyles)(styles)(CorrectResponse);
-
-exports["default"] = _default;
+var _default = exports.default = CorrectResponse;
 //# sourceMappingURL=correct-response.js.map