@pie-element/graphing 3.5.4-next.137 → 3.5.4-next.1372

package/configure/lib/index.js

@@ -35,23 +35,24 @@ var _debug = _interopRequireDefault(require("debug"));
 
 var _defaults = _interopRequireDefault(require("./defaults"));
 
-var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
+var _mathRendering = require("@pie-lib/math-rendering");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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 { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+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 log = (0, _debug["default"])('pie-elements:graphing:configure');
+var log = (0, _debug["default"])('pie-elements:graphing:configure'); // this function is implemented in controller as well
 
-// this function is implemented in controller as well
 var sortedAnswers = function sortedAnswers(answers) {
-  answers = answers || {};
-  return Object.keys(answers).sort().reduce(function (result, key) {
-    result[key] = answers[key];
+  return Object.keys(answers || {}).sort().reduce(function (result, key) {
+    if (key !== 'correctAnswer') {
+      result[key] = answers[key];
+    }
+
     return result;
   }, {});
 };
@@ -73,7 +74,7 @@ var GraphLinesConfigure = /*#__PURE__*/function (_HTMLElement) {
 
       log('[onModelChanged]: ', _this._model);
 
-      _this.dispatchEvent(new _pieConfigureEvents.ModelUpdatedEvent(_this._model, true));
+      _this.dispatchEvent(new _pieConfigureEvents.ModelUpdatedEvent(_this._model));
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onConfigurationChanged", function (config) {
       _this._configuration = config;
@@ -105,9 +106,21 @@ var GraphLinesConfigure = /*#__PURE__*/function (_HTMLElement) {
 
       this._render();
     }
+  }, {
+    key: "insertSound",
+    value: function insertSound(handler) {
+      this.dispatchEvent(new _pieConfigureEvents.InsertSoundEvent(handler));
+    }
+  }, {
+    key: "onDeleteSound",
+    value: function onDeleteSound(src, done) {
+      this.dispatchEvent(new _pieConfigureEvents.DeleteSoundEvent(src, done));
+    }
   }, {
     key: "_render",
     value: function _render() {
+      var _this2 = this;
+
       if (this._model) {
         var el = /*#__PURE__*/_react["default"].createElement(_configure["default"], {
           onModelChanged: this.onModelChanged,
@@ -117,10 +130,16 @@ var GraphLinesConfigure = /*#__PURE__*/function (_HTMLElement) {
           imageSupport: {
             add: this.insertImage,
             "delete": this.onDeleteImage
+          },
+          uploadSoundSupport: {
+            add: this.insertSound.bind(this),
+            "delete": this.onDeleteSound.bind(this)
           }
         });
 
-        _reactDom["default"].render(el, this);
+        _reactDom["default"].render(el, this, function () {
+          (0, _mathRendering.renderMath)(_this2);
+        });
       }
     }
   }]);
@@ -131,12 +150,38 @@ exports["default"] = GraphLinesConfigure;
 (0, _defineProperty2["default"])(GraphLinesConfigure, "createDefaultModel", function () {
   var model = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
-  if (!(0, _isEmpty["default"])(model.answers) && model.answers.hasOwnProperty('correctAnswer')) {
-    model.answers = Object.assign({
-      correctAnswer: model.answers.correctAnswer
-    }, sortedAnswers(model.answers));
-  }
-
-  return _objectSpread(_objectSpread({}, _defaults["default"].model), model);
+  var normalizedModel = _objectSpread(_objectSpread({}, _defaults["default"].model), model);
+
+  var _normalizedModel$answ = normalizedModel.answers,
+      answers = _normalizedModel$answ === void 0 ? {} : _normalizedModel$answ,
+      _normalizedModel$doma = normalizedModel.domain,
+      domain = _normalizedModel$doma === void 0 ? {} : _normalizedModel$doma,
+      defaultTool = normalizedModel.defaultTool,
+      _normalizedModel$grap = normalizedModel.graph,
+      graph = _normalizedModel$grap === void 0 ? {} : _normalizedModel$grap,
+      _normalizedModel$rang = normalizedModel.range,
+      range = _normalizedModel$rang === void 0 ? {} : _normalizedModel$rang,
+      standardGrid = normalizedModel.standardGrid,
+      toolbarTools = normalizedModel.toolbarTools; // added support for models without defaultTool defined; also used in packages/graphing/controller/src/index.js
+
+  var toolbarToolsNoLabel = (toolbarTools || []).filter(function (tool) {
+    return tool !== 'label';
+  });
+  var normalizedDefaultTool = defaultTool || toolbarToolsNoLabel.length && toolbarToolsNoLabel[0] || '';
+  return _objectSpread(_objectSpread({}, normalizedModel), {}, {
+    answers: answers && answers.correctAnswer && _objectSpread({
+      correctAnswer: answers.correctAnswer
+    }, sortedAnswers(answers)) || answers,
+    defaultTool: normalizedDefaultTool,
+    range: standardGrid && _objectSpread(_objectSpread({}, range), {}, {
+      min: domain.min,
+      max: domain.max,
+      step: domain.step,
+      labelStep: domain.labelStep
+    }) || range,
+    graph: standardGrid && _objectSpread(_objectSpread({}, graph), {}, {
+      height: graph.width
+    }) || graph
+  });
 });
 //# sourceMappingURL=index.js.map

package/configure/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.js"],"names":["log","sortedAnswers","answers","Object","keys","sort","reduce","result","key","GraphLinesConfigure","model","_model","_render","dispatchEvent","ModelUpdatedEvent","config","_configuration","handler","InsertImageEvent","src","done","DeleteImageEvent","createDefaultModel","defaultValues","configuration","m","c","el","React","createElement","Configure","onModelChanged","onConfigurationChanged","imageSupport","add","insertImage","onDeleteImage","ReactDOM","render","HTMLElement","hasOwnProperty","assign","correctAnswer"],"mappings":"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","sourcesContent":["import React from 'react';\nimport ReactDOM from 'react-dom';\nimport Configure from './configure';\nimport { DeleteImageEvent, InsertImageEvent, ModelUpdatedEvent } from '@pie-framework/pie-configure-events';\nimport debug from 'debug';\n\nimport defaultValues from './defaults';\n\nconst log = debug('pie-elements:graphing:configure');\nimport isEmpty from 'lodash/isEmpty';\n\n// this function is implemented in controller as well\nconst sortedAnswers = (answers) => {\n  answers = answers || {};\n\n  return Object.keys(answers).sort().reduce((result, key) => {\n    result[key] = answers[key];\n\n    return result;\n  }, {});\n};\n\nexport default class GraphLinesConfigure extends HTMLElement {\n  static createDefaultModel = (model = {}) => {\n    \n    if (!isEmpty(model.answers) && model.answers.hasOwnProperty('correctAnswer')) {\n        model.answers = Object.assign({ correctAnswer: model.answers.correctAnswer }, sortedAnswers(model.answers));\n    }\n\n    return { ...defaultValues.model, ...model }\n  };\n\n  constructor() {\n    super();\n    this._model = GraphLinesConfigure.createDefaultModel();\n    this._configuration = defaultValues.configuration;\n  }\n\n  set model(m) {\n    this._model = GraphLinesConfigure.createDefaultModel(m);\n    this._render();\n  }\n\n  set configuration(c) {\n    this._configuration = c;\n    this._render();\n  }\n\n  onModelChanged = (model) => {\n    this._model = model;\n    this._render();\n\n    log('[onModelChanged]: ', this._model);\n\n    this.dispatchEvent(new ModelUpdatedEvent(this._model, true));\n  };\n\n  onConfigurationChanged = (config) => {\n    this._configuration = config;\n    this._render();\n  };\n\n  insertImage = (handler) => {\n    this.dispatchEvent(new InsertImageEvent(handler));\n  };\n\n  onDeleteImage = (src, done) => {\n    this.dispatchEvent(new DeleteImageEvent(src, done));\n  };\n\n  _render() {\n    if (this._model) {\n      const el = React.createElement(Configure, {\n        onModelChanged: this.onModelChanged,\n        onConfigurationChanged: this.onConfigurationChanged,\n        model: this._model,\n        configuration: this._configuration,\n        imageSupport: {\n          add: this.insertImage,\n          delete: this.onDeleteImage,\n        }\n      });\n      ReactDOM.render(el, this);\n    }\n  }\n}\n"],"file":"index.js"}
+{"version":3,"sources":["../src/index.js"],"names":["log","sortedAnswers","answers","Object","keys","sort","reduce","result","key","GraphLinesConfigure","model","_model","_render","dispatchEvent","ModelUpdatedEvent","config","_configuration","handler","InsertImageEvent","src","done","DeleteImageEvent","createDefaultModel","defaultValues","configuration","m","c","InsertSoundEvent","DeleteSoundEvent","el","React","createElement","Configure","onModelChanged","onConfigurationChanged","imageSupport","add","insertImage","onDeleteImage","uploadSoundSupport","insertSound","bind","onDeleteSound","ReactDOM","render","HTMLElement","normalizedModel","domain","defaultTool","graph","range","standardGrid","toolbarTools","toolbarToolsNoLabel","filter","tool","normalizedDefaultTool","length","correctAnswer","min","max","step","labelStep","height","width"],"mappings":"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","sourcesContent":["import React from 'react';\nimport ReactDOM from 'react-dom';\nimport Configure from './configure';\nimport {\n  ModelUpdatedEvent,\n  DeleteImageEvent,\n  InsertImageEvent,\n  InsertSoundEvent,\n  DeleteSoundEvent\n} from '@pie-framework/pie-configure-events';\nimport debug from 'debug';\nimport defaultValues from './defaults';\nimport { renderMath } from '@pie-lib/math-rendering';\n\nconst log = debug('pie-elements:graphing:configure');\n\n// this function is implemented in controller as well\nconst sortedAnswers = answers => Object.keys(answers || {}).sort().reduce((result, key) => {\n  if (key !== 'correctAnswer') {\n    result[key] = answers[key];\n  }\n\n  return result;\n}, {});\n\nexport default class GraphLinesConfigure extends HTMLElement {\n  static createDefaultModel = (model = {}) => {\n    const normalizedModel = { ...defaultValues.model, ...model };\n    const {\n      answers = {},\n      domain = {},\n      defaultTool,\n      graph = {},\n      range = {},\n      standardGrid,\n      toolbarTools\n    } = normalizedModel;\n\n    // added support for models without defaultTool defined; also used in packages/graphing/controller/src/index.js\n    const toolbarToolsNoLabel = (toolbarTools || []).filter(tool => tool !== 'label');\n    const normalizedDefaultTool = defaultTool || toolbarToolsNoLabel.length && toolbarToolsNoLabel[0] || '';\n\n    return {\n      ...normalizedModel,\n      answers: answers && answers.correctAnswer && {\n        correctAnswer: answers.correctAnswer,\n        ...sortedAnswers(answers)\n      } || answers,\n      defaultTool: normalizedDefaultTool,\n      range: standardGrid && {\n        ...range,\n        min: domain.min,\n        max: domain.max,\n        step: domain.step,\n        labelStep: domain.labelStep\n      } || range,\n      graph: standardGrid && { ...graph, height: graph.width } || graph\n    };\n  };\n\n  constructor() {\n    super();\n    this._model = GraphLinesConfigure.createDefaultModel();\n    this._configuration = defaultValues.configuration;\n  }\n\n  set model(m) {\n    this._model = GraphLinesConfigure.createDefaultModel(m);\n    this._render();\n  }\n\n  set configuration(c) {\n    this._configuration = c;\n    this._render();\n  }\n\n  onModelChanged = (model) => {\n    this._model = model;\n    this._render();\n\n    log('[onModelChanged]: ', this._model);\n\n    this.dispatchEvent(new ModelUpdatedEvent(this._model));\n  };\n\n  onConfigurationChanged = (config) => {\n    this._configuration = config;\n    this._render();\n  };\n\n  insertImage = (handler) => {\n    this.dispatchEvent(new InsertImageEvent(handler));\n  };\n\n  onDeleteImage = (src, done) => {\n    this.dispatchEvent(new DeleteImageEvent(src, done));\n  };\n\n  insertSound(handler) {\n    this.dispatchEvent(new InsertSoundEvent(handler));\n  }\n\n  onDeleteSound(src, done) {\n    this.dispatchEvent(new DeleteSoundEvent(src, done));\n  }\n\n  _render() {\n    if (this._model) {\n      const el = React.createElement(Configure, {\n        onModelChanged: this.onModelChanged,\n        onConfigurationChanged: this.onConfigurationChanged,\n        model: this._model,\n        configuration: this._configuration,\n        imageSupport: {\n          add: this.insertImage,\n          delete: this.onDeleteImage,\n        },\n        uploadSoundSupport: {\n          add: this.insertSound.bind(this),\n          delete: this.onDeleteSound.bind(this)\n        }\n      });\n\n      ReactDOM.render(el, this, () => {\n        renderMath(this);\n      });\n    }\n  }\n}\n"],"file":"index.js"}

package/configure/lib/utils.js

@@ -0,0 +1,94 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getLabelValues = exports.getGridValues = exports.applyConstraints = exports.VALID_LABEL_VALUES = void 0;
+
+var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
+
+var VALID_GRID_VALUES = [0.01, 0.02, 0.04, 0.05, 0.0625, 0.1, 0.125, 0.2, 0.25, 0.5, 1, 2, 3, 4, 5, 8, 10, 12, 15, 20, 40, 50, 64, 100, 500, 1000]; // same as VALID_GRID_VALUES but next values are excluded: 0.04, 0.0625, 0.125, 3, 4, 8, 12, 15, 40, 64
+
+var PREFERRED_VALID_GRID_VALUES = [0.01, 0.02, 0.05, 0.1, 0.2, 0.25, 0.5, 1, 2, 5, 10, 20, 50, 100, 500, 1000];
+var VALID_LABEL_VALUES = {
+  '0.01': [0, 0.01, 0.02, 0.04, 0.05, 0.1],
+  '0.02': [0, 0.02, 0.04, 0.1],
+  '0.04': [0, 0.04, 0.08, 0.16, 0.2],
+  '0.05': [0, 0.05, 0.1, 0.2, 0.25],
+  '0.0625': [0, 0.0625, 0.125, 0.25, 0.5],
+  '0.1': [0, 0.1, 0.2, 0.4, 0.5, 1],
+  '0.125': [0, 0.125, 0.25, 0.5, 1],
+  '0.2': [0, 0.2, 0.5, 0.1],
+  '0.25': [0, 0.25, 0.5, 1, 2],
+  '0.5': [0, 0.5, 1, 2],
+  '1': [0, 1, 2, 4, 5, 10],
+  '2': [0, 2, 4, 8, 10],
+  '3': [0, 3, 6, 12, 15],
+  '4': [0, 4, 8, 16, 20],
+  '5': [0, 5, 10, 20, 25],
+  '8': [0, 8, 16, 32, 40, 64],
+  '10': [0, 10, 20, 40, 50, 100],
+  '12': [0, 12, 24],
+  '15': [0, 15, 30, 60],
+  '20': [0, 20, 40, 80, 100],
+  '40': [0, 40, 80, 160, 200],
+  '50': [0, 50, 100, 200, 250],
+  '64': [0, 64, 128],
+  '100': [0, 100, 200, 400, 500],
+  '500': [0, 500, 1000, 2500],
+  '1000': [0, 1000, 2000, 4000, 5000]
+};
+exports.VALID_LABEL_VALUES = VALID_LABEL_VALUES;
+
+var getGridValues = function getGridValues(axis, size) {
+  var prefferedValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var minValue = 10 * (axis.max - axis.min) / size;
+  var maxValue = minValue * 10;
+  var values = prefferedValues ? PREFERRED_VALID_GRID_VALUES : VALID_GRID_VALUES;
+  return values.filter(function (value) {
+    return value >= minValue && value <= maxValue;
+  });
+};
+
+exports.getGridValues = getGridValues;
+
+var getLabelValues = function getLabelValues(value) {
+  return VALID_LABEL_VALUES[value] || [];
+};
+
+exports.getLabelValues = getLabelValues;
+
+var applyConstraints = function applyConstraints(axis, size, oldGridValues, oldLabelValues) {
+  var gridValues = getGridValues(axis, size);
+  var labelValues = getLabelValues(axis.step);
+
+  if (!(0, _isEqual["default"])(oldGridValues, gridValues) && !gridValues.includes(axis.step)) {
+    var preferredValues = getGridValues(axis, size, true);
+    var lowestValue = preferredValues[0] || 1;
+    axis.step = lowestValue;
+    labelValues = getLabelValues(lowestValue);
+
+    if (!labelValues.includes(axis.labelStep)) {
+      axis.labelStep = lowestValue;
+    }
+
+    return {
+      gridValues: gridValues,
+      labelValues: labelValues
+    };
+  }
+
+  if (!(0, _isEqual["default"])(oldLabelValues, labelValues) && !labelValues.includes(axis.labelStep)) {
+    axis.labelStep = axis.step;
+  }
+
+  return {
+    gridValues: gridValues,
+    labelValues: labelValues
+  };
+};
+
+exports.applyConstraints = applyConstraints;
+//# sourceMappingURL=utils.js.map

package/configure/lib/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/utils.js"],"names":["VALID_GRID_VALUES","PREFERRED_VALID_GRID_VALUES","VALID_LABEL_VALUES","getGridValues","axis","size","prefferedValues","minValue","max","min","maxValue","values","filter","value","getLabelValues","applyConstraints","oldGridValues","oldLabelValues","gridValues","labelValues","step","includes","preferredValues","lowestValue","labelStep"],"mappings":"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","sourcesContent":["import isEqual from 'lodash/isEqual';\n\nconst VALID_GRID_VALUES = [\n  0.01, 0.02, 0.04, 0.05, 0.0625, 0.1, 0.125, 0.2, 0.25, 0.5,\n  1, 2, 3, 4, 5, 8, 10, 12, 15, 20, 40, 50, 64, 100, 500, 1000\n];\n\n// same as VALID_GRID_VALUES but next values are excluded: 0.04, 0.0625, 0.125, 3, 4, 8, 12, 15, 40, 64\nconst PREFERRED_VALID_GRID_VALUES = [ 0.01, 0.02, 0.05, 0.1, 0.2, 0.25, 0.5, 1, 2, 5, 10, 20, 50, 100, 500, 1000 ];\n\nexport const VALID_LABEL_VALUES = {\n  '0.01': [0, 0.01, 0.02, 0.04, 0.05, 0.1],\n  '0.02': [0, 0.02, 0.04, 0.1],\n  '0.04': [0, 0.04, 0.08, 0.16, 0.2],\n  '0.05': [0, 0.05, 0.1, 0.2, 0.25],\n  '0.0625': [0, 0.0625, 0.125, 0.25, 0.5],\n  '0.1': [0, 0.1, 0.2, 0.4, 0.5, 1],\n  '0.125': [0, 0.125, 0.25, 0.5, 1],\n  '0.2': [0, 0.2, 0.5, 0.1],\n  '0.25': [0, 0.25, 0.5, 1, 2],\n  '0.5': [0, 0.5, 1, 2],\n  '1': [0, 1, 2, 4, 5, 10],\n  '2': [0, 2, 4, 8, 10],\n  '3': [0, 3, 6, 12, 15],\n  '4': [0, 4, 8, 16, 20],\n  '5': [0, 5, 10, 20, 25],\n  '8': [0, 8, 16, 32, 40, 64],\n  '10': [0, 10, 20, 40, 50, 100],\n  '12': [0, 12, 24],\n  '15': [0, 15, 30, 60],\n  '20': [0, 20, 40, 80, 100],\n  '40': [0, 40, 80, 160, 200],\n  '50': [0, 50, 100, 200, 250],\n  '64': [0, 64, 128],\n  '100': [0, 100, 200, 400, 500],\n  '500': [0, 500, 1000, 2500],\n  '1000': [0, 1000, 2000, 4000, 5000]\n};\n\nexport const getGridValues = (axis, size, prefferedValues = false) => {\n  const minValue = 10 * (axis.max - axis.min) / size;\n  const maxValue = minValue * 10;\n  const values = prefferedValues ? PREFERRED_VALID_GRID_VALUES : VALID_GRID_VALUES;\n\n  return values.filter(value => value >= minValue && value <= maxValue);\n};\n\nexport const getLabelValues = value => VALID_LABEL_VALUES[value] || [];\n\nexport const applyConstraints = (axis, size, oldGridValues, oldLabelValues) => {\n  const gridValues = getGridValues(axis, size);\n  let labelValues = getLabelValues(axis.step);\n\n  if (!isEqual(oldGridValues, gridValues) && !gridValues.includes(axis.step)) {\n    const preferredValues = getGridValues(axis, size, true);\n    const lowestValue = preferredValues[0] || 1;\n\n    axis.step = lowestValue;\n    labelValues = getLabelValues(lowestValue);\n\n    if (!labelValues.includes(axis.labelStep)) {\n      axis.labelStep = lowestValue;\n    }\n\n    return { gridValues, labelValues };\n  }\n\n  if (!isEqual(oldLabelValues, labelValues) && !labelValues.includes(axis.labelStep)) {\n    axis.labelStep = axis.step;\n  }\n\n  return { gridValues, labelValues };\n};\n"],"file":"utils.js"}

package/configure/package.json

@@ -1,17 +1,18 @@
 {
   "name": "@pie-element/graphing-configure",
   "private": true,
-  "version": "3.1.25",
+  "version": "4.1.0",
   "description": "",
   "main": "lib/index.js",
   "module": "src/index.js",
   "author": "",
   "dependencies": {
     "@material-ui/core": "^3.9.2",
-    "@pie-framework/pie-configure-events": "^1.2.0",
-    "@pie-lib/config-ui": "^10.10.2",
-    "@pie-lib/editable-html": "^7.17.2",
-    "@pie-lib/graphing": "^2.4.1",
+    "@pie-framework/pie-configure-events": "^1.3.0",
+    "@pie-lib/config-ui": "^11.0.20",
+    "@pie-lib/editable-html": "^9.2.2",
+    "@pie-lib/graphing": "^2.11.2",
+    "@pie-lib/math-rendering": "^2.5.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "prop-types": "^15.6.2",

package/controller/CHANGELOG.md

@@ -3,6 +3,90 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing-controller@3.4.6...@pie-element/graphing-controller@4.0.0) (2022-06-28)
+
+
+### chore
+
+* Merge master with develop. ([cdca48a](https://github.com/pie-framework/pie-elements/commit/cdca48abaa1d4179e4a961e13d171e14b7ed2444))
+
+
+### BREAKING CHANGES
+
+* Image percent buttons were removed from toolbar.
+New properties maxImageWidth and maxImageHeight were added.
+
+
+
+
+
+## [3.4.6](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing-controller@3.4.5...@pie-element/graphing-controller@3.4.6) (2022-06-13)
+
+**Note:** Version bump only for package @pie-element/graphing-controller
+
+
+
+
+
+## [3.4.5](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing-controller@3.4.4...@pie-element/graphing-controller@3.4.5) (2022-02-21)
+
+**Note:** Version bump only for package @pie-element/graphing-controller
+
+
+
+
+
+## [3.4.1](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing-controller@3.3.0...@pie-element/graphing-controller@3.4.1) (2021-11-11)
+
+**Note:** Version bump only for package @pie-element/graphing-controller
+
+
+
+
+
+# [3.4.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing-controller@3.2.16...@pie-element/graphing-controller@3.4.0) (2021-11-11)
+
+
+### Features
+
+* **graphing:** control over displaying graph arrows PD-483 ([6f98639](https://github.com/pie-framework/pie-elements/commit/6f98639b4bcce0e7ce75f28435c6fe1c8db8a4d4))
+* **graphing:** Displayed point coordinates on hover PD-188 \n BREAKING CHANGE: Added coordinatesOnHover property to the model ([124cc2d](https://github.com/pie-framework/pie-elements/commit/124cc2de418fbdd1825c6c39eee550875a3e24af))
+
+
+
+
+
+# [3.3.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing-controller@3.2.16...@pie-element/graphing-controller@3.3.0) (2021-08-05)
+
+
+### Features
+
+* **graphing:** control over displaying graph arrows PD-483 ([6f98639](https://github.com/pie-framework/pie-elements/commit/6f98639b4bcce0e7ce75f28435c6fe1c8db8a4d4))
+* **graphing:** Displayed point coordinates on hover PD-188 \n BREAKING CHANGE: Added coordinatesOnHover property to the model ([124cc2d](https://github.com/pie-framework/pie-elements/commit/124cc2de418fbdd1825c6c39eee550875a3e24af))
+
+
+
+
+
+## [3.2.16](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing-controller@3.2.14...@pie-element/graphing-controller@3.2.16) (2021-08-05)
+
+
+### Bug Fixes
+
+* force bump ([5ea7295](https://github.com/pie-framework/pie-elements/commit/5ea7295e4755fbc492a76e7ec69e5fc35b196919))
+
+
+
+
+
+## [3.2.14](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing-controller@3.2.13...@pie-element/graphing-controller@3.2.14) (2021-06-29)
+
+**Note:** Version bump only for package @pie-element/graphing-controller
+
+
+
+
+
 ## [3.2.13](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing-controller@3.2.10...@pie-element/graphing-controller@3.2.13) (2021-03-03)
 
 **Note:** Version bump only for package @pie-element/graphing-controller

package/controller/lib/defaults.js

@@ -28,7 +28,9 @@ var _default = {
     width: 500,
     height: 500
   },
+  includeAxes: true,
   labels: {},
+  labelsEnabled: true,
   coordinatesOnHover: false,
   padding: true,
   prompt: '',
@@ -40,7 +42,9 @@ var _default = {
     axisLabel: 'y'
   },
   rationale: '',
+  standardGrid: false,
   title: '',
+  titleEnabled: true,
   toolbarTools: allTools,
   promptEnabled: true,
   rationaleEnabled: true,

package/controller/lib/defaults.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/defaults.js"],"names":["allTools","answers","arrows","left","right","up","down","backgroundMarks","domain","min","max","step","labelStep","axisLabel","graph","width","height","labels","coordinatesOnHover","padding","prompt","range","rationale","title","toolbarTools","promptEnabled","rationaleEnabled","teacherInstructionsEnabled","studentInstructionsEnabled"],"mappings":";;;;;;AAAA;AACA,IAAMA,QAAQ,GAAG,CACf,QADe,EAEf,MAFe,EAGf,OAHe,EAIf,UAJe,EAKf,OALe,EAMf,SANe,EAOf,KAPe,EAQf,SARe,EASf,MATe,EAUf,QAVe,CAAjB;AAYA;;eACe;AACbC,EAAAA,OAAO,EAAE,EADI;AAEbC,EAAAA,MAAM,EAAE;AACNC,IAAAA,IAAI,EAAE,IADA;AAENC,IAAAA,KAAK,EAAE,IAFD;AAGNC,IAAAA,EAAE,EAAE,IAHE;AAINC,IAAAA,IAAI,EAAE;AAJA,GAFK;AAQbC,EAAAA,eAAe,EAAE,EARJ;AASbC,EAAAA,MAAM,EAAE;AACNC,IAAAA,GAAG,EAAE,CAAC,CADA;AAENC,IAAAA,GAAG,EAAE,CAFC;AAGNC,IAAAA,IAAI,EAAE,CAHA;AAINC,IAAAA,SAAS,EAAE,CAJL;AAKNC,IAAAA,SAAS,EAAE;AALL,GATK;AAgBbC,EAAAA,KAAK,EAAE;AACLC,IAAAA,KAAK,EAAE,GADF;AAELC,IAAAA,MAAM,EAAE;AAFH,GAhBM;AAoBbC,EAAAA,MAAM,EAAE,EApBK;AAqBbC,EAAAA,kBAAkB,EAAE,KArBP;AAsBbC,EAAAA,OAAO,EAAE,IAtBI;AAuBbC,EAAAA,MAAM,EAAE,EAvBK;AAwBbC,EAAAA,KAAK,EAAE;AACLZ,IAAAA,GAAG,EAAE,CAAC,CADD;AAELC,IAAAA,GAAG,EAAE,CAFA;AAGLC,IAAAA,IAAI,EAAE,CAHD;AAILC,IAAAA,SAAS,EAAE,CAJN;AAKLC,IAAAA,SAAS,EAAE;AALN,GAxBM;AA+BbS,EAAAA,SAAS,EAAE,EA/BE;AAgCbC,EAAAA,KAAK,EAAE,EAhCM;AAiCbC,EAAAA,YAAY,EAAExB,QAjCD;AAkCbyB,EAAAA,aAAa,EAAE,IAlCF;AAmCbC,EAAAA,gBAAgB,EAAE,IAnCL;AAoCbC,EAAAA,0BAA0B,EAAE,IApCf;AAqCbC,EAAAA,0BAA0B,EAAE;AArCf,C","sourcesContent":["// TODO: This is lifted from @pie-lib/graphing, however importing this will break a controller build because it has jsx source in that package.\nconst allTools = [\n  'circle',\n  'line',\n  'label',\n  'parabola',\n  'point',\n  'polygon',\n  'ray',\n  'segment',\n  'sine',\n  'vector'];\n\n/* model defaults */\nexport default {\n  answers: {},\n  arrows: {\n    left: true,\n    right: true,\n    up: true,\n    down: true\n  },\n  backgroundMarks: [],\n  domain: {\n    min: -5,\n    max: 5,\n    step: 1,\n    labelStep: 1,\n    axisLabel: 'x'\n  },\n  graph: {\n    width: 500,\n    height: 500\n  },\n  labels: {},\n  coordinatesOnHover: false,\n  padding: true,\n  prompt: '',\n  range: {\n    min: -5,\n    max: 5,\n    step: 1,\n    labelStep: 1,\n    axisLabel: 'y'\n  },\n  rationale: '',\n  title: '',\n  toolbarTools: allTools,\n  promptEnabled: true,\n  rationaleEnabled: true,\n  teacherInstructionsEnabled: true,\n  studentInstructionsEnabled: true\n};\n"],"file":"defaults.js"}
+{"version":3,"sources":["../src/defaults.js"],"names":["allTools","answers","arrows","left","right","up","down","backgroundMarks","domain","min","max","step","labelStep","axisLabel","graph","width","height","includeAxes","labels","labelsEnabled","coordinatesOnHover","padding","prompt","range","rationale","standardGrid","title","titleEnabled","toolbarTools","promptEnabled","rationaleEnabled","teacherInstructionsEnabled","studentInstructionsEnabled"],"mappings":";;;;;;AAAA;AACA,IAAMA,QAAQ,GAAG,CACf,QADe,EAEf,MAFe,EAGf,OAHe,EAIf,UAJe,EAKf,OALe,EAMf,SANe,EAOf,KAPe,EAQf,SARe,EASf,MATe,EAUf,QAVe,CAAjB;AAaA;;eACe;AACbC,EAAAA,OAAO,EAAE,EADI;AAEbC,EAAAA,MAAM,EAAE;AACNC,IAAAA,IAAI,EAAE,IADA;AAENC,IAAAA,KAAK,EAAE,IAFD;AAGNC,IAAAA,EAAE,EAAE,IAHE;AAINC,IAAAA,IAAI,EAAE;AAJA,GAFK;AAQbC,EAAAA,eAAe,EAAE,EARJ;AASbC,EAAAA,MAAM,EAAE;AACNC,IAAAA,GAAG,EAAE,CAAC,CADA;AAENC,IAAAA,GAAG,EAAE,CAFC;AAGNC,IAAAA,IAAI,EAAE,CAHA;AAINC,IAAAA,SAAS,EAAE,CAJL;AAKNC,IAAAA,SAAS,EAAE;AALL,GATK;AAgBbC,EAAAA,KAAK,EAAE;AACLC,IAAAA,KAAK,EAAE,GADF;AAELC,IAAAA,MAAM,EAAE;AAFH,GAhBM;AAoBbC,EAAAA,WAAW,EAAE,IApBA;AAqBbC,EAAAA,MAAM,EAAE,EArBK;AAsBbC,EAAAA,aAAa,EAAE,IAtBF;AAuBbC,EAAAA,kBAAkB,EAAE,KAvBP;AAwBbC,EAAAA,OAAO,EAAE,IAxBI;AAyBbC,EAAAA,MAAM,EAAE,EAzBK;AA0BbC,EAAAA,KAAK,EAAE;AACLd,IAAAA,GAAG,EAAE,CAAC,CADD;AAELC,IAAAA,GAAG,EAAE,CAFA;AAGLC,IAAAA,IAAI,EAAE,CAHD;AAILC,IAAAA,SAAS,EAAE,CAJN;AAKLC,IAAAA,SAAS,EAAE;AALN,GA1BM;AAiCbW,EAAAA,SAAS,EAAE,EAjCE;AAkCbC,EAAAA,YAAY,EAAE,KAlCD;AAmCbC,EAAAA,KAAK,EAAE,EAnCM;AAoCbC,EAAAA,YAAY,EAAE,IApCD;AAqCbC,EAAAA,YAAY,EAAE5B,QArCD;AAsCb6B,EAAAA,aAAa,EAAE,IAtCF;AAuCbC,EAAAA,gBAAgB,EAAE,IAvCL;AAwCbC,EAAAA,0BAA0B,EAAE,IAxCf;AAyCbC,EAAAA,0BAA0B,EAAE;AAzCf,C","sourcesContent":["// TODO: This is lifted from @pie-lib/graphing, however importing this will break a controller build because it has jsx source in that package.\nconst allTools = [\n  'circle',\n  'line',\n  'label',\n  'parabola',\n  'point',\n  'polygon',\n  'ray',\n  'segment',\n  'sine',\n  'vector'\n];\n\n/* model defaults */\nexport default {\n  answers: {},\n  arrows: {\n    left: true,\n    right: true,\n    up: true,\n    down: true\n  },\n  backgroundMarks: [],\n  domain: {\n    min: -5,\n    max: 5,\n    step: 1,\n    labelStep: 1,\n    axisLabel: 'x'\n  },\n  graph: {\n    width: 500,\n    height: 500\n  },\n  includeAxes: true,\n  labels: {},\n  labelsEnabled: true,\n  coordinatesOnHover: false,\n  padding: true,\n  prompt: '',\n  range: {\n    min: -5,\n    max: 5,\n    step: 1,\n    labelStep: 1,\n    axisLabel: 'y'\n  },\n  rationale: '',\n  standardGrid: false,\n  title: '',\n  titleEnabled: true,\n  toolbarTools: allTools,\n  promptEnabled: true,\n  rationaleEnabled: true,\n  teacherInstructionsEnabled: true,\n  studentInstructionsEnabled: true\n};\n"],"file":"defaults.js"}

package/controller/lib/index.js

@@ -5,9 +5,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.getBestAnswer = exports.getAnswerCorrected = exports.createCorrectResponseSession = exports.compareMarks = void 0;
 exports.model = model;
+exports.normalize = void 0;
 exports.outcome = outcome;
-exports.createCorrectResponseSession = exports.normalize = exports.getBestAnswer = exports.orderCorrectAnswers = exports.getAnswerCorrected = exports.compareMarks = void 0;
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
@@ -29,9 +30,11 @@ var _utils = require("./utils");
 
 var _controllerUtils = require("@pie-lib/controller-utils");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+var _excluded = ["defaultTool", "prompt", "promptEnabled", "graph", "answers", "toolbarTools"];
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 var log = (0, _debug["default"])('@pie-element:graphing:controller');
 
@@ -89,26 +92,13 @@ var getPartialScoring = function getPartialScoring(_ref2) {
   }, env);
 };
 
-var orderCorrectAnswers = function orderCorrectAnswers(questionPossibleAnswers) {
-  questionPossibleAnswers = questionPossibleAnswers || {};
-
-  if (!questionPossibleAnswers.hasOwnProperty('correctAnswer')) {
-    (0, _utils.sortedAnswers)(questionPossibleAnswers);
-  }
-
-  return Object.assign({
-    correctAnswer: questionPossibleAnswers.correctAnswer
-  }, (0, _utils.sortedAnswers)(questionPossibleAnswers));
-};
-
-exports.orderCorrectAnswers = orderCorrectAnswers;
-
 var getBestAnswer = function getBestAnswer(question, session) {
   var env = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
 
   // questionPossibleAnswers contains all possible answers (correct response and alternates);
   var _ref3 = question || {},
-      questionPossibleAnswers = _ref3.answers,
+      _ref3$answers = _ref3.answers,
+      questionPossibleAnswers = _ref3$answers === void 0 ? {} : _ref3$answers,
       scoringType = _ref3.scoringType;
 
   var _ref4 = session || {},
@@ -122,7 +112,9 @@ var getBestAnswer = function getBestAnswer(question, session) {
       correctAnswer: initializeGraphMap()
     };
   } else {
-    orderCorrectAnswers(questionPossibleAnswers);
+    questionPossibleAnswers = _objectSpread({
+      correctAnswer: questionPossibleAnswers.correctAnswer
+    }, (0, _utils.sortedAnswers)(questionPossibleAnswers));
   }
 
   var partialScoringEnabled = getPartialScoring({
@@ -201,11 +193,13 @@ function model(question, session, env) {
     var normalizedQuestion = normalize(question);
 
     var _ref5 = normalizedQuestion || {},
+        defaultTool = _ref5.defaultTool,
         prompt = _ref5.prompt,
         promptEnabled = _ref5.promptEnabled,
         graph = _ref5.graph,
         answers = _ref5.answers,
-        questionProps = (0, _objectWithoutProperties2["default"])(_ref5, ["prompt", "promptEnabled", "graph", "answers"]);
+        toolbarTools = _ref5.toolbarTools,
+        questionProps = (0, _objectWithoutProperties2["default"])(_ref5, _excluded);
 
     var arrows = normalizedQuestion.arrows;
 
@@ -231,17 +225,25 @@ function model(question, session, env) {
           down: false
         };
       }
-    }
+    } // added support for models without defaultTool defined; also used in packages/graphing/configure/src/index.js
+
+
+    var toolbarToolsNoLabel = (toolbarTools || []).filter(function (tool) {
+      return tool !== 'label';
+    });
+    var normalizedDefaultTool = defaultTool || toolbarToolsNoLabel.length && toolbarToolsNoLabel[0] || '';
 
     var base = _objectSpread(_objectSpread({}, questionProps), {}, {
       answers: answers,
+      arrows: arrows,
+      defaultTool: normalizedDefaultTool,
       disabled: env.mode !== 'gather',
       prompt: promptEnabled ? prompt : null,
       rationale: null,
       size: graph,
       showToggle: env.mode === 'evaluate' && !(0, _isEmpty["default"])(answers),
       teacherInstructions: null,
-      arrows: arrows
+      toolbarTools: toolbarTools
     });
 
     if (role === 'instructor' && (mode === 'view' || mode === 'evaluate')) {
@@ -267,7 +269,7 @@ function model(question, session, env) {
         base.correctResponse = bestScoreAnswerKey ? (answers[bestScoreAnswerKey] || {}).marks : [];
         base.showToggle = base.showToggle && bestScore !== 1;
       } else {
-        base.answersCorrected = [];
+        base.answersCorrected = session && session.answer || [];
         base.correctResponse = [];
       }
     }