@pie-element/graphing 5.15.1-next.1 → 5.15.1-next.6

package/configure/lib/index.js

@@ -0,0 +1,232 @@
+"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 _wrapNativeSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/wrapNativeSuper"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _reactDom = _interopRequireDefault(require("react-dom"));
+
+var _configure = _interopRequireDefault(require("./configure"));
+
+var _pieConfigureEvents = require("@pie-framework/pie-configure-events");
+
+var _debug = _interopRequireDefault(require("debug"));
+
+var _defaults = _interopRequireDefault(require("./defaults"));
+
+var _mathRenderingAccessible = require("@pie-lib/pie-toolbox/math-rendering-accessible");
+
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
+
+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 log = (0, _debug["default"])('pie-elements:graphing:configure'); // this function is implemented in controller as well
+
+var sortedAnswers = function sortedAnswers(answers) {
+  return Object.keys(answers || {}).sort().reduce(function (result, key) {
+    if (key !== 'correctAnswer') {
+      result[key] = answers[key];
+    }
+
+    return result;
+  }, {});
+};
+
+var GraphLinesConfigure = /*#__PURE__*/function (_HTMLElement) {
+  (0, _inherits2["default"])(GraphLinesConfigure, _HTMLElement);
+
+  var _super = _createSuper(GraphLinesConfigure);
+
+  function GraphLinesConfigure() {
+    var _this;
+
+    (0, _classCallCheck2["default"])(this, GraphLinesConfigure);
+    _this = _super.call(this);
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "resetModelAfterConfigurationIsSet", function () {
+      // In environments that use pie-player-components, model is set before configuration.
+      // This is the reason why sometimes the model gets altered non-reversible
+      // (altered using default configuration instead of client configuration, because at that point client configuration was not set yet)
+      // Therefore, in such environments, we will make sure to keep a modelCopy (initialised in set model) and use it to reset
+      // the model in set configuration (resetModelAfterConfigurationIsSet) if set configuration is ever called
+      var pieAuthors = document.querySelectorAll('pie-author');
+      _this.hasPlayerAsParent = Array.from(pieAuthors).some(function (author) {
+        return author.contains((0, _assertThisInitialized2["default"])(_this));
+      });
+
+      if (_this.hasPlayerAsParent) {
+        if (_this._modelCopy) {
+          _this._model = _this._modelCopy;
+        } else {
+          delete _this._modelCopy;
+        }
+      }
+    });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onModelChanged", function (model) {
+      _this._model = model;
+
+      _this._render();
+
+      log('[onModelChanged]: ', _this._model);
+
+      _this.dispatchEvent(new _pieConfigureEvents.ModelUpdatedEvent(_this._model));
+    });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onConfigurationChanged", function (config) {
+      _this._configuration = config;
+
+      _this._render();
+    });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "insertImage", function (handler) {
+      _this.dispatchEvent(new _pieConfigureEvents.InsertImageEvent(handler));
+    });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onDeleteImage", function (src, done) {
+      _this.dispatchEvent(new _pieConfigureEvents.DeleteImageEvent(src, done));
+    });
+    _this._model = GraphLinesConfigure.createDefaultModel();
+    _this._configuration = _defaults["default"].configuration;
+    return _this;
+  }
+
+  (0, _createClass2["default"])(GraphLinesConfigure, [{
+    key: "model",
+    set: function set(m) {
+      this._model = GraphLinesConfigure.createDefaultModel(m);
+      this._modelCopy = (0, _cloneDeep["default"])(this._model);
+
+      this._render();
+    }
+  }, {
+    key: "configuration",
+    set: function set(c) {
+      var _c$language;
+
+      this._configuration = c;
+      this.resetModelAfterConfigurationIsSet(); // if language:enabled is true, then the corresponding default item model should include a language value;
+      // if it is false, then the language field should be omitted from the item model.
+      // if a default item model includes a language value (e.g., en_US) and the corresponding authoring view settings have language:settings = true,
+      // then (a) language:enabled should also be true, and (b) that default language value should be represented in languageChoices[] (as a key).
+      //TODO: add logic in controller and add tests
+
+      if ((_c$language = c.language) !== null && _c$language !== void 0 && _c$language.enabled) {
+        var _c$languageChoices, _c$languageChoices$op;
+
+        if ((_c$languageChoices = c.languageChoices) !== null && _c$languageChoices !== void 0 && (_c$languageChoices$op = _c$languageChoices.options) !== null && _c$languageChoices$op !== void 0 && _c$languageChoices$op.length) {
+          this._model.language = c.languageChoices.options[0].value;
+        }
+      } else {
+        if (c.language.settings) {
+          if (this._model.language) {
+            this._configuration.language.enabled = true;
+          }
+        } else {
+          delete this._model.language;
+        }
+      }
+
+      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,
+          onConfigurationChanged: this.onConfigurationChanged,
+          model: this._model,
+          configuration: this._configuration,
+          imageSupport: {
+            add: this.insertImage,
+            "delete": this.onDeleteImage
+          },
+          uploadSoundSupport: {
+            add: this.insertSound.bind(this),
+            "delete": this.onDeleteSound.bind(this)
+          }
+        });
+
+        _reactDom["default"].render(el, this, function () {
+          (0, _mathRenderingAccessible.renderMath)(_this2);
+        });
+      }
+    }
+  }]);
+  return GraphLinesConfigure;
+}( /*#__PURE__*/(0, _wrapNativeSuper2["default"])(HTMLElement));
+
+exports["default"] = GraphLinesConfigure;
+(0, _defineProperty2["default"])(GraphLinesConfigure, "createDefaultModel", function () {
+  var model = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+  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

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/index.js"],"names":["log","sortedAnswers","answers","Object","keys","sort","reduce","result","key","GraphLinesConfigure","pieAuthors","document","querySelectorAll","hasPlayerAsParent","Array","from","some","author","contains","_modelCopy","_model","model","_render","dispatchEvent","ModelUpdatedEvent","config","_configuration","handler","InsertImageEvent","src","done","DeleteImageEvent","createDefaultModel","defaultValues","configuration","m","c","resetModelAfterConfigurationIsSet","language","enabled","languageChoices","options","length","value","settings","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","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/pie-toolbox/math-rendering-accessible';\nimport cloneDeep from 'lodash/cloneDeep';\n\nconst log = debug('pie-elements:graphing:configure');\n\n// this function is implemented in controller as well\nconst sortedAnswers = (answers) =>\n  Object.keys(answers || {})\n    .sort()\n    .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:\n        (answers &&\n          answers.correctAnswer && {\n            correctAnswer: answers.correctAnswer,\n            ...sortedAnswers(answers),\n          }) ||\n        answers,\n      defaultTool: normalizedDefaultTool,\n      range:\n        (standardGrid && {\n          ...range,\n          min: domain.min,\n          max: domain.max,\n          step: domain.step,\n          labelStep: domain.labelStep,\n        }) ||\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._modelCopy = cloneDeep(this._model);\n\n    this._render();\n  }\n\n  resetModelAfterConfigurationIsSet = () => {\n    // In environments that use pie-player-components, model is set before configuration.\n    // This is the reason why sometimes the model gets altered non-reversible\n    // (altered using default configuration instead of client configuration, because at that point client configuration was not set yet)\n    // Therefore, in such environments, we will make sure to keep a modelCopy (initialised in set model) and use it to reset\n    // the model in set configuration (resetModelAfterConfigurationIsSet) if set configuration is ever called\n    const pieAuthors = document.querySelectorAll('pie-author');\n    this.hasPlayerAsParent = Array.from(pieAuthors).some(author => author.contains(this));\n\n    if (this.hasPlayerAsParent) {\n      if (this._modelCopy) {\n        this._model = this._modelCopy;\n      } else {\n        delete this._modelCopy;\n      }\n    }\n  }\n\n  set configuration(c) {\n    this._configuration = c;\n\n    this.resetModelAfterConfigurationIsSet();\n\n    // if language:enabled is true, then the corresponding default item model should include a language value;\n    // if it is false, then the language field should be omitted from the item model.\n    // if a default item model includes a language value (e.g., en_US) and the corresponding authoring view settings have language:settings = true,\n    // then (a) language:enabled should also be true, and (b) that default language value should be represented in languageChoices[] (as a key).\n    //TODO: add logic in controller and add tests\n    if (c.language?.enabled) {\n      if (c.languageChoices?.options?.length) {\n        this._model.language = c.languageChoices.options[0].value;\n      }\n    } else {\n      if (c.language.settings) {\n        if (this._model.language) {\n          this._configuration.language.enabled = true;\n        }\n      } else {\n        delete this._model.language;\n      }\n    }\n\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,168 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getLabelValues = exports.getGridValues = exports.filterPlotableMarks = exports.applyConstraints = exports.VALID_LABEL_VALUES = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
+
+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 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; // if preferred values should be used enforce all values to be used if the axis step
+  // is included in all supported values and not included in preferred values
+
+  var useAllValues = prefferedValues && !PREFERRED_VALID_GRID_VALUES.includes(axis.step) && VALID_GRID_VALUES.includes(axis.step);
+  var values = !prefferedValues || useAllValues ? VALID_GRID_VALUES : PREFERRED_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
+  };
+}; // also used in pie-lib/graphing/utils as 'getTickValues'
+
+
+exports.applyConstraints = applyConstraints;
+
+var getPlotablePoints = function getPlotablePoints(prop) {
+  var tickValues = [];
+  var tickVal = 0;
+
+  while (tickVal >= prop.min && tickValues.indexOf(tickVal) < 0) {
+    tickValues.push(tickVal);
+    tickVal = Math.round((tickVal - prop.step) * 10000) / 10000;
+  }
+
+  tickVal = Math.round(prop.step * 10000) / 10000;
+
+  while (tickVal <= prop.max && tickValues.indexOf(tickVal) < 0) {
+    tickValues.push(tickVal);
+    tickVal = Math.round((tickVal + prop.step) * 10000) / 10000;
+  } // return only ticks that are inside the min-max interval
+
+
+  if (tickValues) {
+    return tickValues.filter(function (tV) {
+      return tV >= prop.min && tV <= prop.max;
+    });
+  }
+
+  return [];
+};
+
+var filterPlotableMarks = function filterPlotableMarks(domain, range, answers) {
+  var domainValues = getPlotablePoints(domain);
+  var rangeValues = getPlotablePoints(range);
+
+  var isPointPlotable = function isPointPlotable(x, y) {
+    return domainValues.includes(x) && rangeValues.includes(y);
+  };
+
+  return Object.entries(answers || {}).reduce(function (newAnswers, _ref) {
+    var _ref2 = (0, _slicedToArray2["default"])(_ref, 2),
+        key = _ref2[0],
+        answer = _ref2[1];
+
+    newAnswers[key] = _objectSpread(_objectSpread({}, answer), {}, {
+      marks: (answer.marks || []).filter(function (mark) {
+        if (mark.type === 'point') {
+          return isPointPlotable(mark.x, mark.y);
+        }
+
+        if (mark.type === 'polygon') {
+          return !mark.points.find(function (point) {
+            return !isPointPlotable(point.x, point.y);
+          });
+        }
+
+        var from = mark.from || mark.root;
+        var to = mark.to || mark.edge;
+        return mark.building ? isPointPlotable(from.x, from.y) : isPointPlotable(from.x, from.y) && isPointPlotable(to.x, to.y);
+      })
+    });
+    return newAnswers;
+  }, {});
+};
+
+exports.filterPlotableMarks = filterPlotableMarks;
+//# 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","useAllValues","includes","step","values","filter","value","getLabelValues","applyConstraints","oldGridValues","oldLabelValues","gridValues","labelValues","preferredValues","lowestValue","labelStep","getPlotablePoints","prop","tickValues","tickVal","indexOf","push","Math","round","tV","filterPlotableMarks","domain","range","answers","domainValues","rangeValues","isPointPlotable","x","y","Object","entries","reduce","newAnswers","key","answer","marks","mark","type","points","find","point","from","root","to","edge","building"],"mappings":";;;;;;;;;;;;;AAAA;;;;;;AAEA,IAAMA,iBAAiB,GAAG,CACxB,IADwB,EAClB,IADkB,EACZ,IADY,EACN,IADM,EACA,MADA,EACQ,GADR,EACa,KADb,EACoB,GADpB,EACyB,IADzB,EAC+B,GAD/B,EACoC,CADpC,EACuC,CADvC,EAC0C,CAD1C,EAC6C,CAD7C,EACgD,CADhD,EACmD,CADnD,EACsD,EADtD,EAC0D,EAD1D,EAC8D,EAD9D,EACkE,EADlE,EACsE,EADtE,EAC0E,EAD1E,EAC8E,EAD9E,EACkF,GADlF,EACuF,GADvF,EAExB,IAFwB,CAA1B,C,CAKA;;AACA,IAAMC,2BAA2B,GAAG,CAAC,IAAD,EAAO,IAAP,EAAa,IAAb,EAAmB,GAAnB,EAAwB,GAAxB,EAA6B,IAA7B,EAAmC,GAAnC,EAAwC,CAAxC,EAA2C,CAA3C,EAA8C,CAA9C,EAAiD,EAAjD,EAAqD,EAArD,EAAyD,EAAzD,EAA6D,GAA7D,EAAkE,GAAlE,EAAuE,IAAvE,CAApC;AAEO,IAAMC,kBAAkB,GAAG;AAChC,QAAM,CAAC,CAAD,EAAI,IAAJ,EAAU,IAAV,EAAgB,IAAhB,EAAsB,IAAtB,EAA4B,GAA5B,CAD0B;AAEhC,QAAM,CAAC,CAAD,EAAI,IAAJ,EAAU,IAAV,EAAgB,GAAhB,CAF0B;AAGhC,QAAM,CAAC,CAAD,EAAI,IAAJ,EAAU,IAAV,EAAgB,IAAhB,EAAsB,GAAtB,CAH0B;AAIhC,QAAM,CAAC,CAAD,EAAI,IAAJ,EAAU,GAAV,EAAe,GAAf,EAAoB,IAApB,CAJ0B;AAKhC,UAAQ,CAAC,CAAD,EAAI,MAAJ,EAAY,KAAZ,EAAmB,IAAnB,EAAyB,GAAzB,CALwB;AAMhC,OAAK,CAAC,CAAD,EAAI,GAAJ,EAAS,GAAT,EAAc,GAAd,EAAmB,GAAnB,EAAwB,CAAxB,CAN2B;AAOhC,SAAO,CAAC,CAAD,EAAI,KAAJ,EAAW,IAAX,EAAiB,GAAjB,EAAsB,CAAtB,CAPyB;AAQhC,OAAK,CAAC,CAAD,EAAI,GAAJ,EAAS,GAAT,EAAc,GAAd,CAR2B;AAShC,QAAM,CAAC,CAAD,EAAI,IAAJ,EAAU,GAAV,EAAe,CAAf,EAAkB,CAAlB,CAT0B;AAUhC,OAAK,CAAC,CAAD,EAAI,GAAJ,EAAS,CAAT,EAAY,CAAZ,CAV2B;AAWhC,KAAG,CAAC,CAAD,EAAI,CAAJ,EAAO,CAAP,EAAU,CAAV,EAAa,CAAb,EAAgB,EAAhB,CAX6B;AAYhC,KAAG,CAAC,CAAD,EAAI,CAAJ,EAAO,CAAP,EAAU,CAAV,EAAa,EAAb,CAZ6B;AAahC,KAAG,CAAC,CAAD,EAAI,CAAJ,EAAO,CAAP,EAAU,EAAV,EAAc,EAAd,CAb6B;AAchC,KAAG,CAAC,CAAD,EAAI,CAAJ,EAAO,CAAP,EAAU,EAAV,EAAc,EAAd,CAd6B;AAehC,KAAG,CAAC,CAAD,EAAI,CAAJ,EAAO,EAAP,EAAW,EAAX,EAAe,EAAf,CAf6B;AAgBhC,KAAG,CAAC,CAAD,EAAI,CAAJ,EAAO,EAAP,EAAW,EAAX,EAAe,EAAf,EAAmB,EAAnB,CAhB6B;AAiBhC,MAAI,CAAC,CAAD,EAAI,EAAJ,EAAQ,EAAR,EAAY,EAAZ,EAAgB,EAAhB,EAAoB,GAApB,CAjB4B;AAkBhC,MAAI,CAAC,CAAD,EAAI,EAAJ,EAAQ,EAAR,CAlB4B;AAmBhC,MAAI,CAAC,CAAD,EAAI,EAAJ,EAAQ,EAAR,EAAY,EAAZ,CAnB4B;AAoBhC,MAAI,CAAC,CAAD,EAAI,EAAJ,EAAQ,EAAR,EAAY,EAAZ,EAAgB,GAAhB,CApB4B;AAqBhC,MAAI,CAAC,CAAD,EAAI,EAAJ,EAAQ,EAAR,EAAY,GAAZ,EAAiB,GAAjB,CArB4B;AAsBhC,MAAI,CAAC,CAAD,EAAI,EAAJ,EAAQ,GAAR,EAAa,GAAb,EAAkB,GAAlB,CAtB4B;AAuBhC,MAAI,CAAC,CAAD,EAAI,EAAJ,EAAQ,GAAR,CAvB4B;AAwBhC,OAAK,CAAC,CAAD,EAAI,GAAJ,EAAS,GAAT,EAAc,GAAd,EAAmB,GAAnB,CAxB2B;AAyBhC,OAAK,CAAC,CAAD,EAAI,GAAJ,EAAS,IAAT,EAAe,IAAf,CAzB2B;AA0BhC,QAAM,CAAC,CAAD,EAAI,IAAJ,EAAU,IAAV,EAAgB,IAAhB,EAAsB,IAAtB;AA1B0B,CAA3B;;;AA6BA,IAAMC,aAAa,GAAG,SAAhBA,aAAgB,CAACC,IAAD,EAAOC,IAAP,EAAyC;AAAA,MAA5BC,eAA4B,uEAAV,KAAU;AACpE,MAAMC,QAAQ,GAAI,MAAMH,IAAI,CAACI,GAAL,GAAWJ,IAAI,CAACK,GAAtB,CAAD,GAA+BJ,IAAhD;AACA,MAAMK,QAAQ,GAAGH,QAAQ,GAAG,EAA5B,CAFoE,CAIpE;AACA;;AACA,MAAMI,YAAY,GAChBL,eAAe,IAAI,CAACL,2BAA2B,CAACW,QAA5B,CAAqCR,IAAI,CAACS,IAA1C,CAApB,IAAuEb,iBAAiB,CAACY,QAAlB,CAA2BR,IAAI,CAACS,IAAhC,CADzE;AAEA,MAAMC,MAAM,GAAG,CAACR,eAAD,IAAoBK,YAApB,GAAmCX,iBAAnC,GAAuDC,2BAAtE;AAEA,SAAOa,MAAM,CAACC,MAAP,CAAc,UAACC,KAAD;AAAA,WAAWA,KAAK,IAAIT,QAAT,IAAqBS,KAAK,IAAIN,QAAzC;AAAA,GAAd,CAAP;AACD,CAXM;;;;AAaA,IAAMO,cAAc,GAAG,SAAjBA,cAAiB,CAACD,KAAD;AAAA,SAAWd,kBAAkB,CAACc,KAAD,CAAlB,IAA6B,EAAxC;AAAA,CAAvB;;;;AAEA,IAAME,gBAAgB,GAAG,SAAnBA,gBAAmB,CAACd,IAAD,EAAOC,IAAP,EAAac,aAAb,EAA4BC,cAA5B,EAA+C;AAC7E,MAAMC,UAAU,GAAGlB,aAAa,CAACC,IAAD,EAAOC,IAAP,CAAhC;AACA,MAAIiB,WAAW,GAAGL,cAAc,CAACb,IAAI,CAACS,IAAN,CAAhC;;AAEA,MAAI,CAAC,yBAAQM,aAAR,EAAuBE,UAAvB,CAAD,IAAuC,CAACA,UAAU,CAACT,QAAX,CAAoBR,IAAI,CAACS,IAAzB,CAA5C,EAA4E;AAC1E,QAAMU,eAAe,GAAGpB,aAAa,CAACC,IAAD,EAAOC,IAAP,EAAa,IAAb,CAArC;AACA,QAAMmB,WAAW,GAAGD,eAAe,CAAC,CAAD,CAAf,IAAsB,CAA1C;AAEAnB,IAAAA,IAAI,CAACS,IAAL,GAAYW,WAAZ;AACAF,IAAAA,WAAW,GAAGL,cAAc,CAACO,WAAD,CAA5B;;AAEA,QAAI,CAACF,WAAW,CAACV,QAAZ,CAAqBR,IAAI,CAACqB,SAA1B,CAAL,EAA2C;AACzCrB,MAAAA,IAAI,CAACqB,SAAL,GAAiBD,WAAjB;AACD;;AAED,WAAO;AAAEH,MAAAA,UAAU,EAAVA,UAAF;AAAcC,MAAAA,WAAW,EAAXA;AAAd,KAAP;AACD;;AAED,MAAI,CAAC,yBAAQF,cAAR,EAAwBE,WAAxB,CAAD,IAAyC,CAACA,WAAW,CAACV,QAAZ,CAAqBR,IAAI,CAACqB,SAA1B,CAA9C,EAAoF;AAClFrB,IAAAA,IAAI,CAACqB,SAAL,GAAiBrB,IAAI,CAACS,IAAtB;AACD;;AAED,SAAO;AAAEQ,IAAAA,UAAU,EAAVA,UAAF;AAAcC,IAAAA,WAAW,EAAXA;AAAd,GAAP;AACD,CAvBM,C,CAyBP;;;;;AACA,IAAMI,iBAAiB,GAAG,SAApBA,iBAAoB,CAACC,IAAD,EAAU;AAClC,MAAMC,UAAU,GAAG,EAAnB;AACA,MAAIC,OAAO,GAAG,CAAd;;AAEA,SAAOA,OAAO,IAAIF,IAAI,CAAClB,GAAhB,IAAuBmB,UAAU,CAACE,OAAX,CAAmBD,OAAnB,IAA8B,CAA5D,EAA+D;AAC7DD,IAAAA,UAAU,CAACG,IAAX,CAAgBF,OAAhB;AACAA,IAAAA,OAAO,GAAGG,IAAI,CAACC,KAAL,CAAW,CAACJ,OAAO,GAAGF,IAAI,CAACd,IAAhB,IAAwB,KAAnC,IAA4C,KAAtD;AACD;;AAEDgB,EAAAA,OAAO,GAAGG,IAAI,CAACC,KAAL,CAAWN,IAAI,CAACd,IAAL,GAAY,KAAvB,IAAgC,KAA1C;;AAEA,SAAOgB,OAAO,IAAIF,IAAI,CAACnB,GAAhB,IAAuBoB,UAAU,CAACE,OAAX,CAAmBD,OAAnB,IAA8B,CAA5D,EAA+D;AAC7DD,IAAAA,UAAU,CAACG,IAAX,CAAgBF,OAAhB;AACAA,IAAAA,OAAO,GAAGG,IAAI,CAACC,KAAL,CAAW,CAACJ,OAAO,GAAGF,IAAI,CAACd,IAAhB,IAAwB,KAAnC,IAA4C,KAAtD;AACD,GAdiC,CAgBlC;;;AACA,MAAIe,UAAJ,EAAgB;AACd,WAAOA,UAAU,CAACb,MAAX,CAAkB,UAACmB,EAAD;AAAA,aAAQA,EAAE,IAAIP,IAAI,CAAClB,GAAX,IAAkByB,EAAE,IAAIP,IAAI,CAACnB,GAArC;AAAA,KAAlB,CAAP;AACD;;AAED,SAAO,EAAP;AACD,CAtBD;;AAwBO,IAAM2B,mBAAmB,GAAG,SAAtBA,mBAAsB,CAACC,MAAD,EAASC,KAAT,EAAgBC,OAAhB,EAA4B;AAC7D,MAAMC,YAAY,GAAGb,iBAAiB,CAACU,MAAD,CAAtC;AACA,MAAMI,WAAW,GAAGd,iBAAiB,CAACW,KAAD,CAArC;;AAEA,MAAMI,eAAe,GAAG,SAAlBA,eAAkB,CAACC,CAAD,EAAIC,CAAJ;AAAA,WAAUJ,YAAY,CAAC3B,QAAb,CAAsB8B,CAAtB,KAA4BF,WAAW,CAAC5B,QAAZ,CAAqB+B,CAArB,CAAtC;AAAA,GAAxB;;AAEA,SAAOC,MAAM,CAACC,OAAP,CAAeP,OAAO,IAAI,EAA1B,EAA8BQ,MAA9B,CAAqC,UAACC,UAAD,QAA+B;AAAA;AAAA,QAAjBC,GAAiB;AAAA,QAAZC,MAAY;;AACzEF,IAAAA,UAAU,CAACC,GAAD,CAAV,mCACKC,MADL;AAEEC,MAAAA,KAAK,EAAE,CAACD,MAAM,CAACC,KAAP,IAAgB,EAAjB,EAAqBnC,MAArB,CAA4B,UAACoC,IAAD,EAAU;AAC3C,YAAIA,IAAI,CAACC,IAAL,KAAc,OAAlB,EAA2B;AACzB,iBAAOX,eAAe,CAACU,IAAI,CAACT,CAAN,EAASS,IAAI,CAACR,CAAd,CAAtB;AACD;;AAED,YAAIQ,IAAI,CAACC,IAAL,KAAc,SAAlB,EAA6B;AAC3B,iBAAO,CAACD,IAAI,CAACE,MAAL,CAAYC,IAAZ,CAAiB,UAACC,KAAD;AAAA,mBAAW,CAACd,eAAe,CAACc,KAAK,CAACb,CAAP,EAAUa,KAAK,CAACZ,CAAhB,CAA3B;AAAA,WAAjB,CAAR;AACD;;AAED,YAAMa,IAAI,GAAGL,IAAI,CAACK,IAAL,IAAaL,IAAI,CAACM,IAA/B;AACA,YAAMC,EAAE,GAAGP,IAAI,CAACO,EAAL,IAAWP,IAAI,CAACQ,IAA3B;AAEA,eAAOR,IAAI,CAACS,QAAL,GACHnB,eAAe,CAACe,IAAI,CAACd,CAAN,EAASc,IAAI,CAACb,CAAd,CADZ,GAEHF,eAAe,CAACe,IAAI,CAACd,CAAN,EAASc,IAAI,CAACb,CAAd,CAAf,IAAmCF,eAAe,CAACiB,EAAE,CAAChB,CAAJ,EAAOgB,EAAE,CAACf,CAAV,CAFtD;AAGD,OAfM;AAFT;AAoBA,WAAOI,UAAP;AACD,GAtBM,EAsBJ,EAtBI,CAAP;AAuBD,CA7BM","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, 1, 2, 3, 4, 5, 8, 10, 12, 15, 20, 40, 50, 64, 100, 500,\n  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\n  // if preferred values should be used enforce all values to be used if the axis step\n  // is included in all supported values and not included in preferred values\n  const useAllValues =\n    prefferedValues && !PREFERRED_VALID_GRID_VALUES.includes(axis.step) && VALID_GRID_VALUES.includes(axis.step);\n  const values = !prefferedValues || useAllValues ? VALID_GRID_VALUES : PREFERRED_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\n// also used in pie-lib/graphing/utils as 'getTickValues'\nconst getPlotablePoints = (prop) => {\n  const tickValues = [];\n  let tickVal = 0;\n\n  while (tickVal >= prop.min && tickValues.indexOf(tickVal) < 0) {\n    tickValues.push(tickVal);\n    tickVal = Math.round((tickVal - prop.step) * 10000) / 10000;\n  }\n\n  tickVal = Math.round(prop.step * 10000) / 10000;\n\n  while (tickVal <= prop.max && tickValues.indexOf(tickVal) < 0) {\n    tickValues.push(tickVal);\n    tickVal = Math.round((tickVal + prop.step) * 10000) / 10000;\n  }\n\n  // return only ticks that are inside the min-max interval\n  if (tickValues) {\n    return tickValues.filter((tV) => tV >= prop.min && tV <= prop.max);\n  }\n\n  return [];\n};\n\nexport const filterPlotableMarks = (domain, range, answers) => {\n  const domainValues = getPlotablePoints(domain);\n  const rangeValues = getPlotablePoints(range);\n\n  const isPointPlotable = (x, y) => domainValues.includes(x) && rangeValues.includes(y);\n\n  return Object.entries(answers || {}).reduce((newAnswers, [key, answer]) => {\n    newAnswers[key] = {\n      ...answer,\n      marks: (answer.marks || []).filter((mark) => {\n        if (mark.type === 'point') {\n          return isPointPlotable(mark.x, mark.y);\n        }\n\n        if (mark.type === 'polygon') {\n          return !mark.points.find((point) => !isPointPlotable(point.x, point.y));\n        }\n\n        const from = mark.from || mark.root;\n        const to = mark.to || mark.edge;\n\n        return mark.building\n          ? isPointPlotable(from.x, from.y)\n          : isPointPlotable(from.x, from.y) && isPointPlotable(to.x, to.y);\n      }),\n    };\n\n    return newAnswers;\n  }, {});\n};\n"],"file":"utils.js"}

