@pie-element/charting 8.2.2-next.9 → 8.3.0

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [8.3.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/charting@8.2.1...@pie-element/charting@8.3.0) (2024-11-15)
+
+
+### Bug Fixes
+
+* update pie-lib/pie-toolbox PD-4401, PD-4441, PD-4319, PD-4394, PD-3687 ([f1f0af3](https://github.com/pie-framework/pie-elements/commit/f1f0af31f3c6fba54ca3a378dea3b8b32d8ebb87))
+
+
+### Features
+
+* Adjust all elements to support custom color for controls in authoring PD-4334 ([d6b3dc5](https://github.com/pie-framework/pie-elements/commit/d6b3dc5963824d0a1ce7bf36a8c590e27761c86c))
+
+
+
+
+
 ## [8.2.1](https://github.com/pie-framework/pie-elements/compare/@pie-element/charting@8.2.0...@pie-element/charting@8.2.1) (2024-11-01)
 
 

package/configure/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [8.2.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/charting-configure@8.1.1...@pie-element/charting-configure@8.2.0) (2024-11-15)
+
+
+### Bug Fixes
+
+* update pie-lib/pie-toolbox PD-4401, PD-4441, PD-4319, PD-4394, PD-3687 ([f1f0af3](https://github.com/pie-framework/pie-elements/commit/f1f0af31f3c6fba54ca3a378dea3b8b32d8ebb87))
+
+
+### Features
+
+* Adjust all elements to support custom color for controls in authoring PD-4334 ([d6b3dc5](https://github.com/pie-framework/pie-elements/commit/d6b3dc5963824d0a1ce7bf36a8c590e27761c86c))
+
+
+
+
+
 ## [8.1.1](https://github.com/pie-framework/pie-elements/compare/@pie-element/charting-configure@8.1.0...@pie-element/charting-configure@8.1.1) (2024-11-01)
 
 

package/configure/lib/charting-config.js

@@ -35,6 +35,8 @@ var _configUi = require("@pie-lib/pie-toolbox/config-ui");
 
 var _Checkbox = _interopRequireDefault(require("@material-ui/core/Checkbox"));
 
+var _renderUi = require("@pie-lib/pie-toolbox/render-ui");
+
 var _Typography = _interopRequireDefault(require("@material-ui/core/Typography"));
 
 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); }
@@ -61,6 +63,9 @@ var styles = function styles(theme) {
     },
     column: {
       flex: 1
+    },
+    customColor: {
+      color: "".concat(_renderUi.color.tertiary(), " !important")
     }
   };
 };
@@ -222,6 +227,7 @@ var ChartingConfig = /*#__PURE__*/function (_React$Component) {
         mathMlOptions: mathMlOptions,
         labelsCharactersLimit: labelsCharactersLimit
       }), model.changeAddCategoryEnabled && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Checkbox["default"], {
+        className: classes.customColor,
         checked: model.addCategoryEnabled,
         onChange: function onChange(e) {
           _this2.changeAddRemoveEnabled(e.target.checked);

package/configure/lib/charting-config.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/charting-config.jsx"],"names":["styles","theme","container","marginBottom","spacing","unit","display","flex","title","column","restoreCorrectAnswer","correctAnswer","data","correctResponseDefinition","forEach","category","currentIndex","editable","interactive","label","value","ChartingConfig","props","open","callback","setState","dialog","onChange","model","text","onConfirm","handleAlertDialog","addCategoryEnabled","onClose","type","state","classes","charts","labelsPlaceholders","titlePlaceholder","showPixelGuides","authorNewCategoryDefaults","chartingOptions","mathMlOptions","labelsCharactersLimit","domain","range","chartType","graph","map","index","changeData","changeTitle","changeLabel","changeInteractiveEnabled","changeEditableEnabled","changeAddCategoryEnabled","e","changeAddRemoveEnabled","target","checked","addCategory","authoringLabel","React","Component","PropTypes","object","isRequired","func","array","bool"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;AAEA;;;;;;;;;;;;;;AAEA,IAAMA,MAAM,GAAG,SAATA,MAAS,CAACC,KAAD;AAAA,SAAY;AACzBC,IAAAA,SAAS,EAAE;AACTC,MAAAA,YAAY,EAAEF,KAAK,CAACG,OAAN,CAAcC,IAAd,GAAqB,GAD1B;AAETC,MAAAA,OAAO,EAAE,MAFA;AAGTC,MAAAA,IAAI,EAAE;AAHG,KADc;AAMzBC,IAAAA,KAAK,EAAE;AACLL,MAAAA,YAAY,EAAEF,KAAK,CAACG,OAAN,CAAcC;AADvB,KANkB;AASzBI,IAAAA,MAAM,EAAE;AACNF,MAAAA,IAAI,EAAE;AADA;AATiB,GAAZ;AAAA,CAAf;;AAcA,IAAMG,oBAAoB,GAAG,SAAvBA,oBAAuB,CAACC,aAAD,EAAgBC,IAAhB,EAAyB;AACpD,MAAI,CAACD,aAAL,EAAoB;AAClB,WAAOC,IAAP;AACD;;AAED,MAAIC,yBAAyB,GAAG,EAAhC;AAEA,GAACD,IAAI,IAAI,EAAT,EAAaE,OAAb,CAAqB,UAACC,QAAD,EAAWC,YAAX,EAA4B;AAAA;;AAC/C,QAAQC,QAAR,GAAkCF,QAAlC,CAAQE,QAAR;AAAA,QAAkBC,WAAlB,GAAkCH,QAAlC,CAAkBG,WAAlB;AAEA,QAAMC,KAAK,GAAGF,QAAQ,6BAAIN,aAAa,CAACK,YAAD,CAAjB,kDAAI,sBAA6BG,KAAzC,GAAiDR,aAAa,CAACK,YAAD,CAAb,CAA4BG,KAA7E,GAAqFJ,QAAQ,CAACI,KAA5G;AAEA,QAAMC,KAAK,GACTF,WAAW,8BAAIP,aAAa,CAACK,YAAD,CAAjB,mDAAI,uBAA6BI,KAA5C,GAAoDT,aAAa,CAACK,YAAD,CAAb,CAA4BI,KAAhF,GAAwFL,QAAQ,CAACK,KADnG;AAGAP,IAAAA,yBAAyB,CAACG,YAAD,CAAzB,GAA0C;AACxCG,MAAAA,KAAK,EAAEA,KADiC;AAExCC,MAAAA,KAAK,EAAEA,KAFiC;AAGxCH,MAAAA,QAAQ,EAAEF,QAAQ,CAACE,QAHqB;AAIxCC,MAAAA,WAAW,EAAEH,QAAQ,CAACG;AAJkB,KAA1C;AAMD,GAdD;AAgBA,SAAOL,yBAAP;AACD,CAxBD;;IA0BaQ,c;;;;;AAaX,0BAAYC,KAAZ,EAAmB;AAAA;;AAAA;AACjB,8BAAMA,KAAN;AADiB,0GASC,UAACC,IAAD,EAAOC,QAAP;AAAA,aAClB,MAAKC,QAAL,CACE;AACEC,QAAAA,MAAM,EAAE;AAAEH,UAAAA,IAAI,EAAJA;AAAF;AADV,OADF,EAIEC,QAJF,CADkB;AAAA,KATD;AAAA,mGAiBN,UAACZ,IAAD;AAAA,aAAU,MAAKU,KAAL,CAAWK,QAAX,iCAAyB,MAAKL,KAAL,CAAWM,KAApC;AAA2ChB,QAAAA,IAAI,EAAJA;AAA3C,SAAV;AAAA,KAjBM;AAAA,+GAmBM,UAACQ,KAAD,EAAW;AAClC,UAAQQ,KAAR,GAAkB,MAAKN,KAAvB,CAAQM,KAAR;AACA,UAAMjB,aAAa,GAAGD,oBAAoB,CAACkB,KAAK,CAACjB,aAAN,CAAoBC,IAArB,EAA2BgB,KAAK,CAAChB,IAAjC,CAA1C;;AAEA,UAAI,CAACQ,KAAL,EAAY;AACV,cAAKK,QAAL,CAAc;AACZC,UAAAA,MAAM,EAAE;AACNH,YAAAA,IAAI,EAAE,IADA;AAENf,YAAAA,KAAK,EAAE,SAFD;AAGNqB,YAAAA,IAAI,EAAE,4GAHA;AAINC,YAAAA,SAAS,EAAE;AAAA,qBACT,MAAKC,iBAAL,CACE,KADF,EAEE,MAAKT,KAAL,CAAWK,QAAX,iCACK,MAAKL,KAAL,CAAWM,KADhB;AAEEI,gBAAAA,kBAAkB,EAAEZ,KAFtB;AAGET,gBAAAA,aAAa,EAAE;AAAEC,kBAAAA,IAAI,EAAED;AAAR;AAHjB,iBAFF,CADS;AAAA,aAJL;AAaNsB,YAAAA,OAAO,EAAE;AAAA,qBAAM,MAAKF,iBAAL,CAAuB,KAAvB,CAAN;AAAA;AAbH;AADI,SAAd;AAiBD,OAlBD,MAkBO;AACL,cAAKT,KAAL,CAAWK,QAAX,iCAAyB,MAAKL,KAAL,CAAWM,KAApC;AAA2CI,UAAAA,kBAAkB,EAAEZ;AAA/D;AACD;AACF,KA5CkB;AAAA,oGA8CL,UAACZ,KAAD;AAAA,aAAW,MAAKc,KAAL,CAAWK,QAAX,iCAAyB,MAAKL,KAAL,CAAWM,KAApC;AAA2CpB,QAAAA,KAAK,EAALA;AAA3C,SAAX;AAAA,KA9CK;AAAA,oGAgDL,UAAC0B,IAAD,EAAOf,KAAP;AAAA,aACZ,MAAKG,KAAL,CAAWK,QAAX,iCACK,MAAKL,KAAL,CAAWM,KADhB,4CAEGM,IAFH,kCAGO,MAAKZ,KAAL,CAAWM,KAAX,CAAiBM,IAAjB,CAHP;AAIIf,QAAAA,KAAK,EAALA;AAJJ,WADY;AAAA,KAhDK;AAEjB,UAAKgB,KAAL,GAAa;AACXT,MAAAA,MAAM,EAAE;AACNH,QAAAA,IAAI,EAAE;AADA;AADG,KAAb;AAFiB;AAOlB;;;;WAkDD,kBAAS;AAAA;AAAA;;AACP,wBAWI,KAAKD,KAXT;AAAA,UACEc,OADF,eACEA,OADF;AAAA,UAEER,KAFF,eAEEA,KAFF;AAAA,UAGES,MAHF,eAGEA,MAHF;AAAA,UAIEC,kBAJF,eAIEA,kBAJF;AAAA,UAKEC,gBALF,eAKEA,gBALF;AAAA,UAMEC,eANF,eAMEA,eANF;AAAA,UAOEC,yBAPF,eAOEA,yBAPF;AAAA,UAQEC,eARF,eAQEA,eARF;AAAA,8CASEC,aATF;AAAA,UASEA,aATF,sCASkB,EATlB;AAAA,UAUEC,qBAVF,eAUEA,qBAVF;AAYA,UAAQlB,MAAR,GAAmB,KAAKS,KAAxB,CAAQT,MAAR;;AACA,iBAAoCE,KAAK,IAAI,EAA7C;AAAA,6BAAQiB,MAAR;AAAA,UAAQA,MAAR,4BAAiB,EAAjB;AAAA,4BAAqBC,KAArB;AAAA,UAAqBA,KAArB,2BAA6B,EAA7B;;AAEA,0BACE,8CACE;AAAK,QAAA,SAAS,EAAEV,OAAO,CAAC5B;AAAxB,2CADF,eAEE;AAAK,QAAA,SAAS,EAAE4B,OAAO,CAAClC;AAAxB,sBACE;AAAK,QAAA,SAAS,EAAEkC,OAAO,CAAC3B,MAAxB;AAAgC,QAAA,GAAG,EAAC;AAApC,sBACE,oBAAC,sBAAD;AAAY,QAAA,SAAS,EAAC,KAAtB;AAA4B,QAAA,IAAI,EAAC;AAAjC,sBACE,qHADF,CADF,eAKE,oBAAC,eAAD;AACE,QAAA,WAAW,EAAE,IADf;AAEE,QAAA,eAAe,EAAEiC,eAFnB;AAGE,QAAA,eAAe,EAAEF,eAHnB;AAIE,QAAA,SAAS,EAAEZ,KAAK,CAACmB,SAJnB;AAKE,QAAA,IAAI,EAAEnB,KAAK,CAACoB,KALd;AAME,QAAA,MAAM,EAAEH,MANV;AAOE,QAAA,KAAK,EAAEC,KAPT;AAQE,QAAA,MAAM,EAAET,MARV,CASE;AATF;AAUE,QAAA,IAAI,EAAET,KAAK,CAAChB,IAAN,CAAWqC,GAAX,CAAe,UAAClC,QAAD,EAAWmC,KAAX;AAAA,iDAChBnC,QADgB;AAEnBmC,YAAAA,KAAK,EAAEA;AAFY;AAAA,SAAf,CAVR;AAcE,QAAA,KAAK,EAAEtB,KAAK,CAACpB,KAdf;AAeE,QAAA,YAAY,EAAE,KAAK2C,UAfrB;AAgBE,QAAA,aAAa,EAAE,KAAKC,WAhBtB;AAiBE,QAAA,cAAc,EAAE,KAAKC,WAjBvB;AAkBE,QAAA,kBAAkB,EAAE,IAlBtB;AAmBE,QAAA,wBAAwB,EAAEzB,KAAK,CAAC0B,wBAnBlC;AAoBE,QAAA,qBAAqB,EAAE1B,KAAK,CAAC2B,qBApB/B;AAqBE,QAAA,oBAAoB,EAAEd,yBAAF,aAAEA,yBAAF,uBAAEA,yBAAyB,CAAEtB,KArBnD;AAsBE,QAAA,gBAAgB,EAAEsB,yBAtBpB;AAuBE,QAAA,kBAAkB,EAAEH,kBAvBtB;AAwBE,QAAA,gBAAgB,EAAEC,gBAAF,aAAEA,gBAAF,uBAAEA,gBAAgB,CAAEpB,KAxBtC;AAyBE,QAAA,aAAa,EAAEwB,aAzBjB;AA0BE,QAAA,qBAAqB,EAAEC;AA1BzB,QALF,EAiCGhB,KAAK,CAAC4B,wBAAN,iBACC,8CACE,oBAAC,oBAAD;AACE,QAAA,OAAO,EAAE5B,KAAK,CAACI,kBADjB;AAEE,QAAA,QAAQ,EAAE,kBAACyB,CAAD,EAAO;AACf,UAAA,MAAI,CAACC,sBAAL,CAA4BD,CAAC,CAACE,MAAF,CAASC,OAArC;AACD;AAJH,QADF,EAOGlB,eAPH,aAOGA,eAPH,gDAOGA,eAAe,CAAEmB,WAPpB,0DAOG,sBAA8BC,cAPjC,CAlCJ,eA4CE,oBAAC,qBAAD;AACE,QAAA,IAAI,EAAEpC,MAAM,CAACH,IADf;AAEE,QAAA,KAAK,EAAEG,MAAM,CAAClB,KAFhB;AAGE,QAAA,IAAI,EAAEkB,MAAM,CAACG,IAHf;AAIE,QAAA,OAAO,EAAEH,MAAM,CAACO,OAJlB;AAKE,QAAA,SAAS,EAAEP,MAAM,CAACI;AALpB,QA5CF,CADF,CAFF,CADF;AA2DD;;;EAjJiCiC,KAAK,CAACC,S;;;iCAA7B3C,c,eACQ;AACjBe,EAAAA,OAAO,EAAE6B,sBAAUC,MAAV,CAAiBC,UADT;AAEjBvC,EAAAA,KAAK,EAAEqC,sBAAUC,MAAV,CAAiBC,UAFP;AAGjBxC,EAAAA,QAAQ,EAAEsC,sBAAUG,IAAV,CAAeD,UAHR;AAIjB9B,EAAAA,MAAM,EAAE4B,sBAAUI,KAJD;AAKjB/B,EAAAA,kBAAkB,EAAE2B,sBAAUC,MALb;AAMjB3B,EAAAA,gBAAgB,EAAE0B,sBAAUC,MANX;AAOjB1B,EAAAA,eAAe,EAAEyB,sBAAUK,IAPV;AAQjB7B,EAAAA,yBAAyB,EAAEwB,sBAAUC,MARpB;AASjBxB,EAAAA,eAAe,EAAEuB,sBAAUC;AATV,C;;eAmJN,wBAAWlE,MAAX,EAAmBqB,cAAnB,C","sourcesContent":["import * as React from 'react';\nimport PropTypes from 'prop-types';\nimport { withStyles } from '@material-ui/core/styles';\nimport { Chart } from '@pie-lib/pie-toolbox/charting';\nimport { AlertDialog } from '@pie-lib/pie-toolbox/config-ui';\nimport Checkbox from '@material-ui/core/Checkbox';\n\nimport Typography from '@material-ui/core/Typography';\n\nconst styles = (theme) => ({\n  container: {\n    marginBottom: theme.spacing.unit * 2.5,\n    display: 'flex',\n    flex: 1,\n  },\n  title: {\n    marginBottom: theme.spacing.unit,\n  },\n  column: {\n    flex: 1,\n  },\n});\n\nconst restoreCorrectAnswer = (correctAnswer, data) => {\n  if (!correctAnswer) {\n    return data;\n  }\n\n  let correctResponseDefinition = [];\n\n  (data || []).forEach((category, currentIndex) => {\n    const { editable, interactive } = category;\n\n    const label = editable && correctAnswer[currentIndex]?.label ? correctAnswer[currentIndex].label : category.label;\n\n    const value =\n      interactive && correctAnswer[currentIndex]?.value ? correctAnswer[currentIndex].value : category.value;\n\n    correctResponseDefinition[currentIndex] = {\n      label: label,\n      value: value,\n      editable: category.editable,\n      interactive: category.interactive,\n    };\n  });\n\n  return correctResponseDefinition;\n};\n\nexport class ChartingConfig extends React.Component {\n  static propTypes = {\n    classes: PropTypes.object.isRequired,\n    model: PropTypes.object.isRequired,\n    onChange: PropTypes.func.isRequired,\n    charts: PropTypes.array,\n    labelsPlaceholders: PropTypes.object,\n    titlePlaceholder: PropTypes.object,\n    showPixelGuides: PropTypes.bool,\n    authorNewCategoryDefaults: PropTypes.object,\n    chartingOptions: PropTypes.object,\n  };\n\n  constructor(props) {\n    super(props);\n    this.state = {\n      dialog: {\n        open: false,\n      },\n    };\n  }\n\n  handleAlertDialog = (open, callback) =>\n    this.setState(\n      {\n        dialog: { open },\n      },\n      callback,\n    );\n\n  changeData = (data) => this.props.onChange({ ...this.props.model, data });\n\n  changeAddRemoveEnabled = (value) => {\n    const { model } = this.props;\n    const correctAnswer = restoreCorrectAnswer(model.correctAnswer.data, model.data);\n\n    if (!value) {\n      this.setState({\n        dialog: {\n          open: true,\n          title: 'Warning',\n          text: 'This change will remove any correct answer categories that are not part of the initial item configuration.',\n          onConfirm: () =>\n            this.handleAlertDialog(\n              false,\n              this.props.onChange({\n                ...this.props.model,\n                addCategoryEnabled: value,\n                correctAnswer: { data: correctAnswer },\n              }),\n            ),\n          onClose: () => this.handleAlertDialog(false),\n        },\n      });\n    } else {\n      this.props.onChange({ ...this.props.model, addCategoryEnabled: value });\n    }\n  };\n\n  changeTitle = (title) => this.props.onChange({ ...this.props.model, title });\n\n  changeLabel = (type, label) =>\n    this.props.onChange({\n      ...this.props.model,\n      [type]: {\n        ...this.props.model[type],\n        label,\n      },\n    });\n\n  render() {\n    const {\n      classes,\n      model,\n      charts,\n      labelsPlaceholders,\n      titlePlaceholder,\n      showPixelGuides,\n      authorNewCategoryDefaults,\n      chartingOptions,\n      mathMlOptions = {},\n      labelsCharactersLimit,\n    } = this.props;\n    const { dialog } = this.state;\n    const { domain = {}, range = {} } = model || {};\n\n    return (\n      <div>\n        <div className={classes.title}>Define Initial Chart Attributes</div>\n        <div className={classes.container}>\n          <div className={classes.column} key=\"graph\">\n            <Typography component=\"div\" type=\"body1\">\n              <span>Use the tools below to set up the chart as it will initially appear to students.</span>\n            </Typography>\n\n            <Chart\n              defineChart={true}\n              chartingOptions={chartingOptions}\n              showPixelGuides={showPixelGuides}\n              chartType={model.chartType}\n              size={model.graph}\n              domain={domain}\n              range={range}\n              charts={charts}\n              // index is a property used for setting the correct answer data; it's needed in order to remove categories from other data sets from the same index it was removed from the initial data\n              data={model.data.map((category, index) => ({\n                ...category,\n                index: index,\n              }))}\n              title={model.title}\n              onDataChange={this.changeData}\n              onChangeTitle={this.changeTitle}\n              onChangeLabels={this.changeLabel}\n              addCategoryEnabled={true}\n              changeInteractiveEnabled={model.changeInteractiveEnabled}\n              changeEditableEnabled={model.changeEditableEnabled}\n              categoryDefaultLabel={authorNewCategoryDefaults?.label}\n              categoryDefaults={authorNewCategoryDefaults}\n              labelsPlaceholders={labelsPlaceholders}\n              titlePlaceholder={titlePlaceholder?.label}\n              mathMlOptions={mathMlOptions}\n              labelsCharactersLimit={labelsCharactersLimit}\n            />\n            {model.changeAddCategoryEnabled && (\n              <div>\n                <Checkbox\n                  checked={model.addCategoryEnabled}\n                  onChange={(e) => {\n                    this.changeAddRemoveEnabled(e.target.checked);\n                  }}\n                />\n                {chartingOptions?.addCategory?.authoringLabel}\n              </div>\n            )}\n            <AlertDialog\n              open={dialog.open}\n              title={dialog.title}\n              text={dialog.text}\n              onClose={dialog.onClose}\n              onConfirm={dialog.onConfirm}\n            />\n          </div>\n        </div>\n      </div>\n    );\n  }\n}\n\nexport default withStyles(styles)(ChartingConfig);\n"],"file":"charting-config.js"}
+{"version":3,"sources":["../src/charting-config.jsx"],"names":["styles","theme","container","marginBottom","spacing","unit","display","flex","title","column","customColor","color","tertiary","restoreCorrectAnswer","correctAnswer","data","correctResponseDefinition","forEach","category","currentIndex","editable","interactive","label","value","ChartingConfig","props","open","callback","setState","dialog","onChange","model","text","onConfirm","handleAlertDialog","addCategoryEnabled","onClose","type","state","classes","charts","labelsPlaceholders","titlePlaceholder","showPixelGuides","authorNewCategoryDefaults","chartingOptions","mathMlOptions","labelsCharactersLimit","domain","range","chartType","graph","map","index","changeData","changeTitle","changeLabel","changeInteractiveEnabled","changeEditableEnabled","changeAddCategoryEnabled","e","changeAddRemoveEnabled","target","checked","addCategory","authoringLabel","React","Component","PropTypes","object","isRequired","func","array","bool"],"mappings":"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","sourcesContent":["import * as React from 'react';\nimport PropTypes from 'prop-types';\nimport { withStyles } from '@material-ui/core/styles';\nimport { Chart } from '@pie-lib/pie-toolbox/charting';\nimport { AlertDialog } from '@pie-lib/pie-toolbox/config-ui';\nimport Checkbox from '@material-ui/core/Checkbox';\nimport { color } from '@pie-lib/pie-toolbox/render-ui';\n\nimport Typography from '@material-ui/core/Typography';\n\nconst styles = (theme) => ({\n  container: {\n    marginBottom: theme.spacing.unit * 2.5,\n    display: 'flex',\n    flex: 1,\n  },\n  title: {\n    marginBottom: theme.spacing.unit,\n  },\n  column: {\n    flex: 1,\n  },\n  customColor: {\n    color: `${color.tertiary()} !important`\n  },\n});\n\nconst restoreCorrectAnswer = (correctAnswer, data) => {\n  if (!correctAnswer) {\n    return data;\n  }\n\n  let correctResponseDefinition = [];\n\n  (data || []).forEach((category, currentIndex) => {\n    const { editable, interactive } = category;\n\n    const label = editable && correctAnswer[currentIndex]?.label ? correctAnswer[currentIndex].label : category.label;\n\n    const value =\n      interactive && correctAnswer[currentIndex]?.value ? correctAnswer[currentIndex].value : category.value;\n\n    correctResponseDefinition[currentIndex] = {\n      label: label,\n      value: value,\n      editable: category.editable,\n      interactive: category.interactive,\n    };\n  });\n\n  return correctResponseDefinition;\n};\n\nexport class ChartingConfig extends React.Component {\n  static propTypes = {\n    classes: PropTypes.object.isRequired,\n    model: PropTypes.object.isRequired,\n    onChange: PropTypes.func.isRequired,\n    charts: PropTypes.array,\n    labelsPlaceholders: PropTypes.object,\n    titlePlaceholder: PropTypes.object,\n    showPixelGuides: PropTypes.bool,\n    authorNewCategoryDefaults: PropTypes.object,\n    chartingOptions: PropTypes.object,\n  };\n\n  constructor(props) {\n    super(props);\n    this.state = {\n      dialog: {\n        open: false,\n      },\n    };\n  }\n\n  handleAlertDialog = (open, callback) =>\n    this.setState(\n      {\n        dialog: { open },\n      },\n      callback,\n    );\n\n  changeData = (data) => this.props.onChange({ ...this.props.model, data });\n\n  changeAddRemoveEnabled = (value) => {\n    const { model } = this.props;\n    const correctAnswer = restoreCorrectAnswer(model.correctAnswer.data, model.data);\n\n    if (!value) {\n      this.setState({\n        dialog: {\n          open: true,\n          title: 'Warning',\n          text: 'This change will remove any correct answer categories that are not part of the initial item configuration.',\n          onConfirm: () =>\n            this.handleAlertDialog(\n              false,\n              this.props.onChange({\n                ...this.props.model,\n                addCategoryEnabled: value,\n                correctAnswer: { data: correctAnswer },\n              }),\n            ),\n          onClose: () => this.handleAlertDialog(false),\n        },\n      });\n    } else {\n      this.props.onChange({ ...this.props.model, addCategoryEnabled: value });\n    }\n  };\n\n  changeTitle = (title) => this.props.onChange({ ...this.props.model, title });\n\n  changeLabel = (type, label) =>\n    this.props.onChange({\n      ...this.props.model,\n      [type]: {\n        ...this.props.model[type],\n        label,\n      },\n    });\n\n  render() {\n    const {\n      classes,\n      model,\n      charts,\n      labelsPlaceholders,\n      titlePlaceholder,\n      showPixelGuides,\n      authorNewCategoryDefaults,\n      chartingOptions,\n      mathMlOptions = {},\n      labelsCharactersLimit,\n    } = this.props;\n    const { dialog } = this.state;\n    const { domain = {}, range = {} } = model || {};\n\n    return (\n      <div>\n        <div className={classes.title}>Define Initial Chart Attributes</div>\n        <div className={classes.container}>\n          <div className={classes.column} key=\"graph\">\n            <Typography component=\"div\" type=\"body1\">\n              <span>Use the tools below to set up the chart as it will initially appear to students.</span>\n            </Typography>\n\n            <Chart\n              defineChart={true}\n              chartingOptions={chartingOptions}\n              showPixelGuides={showPixelGuides}\n              chartType={model.chartType}\n              size={model.graph}\n              domain={domain}\n              range={range}\n              charts={charts}\n              // index is a property used for setting the correct answer data; it's needed in order to remove categories from other data sets from the same index it was removed from the initial data\n              data={model.data.map((category, index) => ({\n                ...category,\n                index: index,\n              }))}\n              title={model.title}\n              onDataChange={this.changeData}\n              onChangeTitle={this.changeTitle}\n              onChangeLabels={this.changeLabel}\n              addCategoryEnabled={true}\n              changeInteractiveEnabled={model.changeInteractiveEnabled}\n              changeEditableEnabled={model.changeEditableEnabled}\n              categoryDefaultLabel={authorNewCategoryDefaults?.label}\n              categoryDefaults={authorNewCategoryDefaults}\n              labelsPlaceholders={labelsPlaceholders}\n              titlePlaceholder={titlePlaceholder?.label}\n              mathMlOptions={mathMlOptions}\n              labelsCharactersLimit={labelsCharactersLimit}\n            />\n            {model.changeAddCategoryEnabled && (\n              <div>\n                <Checkbox\n                  className={classes.customColor}\n                  checked={model.addCategoryEnabled}\n                  onChange={(e) => {\n                    this.changeAddRemoveEnabled(e.target.checked);\n                  }}\n                />\n                {chartingOptions?.addCategory?.authoringLabel}\n              </div>\n            )}\n            <AlertDialog\n              open={dialog.open}\n              title={dialog.title}\n              text={dialog.text}\n              onClose={dialog.onClose}\n              onConfirm={dialog.onConfirm}\n            />\n          </div>\n        </div>\n      </div>\n    );\n  }\n}\n\nexport default withStyles(styles)(ChartingConfig);\n"],"file":"charting-config.js"}

package/configure/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pie-element/charting-configure",
   "private": true,
-  "version": "8.1.1",
+  "version": "8.2.0",
   "description": "",
   "main": "lib/index.js",
   "module": "src/index.js",
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.1.3",
+    "@pie-lib/pie-toolbox": "2.2.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "prop-types": "^15.6.2",

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.
 
+## [5.1.2](https://github.com/pie-framework/pie-elements/compare/@pie-element/charting-controller@5.1.1...@pie-element/charting-controller@5.1.2) (2024-11-15)
+
+
+### Bug Fixes
+
+* update pie-lib/pie-toolbox PD-4401, PD-4441, PD-4319, PD-4394, PD-3687 ([f1f0af3](https://github.com/pie-framework/pie-elements/commit/f1f0af31f3c6fba54ca3a378dea3b8b32d8ebb87))
+
+
+
+
+
 ## [5.1.1](https://github.com/pie-framework/pie-elements/compare/@pie-element/charting-controller@5.1.0...@pie-element/charting-controller@5.1.1) (2024-11-01)
 
 

package/controller/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pie-element/charting-controller",
   "private": true,
-  "version": "5.1.1",
+  "version": "5.1.2",
   "description": "",
   "main": "lib/index.js",
   "module": "src/index.js",
@@ -9,7 +9,7 @@
     "test": "./node_modules/.bin/jest"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.1.3",
+    "@pie-lib/pie-toolbox": "2.2.0",
     "debug": "^4.1.1",
     "lodash": "^4.17.15"
   },

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "repository": "pie-framework/pie-elements",
-  "version": "8.2.2-next.9+ace661f34",
+  "version": "8.3.0",
   "description": "",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
@@ -12,7 +12,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.1.3",
+    "@pie-lib/pie-toolbox": "2.2.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.15",
@@ -21,7 +21,7 @@
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "ace661f34b6e59271949e848ce2474dce65c4d64",
+  "gitHead": "20cc12d3d06ad5318bfa4c6994cf7c7614dfed2f",
   "main": "lib/index.js",
   "module": "src/index.js"
 }