@pie-element/charting 6.5.1-next.2 → 6.5.2-next.11

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.5.1](https://github.com/pie-framework/pie-elements/compare/@pie-element/charting@6.5.0...@pie-element/charting@6.5.1) (2023-10-16)
+
+
+### Bug Fixes
+
+* **charting:** remove unwanted double quotes from error message ([89ca1db](https://github.com/pie-framework/pie-elements/commit/89ca1db5f2d33d56da8054849e555c2cffdb5c49))
+
+
+
+
+
 # [6.5.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/charting@6.4.3...@pie-element/charting@6.5.0) (2023-10-16)
 
 

package/configure/package.json

@@ -10,8 +10,8 @@
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
     "@pie-lib/charting": "^5.15.6",
-    "@pie-lib/config-ui": "^11.9.23",
-    "@pie-lib/editable-html": "^11.1.0",
+    "@pie-lib/config-ui": "^11.9.24",
+    "@pie-lib/editable-html": "^11.1.1",
     "@pie-lib/math-rendering": "2.5.18",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",

package/controller/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.1.3](https://github.com/pie-framework/pie-elements/compare/@pie-element/charting-controller@3.1.2...@pie-element/charting-controller@3.1.3) (2023-10-16)
+
+
+### Bug Fixes
+
+* **charting:** remove unwanted double quotes from error message ([89ca1db](https://github.com/pie-framework/pie-elements/commit/89ca1db5f2d33d56da8054849e555c2cffdb5c49))
+
+
+
+
+
 ## [3.1.2](https://github.com/pie-framework/pie-elements/compare/@pie-element/charting-controller@3.1.1...@pie-element/charting-controller@3.1.2) (2023-10-16)
 
 

package/controller/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pie-element/charting-controller",
   "private": true,
-  "version": "3.1.2",
+  "version": "3.1.3",
   "description": "",
   "main": "lib/index.js",
   "module": "src/index.js",

package/lib/main.js

@@ -75,6 +75,19 @@ var Main = /*#__PURE__*/function (_React$Component) {
   }
 
   (0, _createClass2["default"])(Main, [{
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps) {
+      if (!(0, _isEqual["default"])(prevProps.categories, this.props.categories)) {
+        this.setState({
+          categories: this.props.categories
+        });
+      } else if (!(0, _isEqual["default"])(prevProps.model.data, this.props.model.data)) {
+        this.setState({
+          categories: this.props.model.data
+        });
+      }
+    }
+  }, {
     key: "render",
     value: function render() {
       var _this$state = this.state,
@@ -156,25 +169,6 @@ var Main = /*#__PURE__*/function (_React$Component) {
         prompt: rationale
       })));
     }
-  }], [{
-    key: "getDerivedStateFromProps",
-    value: function getDerivedStateFromProps(nextProps, prevState) {
-      var newCategories = nextProps.categories,
-          _nextProps$model = nextProps.model;
-      _nextProps$model = _nextProps$model === void 0 ? {} : _nextProps$model;
-      var _nextProps$model$data = _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"])(nextCategories, categories)) {
-        return {
-          categories: nextCategories
-        };
-      }
-
-      return null;
-    }
   }]);
   return Main;
 }(_react["default"].Component);

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/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      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":["Main","props","data","setState","categories","onAnswersChange","showingCorrect","state","model","prevProps","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","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  componentDidUpdate(prevProps) {\n    if (!isEqual(prevProps.categories, this.props.categories)) {\n        this.setState({ categories: this.props.categories });\n    } else if (!isEqual(prevProps.model.data, this.props.model.data)) {\n        this.setState({ categories: this.props.model.data });\n    }\n}\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-next.2+b1d5d132f",
+  "version": "6.5.2-next.11+f04d59f20",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -26,7 +26,7 @@
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "b1d5d132f6f7332b75347696b7005a3408a9a799",
+  "gitHead": "f04d59f204852e430dc3e8fe2c442bb9a1634761",
   "main": "lib/index.js",
   "module": "src/index.js"
 }