package/configure/package.json

@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "1.16.1-next.28",
+    "@pie-lib/pie-toolbox": "1.16.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.15",

package/controller/lib/defaults.js

@@ -0,0 +1,62 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+// TODO: This is lifted from @pie-lib/graphing, however importing this will break a controller build because it has jsx source in that package.
+var allTools = ['circle', 'line', 'label', 'parabola', 'point', 'polygon', 'ray', 'segment', 'sine', 'vector' // 'absolute', // - not available as default
+// 'exponential', // - not available as default
+];
+/* model defaults */
+
+var _default = {
+  answers: {
+    correctAnswer: {
+      name: 'Correct Answer',
+      marks: []
+    }
+  },
+  arrows: {
+    left: true,
+    right: true,
+    up: true,
+    down: true
+  },
+  backgroundMarks: [],
+  domain: {
+    min: -5,
+    max: 5,
+    step: 1,
+    labelStep: 1,
+    axisLabel: 'x'
+  },
+  graph: {
+    width: 500,
+    height: 500
+  },
+  includeAxes: true,
+  labels: {},
+  labelsEnabled: true,
+  coordinatesOnHover: false,
+  padding: true,
+  prompt: '',
+  range: {
+    min: -5,
+    max: 5,
+    step: 1,
+    labelStep: 1,
+    axisLabel: 'y'
+  },
+  rationale: '',
+  standardGrid: false,
+  title: '',
+  titleEnabled: true,
+  toolbarTools: allTools,
+  promptEnabled: true,
+  rationaleEnabled: true,
+  teacherInstructionsEnabled: true,
+  studentInstructionsEnabled: true
+};
+exports["default"] = _default;
+//# sourceMappingURL=defaults.js.map

