@pie-element/charting 6.5.1-beta → 6.5.1-beta.2

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/chart-toolbox": "1.0.1-next.4186",
+    "@pie-lib/chart-toolbox": "1.0.1-next.4188",
     "@pie-lib/config-ui": "^11.9.23",
     "@pie-lib/editable-html": "^11.1.0",
     "@pie-lib/math-rendering": "2.5.18",

package/lib/__tests__/main.test.js

@@ -0,0 +1,54 @@
+"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 onAnswersChange = jest.fn();
+  var defaultProps = {
+    model: {
+      backgroundMarks: [],
+      correctMarks: []
+    },
+    onAnswersChange: onAnswersChange,
+    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();
+    });
+  });
+  describe('logic', function () {
+    var w;
+    beforeEach(function () {
+      w = function w(props) {
+        return (0, _build.shallow)( /*#__PURE__*/React.createElement(_main.Main, props));
+      };
+    });
+    it('calls onAnswersChange', function () {
+      w(defaultProps).instance().changeData([]);
+      expect(onAnswersChange).toHaveBeenCalledWith([]);
+    });
+  });
+});
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9fX3Rlc3RzX18vbWFpbi50ZXN0LmpzIl0sIm5hbWVzIjpbImplc3QiLCJtb2NrIiwiZGVzY3JpYmUiLCJvbkFuc3dlcnNDaGFuZ2UiLCJmbiIsImRlZmF1bHRQcm9wcyIsIm1vZGVsIiwiYmFja2dyb3VuZE1hcmtzIiwiY29ycmVjdE1hcmtzIiwic2Vzc2lvbiIsInciLCJiZWZvcmVFYWNoIiwicHJvcHMiLCJpdCIsImV4cGVjdCIsInRvTWF0Y2hTbmFwc2hvdCIsImluc3RhbmNlIiwiY2hhbmdlRGF0YSIsInRvSGF2ZUJlZW5DYWxsZWRXaXRoIl0sIm1hcHBpbmdzIjoiOzs7O0FBQUE7O0FBQ0E7O0FBQ0E7Ozs7OztBQUVBQSxJQUFJLENBQUNDLElBQUwsQ0FBVSxhQUFWLEVBQXlCLFlBQU07QUFDN0IsU0FBTztBQUFBLFdBQU0sRUFBTjtBQUFBLEdBQVA7QUFDRCxDQUZEO0FBSUFDLFFBQVEsQ0FBQyxNQUFELEVBQVMsWUFBTTtBQUNyQixNQUFNQyxlQUFlLEdBQUdILElBQUksQ0FBQ0ksRUFBTCxFQUF4QjtBQUNBLE1BQU1DLFlBQVksR0FBRztBQUNuQkMsSUFBQUEsS0FBSyxFQUFFO0FBQ0xDLE1BQUFBLGVBQWUsRUFBRSxFQURaO0FBRUxDLE1BQUFBLFlBQVksRUFBRTtBQUZULEtBRFk7QUFLbkJMLElBQUFBLGVBQWUsRUFBZkEsZUFMbUI7QUFNbkJNLElBQUFBLE9BQU8sRUFBRTtBQU5VLEdBQXJCO0FBU0FQLEVBQUFBLFFBQVEsQ0FBQyxRQUFELEVBQVcsWUFBTTtBQUN2QixRQUFJUSxDQUFKO0FBRUFDLElBQUFBLFVBQVUsQ0FBQyxZQUFNO0FBQ2ZELE1BQUFBLENBQUMsR0FBRyxXQUFDRSxLQUFEO0FBQUEsZUFBVyxrQ0FBUSxvQkFBQyxVQUFELEVBQVVBLEtBQVYsQ0FBUixDQUFYO0FBQUEsT0FBSjtBQUNELEtBRlMsQ0FBVjtBQUlBQyxJQUFBQSxFQUFFLENBQUMsVUFBRCxFQUFhLFlBQU07QUFDbkJDLE1BQUFBLE1BQU0sQ0FBQ0osQ0FBQyxDQUFDTCxZQUFELENBQUYsQ0FBTixDQUF3QlUsZUFBeEI7QUFDRCxLQUZDLENBQUY7QUFHRCxHQVZPLENBQVI7QUFZQWIsRUFBQUEsUUFBUSxDQUFDLE9BQUQsRUFBVSxZQUFNO0FBQ3RCLFFBQUlRLENBQUo7QUFFQUMsSUFBQUEsVUFBVSxDQUFDLFlBQU07QUFDZkQsTUFBQUEsQ0FBQyxHQUFHLFdBQUNFLEtBQUQ7QUFBQSxlQUFXLGtDQUFRLG9CQUFDLFVBQUQsRUFBVUEsS0FBVixDQUFSLENBQVg7QUFBQSxPQUFKO0FBQ0QsS0FGUyxDQUFWO0FBSUFDLElBQUFBLEVBQUUsQ0FBQyx1QkFBRCxFQUEwQixZQUFNO0FBQ2hDSCxNQUFBQSxDQUFDLENBQUNMLFlBQUQsQ0FBRCxDQUFnQlcsUUFBaEIsR0FBMkJDLFVBQTNCLENBQXNDLEVBQXRDO0FBQ0FILE1BQUFBLE1BQU0sQ0FBQ1gsZUFBRCxDQUFOLENBQXdCZSxvQkFBeEIsQ0FBNkMsRUFBN0M7QUFDRCxLQUhDLENBQUY7QUFJRCxHQVhPLENBQVI7QUFZRCxDQW5DTyxDQUFSIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0ICogYXMgUmVhY3QgZnJvbSAncmVhY3QnO1xuaW1wb3J0IHsgTWFpbiB9IGZyb20gJy4uL21haW4nO1xuaW1wb3J0IHsgc2hhbGxvdyB9IGZyb20gJ2VuenltZS9idWlsZCc7XG5cbmplc3QubW9jaygnbG9kYXNoL3VuaXEnLCAoKSA9PiB7XG4gIHJldHVybiAoKSA9PiBbXTtcbn0pO1xuXG5kZXNjcmliZSgnTWFpbicsICgpID0+IHtcbiAgY29uc3Qgb25BbnN3ZXJzQ2hhbmdlID0gamVzdC5mbigpO1xuICBjb25zdCBkZWZhdWx0UHJvcHMgPSB7XG4gICAgbW9kZWw6IHtcbiAgICAgIGJhY2tncm91bmRNYXJrczogW10sXG4gICAgICBjb3JyZWN0TWFya3M6IFtdLFxuICAgIH0sXG4gICAgb25BbnN3ZXJzQ2hhbmdlLFxuICAgIHNlc3Npb246IHt9LFxuICB9O1xuXG4gIGRlc2NyaWJlKCdyZW5kZXInLCAoKSA9PiB7XG4gICAgbGV0IHc7XG5cbiAgICBiZWZvcmVFYWNoKCgpID0+IHtcbiAgICAgIHcgPSAocHJvcHMpID0+IHNoYWxsb3coPE1haW4gey4uLnByb3BzfSAvPik7XG4gICAgfSk7XG5cbiAgICBpdCgnc25hcHNob3QnLCAoKSA9PiB7XG4gICAgICBleHBlY3QodyhkZWZhdWx0UHJvcHMpKS50b01hdGNoU25hcHNob3QoKTtcbiAgICB9KTtcbiAgfSk7XG5cbiAgZGVzY3JpYmUoJ2xvZ2ljJywgKCkgPT4ge1xuICAgIGxldCB3O1xuXG4gICAgYmVmb3JlRWFjaCgoKSA9PiB7XG4gICAgICB3ID0gKHByb3BzKSA9PiBzaGFsbG93KDxNYWluIHsuLi5wcm9wc30gLz4pO1xuICAgIH0pO1xuXG4gICAgaXQoJ2NhbGxzIG9uQW5zd2Vyc0NoYW5nZScsICgpID0+IHtcbiAgICAgIHcoZGVmYXVsdFByb3BzKS5pbnN0YW5jZSgpLmNoYW5nZURhdGEoW10pO1xuICAgICAgZXhwZWN0KG9uQW5zd2Vyc0NoYW5nZSkudG9IYXZlQmVlbkNhbGxlZFdpdGgoW10pO1xuICAgIH0pO1xuICB9KTtcbn0pO1xuIl19

