@pie-element/charting 5.11.3-next.47 → 5.11.3-next.50

package/configure/package.json

@@ -9,9 +9,9 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/charting": "^5.8.0",
-    "@pie-lib/config-ui": "^11.6.6",
-    "@pie-lib/editable-html": "^9.5.25",
+    "@pie-lib/charting": "^5.8.1",
+    "@pie-lib/config-ui": "^11.6.7",
+    "@pie-lib/editable-html": "^9.5.26",
     "@pie-lib/math-rendering": "^2.5.14",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",

package/lib/main.js

@@ -31,6 +31,8 @@ var _renderUi = require("@pie-lib/render-ui");
 
 var _charting = require("@pie-lib/charting");
 
+var _isArray = _interopRequireDefault(require("lodash/isArray"));
+
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 
 var _correctAnswerToggle = _interopRequireDefault(require("@pie-lib/correct-answer-toggle"));
@@ -66,7 +68,7 @@ var Main = /*#__PURE__*/function (_React$Component) {
       });
     });
     _this.state = {
-      categories: props.model.data,
+      categories: props.categories || props.model.data,
       showingCorrect: false
     };
     return _this;
@@ -153,15 +155,17 @@ var Main = /*#__PURE__*/function (_React$Component) {
   }], [{
     key: "getDerivedStateFromProps",
     value: function getDerivedStateFromProps(nextProps, prevState) {
-      var _nextProps$model = nextProps.model;
+      var newCategories = nextProps.categories,
+          _nextProps$model = nextProps.model;
       _nextProps$model = _nextProps$model === void 0 ? {} : _nextProps$model;
       var _nextProps$model$data = _nextProps$model.data,
-          nextData = _nextProps$model$data === void 0 ? [] : _nextProps$model$data;
+          defaultCategories = _nextProps$model$data === void 0 ? [] : _nextProps$model$data;
       var categories = prevState.categories;
+      var nextCategories = (0, _isArray["default"])(newCategories) ? newCategories : defaultCategories;
 
-      if (!(0, _isEqual["default"])(nextData, categories)) {
+      if (!(0, _isEqual["default"])(nextCategories, categories)) {
         return {
-          categories: nextData
+          categories: nextCategories
         };
       }
 

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","categoryDefaultLabel","rationale","correctedAnswer","correctAnswer","correctData","map","interactive","editable","showToggle","length","mainContainer","collapsible","hidden","visible","toggleCorrect","chart","chartTypes","Bar","Histogram","LineDot","LineCross","DotPlot","LinePlot","changeData","nextProps","prevState","nextData","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/charting';\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.model.data,\n      showingCorrect: false,\n    };\n  }\n  \n  static getDerivedStateFromProps(nextProps, prevState) {\n    const { model: { data: nextData = [] } = {} } = nextProps;\n    const { categories } = prevState;\n\n    if (!isEqual(nextData, categories)) {\n      return { categories: nextData };\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      categoryDefaultLabel,\n      rationale,\n      correctedAnswer,\n      correctAnswer,\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 show={showToggle} toggled={showingCorrect} onToggle={this.toggleCorrect} />\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={categoryDefaultLabel}\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={categoryDefaultLabel}\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":["Main","props","data","setState","categories","onAnswersChange","showingCorrect","state","model","classes","teacherInstructions","prompt","chartType","size","domain","range","title","addCategoryEnabled","categoryDefaultLabel","rationale","correctedAnswer","correctAnswer","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/charting';\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      categoryDefaultLabel,\n      rationale,\n      correctedAnswer,\n      correctAnswer,\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 show={showToggle} toggled={showingCorrect} onToggle={this.toggleCorrect} />\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={categoryDefaultLabel}\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={categoryDefaultLabel}\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": "5.11.3-next.47+3605c0ecf",
+  "version": "5.11.3-next.50+698446b29",
   "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/charting": "^5.8.0",
+    "@pie-lib/charting": "^5.8.1",
     "@pie-lib/correct-answer-toggle": "^2.3.73",
     "@pie-lib/math-rendering": "^2.5.14",
     "@pie-lib/render-ui": "^4.14.23",
@@ -25,7 +25,7 @@
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "3605c0ecf5306fecdc5d50c99999699846473841",
+  "gitHead": "698446b29a553a022c91825118370faae824b723",
   "main": "lib/index.js",
   "module": "src/index.js"
 }