@pie-element/graphing 4.16.6-next.2 → 4.17.0-beta

package/CHANGELOG.md

@@ -3,6 +3,29 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.17.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing@4.16.6...@pie-element/graphing@4.17.0) (2023-10-16)
+
+
+### Features
+
+* updated pie-libs PD-2950 ([acffe41](https://github.com/pie-framework/pie-elements/commit/acffe41120fbe288e375321cbd58cfbd48f98595))
+
+
+
+
+
+## [4.16.6](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing@4.16.5...@pie-element/graphing@4.16.6) (2023-10-16)
+
+
+### Bug Fixes
+
+* updated pie-libs PD-3223, PD-3121, PD-3018, PD-2765, PD-3105 ([666e660](https://github.com/pie-framework/pie-elements/commit/666e6604c40b9bde8b88af5ce1b02ba65f11e957))
+* **number-line, graphing, image-cloze-association:** add language prop to show correct answer toggle PD-3208 ([86c40d0](https://github.com/pie-framework/pie-elements/commit/86c40d081a43b4f282b4f830aaa4a6b59274d966))
+
+
+
+
+
 ## [4.16.5](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing@4.16.4...@pie-element/graphing@4.16.5) (2023-10-03)
 
 

package/configure/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.17.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing-configure@4.16.6...@pie-element/graphing-configure@4.17.0) (2023-10-16)
+
+
+### Features
+
+* updated pie-libs PD-2950 ([acffe41](https://github.com/pie-framework/pie-elements/commit/acffe41120fbe288e375321cbd58cfbd48f98595))
+
+
+
+
+
+## [4.16.6](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing-configure@4.16.5...@pie-element/graphing-configure@4.16.6) (2023-10-16)
+
+
+### Bug Fixes
+
+* updated pie-libs PD-3223, PD-3121, PD-3018, PD-2765, PD-3105 ([666e660](https://github.com/pie-framework/pie-elements/commit/666e6604c40b9bde8b88af5ce1b02ba65f11e957))
+
+
+
+
+
 ## [4.16.5](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing-configure@4.16.4...@pie-element/graphing-configure@4.16.5) (2023-10-03)
 
 

package/configure/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pie-element/graphing-configure",
   "private": true,
-  "version": "4.16.5",
+  "version": "4.17.0",
   "description": "",
   "main": "lib/index.js",
   "module": "src/index.js",
@@ -9,9 +9,9 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/config-ui": "^11.9.21",
-    "@pie-lib/editable-html": "^11.0.8",
-    "@pie-lib/graphing": "^2.14.20",
+    "@pie-lib/config-ui": "^11.9.23",
+    "@pie-lib/editable-html": "^11.1.0",
+    "@pie-lib/chart-toolbox": "1.0.1-next.4186",
     "@pie-lib/math-rendering": "2.5.18",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",

package/controller/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@pie-lib/controller-utils": "^0.2.44",
     "@pie-lib/feedback": "^0.4.43",
-    "@pie-lib/graphing-utils": "^1.1.33",
+    "@pie-lib/chart-toolbox": "1.0.1-next.4186",
     "debug": "^4.1.1"
   },
   "devDependencies": {

package/lib/__tests__/main.test.js

@@ -0,0 +1,42 @@
+"use strict";
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+var React = _interopRequireWildcard(require("react"));
+
+var _main = require("../main");
+
+var _build = require("enzyme/build");
+
+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; }
+
+jest.mock('lodash/uniq', function () {
+  return function () {
+    return [];
+  };
+});
+describe('Main', function () {
+  var defaultProps = {
+    model: {
+      backgroundMarks: [],
+      correctMarks: []
+    },
+    onSessionChange: jest.fn(),
+    onAnswersChange: jest.fn(),
+    session: {}
+  };
+  describe('render', function () {
+    var w;
+    beforeEach(function () {
+      w = function w(props) {
+        return (0, _build.shallow)( /*#__PURE__*/React.createElement(_main.Main, props));
+      };
+    });
+    it('snapshot', function () {
+      expect(w(defaultProps)).toMatchSnapshot();
+    });
+  });
+});
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9fX3Rlc3RzX18vbWFpbi50ZXN0LmpzIl0sIm5hbWVzIjpbImplc3QiLCJtb2NrIiwiZGVzY3JpYmUiLCJkZWZhdWx0UHJvcHMiLCJtb2RlbCIsImJhY2tncm91bmRNYXJrcyIsImNvcnJlY3RNYXJrcyIsIm9uU2Vzc2lvbkNoYW5nZSIsImZuIiwib25BbnN3ZXJzQ2hhbmdlIiwic2Vzc2lvbiIsInciLCJiZWZvcmVFYWNoIiwicHJvcHMiLCJpdCIsImV4cGVjdCIsInRvTWF0Y2hTbmFwc2hvdCJdLCJtYXBwaW5ncyI6Ijs7OztBQUFBOztBQUNBOztBQUNBOzs7Ozs7QUFFQUEsSUFBSSxDQUFDQyxJQUFMLENBQVUsYUFBVixFQUF5QixZQUFNO0FBQzdCLFNBQU87QUFBQSxXQUFNLEVBQU47QUFBQSxHQUFQO0FBQ0QsQ0FGRDtBQUlBQyxRQUFRLENBQUMsTUFBRCxFQUFTLFlBQU07QUFDckIsTUFBTUMsWUFBWSxHQUFHO0FBQ25CQyxJQUFBQSxLQUFLLEVBQUU7QUFDTEMsTUFBQUEsZUFBZSxFQUFFLEVBRFo7QUFFTEMsTUFBQUEsWUFBWSxFQUFFO0FBRlQsS0FEWTtBQUtuQkMsSUFBQUEsZUFBZSxFQUFFUCxJQUFJLENBQUNRLEVBQUwsRUFMRTtBQU1uQkMsSUFBQUEsZUFBZSxFQUFFVCxJQUFJLENBQUNRLEVBQUwsRUFORTtBQU9uQkUsSUFBQUEsT0FBTyxFQUFFO0FBUFUsR0FBckI7QUFVQVIsRUFBQUEsUUFBUSxDQUFDLFFBQUQsRUFBVyxZQUFNO0FBQ3ZCLFFBQUlTLENBQUo7QUFFQUMsSUFBQUEsVUFBVSxDQUFDLFlBQU07QUFDZkQsTUFBQUEsQ0FBQyxHQUFHLFdBQUNFLEtBQUQ7QUFBQSxlQUFXLGtDQUFRLG9CQUFDLFVBQUQsRUFBVUEsS0FBVixDQUFSLENBQVg7QUFBQSxPQUFKO0FBQ0QsS0FGUyxDQUFWO0FBSUFDLElBQUFBLEVBQUUsQ0FBQyxVQUFELEVBQWEsWUFBTTtBQUNuQkMsTUFBQUEsTUFBTSxDQUFDSixDQUFDLENBQUNSLFlBQUQsQ0FBRixDQUFOLENBQXdCYSxlQUF4QjtBQUNELEtBRkMsQ0FBRjtBQUdELEdBVk8sQ0FBUjtBQVdELENBdEJPLENBQVIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgKiBhcyBSZWFjdCBmcm9tICdyZWFjdCc7XG5pbXBvcnQgeyBNYWluIH0gZnJvbSAnLi4vbWFpbic7XG5pbXBvcnQgeyBzaGFsbG93IH0gZnJvbSAnZW56eW1lL2J1aWxkJztcblxuamVzdC5tb2NrKCdsb2Rhc2gvdW5pcScsICgpID0+IHtcbiAgcmV0dXJuICgpID0+IFtdO1xufSk7XG5cbmRlc2NyaWJlKCdNYWluJywgKCkgPT4ge1xuICBjb25zdCBkZWZhdWx0UHJvcHMgPSB7XG4gICAgbW9kZWw6IHtcbiAgICAgIGJhY2tncm91bmRNYXJrczogW10sXG4gICAgICBjb3JyZWN0TWFya3M6IFtdLFxuICAgIH0sXG4gICAgb25TZXNzaW9uQ2hhbmdlOiBqZXN0LmZuKCksXG4gICAgb25BbnN3ZXJzQ2hhbmdlOiBqZXN0LmZuKCksXG4gICAgc2Vzc2lvbjoge30sXG4gIH07XG5cbiAgZGVzY3JpYmUoJ3JlbmRlcicsICgpID0+IHtcbiAgICBsZXQgdztcblxuICAgIGJlZm9yZUVhY2goKCkgPT4ge1xuICAgICAgdyA9IChwcm9wcykgPT4gc2hhbGxvdyg8TWFpbiB7Li4ucHJvcHN9IC8+KTtcbiAgICB9KTtcblxuICAgIGl0KCdzbmFwc2hvdCcsICgpID0+IHtcbiAgICAgIGV4cGVjdCh3KGRlZmF1bHRQcm9wcykpLnRvTWF0Y2hTbmFwc2hvdCgpO1xuICAgIH0pO1xuICB9KTtcbn0pO1xuIl19

package/lib/__tests__/utils.test.js

@@ -0,0 +1,422 @@
+"use strict";
+
+var _utils = require("../utils");
+
+describe('removeInvalidAnswers', function () {
+  test.each([[undefined, []], [null, []], [[], []], [[{
+    type: 'point'
+  }, {
+    type: 'point',
+    x: null,
+    y: undefined
+  }, {
+    type: 'point',
+    x: 'a',
+    y: 2
+  }, {
+    type: 'point',
+    x: 'a',
+    y: 2.76
+  }, {
+    type: 'point',
+    x: 0,
+    y: '2.76'
+  }, {
+    type: 'point',
+    x: 0,
+    y: 2.76
+  }, {
+    type: 'nonexistent type',
+    x: 'a',
+    y: 2
+  }, {
+    type: 'segment'
+  }, {
+    type: 'segment',
+    from: null,
+    to: null
+  }, {
+    type: 'segment',
+    from: {},
+    to: {}
+  }, {
+    type: 'segment',
+    from: {},
+    to: {
+      x: 'a',
+      y: NaN
+    }
+  }, {
+    type: 'segment',
+    from: {
+      x: 0,
+      y: 0
+    },
+    to: {
+      x: 1,
+      y: 1
+    }
+  }, {
+    type: 'segment',
+    from: {
+      x: 0,
+      y: 0
+    }
+  }, {
+    type: 'vector'
+  }, {
+    type: 'vector',
+    from: null,
+    to: null
+  }, {
+    type: 'vector',
+    from: {},
+    to: {
+      a: 'a',
+      b: 0
+    }
+  }, {
+    type: 'vector',
+    from: {},
+    to: {
+      x: 'a',
+      y: NaN
+    }
+  }, {
+    type: 'vector',
+    from: {
+      x: 0,
+      y: 0
+    },
+    to: {
+      x: 1,
+      y: 1
+    }
+  }, {
+    type: 'vector',
+    from: {
+      x: 0,
+      y: 0
+    }
+  }, {
+    type: 'line'
+  }, {
+    type: 'line',
+    from: null,
+    to: null
+  }, {
+    type: 'line',
+    from: {},
+    to: {}
+  }, {
+    type: 'line',
+    from: null,
+    to: {
+      x: 'a',
+      y: NaN
+    }
+  }, {
+    type: 'line',
+    from: {
+      x: 0,
+      y: 0
+    },
+    to: {
+      x: 1,
+      y: 1
+    }
+  }, {
+    type: 'line',
+    to: {
+      x: 0,
+      y: 0
+    }
+  }, {
+    type: 'ray'
+  }, {
+    type: 'ray',
+    from: null,
+    to: null
+  }, {
+    type: 'ray',
+    from: {},
+    to: {}
+  }, {
+    type: 'ray',
+    from: null,
+    to: {
+      x: 'a',
+      y: NaN
+    }
+  }, {
+    type: 'ray',
+    from: {
+      x: 0,
+      y: 0
+    },
+    to: {
+      x: 1,
+      y: 1
+    }
+  }, {
+    type: 'ray',
+    to: {
+      x: 0,
+      y: 0
+    }
+  }, {
+    type: 'polygon'
+  }, {
+    type: 'polygon',
+    points: null
+  }, {
+    type: 'polygon',
+    points: []
+  }, {
+    type: 'polygon',
+    points: [{}]
+  }, {
+    type: 'polygon',
+    points: [{
+      x: 1,
+      a: 'v'
+    }]
+  }, {
+    type: 'polygon',
+    points: [{
+      x: 1,
+      y: 'v'
+    }]
+  }, {
+    type: 'polygon',
+    points: [{
+      x: NaN,
+      y: 'v'
+    }]
+  }, {
+    type: 'polygon',
+    points: [{
+      x: 0,
+      y: 0
+    }]
+  }, {
+    type: 'polygon',
+    points: [{
+      x: 0,
+      y: 0
+    }, {}]
+  }, {
+    type: 'circle'
+  }, {
+    type: 'circle',
+    from: null,
+    to: null
+  }, {
+    type: 'circle',
+    edge: null,
+    root: null
+  }, {
+    type: 'circle',
+    from: {},
+    to: {}
+  }, {
+    type: 'circle',
+    edge: {},
+    root: {}
+  }, {
+    type: 'circle',
+    from: null,
+    to: {
+      x: 'a',
+      y: NaN
+    }
+  }, {
+    type: 'circle',
+    edge: null,
+    root: {
+      x: 'a',
+      y: NaN
+    }
+  }, {
+    type: 'circle',
+    from: {
+      x: 0,
+      y: 0
+    },
+    to: {
+      x: 1,
+      y: 1
+    }
+  }, {
+    type: 'circle',
+    edge: {
+      x: 0,
+      y: 0
+    },
+    root: {
+      x: 1,
+      y: 1
+    }
+  }, {
+    type: 'circle',
+    to: {
+      x: 0,
+      y: 0
+    }
+  }, {
+    type: 'circle',
+    root: {
+      x: 0,
+      y: 0
+    }
+  }, {
+    type: 'parabola'
+  }, {
+    type: 'parabola',
+    edge: null,
+    root: null
+  }, {
+    type: 'parabola',
+    edge: {},
+    root: {}
+  }, {
+    type: 'parabola',
+    edge: null,
+    root: {
+      x: 'a',
+      y: NaN
+    }
+  }, {
+    type: 'parabola',
+    edge: {
+      x: 0,
+      y: 0
+    },
+    root: {
+      x: 1,
+      y: 1
+    }
+  }, {
+    type: 'parabola',
+    root: {
+      x: 0,
+      y: 0
+    }
+  }, {
+    type: 'sine'
+  }, {
+    type: 'sine',
+    edge: null,
+    root: null
+  }, {
+    type: 'sine',
+    edge: {},
+    root: {}
+  }, {
+    type: 'sine',
+    edge: null,
+    root: {
+      x: 'a',
+      y: NaN
+    }
+  }, {
+    type: 'sine',
+    edge: {
+      x: 0,
+      y: 0
+    },
+    root: {
+      x: 1,
+      y: 1
+    }
+  }, {
+    type: 'sine',
+    root: {
+      x: 0,
+      y: 0
+    }
+  }], [{
+    type: 'point',
+    x: 0,
+    y: 2.76
+  }, {
+    type: 'segment',
+    from: {
+      x: 0,
+      y: 0
+    },
+    to: {
+      x: 1,
+      y: 1
+    }
+  }, {
+    type: 'vector',
+    from: {
+      x: 0,
+      y: 0
+    },
+    to: {
+      x: 1,
+      y: 1
+    }
+  }, {
+    type: 'line',
+    from: {
+      x: 0,
+      y: 0
+    },
+    to: {
+      x: 1,
+      y: 1
+    }
+  }, {
+    type: 'ray',
+    from: {
+      x: 0,
+      y: 0
+    },
+    to: {
+      x: 1,
+      y: 1
+    }
+  }, {
+    type: 'polygon',
+    points: [{
+      x: 0,
+      y: 0
+    }]
+  }, {
+    type: 'circle',
+    edge: {
+      x: 0,
+      y: 0
+    },
+    root: {
+      x: 1,
+      y: 1
+    }
+  }, {
+    type: 'parabola',
+    edge: {
+      x: 0,
+      y: 0
+    },
+    root: {
+      x: 1,
+      y: 1
+    }
+  }, {
+    type: 'sine',
+    edge: {
+      x: 0,
+      y: 0
+    },
+    root: {
+      x: 1,
+      y: 1
+    }
+  }]]])('answers: %j, only valid answers: %j', function (answers, validAnswers) {
+    expect((0, _utils.removeInvalidAnswers)(answers)).toEqual(validAnswers);
+  });
+});
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/__tests__/utils.test.js"],"names":["describe","test","each","undefined","type","x","y","from","to","NaN","a","b","points","edge","root","answers","validAnswers","expect","toEqual"],"mappings":"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","sourcesContent":["import { removeInvalidAnswers } from '../utils';\n\ndescribe('removeInvalidAnswers', () => {\n  test.each([\n    [undefined, []],\n    [null, []],\n    [[], []],\n    [\n      [\n        { type: 'point' },\n        { type: 'point', x: null, y: undefined },\n        { type: 'point', x: 'a', y: 2 },\n        { type: 'point', x: 'a', y: 2.76 },\n        { type: 'point', x: 0, y: '2.76' },\n        { type: 'point', x: 0, y: 2.76 },\n        { type: 'nonexistent type', x: 'a', y: 2 },\n        { type: 'segment' },\n        { type: 'segment', from: null, to: null },\n        { type: 'segment', from: {}, to: {} },\n        { type: 'segment', from: {}, to: { x: 'a', y: NaN } },\n        { type: 'segment', from: { x: 0, y: 0 }, to: { x: 1, y: 1 } },\n        { type: 'segment', from: { x: 0, y: 0 } },\n        { type: 'vector' },\n        { type: 'vector', from: null, to: null },\n        { type: 'vector', from: {}, to: { a: 'a', b: 0 } },\n        { type: 'vector', from: {}, to: { x: 'a', y: NaN } },\n        { type: 'vector', from: { x: 0, y: 0 }, to: { x: 1, y: 1 } },\n        { type: 'vector', from: { x: 0, y: 0 } },\n        { type: 'line' },\n        { type: 'line', from: null, to: null },\n        { type: 'line', from: {}, to: {} },\n        { type: 'line', from: null, to: { x: 'a', y: NaN } },\n        { type: 'line', from: { x: 0, y: 0 }, to: { x: 1, y: 1 } },\n        { type: 'line', to: { x: 0, y: 0 } },\n        { type: 'ray' },\n        { type: 'ray', from: null, to: null },\n        { type: 'ray', from: {}, to: {} },\n        { type: 'ray', from: null, to: { x: 'a', y: NaN } },\n        { type: 'ray', from: { x: 0, y: 0 }, to: { x: 1, y: 1 } },\n        { type: 'ray', to: { x: 0, y: 0 } },\n        { type: 'polygon' },\n        { type: 'polygon', points: null },\n        { type: 'polygon', points: [] },\n        { type: 'polygon', points: [{}] },\n        { type: 'polygon', points: [{ x: 1, a: 'v' }] },\n        { type: 'polygon', points: [{ x: 1, y: 'v' }] },\n        { type: 'polygon', points: [{ x: NaN, y: 'v' }] },\n        { type: 'polygon', points: [{ x: 0, y: 0 }] },\n        { type: 'polygon', points: [{ x: 0, y: 0 }, {}] },\n        { type: 'circle' },\n        { type: 'circle', from: null, to: null },\n        { type: 'circle', edge: null, root: null },\n        { type: 'circle', from: {}, to: {} },\n        { type: 'circle', edge: {}, root: {} },\n        { type: 'circle', from: null, to: { x: 'a', y: NaN } },\n        { type: 'circle', edge: null, root: { x: 'a', y: NaN } },\n        { type: 'circle', from: { x: 0, y: 0 }, to: { x: 1, y: 1 } },\n        { type: 'circle', edge: { x: 0, y: 0 }, root: { x: 1, y: 1 } },\n        { type: 'circle', to: { x: 0, y: 0 } },\n        { type: 'circle', root: { x: 0, y: 0 } },\n        { type: 'parabola' },\n        { type: 'parabola', edge: null, root: null },\n        { type: 'parabola', edge: {}, root: {} },\n        { type: 'parabola', edge: null, root: { x: 'a', y: NaN } },\n        { type: 'parabola', edge: { x: 0, y: 0 }, root: { x: 1, y: 1 } },\n        { type: 'parabola', root: { x: 0, y: 0 } },\n        { type: 'sine' },\n        { type: 'sine', edge: null, root: null },\n        { type: 'sine', edge: {}, root: {} },\n        { type: 'sine', edge: null, root: { x: 'a', y: NaN } },\n        { type: 'sine', edge: { x: 0, y: 0 }, root: { x: 1, y: 1 } },\n        { type: 'sine', root: { x: 0, y: 0 } },\n      ],\n      [\n        { type: 'point', x: 0, y: 2.76 },\n        { type: 'segment', from: { x: 0, y: 0 }, to: { x: 1, y: 1 } },\n        { type: 'vector', from: { x: 0, y: 0 }, to: { x: 1, y: 1 } },\n        { type: 'line', from: { x: 0, y: 0 }, to: { x: 1, y: 1 } },\n        { type: 'ray', from: { x: 0, y: 0 }, to: { x: 1, y: 1 } },\n        { type: 'polygon', points: [{ x: 0, y: 0 }] },\n        { type: 'circle', edge: { x: 0, y: 0 }, root: { x: 1, y: 1 } },\n        { type: 'parabola', edge: { x: 0, y: 0 }, root: { x: 1, y: 1 } },\n        { type: 'sine', edge: { x: 0, y: 0 }, root: { x: 1, y: 1 } },\n      ],\n    ],\n  ])('answers: %j, only valid answers: %j', (answers, validAnswers) => {\n    expect(removeInvalidAnswers(answers)).toEqual(validAnswers);\n  });\n});\n"]}

package/lib/main.js

@@ -27,7 +27,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _styles = require("@material-ui/core/styles");
 
-var _graphing = require("@pie-lib/graphing");
+var _graphing = require("@pie-lib/chart-toolbox/lib/graphing");
 
 var _renderUi = require("@pie-lib/render-ui");
 

package/lib/main.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/main.jsx"],"names":["Main","showingCorrect","setState","props","model","classes","onAnswersChange","session","state","answer","answersCorrected","arrows","backgroundMarks","coordinatesOnHover","correctResponse","defaultTool","disabled","domain","labels","labelsEnabled","prompt","range","rationale","size","showToggle","title","titleEnabled","teacherInstructions","toolbarTools","language","marks","mainContainer","hidden","visible","toggleCorrect","graph","includeArrows","map","i","correctness","React","Component","PropTypes","object","isRequired","func","styles","theme","color","text","backgroundColor","background","marginBottom","spacing","unit","marginTop"],"mappings":"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","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { withStyles } from '@material-ui/core/styles';\nimport { GraphContainer } from '@pie-lib/graphing';\nimport { color, Collapsible, hasText, PreviewPrompt } from '@pie-lib/render-ui';\nimport CorrectAnswerToggle from '@pie-lib/correct-answer-toggle';\n\nexport class Main extends React.Component {\n  static propTypes = {\n    classes: PropTypes.object,\n    model: PropTypes.object.isRequired,\n    session: PropTypes.object.isRequired,\n    onAnswersChange: PropTypes.func,\n  };\n\n  static defaultProps = {\n    classes: {},\n  };\n\n  state = { showingCorrect: false };\n\n  toggleCorrect = (showingCorrect) => this.setState({ showingCorrect });\n\n  render() {\n    const { model, classes, onAnswersChange, session } = this.props;\n    const { showingCorrect } = this.state;\n    const { answer } = session || {};\n    const {\n      answersCorrected,\n      arrows,\n      backgroundMarks,\n      coordinatesOnHover,\n      correctResponse,\n      defaultTool,\n      disabled,\n      domain,\n      labels,\n      labelsEnabled,\n      prompt,\n      range,\n      rationale,\n      size,\n      showToggle,\n      title,\n      titleEnabled,\n      teacherInstructions,\n      toolbarTools,\n      language,\n    } = model || {};\n    const marks = answersCorrected || answer || [];\n\n    return (\n      <div className={classes.mainContainer}>\n        {teacherInstructions && hasText(teacherInstructions) && (\n          <Collapsible\n            className={classes.teacherInstructions}\n            labels={{ hidden: 'Show Teacher Instructions', visible: 'Hide Teacher Instructions' }}\n          >\n            <PreviewPrompt prompt={teacherInstructions} />\n          </Collapsible>\n        )}\n\n        {prompt && <PreviewPrompt className=\"prompt\" prompt={prompt} />}\n\n        <CorrectAnswerToggle\n          show={showToggle}\n          toggled={showingCorrect}\n          onToggle={this.toggleCorrect}\n          language={language}\n        />\n\n        {showingCorrect && showToggle ? (\n          <GraphContainer\n            className={classes.graph}\n            axesSettings={{ includeArrows: arrows }}\n            backgroundMarks={backgroundMarks}\n            coordinatesOnHover={coordinatesOnHover}\n            disabled={true}\n            disabledLabels={true}\n            disabledTitle={true}\n            domain={domain}\n            labels={labels}\n            marks={correctResponse.map((i) => ({ ...i, correctness: 'correct' }))}\n            onChangeMarks={onAnswersChange}\n            range={range}\n            showLabels={labelsEnabled}\n            showTitle={titleEnabled}\n            size={size}\n            title={title}\n            toolbarTools={toolbarTools}\n            language={language}\n          />\n        ) : (\n          <GraphContainer\n            className={classes.graph}\n            axesSettings={{ includeArrows: arrows }}\n            backgroundMarks={backgroundMarks}\n            coordinatesOnHover={coordinatesOnHover}\n            defaultTool={defaultTool}\n            disabled={disabled}\n            disabledLabels={true}\n            disabledTitle={true}\n            domain={domain}\n            labels={labels}\n            marks={marks}\n            onChangeMarks={onAnswersChange}\n            range={range}\n            showLabels={labelsEnabled}\n            showTitle={titleEnabled}\n            size={size}\n            title={title}\n            toolbarTools={toolbarTools}\n            language={language}\n          />\n        )}\n\n        {rationale && hasText(rationale) && (\n          <Collapsible labels={{ hidden: 'Show Rationale', visible: 'Hide Rationale' }}>\n            <PreviewPrompt prompt={rationale} />\n          </Collapsible>\n        )}\n      </div>\n    );\n  }\n}\n\nconst styles = (theme) => ({\n  mainContainer: {\n    color: color.text(),\n    backgroundColor: color.background(),\n  },\n  teacherInstructions: {\n    marginBottom: theme.spacing.unit * 2,\n  },\n  graph: {\n    marginTop: theme.spacing.unit * 2,\n    marginBottom: theme.spacing.unit * 2,\n  },\n});\n\nexport default withStyles(styles)(Main);\n"],"file":"main.js"}
+{"version":3,"sources":["../src/main.jsx"],"names":["Main","showingCorrect","setState","props","model","classes","onAnswersChange","session","state","answer","answersCorrected","arrows","backgroundMarks","coordinatesOnHover","correctResponse","defaultTool","disabled","domain","labels","labelsEnabled","prompt","range","rationale","size","showToggle","title","titleEnabled","teacherInstructions","toolbarTools","language","marks","mainContainer","hidden","visible","toggleCorrect","graph","includeArrows","map","i","correctness","React","Component","PropTypes","object","isRequired","func","styles","theme","color","text","backgroundColor","background","marginBottom","spacing","unit","marginTop"],"mappings":"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","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { withStyles } from '@material-ui/core/styles';\nimport { GraphContainer } from '@pie-lib/chart-toolbox/lib/graphing';\nimport { color, Collapsible, hasText, PreviewPrompt } from '@pie-lib/render-ui';\nimport CorrectAnswerToggle from '@pie-lib/correct-answer-toggle';\n\nexport class Main extends React.Component {\n  static propTypes = {\n    classes: PropTypes.object,\n    model: PropTypes.object.isRequired,\n    session: PropTypes.object.isRequired,\n    onAnswersChange: PropTypes.func,\n  };\n\n  static defaultProps = {\n    classes: {},\n  };\n\n  state = { showingCorrect: false };\n\n  toggleCorrect = (showingCorrect) => this.setState({ showingCorrect });\n\n  render() {\n    const { model, classes, onAnswersChange, session } = this.props;\n    const { showingCorrect } = this.state;\n    const { answer } = session || {};\n    const {\n      answersCorrected,\n      arrows,\n      backgroundMarks,\n      coordinatesOnHover,\n      correctResponse,\n      defaultTool,\n      disabled,\n      domain,\n      labels,\n      labelsEnabled,\n      prompt,\n      range,\n      rationale,\n      size,\n      showToggle,\n      title,\n      titleEnabled,\n      teacherInstructions,\n      toolbarTools,\n      language,\n    } = model || {};\n    const marks = answersCorrected || answer || [];\n\n    return (\n      <div className={classes.mainContainer}>\n        {teacherInstructions && hasText(teacherInstructions) && (\n          <Collapsible\n            className={classes.teacherInstructions}\n            labels={{ hidden: 'Show Teacher Instructions', visible: 'Hide Teacher Instructions' }}\n          >\n            <PreviewPrompt prompt={teacherInstructions} />\n          </Collapsible>\n        )}\n\n        {prompt && <PreviewPrompt className=\"prompt\" prompt={prompt} />}\n\n        <CorrectAnswerToggle\n          show={showToggle}\n          toggled={showingCorrect}\n          onToggle={this.toggleCorrect}\n          language={language}\n        />\n\n        {showingCorrect && showToggle ? (\n          <GraphContainer\n            className={classes.graph}\n            axesSettings={{ includeArrows: arrows }}\n            backgroundMarks={backgroundMarks}\n            coordinatesOnHover={coordinatesOnHover}\n            disabled={true}\n            disabledLabels={true}\n            disabledTitle={true}\n            domain={domain}\n            labels={labels}\n            marks={correctResponse.map((i) => ({ ...i, correctness: 'correct' }))}\n            onChangeMarks={onAnswersChange}\n            range={range}\n            showLabels={labelsEnabled}\n            showTitle={titleEnabled}\n            size={size}\n            title={title}\n            toolbarTools={toolbarTools}\n            language={language}\n          />\n        ) : (\n          <GraphContainer\n            className={classes.graph}\n            axesSettings={{ includeArrows: arrows }}\n            backgroundMarks={backgroundMarks}\n            coordinatesOnHover={coordinatesOnHover}\n            defaultTool={defaultTool}\n            disabled={disabled}\n            disabledLabels={true}\n            disabledTitle={true}\n            domain={domain}\n            labels={labels}\n            marks={marks}\n            onChangeMarks={onAnswersChange}\n            range={range}\n            showLabels={labelsEnabled}\n            showTitle={titleEnabled}\n            size={size}\n            title={title}\n            toolbarTools={toolbarTools}\n            language={language}\n          />\n        )}\n\n        {rationale && hasText(rationale) && (\n          <Collapsible labels={{ hidden: 'Show Rationale', visible: 'Hide Rationale' }}>\n            <PreviewPrompt prompt={rationale} />\n          </Collapsible>\n        )}\n      </div>\n    );\n  }\n}\n\nconst styles = (theme) => ({\n  mainContainer: {\n    color: color.text(),\n    backgroundColor: color.background(),\n  },\n  teacherInstructions: {\n    marginBottom: theme.spacing.unit * 2,\n  },\n  graph: {\n    marginTop: theme.spacing.unit * 2,\n    marginBottom: theme.spacing.unit * 2,\n  },\n});\n\nexport default withStyles(styles)(Main);\n"],"file":"main.js"}

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "repository": "pie-framework/pie-elements",
-  "version": "4.16.6-next.2+5da11e0cd",
+  "version": "4.17.0-beta",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -14,7 +14,7 @@
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
     "@pie-lib/correct-answer-toggle": "2.5.11",
-    "@pie-lib/graphing": "^2.14.20",
+    "@pie-lib/chart-toolbox": "1.0.1-next.4186",
     "@pie-lib/math-rendering": "2.5.18",
     "@pie-lib/render-ui": "^4.15.9",
     "@pie-lib/translator": "^2.3.0",
@@ -25,7 +25,7 @@
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "5da11e0cd0618f7b0b36fdfc624013244f4ab86d",
+  "gitHead": "0e14ff981bcdc8a89a0e58484026496701bfdbc3",
   "main": "lib/index.js",
   "module": "src/index.js"
 }

package/LICENSE.md

@@ -1,5 +0,0 @@
-Copyright 2019 CoreSpring Inc
-
-Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.