@pie-element/charting 2.7.3-next.1014 → 2.7.3-next.1031

package/configure/lib/correct-response.js

@@ -21,6 +21,10 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var React = _interopRequireWildcard(require("react"));
@@ -31,18 +35,25 @@ var _styles = require("@material-ui/core/styles");
 
 var _charting = require("@pie-lib/charting");
 
-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); }
+var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 
-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; }
+var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+var _excluded = ["editable", "interactive", "deletable"],
+    _excluded2 = ["interactive", "editable"];
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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; }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
 
 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; } }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 var styles = function styles(theme) {
   return {
     container: {
@@ -62,21 +73,76 @@ var styles = function styles(theme) {
   };
 };
 
+var addCategoryProps = function addCategoryProps(correctAnswer, data) {
+  return correctAnswer.map(function (correct, index) {
+    return _objectSpread(_objectSpread({}, correct), {}, {
+      editable: index < data.length ? data[index].editable : true,
+      interactive: index < data.length ? data[index].interactive : true
+    });
+  });
+};
+
+;
+
+var updateCorrectResponseData = function updateCorrectResponseData(correctAnswer, data) {
+  if (!correctAnswer) {
+    return data;
+  }
+
+  var correctAnswerData = (0, _toConsumableArray2["default"])(correctAnswer);
+  var correctResponseDefinition = [];
+  data.forEach(function (category, currentIndex) {
+    var _correctAnswer$curren, _correctAnswer$curren2;
+
+    var editable = category.editable;
+    var interactive = category.interactive;
+    var label = editable && (_correctAnswer$curren = correctAnswer[currentIndex]) !== null && _correctAnswer$curren !== void 0 && _correctAnswer$curren.label ? correctAnswer[currentIndex].label : category.label;
+    var value = interactive && (_correctAnswer$curren2 = correctAnswer[currentIndex]) !== null && _correctAnswer$curren2 !== void 0 && _correctAnswer$curren2.value ? correctAnswer[currentIndex].value : category.value;
+    correctResponseDefinition[currentIndex] = {
+      label: label,
+      value: value,
+      editable: category.editable,
+      interactive: category.interactive
+    };
+  });
+
+  if (correctResponseDefinition.length < correctAnswer.length) {
+    var missingCategories = correctAnswerData.slice(correctResponseDefinition.length, correctAnswer.length);
+    return addCategoryProps(correctResponseDefinition.concat(missingCategories), data);
+  }
+
+  return correctResponseDefinition;
+};
+
+var insertCategory = function insertCategory(correctAnswer, data) {
+  var positionToInsert = data.length - 1;
+  var _data = data[data.length - 1],
+      editable = _data.editable,
+      interactive = _data.interactive,
+      deletable = _data.deletable,
+      categoryToInsert = (0, _objectWithoutProperties2["default"])(_data, _excluded);
+  correctAnswer.splice(positionToInsert, 0, categoryToInsert);
+  var correctAnswerData = (0, _toConsumableArray2["default"])(correctAnswer);
+  return addCategoryProps(correctAnswerData, data);
+};
+
+var removeCategory = function removeCategory(correctAnswer, data) {
+  var positionToRemove = data.length - 1;
+  correctAnswer.splice(positionToRemove, 1);
+  var correctAnswerData = (0, _toConsumableArray2["default"])(correctAnswer);
+  return addCategoryProps(correctAnswerData, data);
+};
+
 var CorrectResponse = /*#__PURE__*/function (_React$Component) {
   (0, _inherits2["default"])(CorrectResponse, _React$Component);
 
   var _super = _createSuper(CorrectResponse);
 
-  function CorrectResponse() {
+  function CorrectResponse(props) {
     var _this;
 
     (0, _classCallCheck2["default"])(this, CorrectResponse);
-
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    _this = _super.call.apply(_super, [this].concat(args));
+    _this = _super.call(this, props);
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "changeData", function (data) {
       var _this$props = _this.props,
           model = _this$props.model,
@@ -87,22 +153,90 @@ var CorrectResponse = /*#__PURE__*/function (_React$Component) {
 
       onChange(_objectSpread(_objectSpread({}, model), {}, {
         correctAnswer: _objectSpread(_objectSpread({}, correctAnswer), {}, {
-          data: data
+          data: data.map(function (_ref2) {
+            var interactive = _ref2.interactive,
+                editable = _ref2.editable,
+                keepAttrs = (0, _objectWithoutProperties2["default"])(_ref2, _excluded2);
+            return keepAttrs;
+          })
         })
       }));
     });
+    _this.state = {
+      categories: updateCorrectResponseData(props.model.correctAnswer.data, props.model.data)
+    };
     return _this;
   }
 
   (0, _createClass2["default"])(CorrectResponse, [{
+    key: "UNSAFE_componentWillReceiveProps",
+    value: function UNSAFE_componentWillReceiveProps(nextProps) {
+      var _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,
+          _nextProps$model$corr = _nextProps$model.correctAnswer.data,
+          nextCorrectAnswerData = _nextProps$model$corr === void 0 ? [] : _nextProps$model$corr;
+      var _this$props$model = this.props.model;
+      _this$props$model = _this$props$model === void 0 ? {} : _this$props$model;
+      var _this$props$model$dat = _this$props$model.data,
+          data = _this$props$model$dat === void 0 ? [] : _this$props$model$dat;
+      var nextCategories = [];
+
+      if (nextData.length > data.length && nextCorrectAnswerData.length > data.length) {
+        nextCategories = insertCategory(nextCorrectAnswerData, nextData);
+      }
+
+      if (nextData.length < data.length) {
+        nextCategories = removeCategory(nextCorrectAnswerData, nextData);
+      }
+
+      if (!(0, _isEqual["default"])(nextCorrectAnswerData, this.props.model.correctAnswer.data)) {
+        nextCategories = nextCorrectAnswerData.map(function (correct, index) {
+          return _objectSpread(_objectSpread({}, correct), {}, {
+            editable: index < data.length ? data[index].editable : true,
+            interactive: index < data.length ? data[index].interactive : true
+          });
+        });
+      }
+
+      if ((0, _isEmpty["default"])(nextCategories)) {
+        nextCategories = updateCorrectResponseData(nextCorrectAnswerData, nextData);
+        nextCorrectAnswerData.map(function (answer, currentIndex) {
+          var dataExists = currentIndex < nextData.length;
+          var label;
+          var value;
+
+          if (dataExists) {
+            label = nextData[currentIndex].editable ? answer.label : nextData[currentIndex].label;
+            value = nextData[currentIndex].interactive ? answer.value : nextData[currentIndex].value;
+          } else {
+            label = answer.label;
+            value = answer.value;
+          }
+
+          nextCorrectAnswerData[currentIndex] = {
+            label: label,
+            value: value
+          };
+        });
+      }
+
+      if (!(0, _isEqual["default"])(nextCategories, data)) {
+        this.setState({
+          categories: nextCategories
+        });
+      }
+    }
+  }, {
     key: "render",
     value: function render() {
       var _this2 = this;
 
       var _this$props2 = this.props,
-          classes = _this$props2.classes,
           model = _this$props2.model,
           charts = _this$props2.charts;
+      var categories = this.state.categories;
       return /*#__PURE__*/React.createElement("div", null, "Define Correct Response", /*#__PURE__*/React.createElement("div", {
         key: "correct-response-graph-".concat(model.correctAnswer.name)
       }, /*#__PURE__*/React.createElement("p", null, model.correctAnswer.name), /*#__PURE__*/React.createElement(_charting.Chart, {
@@ -111,7 +245,7 @@ var CorrectResponse = /*#__PURE__*/function (_React$Component) {
         domain: model.domain,
         range: model.range,
         charts: charts,
-        data: model.correctAnswer.data || [],
+        data: categories,
         title: model.title,
         onDataChange: function onDataChange(data) {
           return _this2.changeData(data);

package/configure/lib/correct-response.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/correct-response.jsx"],"names":["styles","theme","container","border","borderRadius","padding","spacing","unit","background","button","marginTop","cursor","width","CorrectResponse","data","props","model","onChange","correctAnswer","classes","charts","name","chartType","graph","domain","range","title","changeData","addCategoryEnabled","categoryDefaultLabel","React","Component","PropTypes","object","isRequired","func","array"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;;;;;;;;;;;;;AAEA,IAAMA,MAAM,GAAG,SAATA,MAAS,CAAAC,KAAK;AAAA,SAAK;AACvBC,IAAAA,SAAS,EAAE;AACTC,MAAAA,MAAM,EAAE,mBADC;AAETC,MAAAA,YAAY,EAAE,KAFL;AAGTC,MAAAA,OAAO,YAAKJ,KAAK,CAACK,OAAN,CAAcC,IAAd,GAAqB,CAA1B,gBAAiCN,KAAK,CAACK,OAAN,CAAcC,IAAd,GAAqB,CAAtD,OAHE;AAITC,MAAAA,UAAU,EAAE;AAJH,KADY;AAOvBC,IAAAA,MAAM,EAAE;AACNC,MAAAA,SAAS,EAAET,KAAK,CAACK,OAAN,CAAcC,IAAd,GAAqB,CAD1B;AAENI,MAAAA,MAAM,EAAE,SAFF;AAGNH,MAAAA,UAAU,EAAE,MAHN;AAINH,MAAAA,OAAO,EAAEJ,KAAK,CAACK,OAAN,CAAcC,IAAd,GAAqB,CAJxB;AAKNK,MAAAA,KAAK,EAAE,aALD;AAMNR,MAAAA,YAAY,EAAE;AANR;AAPe,GAAL;AAAA,CAApB;;IAiBaS,e;;;;;;;;;;;;;;;mGAQE,UAAAC,IAAI,EAAI;AACnB,wBAA4B,MAAKC,KAAjC;AAAA,UAAQC,KAAR,eAAQA,KAAR;AAAA,UAAeC,QAAf,eAAeA,QAAf;;AACA,iBAA0BD,KAAK,IAAI,EAAnC;AAAA,UAAQE,aAAR,QAAQA,aAAR;;AAEAD,MAAAA,QAAQ,iCACHD,KADG;AAENE,QAAAA,aAAa,kCACRA,aADQ;AAEXJ,UAAAA,IAAI,EAAJA;AAFW;AAFP,SAAR;AAOD,K;;;;;;WAED,kBAAS;AAAA;;AACP,yBAAmC,KAAKC,KAAxC;AAAA,UAAQI,OAAR,gBAAQA,OAAR;AAAA,UAAiBH,KAAjB,gBAAiBA,KAAjB;AAAA,UAAwBI,MAAxB,gBAAwBA,MAAxB;AAEA,0BACE,yEAEI;AAAK,QAAA,GAAG,mCAA4BJ,KAAK,CAACE,aAAN,CAAoBG,IAAhD;AAAR,sBACE,+BAAIL,KAAK,CAACE,aAAN,CAAoBG,IAAxB,CADF,eAEE,oBAAC,eAAD;AACE,QAAA,SAAS,EAAEL,KAAK,CAACM,SADnB;AAEE,QAAA,IAAI,EAAEN,KAAK,CAACO,KAFd;AAGE,QAAA,MAAM,EAAEP,KAAK,CAACQ,MAHhB;AAIE,QAAA,KAAK,EAAER,KAAK,CAACS,KAJf;AAKE,QAAA,MAAM,EAAEL,MALV;AAME,QAAA,IAAI,EAAEJ,KAAK,CAACE,aAAN,CAAoBJ,IAApB,IAA4B,EANpC;AAOE,QAAA,KAAK,EAAEE,KAAK,CAACU,KAPf;AAQE,QAAA,YAAY,EAAE,sBAACZ,IAAD;AAAA,iBAAU,MAAI,CAACa,UAAL,CAAgBb,IAAhB,CAAV;AAAA,SARhB;AASE,QAAA,kBAAkB,EAAEE,KAAK,CAACY,kBAT5B;AAUE,QAAA,oBAAoB,EAAEZ,KAAK,CAACa;AAV9B,QAFF,CAFJ,CADF;AAoBD;;;EA5CkCC,KAAK,CAACC,S;;;iCAA9BlB,e,eACQ;AACjBM,EAAAA,OAAO,EAAEa,sBAAUC,MAAV,CAAiBC,UADT;AAEjBlB,EAAAA,KAAK,EAAEgB,sBAAUC,MAAV,CAAiBC,UAFP;AAGjBjB,EAAAA,QAAQ,EAAEe,sBAAUG,IAAV,CAAeD,UAHR;AAIjBd,EAAAA,MAAM,EAAEY,sBAAUI;AAJD,C;;eA8CN,wBAAWpC,MAAX,EAAmBa,eAAnB,C","sourcesContent":["import * as React from 'react';\nimport PropTypes from 'prop-types';\nimport { withStyles } from '@material-ui/core/styles';\nimport { Chart } from '@pie-lib/charting';\n\nconst styles = theme => ({\n  container: {\n    border: '2px solid #ababab',\n    borderRadius: '4px',\n    padding: `${theme.spacing.unit * 2}px ${theme.spacing.unit * 4}px`,\n    background: '#fafafa'\n  },\n  button: {\n    marginTop: theme.spacing.unit * 3,\n    cursor: 'pointer',\n    background: '#eee',\n    padding: theme.spacing.unit * 2,\n    width: 'fit-content',\n    borderRadius: '4px'\n  }\n});\n\nexport class CorrectResponse 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  };\n\n  changeData = data => {\n    const { model, onChange } = this.props;\n    const { correctAnswer } = model || {};\n\n    onChange({\n      ...model,\n      correctAnswer: {\n        ...correctAnswer,\n        data\n      }\n    });\n  };\n\n  render() {\n    const { classes, model, charts } = this.props;\n\n    return (\n      <div>\n        Define Correct Response\n          <div key={`correct-response-graph-${model.correctAnswer.name}`}>\n            <p>{model.correctAnswer.name}</p>\n            <Chart\n              chartType={model.chartType}\n              size={model.graph}\n              domain={model.domain}\n              range={model.range}\n              charts={charts}\n              data={model.correctAnswer.data || []}\n              title={model.title}\n              onDataChange={(data) => this.changeData(data)}\n              addCategoryEnabled={model.addCategoryEnabled}\n              categoryDefaultLabel={model.categoryDefaultLabel}\n            />\n          </div>\n      </div>\n    );\n  }\n}\n\nexport default withStyles(styles)(CorrectResponse);\n"],"file":"correct-response.js"}
+{"version":3,"sources":["../src/correct-response.jsx"],"names":["styles","theme","container","border","borderRadius","padding","spacing","unit","background","button","marginTop","cursor","width","addCategoryProps","correctAnswer","data","map","correct","index","editable","length","interactive","updateCorrectResponseData","correctAnswerData","correctResponseDefinition","forEach","category","currentIndex","label","value","missingCategories","slice","concat","insertCategory","positionToInsert","deletable","categoryToInsert","splice","removeCategory","positionToRemove","CorrectResponse","props","model","onChange","keepAttrs","state","categories","nextProps","nextData","nextCorrectAnswerData","nextCategories","answer","dataExists","setState","charts","name","chartType","graph","domain","range","title","changeData","addCategoryEnabled","categoryDefaultLabel","React","Component","classes","PropTypes","object","isRequired","func","array"],"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/charting';\nimport isEqual from 'lodash/isEqual';\nimport isEmpty from 'lodash/isEmpty';\n\nconst styles = (theme) => ({\n  container: {\n    border: '2px solid #ababab',\n    borderRadius: '4px',\n    padding: `${theme.spacing.unit * 2}px ${theme.spacing.unit * 4}px`,\n    background: '#fafafa',\n  },\n  button: {\n    marginTop: theme.spacing.unit * 3,\n    cursor: 'pointer',\n    background: '#eee',\n    padding: theme.spacing.unit * 2,\n    width: 'fit-content',\n    borderRadius: '4px',\n  },\n});\n\nconst addCategoryProps = (correctAnswer, data) => correctAnswer.map((correct, index) => ({ ...correct, editable: index < data.length ? data[index].editable : true, interactive: index < data.length ? data[index].interactive : true }));;\n\nconst updateCorrectResponseData = (correctAnswer, data) => {\n  if (!correctAnswer) {\n    return data;\n  }\n\n  const correctAnswerData = [...correctAnswer];\n\n  let correctResponseDefinition = [];\n\n  data.forEach((category, currentIndex) => {\n    const editable = category.editable;\n    const interactive = category.interactive;\n\n    const label = (editable && correctAnswer[currentIndex]?.label)\n      ? correctAnswer[currentIndex].label\n      : category.label\n\n    const value = (interactive && correctAnswer[currentIndex]?.value)\n      ? correctAnswer[currentIndex].value\n      : category.value\n\n    correctResponseDefinition[currentIndex] = {\n      label: label,\n      value: value,\n      editable: category.editable,\n      interactive: category.interactive,\n    };\n  });\n\n  if (correctResponseDefinition.length < correctAnswer.length) {\n    const missingCategories = correctAnswerData.slice(correctResponseDefinition.length, correctAnswer.length)\n\n    return addCategoryProps(correctResponseDefinition.concat(missingCategories), data);\n  }\n\n  return correctResponseDefinition;\n};\n\nconst insertCategory = (correctAnswer, data) => {\n  const positionToInsert = data.length - 1;\n  const { editable, interactive, deletable, ...categoryToInsert } = data[data.length - 1];\n\n  correctAnswer.splice(positionToInsert, 0, categoryToInsert);\n  const correctAnswerData = [...correctAnswer];\n\n  return addCategoryProps(correctAnswerData, data);\n}\n\nconst removeCategory = (correctAnswer, data) => {\n  const positionToRemove = data.length - 1\n\n  correctAnswer.splice(positionToRemove, 1);\n\n  const correctAnswerData = [...correctAnswer];\n\n  return addCategoryProps(correctAnswerData, data);\n}\nexport class CorrectResponse 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  };\n\n  constructor(props) {\n    super(props);\n    this.state = {\n      categories: updateCorrectResponseData(\n        props.model.correctAnswer.data,\n        props.model.data\n      )\n    };\n  }\n\n  changeData = (data) => {\n    const { model, onChange } = this.props;\n    const { correctAnswer } = model || {};\n\n    onChange({\n      ...model,\n      correctAnswer: {\n        ...correctAnswer,\n        data: data.map(({ interactive, editable, ...keepAttrs }) => keepAttrs),\n      },\n    });\n  };\n\n  UNSAFE_componentWillReceiveProps(nextProps) {\n    const {\n      model: {\n        data: nextData = [],\n        correctAnswer: { data: nextCorrectAnswerData = [] },\n      } = {},\n    } = nextProps;\n\n    const {\n      model: {\n        data = [],\n      } = {},\n    } = this.props;\n\n    let nextCategories = [];\n\n    if (nextData.length > data.length && nextCorrectAnswerData.length > data.length) {\n      nextCategories = insertCategory(nextCorrectAnswerData, nextData);\n    }\n\n    if (nextData.length < data.length) {\n      nextCategories = removeCategory(nextCorrectAnswerData, nextData);\n    }\n\n    if (!isEqual(nextCorrectAnswerData, this.props.model.correctAnswer.data)) {\n      nextCategories = nextCorrectAnswerData.map((correct, index) => ({ ...correct, editable: index < data.length ? data[index].editable : true, interactive: index < data.length ? data[index].interactive : true }));\n    }\n\n    if (isEmpty(nextCategories)) {\n      nextCategories = updateCorrectResponseData(\n        nextCorrectAnswerData,\n        nextData\n      );\n\n      nextCorrectAnswerData.map((answer, currentIndex) => {\n        const dataExists = currentIndex < nextData.length;\n        let label;\n        let value;\n\n        if (dataExists) {\n          label = nextData[currentIndex].editable ? answer.label : nextData[currentIndex].label;\n          value = nextData[currentIndex].interactive ? answer.value : nextData[currentIndex].value;\n        } else {\n          label = answer.label;\n          value = answer.value;\n        }\n\n        nextCorrectAnswerData[currentIndex] = {\n          label: label,\n          value: value,\n        };\n      });\n    }\n\n    if (!isEqual(nextCategories, data)) {\n      this.setState({ categories: nextCategories });\n    }\n  }\n\n  render() {\n    const { model, charts } = this.props;\n    const { categories } = this.state;\n\n    return (\n      <div>\n        Define Correct Response\n        <div key={`correct-response-graph-${model.correctAnswer.name}`}>\n          <p>{model.correctAnswer.name}</p>\n          <Chart\n            chartType={model.chartType}\n            size={model.graph}\n            domain={model.domain}\n            range={model.range}\n            charts={charts}\n            data={categories}\n            title={model.title}\n            onDataChange={(data) => this.changeData(data)}\n            addCategoryEnabled={model.addCategoryEnabled}\n            categoryDefaultLabel={model.categoryDefaultLabel}\n          />\n        </div>\n      </div>\n    );\n  }\n}\n\nexport default withStyles(styles)(CorrectResponse);\n"],"file":"correct-response.js"}

package/docs/demo/generate.js

@@ -8,21 +8,15 @@ exports.model = (id, element) => ({
     data: [
       {
         label: 'A',
-        value: 1,
-        interactive: false,
-        editable: false
+        value: 1
       },
       {
         label: 'B',
-        value: 1,
-        interactive: true,
-        editable: false
+        value: 1
       },
       {
         label: 'C',
-        value: 1,
-        interactive: true,
-        editable: false
+        value: 1
       },
     ]
   },

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "repository": "pie-framework/pie-elements",
-  "version": "2.7.3-next.1014+b002895e2",
+  "version": "2.7.3-next.1031+5885a0888",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -25,7 +25,7 @@
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "b002895e29dec43623f303053f9a2bbefe276040",
+  "gitHead": "5885a0888cc8eebb8501e970e2aa9a3addef5547",
   "main": "lib/index.js",
   "module": "src/index.js"
 }