package/controller/lib/defaults.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/defaults.js"],"names":["allTools","answers","correctAnswer","name","marks","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,CAWf;AACA;AAZe,CAAjB;AAeA;;eACe;AACbC,EAAAA,OAAO,EAAE;AACPC,IAAAA,aAAa,EAAE;AACbC,MAAAA,IAAI,EAAE,gBADO;AAEbC,MAAAA,KAAK,EAAE;AAFM;AADR,GADI;AAObC,EAAAA,MAAM,EAAE;AACNC,IAAAA,IAAI,EAAE,IADA;AAENC,IAAAA,KAAK,EAAE,IAFD;AAGNC,IAAAA,EAAE,EAAE,IAHE;AAINC,IAAAA,IAAI,EAAE;AAJA,GAPK;AAabC,EAAAA,eAAe,EAAE,EAbJ;AAcbC,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,GAdK;AAqBbC,EAAAA,KAAK,EAAE;AACLC,IAAAA,KAAK,EAAE,GADF;AAELC,IAAAA,MAAM,EAAE;AAFH,GArBM;AAyBbC,EAAAA,WAAW,EAAE,IAzBA;AA0BbC,EAAAA,MAAM,EAAE,EA1BK;AA2BbC,EAAAA,aAAa,EAAE,IA3BF;AA4BbC,EAAAA,kBAAkB,EAAE,KA5BP;AA6BbC,EAAAA,OAAO,EAAE,IA7BI;AA8BbC,EAAAA,MAAM,EAAE,EA9BK;AA+BbC,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,GA/BM;AAsCbW,EAAAA,SAAS,EAAE,EAtCE;AAuCbC,EAAAA,YAAY,EAAE,KAvCD;AAwCbC,EAAAA,KAAK,EAAE,EAxCM;AAyCbC,EAAAA,YAAY,EAAE,IAzCD;AA0CbC,EAAAA,YAAY,EAAE/B,QA1CD;AA2CbgC,EAAAA,aAAa,EAAE,IA3CF;AA4CbC,EAAAA,gBAAgB,EAAE,IA5CL;AA6CbC,EAAAA,0BAA0B,EAAE,IA7Cf;AA8CbC,EAAAA,0BAA0B,EAAE;AA9Cf,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  // 'absolute', // - not available as default\n  // 'exponential', // - not available as default\n];\n\n/* model defaults */\nexport default {\n  answers: {\n    correctAnswer: {\n      name: 'Correct Answer',\n      marks: [],\n    },\n  },\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"}