@instructure/quiz-core 21.2.0 → 22.1.0

package/lib/reporting/components/MetricsListItem/index.js

@@ -21,10 +21,22 @@ var _styles = _interopRequireDefault(require("./styles"));
 var _quizCommon = require("@instructure/quiz-common");
 var _dec, _class, _MetricsListItem;
 /** @jsx jsx */
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _callSuper(_this, derived, args) {
+  function isNativeReflectConstruct() {
+    if (typeof Reflect === "undefined" || !Reflect.construct) return false;
+    if (Reflect.construct.sham) return false;
+    if (typeof Proxy === "function") return true;
+    try {
+      return !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
+    } catch (e) {
+      return false;
+    }
+  }
+  derived = (0, _getPrototypeOf2["default"])(derived);
+  return (0, _possibleConstructorReturn2["default"])(_this, isNativeReflectConstruct() ? Reflect.construct(derived, args || [], (0, _getPrototypeOf2["default"])(_this).constructor) : derived.apply(_this, args));
+}
 var MetricsListItem = exports.MetricsListItem = (_dec = (0, _quizCommon.withStyleOverrides)(_styles["default"], null), _dec(_class = (_MetricsListItem = /*#__PURE__*/function (_Component) {
   function MetricsListItem() {
     (0, _classCallCheck2["default"])(this, MetricsListItem);

package/lib/reporting/components/charts/CentileDistribution/presenter.js

@@ -24,8 +24,20 @@ var _theme = _interopRequireDefault(require("./theme"));
 var _quizCommon = require("@instructure/quiz-common");
 var _dec, _class, _CentileDistribution;
 /** @jsx jsx */
-function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _callSuper(_this, derived, args) {
+  function isNativeReflectConstruct() {
+    if (typeof Reflect === "undefined" || !Reflect.construct) return false;
+    if (Reflect.construct.sham) return false;
+    if (typeof Proxy === "function") return true;
+    try {
+      return !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
+    } catch (e) {
+      return false;
+    }
+  }
+  derived = (0, _getPrototypeOf2["default"])(derived);
+  return (0, _possibleConstructorReturn2["default"])(_this, isNativeReflectConstruct() ? Reflect.construct(derived, args || [], (0, _getPrototypeOf2["default"])(_this).constructor) : derived.apply(_this, args));
+}
 var starBin = function starBin(props) {
   if (typeof props.starScore !== 'number') return;
   var starScore = Math.max(0, Math.min(props.starScore, 1));
@@ -34,20 +46,20 @@ var starBin = function starBin(props) {
 };
 var CentileDistribution = exports.CentileDistribution = (_dec = (0, _quizCommon.withStyleOverrides)(_styles["default"], _theme["default"]), _dec(_class = (_CentileDistribution = /*#__PURE__*/function (_Component) {
   function CentileDistribution() {
-    var _this;
+    var _this2;
     (0, _classCallCheck2["default"])(this, CentileDistribution);
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-    _this = _callSuper(this, CentileDistribution, [].concat(args));
-    (0, _defineProperty2["default"])(_this, "_calculateAxis", function (x, y, xAxis, height) {
+    _this2 = _callSuper(this, CentileDistribution, [].concat(args));
+    (0, _defineProperty2["default"])(_this2, "_calculateAxis", function (x, y, xAxis, height) {
       x.domain((0, _d3Array.range)(101));
-      if (typeof _this.props.starScore === 'number') {
-        var starIndex = starBin(_this.props);
+      if (typeof _this2.props.starScore === 'number') {
+        var starIndex = starBin(_this2.props);
         // Determine if star above bar will overflow height, and reduce range to
         // account for 18 star height + 12 star bottom padding
-        var starTop = y(_this.props.visualDistribution[starIndex]) - 30;
-        y.rangeRound([height, _this.props.barPaddingTop - Math.min(0, starTop)]);
+        var starTop = y(_this2.props.visualDistribution[starIndex]) - 30;
+        y.rangeRound([height, _this2.props.barPaddingTop - Math.min(0, starTop)]);
       }
       xAxis.tickValues((0, _d3Array.range)(0, 101, 10)).tickFormat(function (d) {
         return (0, _formatMessage["default"])('{percent, number}%', {
@@ -55,28 +67,28 @@ var CentileDistribution = exports.CentileDistribution = (_dec = (0, _quizCommon.
         });
       });
     });
-    (0, _defineProperty2["default"])(_this, "_createChart", function (svg, width) {
+    (0, _defineProperty2["default"])(_this2, "_createChart", function (svg, width) {
       // Manually redraw x axis to extend beyond container
       var axisPadding = 2000;
       svg.select('g[data-role=xAxis] path').attr('d', "M".concat(-1 * axisPadding, ",0H").concat(width + axisPadding));
       return svg;
     });
-    (0, _defineProperty2["default"])(_this, "_summarizeChart", function (summary) {
-      if (typeof _this.props.starScore !== 'number') return summary;
+    (0, _defineProperty2["default"])(_this2, "_summarizeChart", function (summary) {
+      if (typeof _this2.props.starScore !== 'number') return summary;
       return (0, _formatMessage["default"])('You scored {score, number, percent}. ', {
-        score: _this.props.starScore
+        score: _this2.props.starScore
       }) + summary;
     });
-    (0, _defineProperty2["default"])(_this, "_renderTable", function () {
+    (0, _defineProperty2["default"])(_this2, "_renderTable", function () {
       return (0, _emotion.jsx)(_uiA11yContent.ScreenReaderContent, null, (0, _emotion.jsx)(_uiTable.Table, {
         caption: (0, _formatMessage["default"])('Score percentiles chart data')
       }, (0, _emotion.jsx)(_uiTable.Table.Head, null, (0, _emotion.jsx)(_uiTable.Table.Row, null, (0, _emotion.jsx)(_uiTable.Table.ColHeader, {
         id: "score-percentiles-chart-data-score-percentile"
       }, (0, _formatMessage["default"])('Score Percentile')), (0, _emotion.jsx)(_uiTable.Table.ColHeader, {
         id: "score-percentiles-chart-data-count"
-      }, (0, _formatMessage["default"])('Count')))), (0, _emotion.jsx)(_uiTable.Table.Body, null, _this._renderTableRows())));
+      }, (0, _formatMessage["default"])('Count')))), (0, _emotion.jsx)(_uiTable.Table.Body, null, _this2._renderTableRows())));
     });
-    return _this;
+    return _this2;
   }
   (0, _inherits2["default"])(CentileDistribution, _Component);
   return (0, _createClass2["default"])(CentileDistribution, [{

package/lib/reporting/components/charts/Distribution/presenter.js

@@ -27,57 +27,69 @@ var _flow = _interopRequireDefault(require("lodash/flow"));
 var _quizCommon = require("@instructure/quiz-common");
 var _dec, _class, _Distribution;
 /** @jsx jsx */
-function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _callSuper(_this, derived, args) {
+  function isNativeReflectConstruct() {
+    if (typeof Reflect === "undefined" || !Reflect.construct) return false;
+    if (Reflect.construct.sham) return false;
+    if (typeof Proxy === "function") return true;
+    try {
+      return !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
+    } catch (e) {
+      return false;
+    }
+  }
+  derived = (0, _getPrototypeOf2["default"])(derived);
+  return (0, _possibleConstructorReturn2["default"])(_this, isNativeReflectConstruct() ? Reflect.construct(derived, args || [], (0, _getPrototypeOf2["default"])(_this).constructor) : derived.apply(_this, args));
+}
 // Star path copied from instructure-icons/svg/Solid/star.svg
 var starPathData = exports.starPathData = 'M1915.918 737.475c-10.955-33.543-42.014-56.131-77.364-56.131h-612.029l-189.063-582.1v-.112C1026.394 65.588 995.335 43 959.984 43c-35.237 0-66.41 22.588-77.365 56.245L693.443 681.344H81.415c-35.35 0-66.41 22.588-77.365 56.131-10.955 33.544.79 70.137 29.478 91.03l495.247 359.831-189.177 582.212c-10.955 33.657 1.13 70.25 29.817 90.918 14.23 10.278 30.946 15.473 47.66 15.473 16.716 0 33.432-5.195 47.775-15.586l495.134-359.718 495.021 359.718c28.574 20.781 67.087 20.781 95.662.113 28.687-20.668 40.658-57.261 29.703-91.03l-189.176-582.1 495.36-359.83c28.574-20.894 40.433-57.487 29.364-91.03';
 var MARGIN_T = 0;
 var MARGIN_B = 28;
 var Distribution = exports.Distribution = (_dec = (0, _quizCommon.withStyleOverrides)(_styles["default"], _theme["default"]), _dec(_class = (_Distribution = /*#__PURE__*/function (_Component) {
   function Distribution() {
-    var _this;
+    var _this2;
     (0, _classCallCheck2["default"])(this, Distribution);
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-    _this = _callSuper(this, Distribution, [].concat(args));
-    (0, _defineProperty2["default"])(_this, "_isStarred", function (d, i) {
-      return typeof _this.props.starIndex === 'number' && i === _this.props.starIndex;
+    _this2 = _callSuper(this, Distribution, [].concat(args));
+    (0, _defineProperty2["default"])(_this2, "_isStarred", function (d, i) {
+      return typeof _this2.props.starIndex === 'number' && i === _this2.props.starIndex;
     });
-    (0, _defineProperty2["default"])(_this, "_renderStar", function (svg) {
-      if (typeof _this.props.starIndex !== 'number') return;
-      var star = svg.append('path').attr('d', starPathData).attr('style', (0, _emotion.css)(_this.props.styles.barStar).styles);
-      var starIndex = _this.props.starIndex;
-      var starX = _this.x(starIndex) + _this.x.bandwidth() / 2;
-      var starY = _this.y(_this.props.visualDistribution[starIndex]) - 30;
+    (0, _defineProperty2["default"])(_this2, "_renderStar", function (svg) {
+      if (typeof _this2.props.starIndex !== 'number') return;
+      var star = svg.append('path').attr('d', starPathData).attr('style', (0, _emotion.css)(_this2.props.styles.barStar).styles);
+      var starIndex = _this2.props.starIndex;
+      var starX = _this2.x(starIndex) + _this2.x.bandwidth() / 2;
+      var starY = _this2.y(_this2.props.visualDistribution[starIndex]) - 30;
       // scale the star down and position it on the x axis - y axis will be applied by animation
       var xTransform = "translate(".concat(starX, " 0) scale(0.011) translate(-960 0)");
-      _this.applyTransition(star, function (rects) {
+      _this2.applyTransition(star, function (rects) {
         return rects.attr('opacity', 0).attr('transform', "translate(0 ".concat(starY + 20, ") ").concat(xTransform));
       }, function (rects) {
         return rects.attr('opacity', 1).attr('transform', "translate(0 ".concat(starY, ") ").concat(xTransform));
       }, function (transition) {
-        return transition.delay(_this.props.animateDuration).duration(600);
+        return transition.delay(_this2.props.animateDuration).duration(600);
       });
     });
-    (0, _defineProperty2["default"])(_this, "applyTransition", function (selection, initialFunc, finalFunc, transitionFunc) {
+    (0, _defineProperty2["default"])(_this2, "applyTransition", function (selection, initialFunc, finalFunc, transitionFunc) {
       var identity = function identity(s) {
         return s;
       };
       var transition = function transition(s) {
-        return s.transition(_this.getTransition());
+        return s.transition(_this2.getTransition());
       };
       var applicators = [];
-      if (_this.isAnimated()) {
+      if (_this2.isAnimated()) {
         applicators.push(initialFunc || identity, transition, transitionFunc || identity);
       }
       applicators.push(finalFunc || identity);
       return (0, _flow["default"])(applicators)(selection);
     });
-    (0, _defineProperty2["default"])(_this, "setChartRef", function (ref) {
-      _this.chart = ref;
+    (0, _defineProperty2["default"])(_this2, "setChartRef", function (ref) {
+      _this2.chart = ref;
     });
-    return _this;
+    return _this2;
   }
   (0, _inherits2["default"])(Distribution, _Component);
   return (0, _createClass2["default"])(Distribution, [{
@@ -193,16 +205,16 @@ var Distribution = exports.Distribution = (_dec = (0, _quizCommon.withStyleOverr
   }, {
     key: "renderBars",
     value: function renderBars(node, props) {
-      var _this2 = this;
+      var _this3 = this;
       this.chartData = props.visualDistribution;
       var height = this.height;
       var x = this.x;
       var y = this.y;
       var bars = node.selectAll('rect').data(this.chartData);
       var rects = bars.enter().append('rect').attr('style', function (d, i) {
-        return _this2._isStarred(d, i) ? (0, _emotion.css)(_this2.props.styles.barStar).styles : (0, _emotion.css)(_this2.props.styles.bar).styles;
+        return _this3._isStarred(d, i) ? (0, _emotion.css)(_this3.props.styles.barStar).styles : (0, _emotion.css)(_this3.props.styles.bar).styles;
       }).attr('class', function (d, i) {
-        return _this2._isStarred(d, i) ? 'barStar' : 'bar';
+        return _this3._isStarred(d, i) ? 'barStar' : 'bar';
       }).attr('x', function (d, i) {
         return x(i);
       }).attr('width', x.bandwidth());

package/lib/reporting/components/charts/Distribution/theme.js

@@ -8,12 +8,12 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
   var colors = _ref.colors,
     typography = _ref.typography;
   return {
-    barFillColor: colors.electric,
-    barStarFillColor: colors.fire,
-    barLabelColor: colors.textDarkest,
+    barFillColor: colors.contrasts.blue4570,
+    barStarFillColor: colors.contrasts.orange4570,
+    barLabelColor: colors.contrasts.grey125125,
     barLabelFontFamily: typography.fontFamily,
     barLabelFontSize: typography.fontSizeSmall,
-    xAxisColor: colors.textDarkest
+    xAxisColor: colors.contrasts.grey125125
   };
 };
 var _default = exports["default"] = generateComponentTheme;

package/lib/reporting/components/charts/Legend/index.js

@@ -20,10 +20,22 @@ var _theme = _interopRequireDefault(require("./theme"));
 var _quizCommon = require("@instructure/quiz-common");
 var _dec, _class, _Legend;
 /** @jsx jsx */
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _callSuper(_this, derived, args) {
+  function isNativeReflectConstruct() {
+    if (typeof Reflect === "undefined" || !Reflect.construct) return false;
+    if (Reflect.construct.sham) return false;
+    if (typeof Proxy === "function") return true;
+    try {
+      return !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
+    } catch (e) {
+      return false;
+    }
+  }
+  derived = (0, _getPrototypeOf2["default"])(derived);
+  return (0, _possibleConstructorReturn2["default"])(_this, isNativeReflectConstruct() ? Reflect.construct(derived, args || [], (0, _getPrototypeOf2["default"])(_this).constructor) : derived.apply(_this, args));
+}
 var Legend = exports.Legend = (_dec = (0, _quizCommon.withStyleOverrides)(_styles["default"], _theme["default"]), _dec(_class = (_Legend = /*#__PURE__*/function (_Component) {
   function Legend() {
     (0, _classCallCheck2["default"])(this, Legend);
@@ -59,7 +71,7 @@ var Legend = exports.Legend = (_dec = (0, _quizCommon.withStyleOverrides)(_style
   }, {
     key: "render",
     value: function render() {
-      var _this = this;
+      var _this2 = this;
       var _this$props = this.props,
         variant = _this$props.variant,
         series = _this$props.series,
@@ -69,7 +81,7 @@ var Legend = exports.Legend = (_dec = (0, _quizCommon.withStyleOverrides)(_style
         className: containerClass,
         css: styles.containerStyle
       }, series.map(function (s, i) {
-        return _this.renderSeries(s, i, styles);
+        return _this2.renderSeries(s, i, styles);
       })));
     }
   }]);

package/lib/reporting/components/charts/Legend/styles.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 var generateStyle = function generateStyle(componentTheme, props) {
   var containerVariant = {
     row: {

package/lib/reporting/components/charts/Legend/theme.js

@@ -11,14 +11,14 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
     typography = _ref.typography;
   return {
     containerBorderWidth: borders.widthSmall,
-    containerBorderColor: colors.tiara,
+    containerBorderColor: colors.contrasts.grey1214,
     seriesContainerMargin: spacing.small,
     seriesContainerRowMargin: spacing.medium,
     seriesSwatchMargin: spacing.small,
-    seriesSwatchBackgroundColor: colors.electric,
+    seriesSwatchBackgroundColor: colors.contrasts.blue4570,
     seriesLabelFontFamily: typography.fontFamily,
     seriesLabelFontSize: typography.fontSizeXSmall,
-    seriesLabelColor: colors.textDarkest
+    seriesLabelColor: colors.contrasts.grey125125
   };
 };
 var _default = exports["default"] = generateComponentTheme;

package/lib/reporting/components/charts/QuintileDistribution/presenter.js

@@ -24,23 +24,35 @@ var _quizCommon = require("@instructure/quiz-common");
 var _dec, _class, _QuintileDistribution;
 /** @jsx jsx */
 /* eslint "no-mixed-operators": "warn" */
-function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _callSuper(_this, derived, args) {
+  function isNativeReflectConstruct() {
+    if (typeof Reflect === "undefined" || !Reflect.construct) return false;
+    if (Reflect.construct.sham) return false;
+    if (typeof Proxy === "function") return true;
+    try {
+      return !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
+    } catch (e) {
+      return false;
+    }
+  }
+  derived = (0, _getPrototypeOf2["default"])(derived);
+  return (0, _possibleConstructorReturn2["default"])(_this, isNativeReflectConstruct() ? Reflect.construct(derived, args || [], (0, _getPrototypeOf2["default"])(_this).constructor) : derived.apply(_this, args));
+}
 var QuintileDistribution = exports.QuintileDistribution = (_dec = (0, _quizCommon.withStyleOverrides)(_styles["default"], _theme["default"]), _dec(_class = (_QuintileDistribution = /*#__PURE__*/function (_Component) {
   function QuintileDistribution() {
-    var _this;
+    var _this2;
     (0, _classCallCheck2["default"])(this, QuintileDistribution);
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-    _this = _callSuper(this, QuintileDistribution, [].concat(args));
-    (0, _defineProperty2["default"])(_this, "_calculateAxis", function (_, _2, xAxis) {
-      xAxis.tickFormat(_this.calculateLabelForIndex);
+    _this2 = _callSuper(this, QuintileDistribution, [].concat(args));
+    (0, _defineProperty2["default"])(_this2, "_calculateAxis", function (_, _2, xAxis) {
+      xAxis.tickFormat(_this2.calculateLabelForIndex);
     });
-    (0, _defineProperty2["default"])(_this, "calculateLabelForIndex", function (d) {
-      var numBars = _this.props.visualDistribution.length;
-      if (_this.props.calculateLabelForColumn) {
-        return _this.props.calculateLabelForColumn(d, numBars);
+    (0, _defineProperty2["default"])(_this2, "calculateLabelForIndex", function (d) {
+      var numBars = _this2.props.visualDistribution.length;
+      if (_this2.props.calculateLabelForColumn) {
+        return _this2.props.calculateLabelForColumn(d, numBars);
       }
       var lower = Math.floor(d * 100 / numBars);
       var upper = Math.floor((d + 1) * 100 / numBars - (d < numBars - 1 ? 1 : 0));
@@ -50,10 +62,10 @@ var QuintileDistribution = exports.QuintileDistribution = (_dec = (0, _quizCommo
       });
     });
     // updateChart
-    (0, _defineProperty2["default"])(_this, "_renderNumbers", function (svg, x, y, applyTransition, barContainer, height) {
-      var chartData = _this.props.visualDistribution;
+    (0, _defineProperty2["default"])(_this2, "_renderNumbers", function (svg, x, y, applyTransition, barContainer, height) {
+      var chartData = _this2.props.visualDistribution;
       var numbers = barContainer.selectAll('text').data(chartData);
-      var texts = numbers.enter().insert('text', 'rect').attr('style', (0, _emotion.css)(_this.props.styles.barLabel).styles).text(function (d) {
+      var texts = numbers.enter().insert('text', 'rect').attr('style', (0, _emotion.css)(_this2.props.styles.barLabel).styles).text(function (d) {
         return d;
       }).attr('x', function (d, i) {
         return x(i) + x.bandwidth() / 2;
@@ -66,30 +78,30 @@ var QuintileDistribution = exports.QuintileDistribution = (_dec = (0, _quizCommo
         });
       }, function (transition) {
         return transition.delay(function (d, i) {
-          return (_this.props.animateDelay || 0) * (1 + i / _this.props.visualDistribution.length);
+          return (_this2.props.animateDelay || 0) * (1 + i / _this2.props.visualDistribution.length);
         });
       });
       numbers.exit().remove();
     });
-    (0, _defineProperty2["default"])(_this, "_renderTable", function () {
+    (0, _defineProperty2["default"])(_this2, "_renderTable", function () {
       return (0, _emotion.jsx)(_uiA11yContent.ScreenReaderContent, null, (0, _emotion.jsx)(_uiTable.Table, {
         caption: (0, _formatMessage["default"])('Score percentiles chart data')
       }, (0, _emotion.jsx)(_uiTable.Table.Head, null, (0, _emotion.jsx)(_uiTable.Table.Row, null, (0, _emotion.jsx)(_uiTable.Table.ColHeader, {
         id: "score-percentiles-chart-data-score-percentile-range"
       }, (0, _formatMessage["default"])('Score Percentile Range')), (0, _emotion.jsx)(_uiTable.Table.ColHeader, {
         id: "score-percentiles-chart-data-count"
-      }, (0, _formatMessage["default"])('Count')))), (0, _emotion.jsx)(_uiTable.Table.Body, null, _this.renderTableRows())));
+      }, (0, _formatMessage["default"])('Count')))), (0, _emotion.jsx)(_uiTable.Table.Body, null, _this2.renderTableRows())));
     });
-    return _this;
+    return _this2;
   }
   (0, _inherits2["default"])(QuintileDistribution, _Component);
   return (0, _createClass2["default"])(QuintileDistribution, [{
     key: "renderTableRows",
     value: function renderTableRows() {
-      var _this2 = this;
+      var _this3 = this;
       var chartData = this.props.visualDistribution;
       return chartData.map(function (count, index) {
-        var label = _this2.calculateLabelForIndex(index);
+        var label = _this3.calculateLabelForIndex(index);
         return (0, _emotion.jsx)(_uiTable.Table.Row, {
           key: "".concat(label, ":").concat(count)
         }, (0, _emotion.jsx)(_uiTable.Table.RowHeader, null, label), (0, _emotion.jsx)(_uiTable.Table.Cell, null, count));

package/lib/reporting/components/charts/QuintileDistribution/theme.js

@@ -8,7 +8,7 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
   var colors = _ref.colors,
     typography = _ref.typography;
   return {
-    barLabelColor: colors.textDarkest,
+    barLabelColor: colors.contrasts.grey125125,
     barLabelFontFamily: typography.fontFamily,
     barLabelFontSize: typography.fontSizeSmall
   };

package/lib/reporting/components/itemAnalysis/AnswerFrequencySummary/index.js

@@ -27,29 +27,41 @@ var _styles = _interopRequireDefault(require("./styles"));
 var _quizCommon = require("@instructure/quiz-common");
 var _dec, _class, _AnswerFrequencySummary;
 /** @jsx jsx */
-function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _callSuper(_this, derived, args) {
+  function isNativeReflectConstruct() {
+    if (typeof Reflect === "undefined" || !Reflect.construct) return false;
+    if (Reflect.construct.sham) return false;
+    if (typeof Proxy === "function") return true;
+    try {
+      return !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
+    } catch (e) {
+      return false;
+    }
+  }
+  derived = (0, _getPrototypeOf2["default"])(derived);
+  return (0, _possibleConstructorReturn2["default"])(_this, isNativeReflectConstruct() ? Reflect.construct(derived, args || [], (0, _getPrototypeOf2["default"])(_this).constructor) : derived.apply(_this, args));
+}
 var AnswerFrequencySummary = exports.AnswerFrequencySummary = (_dec = (0, _quizCommon.withStyleOverrides)(_styles["default"], _theme["default"]), _dec(_class = (_AnswerFrequencySummary = /*#__PURE__*/function (_Component) {
   function AnswerFrequencySummary() {
-    var _this;
+    var _this2;
     (0, _classCallCheck2["default"])(this, AnswerFrequencySummary);
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-    _this = _callSuper(this, AnswerFrequencySummary, [].concat(args));
-    (0, _defineProperty2["default"])(_this, "renderAnswerTableRow", function (choiceInfo, choiceIndex) {
-      var choiceSum = _this.props.itemAnalysis.choiceCountSum();
-      var choiceBody = _this.renderChoiceBody(choiceInfo);
+    _this2 = _callSuper(this, AnswerFrequencySummary, [].concat(args));
+    (0, _defineProperty2["default"])(_this2, "renderAnswerTableRow", function (choiceInfo, choiceIndex) {
+      var choiceSum = _this2.props.itemAnalysis.choiceCountSum();
+      var choiceBody = _this2.renderChoiceBody(choiceInfo);
       return (0, _emotion.jsx)(_uiTable.Table.Row, {
         key: choiceIndex
-      }, (0, _emotion.jsx)(_uiTable.Table.Cell, null, _this.isCorrect(choiceInfo) ? (0, _emotion.jsx)(_uiIcons.IconCheckSolid, null) : (0, _emotion.jsx)(_uiIcons.IconXSolid, null), (0, _emotion.jsx)(_uiA11yContent.ScreenReaderContent, null, _this.getBarTitle(choiceInfo))), (0, _emotion.jsx)(_uiTable.Table.RowHeader, null, (0, _emotion.jsx)("span", {
+      }, (0, _emotion.jsx)(_uiTable.Table.Cell, null, _this2.isCorrect(choiceInfo) ? (0, _emotion.jsx)(_uiIcons.IconCheckSolid, null) : (0, _emotion.jsx)(_uiIcons.IconXSolid, null), (0, _emotion.jsx)(_uiA11yContent.ScreenReaderContent, null, _this2.getBarTitle(choiceInfo))), (0, _emotion.jsx)(_uiTable.Table.RowHeader, null, (0, _emotion.jsx)("span", {
         "data-testid": "answer-textfield",
         title: choiceBody
       }, choiceBody)), (0, _emotion.jsx)(_uiTable.Table.Cell, null, _formatMessage["default"].number(Math.floor(choiceInfo.get('choiceCount')))), (0, _emotion.jsx)(_uiTable.Table.Cell, null, choiceSum > 0 ? _formatMessage["default"].number(choiceInfo.get('choiceCount') / choiceSum, 'percent') : 0), (0, _emotion.jsx)(_uiTable.Table.Cell, {
         "aria-hidden": "true"
-      }, _this.renderBarPlot(choiceInfo)));
+      }, _this2.renderBarPlot(choiceInfo)));
     });
-    return _this;
+    return _this2;
   }
   (0, _inherits2["default"])(AnswerFrequencySummary, _Component);
   return (0, _createClass2["default"])(AnswerFrequencySummary, [{

package/lib/reporting/components/itemAnalysis/AnswerFrequencySummary/theme.js

@@ -12,20 +12,20 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
     borders = _ref.borders,
     transitions = _ref.transitions;
   return {
-    contentCellBorderColor: colors.tiara,
+    contentCellBorderColor: colors.contrasts.grey1214,
     answerRowCellPadding: spacing.xSmall,
-    answerRowCorrectBackgroundColor: colors.white,
-    answerRowAnswerIconColor: colors.shamrock,
+    answerRowCorrectBackgroundColor: colors.contrasts.white1010,
+    answerRowAnswerIconColor: colors.contrasts.green4570,
     answerRowCorrectTextFieldFontWeight: typography.fontWeightBold,
-    answerRowCorrectBarBackgroundColor: colors.shamrock,
+    answerRowCorrectBarBackgroundColor: colors.contrasts.green4570,
     answerIconFontSize: typography.fontSizeXSmall,
-    answerIconColor: colors.ash,
+    answerIconColor: colors.contrasts.grey4570,
     answerTextfieldFontWeight: typography.fontWeightNormal,
-    respondentLinkColor: colors.ash,
-    respondentLinkPresentColor: colors.electric,
+    respondentLinkColor: colors.contrasts.grey4570,
+    respondentLinkPresentColor: colors.contrasts.blue4570,
     answerRatioPaddingLeft: spacing.small,
     barMinWidth: borders.widthSmall,
-    barBackgroundColor: colors.licorice,
+    barBackgroundColor: colors.contrasts.grey125125,
     phoneBreakPoint: "max-width: ".concat(breakpoints.medium),
     barTransition: "width ".concat(transitions.duration)
   };