package/lib/main.js

@@ -29,7 +29,7 @@ var _styles = require("@material-ui/core/styles");
 
 var _renderUi = require("@pie-lib/render-ui");
 
-var _index = require("@pie-lib/chart-toolbox/lib/charting/index");
+var _chartToolbox = _interopRequireDefault(require("@pie-lib/chart-toolbox"));
 
 var _isArray = _interopRequireDefault(require("lodash/isArray"));
 
@@ -45,6 +45,10 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 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 _ChartToolbox$Chartin = _chartToolbox["default"].Charting,
+    Chart = _ChartToolbox$Chartin.Chart,
+    chartTypes = _ChartToolbox$Chartin.chartTypes;
+
 var Main = /*#__PURE__*/function (_React$Component) {
   (0, _inherits2["default"])(Main, _React$Component);
 
@@ -121,26 +125,26 @@ var Main = /*#__PURE__*/function (_React$Component) {
         toggled: showingCorrect,
         onToggle: this.toggleCorrect,
         language: language
-      }), showingCorrect && showToggle ? /*#__PURE__*/_react["default"].createElement(_index.Chart, {
+      }), showingCorrect && showToggle ? /*#__PURE__*/_react["default"].createElement(Chart, {
         className: classes.chart,
         chartType: chartType,
         size: size,
         domain: domain,
         range: range,
-        charts: [_index.chartTypes.Bar(), _index.chartTypes.Histogram(), _index.chartTypes.LineDot(), _index.chartTypes.LineCross(), _index.chartTypes.DotPlot(), _index.chartTypes.LinePlot()],
+        charts: [chartTypes.Bar(), chartTypes.Histogram(), chartTypes.LineDot(), chartTypes.LineCross(), chartTypes.DotPlot(), chartTypes.LinePlot()],
         data: correctData || categories,
         title: title,
         onDataChange: this.changeData,
         addCategoryEnabled: false,
         categoryDefaultLabel: studentNewCategoryDefaultLabel,
         language: language
-      }) : /*#__PURE__*/_react["default"].createElement(_index.Chart, {
+      }) : /*#__PURE__*/_react["default"].createElement(Chart, {
         className: classes.chart,
         chartType: chartType,
         size: size,
         domain: domain,
         range: range,
-        charts: [_index.chartTypes.Bar(), _index.chartTypes.Histogram(), _index.chartTypes.LineDot(), _index.chartTypes.LineCross(), _index.chartTypes.DotPlot(), _index.chartTypes.LinePlot()],
+        charts: [chartTypes.Bar(), chartTypes.Histogram(), chartTypes.LineDot(), chartTypes.LineCross(), chartTypes.DotPlot(), chartTypes.LinePlot()],
         data: correctedAnswer || categories,
         title: title,
         onDataChange: this.changeData,

package/lib/main.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/main.jsx"],"names":["Main","props","data","setState","categories","onAnswersChange","showingCorrect","state","model","classes","teacherInstructions","prompt","chartType","size","domain","range","title","addCategoryEnabled","studentNewCategoryDefaultLabel","rationale","correctedAnswer","correctAnswer","language","correctData","map","interactive","editable","showToggle","length","mainContainer","collapsible","hidden","visible","toggleCorrect","chart","chartTypes","Bar","Histogram","LineDot","LineCross","DotPlot","LinePlot","changeData","nextProps","prevState","newCategories","defaultCategories","nextCategories","React","Component","PropTypes","object","isRequired","func","array","styles","theme","color","text","backgroundColor","background","overflowX","overflowY","marginTop","spacing","unit","marginBottom"],"mappings":"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","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { withStyles } from '@material-ui/core/styles';\nimport { color, Collapsible, hasText, PreviewPrompt } from '@pie-lib/render-ui';\nimport { Chart, chartTypes } from '@pie-lib/chart-toolbox/lib/charting/index';\nimport isArray from 'lodash/isArray';\nimport isEqual from 'lodash/isEqual';\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    onAnswersChange: PropTypes.func,\n    categories: PropTypes.array,\n  };\n\n  static defaultProps = { classes: {} };\n\n  constructor(props) {\n    super(props);\n\n    this.state = {\n      categories: props.categories || props.model.data,\n      showingCorrect: false,\n    };\n  }\n\n  static getDerivedStateFromProps(nextProps, prevState) {\n    const { categories: newCategories, model: { data: defaultCategories = [] } = {} } = nextProps;\n    const { categories } = prevState;\n    const nextCategories = isArray(newCategories) ? newCategories : defaultCategories;\n\n    if (!isEqual(nextCategories, categories)) {\n      return { categories: nextCategories };\n    }\n\n    return null;\n  }\n\n  changeData = (data) =>\n    this.setState(\n      {\n        categories: data,\n      },\n      () => this.props.onAnswersChange(data),\n    );\n\n  toggleCorrect = (showingCorrect) => this.setState({ showingCorrect });\n\n  render() {\n    const { categories, showingCorrect } = this.state;\n    const { model, classes } = this.props;\n    const {\n      teacherInstructions,\n      prompt,\n      chartType,\n      size,\n      domain,\n      range,\n      title,\n      addCategoryEnabled,\n      studentNewCategoryDefaultLabel,\n      rationale,\n      correctedAnswer,\n      correctAnswer,\n      language\n    } = model;\n\n    const correctData =\n      correctAnswer && correctAnswer.data\n        ? correctAnswer.data.map((data) => {\n            return {\n              ...data,\n              interactive: false,\n              editable: false,\n            };\n          })\n        : [];\n\n    const showToggle = correctData && correctData.length > 0;\n\n    return (\n      <div className={classes.mainContainer}>\n        {teacherInstructions && hasText(teacherInstructions) && (\n          <Collapsible\n            className={classes.collapsible}\n            labels={{\n              hidden: 'Show Teacher Instructions',\n              visible: 'Hide Teacher Instructions',\n            }}\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          <Chart\n            className={classes.chart}\n            chartType={chartType}\n            size={size}\n            domain={domain}\n            range={range}\n            charts={[\n              chartTypes.Bar(),\n              chartTypes.Histogram(),\n              chartTypes.LineDot(),\n              chartTypes.LineCross(),\n              chartTypes.DotPlot(),\n              chartTypes.LinePlot(),\n            ]}\n            data={correctData || categories}\n            title={title}\n            onDataChange={this.changeData}\n            addCategoryEnabled={false}\n            categoryDefaultLabel={studentNewCategoryDefaultLabel}\n            language={language}\n          />\n        ) : (\n          <Chart\n            className={classes.chart}\n            chartType={chartType}\n            size={size}\n            domain={domain}\n            range={range}\n            charts={[\n              chartTypes.Bar(),\n              chartTypes.Histogram(),\n              chartTypes.LineDot(),\n              chartTypes.LineCross(),\n              chartTypes.DotPlot(),\n              chartTypes.LinePlot(),\n            ]}\n            data={correctedAnswer || categories}\n            title={title}\n            onDataChange={this.changeData}\n            addCategoryEnabled={addCategoryEnabled}\n            categoryDefaultLabel={studentNewCategoryDefaultLabel}\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    overflowX: 'scroll',\n    overflowY: 'hidden',\n  },\n  chart: {\n    marginTop: theme.spacing.unit * 2,\n    marginBottom: theme.spacing.unit * 2,\n  },\n  collapsible: {\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":["ChartToolbox","Charting","Chart","chartTypes","Main","props","data","setState","categories","onAnswersChange","showingCorrect","state","model","classes","teacherInstructions","prompt","chartType","size","domain","range","title","addCategoryEnabled","studentNewCategoryDefaultLabel","rationale","correctedAnswer","correctAnswer","language","correctData","map","interactive","editable","showToggle","length","mainContainer","collapsible","hidden","visible","toggleCorrect","chart","Bar","Histogram","LineDot","LineCross","DotPlot","LinePlot","changeData","nextProps","prevState","newCategories","defaultCategories","nextCategories","React","Component","PropTypes","object","isRequired","func","array","styles","theme","color","text","backgroundColor","background","overflowX","overflowY","marginTop","spacing","unit","marginBottom"],"mappings":"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","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { withStyles } from '@material-ui/core/styles';\nimport { color, Collapsible, hasText, PreviewPrompt } from '@pie-lib/render-ui';\nimport ChartToolbox from '@pie-lib/chart-toolbox';\nimport isArray from 'lodash/isArray';\nimport isEqual from 'lodash/isEqual';\nimport CorrectAnswerToggle from '@pie-lib/correct-answer-toggle';\n\nconst { Chart, chartTypes } = ChartToolbox.Charting;\n\nexport class Main extends React.Component {\n  static propTypes = {\n    classes: PropTypes.object,\n    model: PropTypes.object.isRequired,\n    onAnswersChange: PropTypes.func,\n    categories: PropTypes.array,\n  };\n\n  static defaultProps = { classes: {} };\n\n  constructor(props) {\n    super(props);\n\n    this.state = {\n      categories: props.categories || props.model.data,\n      showingCorrect: false,\n    };\n  }\n\n  static getDerivedStateFromProps(nextProps, prevState) {\n    const { categories: newCategories, model: { data: defaultCategories = [] } = {} } = nextProps;\n    const { categories } = prevState;\n    const nextCategories = isArray(newCategories) ? newCategories : defaultCategories;\n\n    if (!isEqual(nextCategories, categories)) {\n      return { categories: nextCategories };\n    }\n\n    return null;\n  }\n\n  changeData = (data) =>\n    this.setState(\n      {\n        categories: data,\n      },\n      () => this.props.onAnswersChange(data),\n    );\n\n  toggleCorrect = (showingCorrect) => this.setState({ showingCorrect });\n\n  render() {\n    const { categories, showingCorrect } = this.state;\n    const { model, classes } = this.props;\n    const {\n      teacherInstructions,\n      prompt,\n      chartType,\n      size,\n      domain,\n      range,\n      title,\n      addCategoryEnabled,\n      studentNewCategoryDefaultLabel,\n      rationale,\n      correctedAnswer,\n      correctAnswer,\n      language\n    } = model;\n\n    const correctData =\n      correctAnswer && correctAnswer.data\n        ? correctAnswer.data.map((data) => {\n            return {\n              ...data,\n              interactive: false,\n              editable: false,\n            };\n          })\n        : [];\n\n    const showToggle = correctData && correctData.length > 0;\n\n    return (\n      <div className={classes.mainContainer}>\n        {teacherInstructions && hasText(teacherInstructions) && (\n          <Collapsible\n            className={classes.collapsible}\n            labels={{\n              hidden: 'Show Teacher Instructions',\n              visible: 'Hide Teacher Instructions',\n            }}\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          <Chart\n            className={classes.chart}\n            chartType={chartType}\n            size={size}\n            domain={domain}\n            range={range}\n            charts={[\n              chartTypes.Bar(),\n              chartTypes.Histogram(),\n              chartTypes.LineDot(),\n              chartTypes.LineCross(),\n              chartTypes.DotPlot(),\n              chartTypes.LinePlot(),\n            ]}\n            data={correctData || categories}\n            title={title}\n            onDataChange={this.changeData}\n            addCategoryEnabled={false}\n            categoryDefaultLabel={studentNewCategoryDefaultLabel}\n            language={language}\n          />\n        ) : (\n          <Chart\n            className={classes.chart}\n            chartType={chartType}\n            size={size}\n            domain={domain}\n            range={range}\n            charts={[\n              chartTypes.Bar(),\n              chartTypes.Histogram(),\n              chartTypes.LineDot(),\n              chartTypes.LineCross(),\n              chartTypes.DotPlot(),\n              chartTypes.LinePlot(),\n            ]}\n            data={correctedAnswer || categories}\n            title={title}\n            onDataChange={this.changeData}\n            addCategoryEnabled={addCategoryEnabled}\n            categoryDefaultLabel={studentNewCategoryDefaultLabel}\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    overflowX: 'scroll',\n    overflowY: 'hidden',\n  },\n  chart: {\n    marginTop: theme.spacing.unit * 2,\n    marginBottom: theme.spacing.unit * 2,\n  },\n  collapsible: {\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": "6.5.1-beta",
+  "version": "6.5.1-beta.2",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -13,7 +13,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/chart-toolbox": "1.0.1-next.4186",
+    "@pie-lib/chart-toolbox": "1.0.1-next.4188",
     "@pie-lib/correct-answer-toggle": "^2.5.11",
     "@pie-lib/math-rendering": "2.5.18",
     "@pie-lib/render-ui": "^4.15.9",