@instructure/quiz-core 20.34.1-snapshot.9 → 20.34.1-test.7

package/es/reporting/api/fetchStudentAnalyses.js

@@ -1,13 +1,10 @@
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import Fetcher from "../../common/util/Fetcher.js";
-import { featureOn } from "../../common/util/featureCheck.js";
 var fetcher = new Fetcher();
 export var fetchStudentAnalyses = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(quizId) {
     var filter,
-      isMultiAttemptEnabled,
-      selectedFilter,
       url,
       _args = arguments;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -15,14 +12,12 @@ export var fetchStudentAnalyses = /*#__PURE__*/function () {
         switch (_context.prev = _context.next) {
           case 0:
             filter = _args.length > 1 && _args[1] !== void 0 ? _args[1] : 'last_attempt';
-            isMultiAttemptEnabled = featureOn('student_analysis_multiple_attempts');
-            selectedFilter = isMultiAttemptEnabled ? 'all_attempts' : filter;
-            url = "/api/quizzes/".concat(quizId, "/analyses/student_analyses?filter=").concat(selectedFilter);
-            _context.next = 6;
+            url = "/api/quizzes/".concat(quizId, "/analyses/student_analyses?filter=").concat(filter);
+            _context.next = 4;
             return fetcher.get(url);
-          case 6:
+          case 4:
             return _context.abrupt("return", _context.sent);
-          case 7:
+          case 5:
           case "end":
             return _context.stop();
         }

package/es/reporting/api/getAnalysesExport.js

@@ -3,7 +3,6 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import Fetcher from "../../common/util/Fetcher.js";
 import { csvFormat } from "../components/resources/NewQuizAndItemAnalysis/exportFormats.js";
 import { ITEM_ANALYSES } from '@instructure/quiz-common';
-import { featureOn } from "../../common/util/featureCheck.js";
 var getFetcher = function getFetcher(format) {
   var mimeType = formatsToMimeTypes.get(format);
   if (!mimeType) {
@@ -25,9 +24,6 @@ export var getAnalysesExport = /*#__PURE__*/function () {
     var filter,
       analysisType,
       fetcher,
-      isMultiAttemptEnabled,
-      isStudent_analysis,
-      selectedFilter,
       url,
       _args = arguments;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -37,15 +33,12 @@ export var getAnalysesExport = /*#__PURE__*/function () {
             filter = _args.length > 2 && _args[2] !== void 0 ? _args[2] : 'last_attempt';
             analysisType = _args.length > 3 && _args[3] !== void 0 ? _args[3] : ITEM_ANALYSES;
             fetcher = getFetcher(format);
-            isMultiAttemptEnabled = featureOn('student_analysis_multiple_attempts');
-            isStudent_analysis = analysisType === 'student_analysis';
-            selectedFilter = isMultiAttemptEnabled && isStudent_analysis ? 'all_attempts' : filter;
-            url = "/api/quizzes/".concat(quizId, "/analyses/export?filter=").concat(selectedFilter, "&analysis_type=").concat(analysisType);
-            _context.next = 9;
+            url = "/api/quizzes/".concat(quizId, "/analyses/export?filter=").concat(filter, "&analysis_type=").concat(analysisType);
+            _context.next = 6;
             return fetcher.get(url);
-          case 9:
+          case 6:
             return _context.abrupt("return", _context.sent);
-          case 10:
+          case 7:
           case "end":
             return _context.stop();
         }

package/es/reporting/api/getAnalysesStatus.js

@@ -2,15 +2,11 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import Fetcher from "../../common/util/Fetcher.js";
 import { ITEM_ANALYSES } from '@instructure/quiz-common';
-import { featureOn } from "../../common/util/featureCheck.js";
 var fetcher = new Fetcher();
 export var getAnalysesStatus = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(quizId) {
     var filter,
       analysisType,
-      isMultiAttemptEnabled,
-      isStudent_analysis,
-      selectedFilter,
       url,
       _args = arguments;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -19,15 +15,12 @@ export var getAnalysesStatus = /*#__PURE__*/function () {
           case 0:
             filter = _args.length > 1 && _args[1] !== void 0 ? _args[1] : 'last_attempt';
             analysisType = _args.length > 2 && _args[2] !== void 0 ? _args[2] : ITEM_ANALYSES;
-            isMultiAttemptEnabled = featureOn('student_analysis_multiple_attempts');
-            isStudent_analysis = analysisType === 'student_analysis';
-            selectedFilter = isMultiAttemptEnabled && isStudent_analysis ? 'all_attempts' : filter;
-            url = "/api/quizzes/".concat(quizId, "/analyses/status?filter=").concat(selectedFilter, "&analysis_type=").concat(analysisType);
-            _context.next = 8;
+            url = "/api/quizzes/".concat(quizId, "/analyses/status?filter=").concat(filter, "&analysis_type=").concat(analysisType);
+            _context.next = 5;
             return fetcher.get(url);
-          case 8:
+          case 5:
             return _context.abrupt("return", _context.sent);
-          case 9:
+          case 6:
           case "end":
             return _context.stop();
         }

package/es/reporting/components/Caption/index.js

@@ -7,11 +7,10 @@ var _dec, _class, _Caption;
 import { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Heading } from '@instructure/ui-heading';
-import { jsx } from '@instructure/emotion';
+import { withStyle, jsx } from '@instructure/emotion';
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
-import { withStyleOverrides } from '@instructure/quiz-common';
-export var Caption = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_Caption = /*#__PURE__*/function (_Component) {
+export var Caption = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = (_Caption = /*#__PURE__*/function (_Component) {
   _inherits(Caption, _Component);
   var _super = _createSuper(Caption);
   function Caption() {
@@ -35,7 +34,7 @@ export var Caption = (_dec = withStyleOverrides(generateStyle, generateComponent
   }]);
   Caption.displayName = "Caption";
   return Caption;
-}(Component), _Caption.displayName = 'Caption', _Caption.componentId = "Quizzes".concat(_Caption.displayName), _Caption.propTypes = {
+}(Component), _Caption.propTypes = {
   text: PropTypes.string,
   children: PropTypes.oneOfType([PropTypes.object, PropTypes.arrayOf(PropTypes.object)]),
   styles: PropTypes.object

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

@@ -9,11 +9,10 @@ import { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Metric } from '@instructure/ui-metric';
 import { ScreenReaderContent, PresentationContent } from '@instructure/ui-a11y-content';
-import { jsx } from '@instructure/emotion';
+import { withStyle, jsx } from '@instructure/emotion';
 import t from '@instructure/quiz-i18n/es/format-message';
 import generateStyle from "./styles.js";
-import { withStyleOverrides } from '@instructure/quiz-common';
-export var MetricsListItem = (_dec = withStyleOverrides(generateStyle, null), _dec(_class = (_MetricsListItem = /*#__PURE__*/function (_Component) {
+export var MetricsListItem = (_dec = withStyle(generateStyle, null), _dec(_class = (_MetricsListItem = /*#__PURE__*/function (_Component) {
   _inherits(MetricsListItem, _Component);
   var _super = _createSuper(MetricsListItem);
   function MetricsListItem() {
@@ -44,7 +43,7 @@ export var MetricsListItem = (_dec = withStyleOverrides(generateStyle, null), _d
   }]);
   MetricsListItem.displayName = "MetricsListItem";
   return MetricsListItem;
-}(Component), _MetricsListItem.displayName = 'MetricsListItem', _MetricsListItem.componentId = "Quizzes".concat(_MetricsListItem.displayName), _MetricsListItem.propTypes = _objectSpread(_objectSpread({}, Metric.propTypes), {}, {
+}(Component), _MetricsListItem.propTypes = _objectSpread(_objectSpread({}, Metric.propTypes), {}, {
   customStyles: PropTypes.object,
   styles: PropTypes.object
 }), _MetricsListItem.defaultProps = {

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

@@ -7,21 +7,20 @@ var _dec, _class, _CentileDistribution;
 import { Component } from 'react';
 import { PropTypes } from 'prop-types';
 import { range } from 'd3-array';
-import { jsx } from '@instructure/emotion';
+import { withStyle, jsx } from '@instructure/emotion';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import { Table } from '@instructure/ui-table';
 import Distribution from "../Distribution/index.js";
 import t from '@instructure/quiz-i18n/es/format-message';
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
-import { withStyleOverrides } from '@instructure/quiz-common';
 var starBin = function starBin(props) {
   if (typeof props.starScore !== 'number') return;
   var starScore = Math.max(0, Math.min(props.starScore, 1));
   // min+floor here matches quiz_etl HistogramHelper
   return Math.min(Math.floor(starScore * props.visualDistribution.length), props.visualDistribution.length - 1);
 };
-export var CentileDistribution = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_CentileDistribution = /*#__PURE__*/function (_Component) {
+export var CentileDistribution = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = (_CentileDistribution = /*#__PURE__*/function (_Component) {
   _inherits(CentileDistribution, _Component);
   var _super = _createSuper(CentileDistribution);
   function CentileDistribution() {
@@ -100,7 +99,7 @@ export var CentileDistribution = (_dec = withStyleOverrides(generateStyle, gener
   }]);
   CentileDistribution.displayName = "CentileDistribution";
   return CentileDistribution;
-}(Component), _CentileDistribution.displayName = 'CentileDistribution', _CentileDistribution.componentId = "Quizzes".concat(_CentileDistribution.displayName), _CentileDistribution.propTypes = {
+}(Component), _CentileDistribution.propTypes = {
   animateDelay: PropTypes.number,
   animateDuration: PropTypes.number,
   barPaddingInner: PropTypes.number,

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

@@ -10,20 +10,19 @@ import { max, range, sum } from 'd3-array';
 import { axisBottom } from 'd3-axis';
 import { scaleBand, scaleLinear } from 'd3-scale';
 import { select } from 'd3-selection';
-import { jsx, css } from '@instructure/emotion';
+import { withStyle, jsx, css } from '@instructure/emotion';
 import t from '@instructure/quiz-i18n/es/format-message';
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
 import { ScreenReaderContent, PresentationContent } from '@instructure/ui-a11y-content';
 import { transition } from 'd3-transition';
 import flow from 'lodash/flow';
-import { withStyleOverrides } from '@instructure/quiz-common';
 
 // Star path copied from instructure-icons/svg/Solid/star.svg
 export var 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;
-export var Distribution = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_Distribution = /*#__PURE__*/function (_Component) {
+export var Distribution = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = (_Distribution = /*#__PURE__*/function (_Component) {
   _inherits(Distribution, _Component);
   var _super = _createSuper(Distribution);
   function Distribution() {
@@ -257,7 +256,7 @@ export var Distribution = (_dec = withStyleOverrides(generateStyle, generateComp
   }]);
   Distribution.displayName = "Distribution";
   return Distribution;
-}(Component), _Distribution.displayName = 'Distribution', _Distribution.componentId = "Quizzes".concat(_Distribution.displayName), _Distribution.propTypes = {
+}(Component), _Distribution.displayName = 'Distribution', _Distribution.propTypes = {
   animateDelay: PropTypes.number,
   animateDuration: PropTypes.number,
   // ESLint thinks these props aren't used but they are via a call chain in componentDidMount

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

@@ -8,11 +8,10 @@ var _dec, _class, _Legend;
 import { Component } from 'react';
 import PropTypes from 'prop-types';
 import { PresentationContent } from '@instructure/ui-a11y-content';
-import { jsx } from '@instructure/emotion';
+import { withStyle, jsx } from '@instructure/emotion';
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
-import { withStyleOverrides } from '@instructure/quiz-common';
-export var Legend = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_Legend = /*#__PURE__*/function (_Component) {
+export var Legend = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = (_Legend = /*#__PURE__*/function (_Component) {
   _inherits(Legend, _Component);
   var _super = _createSuper(Legend);
   function Legend() {
@@ -64,7 +63,7 @@ export var Legend = (_dec = withStyleOverrides(generateStyle, generateComponentT
   }]);
   Legend.displayName = "Legend";
   return Legend;
-}(Component), _Legend.displayName = 'Legend', _Legend.componentId = "Quizzes".concat(_Legend.displayName), _Legend.propTypes = {
+}(Component), _Legend.propTypes = {
   series: PropTypes.arrayOf(PropTypes.shape({
     label: PropTypes.string.isRequired,
     customStyles: PropTypes.object.isRequired

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

@@ -7,15 +7,14 @@ var _dec, _class, _QuintileDistribution;
 /* eslint "no-mixed-operators": "warn" */
 import { Component } from 'react';
 import { PropTypes } from 'prop-types';
-import { jsx, css } from '@instructure/emotion';
+import { withStyle, jsx, css } from '@instructure/emotion';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import { Table } from '@instructure/ui-table';
 import t from '@instructure/quiz-i18n/es/format-message';
 import Distribution from "../Distribution/index.js";
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
-import { withStyleOverrides } from '@instructure/quiz-common';
-export var QuintileDistribution = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_QuintileDistribution = /*#__PURE__*/function (_Component) {
+export var QuintileDistribution = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = (_QuintileDistribution = /*#__PURE__*/function (_Component) {
   _inherits(QuintileDistribution, _Component);
   var _super = _createSuper(QuintileDistribution);
   function QuintileDistribution() {
@@ -98,7 +97,7 @@ export var QuintileDistribution = (_dec = withStyleOverrides(generateStyle, gene
   }]);
   QuintileDistribution.displayName = "QuintileDistribution";
   return QuintileDistribution;
-}(Component), _QuintileDistribution.displayName = 'QuintileDistribution', _QuintileDistribution.componentId = "Quizzes".concat(_QuintileDistribution.displayName), _QuintileDistribution.propTypes = {
+}(Component), _QuintileDistribution.propTypes = {
   animateDelay: PropTypes.number,
   animateDuration: PropTypes.number,
   barPaddingInner: PropTypes.number,

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

@@ -12,15 +12,14 @@ import { scaleLinear } from 'd3-scale';
 import { IconXSolid, IconCheckSolid } from '@instructure/ui-icons';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import { Table } from '@instructure/ui-table';
-import { jsx } from '@instructure/emotion';
+import { withStyle, jsx } from '@instructure/emotion';
 import t from '@instructure/quiz-i18n/es/format-message';
 import { extractTextFromHtml } from '@instructure/quiz-interactions';
 import generateComponentTheme from "./theme.js";
 import generateStyle from "./styles.js";
-import { withStyleOverrides } from '@instructure/quiz-common';
 var _ref = jsx(IconCheckSolid, null);
 var _ref2 = jsx(IconXSolid, null);
-export var AnswerFrequencySummary = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_AnswerFrequencySummary = /*#__PURE__*/function (_Component) {
+export var AnswerFrequencySummary = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = (_AnswerFrequencySummary = /*#__PURE__*/function (_Component) {
   _inherits(AnswerFrequencySummary, _Component);
   var _super = _createSuper(AnswerFrequencySummary);
   function AnswerFrequencySummary() {
@@ -110,7 +109,7 @@ export var AnswerFrequencySummary = (_dec = withStyleOverrides(generateStyle, ge
   }]);
   AnswerFrequencySummary.displayName = "AnswerFrequencySummary";
   return AnswerFrequencySummary;
-}(Component), _AnswerFrequencySummary.displayName = 'AnswerFrequencySummary', _AnswerFrequencySummary.componentId = "Quizzes".concat(_AnswerFrequencySummary.displayName), _AnswerFrequencySummary.propTypes = {
+}(Component), _AnswerFrequencySummary.propTypes = {
   itemAnalysis: ImmutablePropTypes.record.isRequired,
   styles: PropTypes.object
 }, _AnswerFrequencySummary)) || _class);

package/es/reporting/components/itemAnalysis/ItemAnalysisRow/presenter.js

@@ -11,7 +11,7 @@ import OutcomeList from '@instructure/outcomes-ui/es/containers/OutcomeList';
 import { MetricGroup } from '@instructure/ui-metric';
 import { Heading } from '@instructure/ui-heading';
 import { ScreenReaderContent, PresentationContent } from '@instructure/ui-a11y-content';
-import { jsx } from '@instructure/emotion';
+import { withStyle, jsx } from '@instructure/emotion';
 import { RichContentRenderer } from '@instructure/quiz-rce';
 import Card from "../../../../common/components/shared/Card/index.js";
 import ExpandButton from "../../../../common/components/shared/ExpandButton/index.js";
@@ -22,11 +22,11 @@ import Legend from "../../charts/Legend/index.js";
 import Caption from "../../Caption/index.js";
 import MetricsListItem from "../../MetricsListItem/index.js";
 import t from '@instructure/quiz-i18n/es/format-message';
-import { liveRegion, withI18nSupport, withStyleOverrides } from '@instructure/quiz-common';
+import { liveRegion, withI18nSupport } from '@instructure/quiz-common';
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
 var _ref2 = jsx(Spinner, null);
-export var ItemAnalysisRow = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_ItemAnalysisRow = /*#__PURE__*/function (_withI18nSupport) {
+export var ItemAnalysisRow = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = (_ItemAnalysisRow = /*#__PURE__*/function (_withI18nSupport) {
   _inherits(ItemAnalysisRow, _withI18nSupport);
   var _super = _createSuper(ItemAnalysisRow);
   function ItemAnalysisRow() {
@@ -236,7 +236,7 @@ export var ItemAnalysisRow = (_dec = withStyleOverrides(generateStyle, generateC
   }]);
   ItemAnalysisRow.displayName = "ItemAnalysisRow";
   return ItemAnalysisRow;
-}(withI18nSupport(Component)), _ItemAnalysisRow.displayName = 'ItemAnalysisRow', _ItemAnalysisRow.componentId = "Quizzes".concat(_ItemAnalysisRow.displayName), _ItemAnalysisRow.propTypes = {
+}(withI18nSupport(Component)), _ItemAnalysisRow.propTypes = {
   animateDelay: PropTypes.number,
   animateDuration: PropTypes.number,
   expanded: PropTypes.bool,

package/es/reporting/components/quizAnalysis/QuizAnalysisOverview.js

@@ -10,7 +10,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import { Heading } from '@instructure/ui-heading';
 import { MetricGroup } from '@instructure/ui-metric';
 import { Text } from '@instructure/ui-text';
-import { jsx } from '@instructure/emotion';
+import { withStyle, jsx } from '@instructure/emotion';
 import FormattedDuration from "../../../common/components/shared/FormattedDuration/index.js";
 import t from '@instructure/quiz-i18n/es/format-message';
 import Card from "../../../common/components/shared/Card/index.js";
@@ -19,10 +19,9 @@ import CentileDistribution from "../charts/CentileDistribution/index.js";
 import MetricsListItem from "../MetricsListItem/index.js";
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
-import { withStyleOverrides } from '@instructure/quiz-common';
 var _ref = jsx("br", null);
 var _ref2 = jsx(Spinner, null);
-export var QuizAnalysisOverview = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_QuizAnalysisOverview = /*#__PURE__*/function (_Component) {
+export var QuizAnalysisOverview = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = (_QuizAnalysisOverview = /*#__PURE__*/function (_Component) {
   _inherits(QuizAnalysisOverview, _Component);
   var _super = _createSuper(QuizAnalysisOverview);
   function QuizAnalysisOverview() {
@@ -121,7 +120,7 @@ export var QuizAnalysisOverview = (_dec = withStyleOverrides(generateStyle, gene
   }]);
   QuizAnalysisOverview.displayName = "QuizAnalysisOverview";
   return QuizAnalysisOverview;
-}(Component), _QuizAnalysisOverview.displayName = 'QuizAnalysisOverview', _QuizAnalysisOverview.componentId = "Quizzes".concat(_QuizAnalysisOverview.displayName), _QuizAnalysisOverview.propTypes = {
+}(Component), _QuizAnalysisOverview.propTypes = {
   animateDelay: PropTypes.number,
   animateDuration: PropTypes.number,
   quizAnalysis: ImmutablePropTypes.record.isRequired,

package/es/reporting/components/resources/NewQuizAndItemAnalysis/AnalysisMetric/presenter.js

@@ -8,10 +8,9 @@ import { Component } from 'react';
 import { getSanitizedMetricValue } from "../../common/utils.js";
 import { Metric } from '@instructure/ui-metric';
 import PropTypes from 'prop-types';
-import { jsx } from '@instructure/emotion';
+import { withStyle, jsx } from '@instructure/emotion';
 import generateStyle from "./styles.js";
-import { withStyleOverrides } from '@instructure/quiz-common';
-export var AnalysisMetric = (_dec = withStyleOverrides(generateStyle, null), _dec(_class = (_AnalysisMetric = /*#__PURE__*/function (_Component) {
+export var AnalysisMetric = (_dec = withStyle(generateStyle, null), _dec(_class = (_AnalysisMetric = /*#__PURE__*/function (_Component) {
   _inherits(AnalysisMetric, _Component);
   var _super = _createSuper(AnalysisMetric);
   function AnalysisMetric() {
@@ -46,7 +45,7 @@ export var AnalysisMetric = (_dec = withStyleOverrides(generateStyle, null), _de
   }]);
   AnalysisMetric.displayName = "AnalysisMetric";
   return AnalysisMetric;
-}(Component), _AnalysisMetric.displayName = 'AnalysisMetric', _AnalysisMetric.componentId = "Quizzes".concat(_AnalysisMetric.displayName), _AnalysisMetric.propTypes = {
+}(Component), _AnalysisMetric.propTypes = {
   metricKey: PropTypes.string.isRequired,
   label: PropTypes.string.isRequired,
   value: PropTypes.oneOfType([PropTypes.number, PropTypes.string, PropTypes.array]),

package/es/reporting/components/resources/NewQuizAndItemAnalysis/AnalysisPopoverMetric/presenter.js

@@ -8,11 +8,10 @@ import { Component } from 'react';
 import { Metric } from '@instructure/ui-metric';
 import { getSanitizedMetricValue } from "../../common/utils.js";
 import MetricPopover from "../MetricPopover/index.js";
-import { jsx } from '@instructure/emotion';
+import { withStyle, jsx } from '@instructure/emotion';
 import generateStyle from "./styles.js";
 import PropTypes from 'prop-types';
-import { withStyleOverrides } from '@instructure/quiz-common';
-export var AnalysisPopoverMetric = (_dec = withStyleOverrides(generateStyle, null), _dec(_class = (_AnalysisPopoverMetric = /*#__PURE__*/function (_Component) {
+export var AnalysisPopoverMetric = (_dec = withStyle(generateStyle, null), _dec(_class = (_AnalysisPopoverMetric = /*#__PURE__*/function (_Component) {
   _inherits(AnalysisPopoverMetric, _Component);
   var _super = _createSuper(AnalysisPopoverMetric);
   function AnalysisPopoverMetric() {
@@ -51,7 +50,7 @@ export var AnalysisPopoverMetric = (_dec = withStyleOverrides(generateStyle, nul
   }]);
   AnalysisPopoverMetric.displayName = "AnalysisPopoverMetric";
   return AnalysisPopoverMetric;
-}(Component), _AnalysisPopoverMetric.displayName = 'AnalysisPopoverMetric', _AnalysisPopoverMetric.componentId = "Quizzes".concat(_AnalysisPopoverMetric.displayName), _AnalysisPopoverMetric.propTypes = {
+}(Component), _AnalysisPopoverMetric.propTypes = {
   metricKey: PropTypes.string.isRequired,
   label: PropTypes.string.isRequired,
   value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),

package/es/reporting/components/resources/NewQuizAndItemAnalysis/AnswerFrequencySummary/LegacyChoiceType/ChoiceTypeTableRow/presenter.js

@@ -7,17 +7,16 @@ var _dec, _class, _ChoiceTypeTableRow;
 import { Component } from 'react';
 import { Table } from '@instructure/ui-table';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
-import { jsx } from '@instructure/emotion';
+import { withStyle, jsx } from '@instructure/emotion';
 import generateComponentTheme from "./theme.js";
 import generateStyle from "./styles.js";
 import PropTypes from 'prop-types';
 import { IconXSolid, IconCheckSolid } from '@instructure/ui-icons';
 import { extractTextFromHtml } from '@instructure/quiz-interactions';
 import t from '@instructure/quiz-i18n/es/format-message';
-import { withStyleOverrides } from '@instructure/quiz-common';
 var _ref = jsx(IconCheckSolid, null);
 var _ref2 = jsx(IconXSolid, null);
-export var ChoiceTypeTableRow = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_ChoiceTypeTableRow = /*#__PURE__*/function (_Component) {
+export var ChoiceTypeTableRow = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = (_ChoiceTypeTableRow = /*#__PURE__*/function (_Component) {
   _inherits(ChoiceTypeTableRow, _Component);
   var _super = _createSuper(ChoiceTypeTableRow);
   function ChoiceTypeTableRow() {
@@ -89,7 +88,7 @@ export var ChoiceTypeTableRow = (_dec = withStyleOverrides(generateStyle, genera
     }
   }]);
   return ChoiceTypeTableRow;
-}(Component), _ChoiceTypeTableRow.displayName = 'Row', _ChoiceTypeTableRow.componentId = "Quizzes".concat(_ChoiceTypeTableRow.displayName), _ChoiceTypeTableRow.propTypes = {
+}(Component), _ChoiceTypeTableRow.displayName = 'Row', _ChoiceTypeTableRow.propTypes = {
   choice: PropTypes.shape({
     body: PropTypes.string,
     correct: PropTypes.bool,

package/es/reporting/components/resources/NewQuizAndItemAnalysis/AnswerFrequencySummary/LegacyChoiceType/presenter.js

@@ -7,7 +7,7 @@ var _dec, _class, _LegacyChoiceType;
 import { Component } from 'react';
 import t from '@instructure/quiz-i18n/es/format-message';
 import { Table } from '@instructure/ui-table';
-import { jsx } from '@instructure/emotion';
+import { withStyle, jsx } from '@instructure/emotion';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import PropTypes from 'prop-types';
 import ChoiceTypeTableRow from "./ChoiceTypeTableRow/index.js";
@@ -15,8 +15,7 @@ import { choiceTypeAnswerSummaryPropType } from "../../../common/propTypes.js";
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
 import AfsTableWrapper from "../shared/AfsTableWrapper/index.js";
-import { withStyleOverrides } from '@instructure/quiz-common';
-export var LegacyChoiceType = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_LegacyChoiceType = /*#__PURE__*/function (_Component) {
+export var LegacyChoiceType = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = (_LegacyChoiceType = /*#__PURE__*/function (_Component) {
   _inherits(LegacyChoiceType, _Component);
   var _super = _createSuper(LegacyChoiceType);
   function LegacyChoiceType() {
@@ -83,7 +82,7 @@ export var LegacyChoiceType = (_dec = withStyleOverrides(generateStyle, generate
   }]);
   LegacyChoiceType.displayName = "LegacyChoiceType";
   return LegacyChoiceType;
-}(Component), _LegacyChoiceType.displayName = 'LegacyChoiceType', _LegacyChoiceType.componentId = "Quizzes".concat(_LegacyChoiceType.displayName), _LegacyChoiceType.propTypes = {
+}(Component), _LegacyChoiceType.propTypes = {
   itemId: PropTypes.number.isRequired,
   answerSummary: choiceTypeAnswerSummaryPropType.isRequired,
   styles: PropTypes.object

package/es/reporting/components/resources/NewQuizAndItemAnalysis/AnswerFrequencySummary/MatchingType/MatchingTypeTable/presenter.js

@@ -9,7 +9,7 @@ import { Flex } from '@instructure/ui-flex';
 import generateStyle from "./styles.js";
 import t from '@instructure/quiz-i18n/es/format-message';
 import { Table } from '@instructure/ui-table';
-import { jsx } from '@instructure/emotion';
+import { withStyle, jsx } from '@instructure/emotion';
 import PropTypes from 'prop-types';
 import { IconCheckSolid } from '@instructure/ui-icons';
 import { matchingTypeAnswerSummaryPropType } from "../../../../common/propTypes.js";
@@ -17,13 +17,12 @@ import MatchingTypeOrderer from "../utils/matchingTypeOrderer.js";
 import { extractTextFromHtml } from '@instructure/quiz-interactions';
 import generateComponentTheme from "./theme.js";
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
-import { withStyleOverrides } from '@instructure/quiz-common';
 var _ref = jsx(IconCheckSolid, null);
 var _ref2 = jsx(Flex.Item, {
   width: "46px",
   textAlign: "center"
 });
-export var MatchingTypeTable = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_MatchingTypeTable = /*#__PURE__*/function (_Component) {
+export var MatchingTypeTable = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = (_MatchingTypeTable = /*#__PURE__*/function (_Component) {
   _inherits(MatchingTypeTable, _Component);
   var _super = _createSuper(MatchingTypeTable);
   function MatchingTypeTable() {
@@ -171,7 +170,7 @@ export var MatchingTypeTable = (_dec = withStyleOverrides(generateStyle, generat
     }
   }]);
   return MatchingTypeTable;
-}(Component), _MatchingTypeTable.displayName = 'MatchingTypeTable', _MatchingTypeTable.componentId = "Quizzes".concat(_MatchingTypeTable.displayName), _MatchingTypeTable.propTypes = {
+}(Component), _MatchingTypeTable.propTypes = {
   itemId: PropTypes.number.isRequired,
   answerSummary: matchingTypeAnswerSummaryPropType.isRequired,
   firstColumnName: PropTypes.string.isRequired,

package/es/reporting/components/resources/NewQuizAndItemAnalysis/AnswerFrequencySummary/NumericType/presenter.js

@@ -12,14 +12,13 @@ import ExpandableCard from "../shared/ExpandableCard/index.js";
 import { Text } from '@instructure/ui-text';
 import t from '@instructure/quiz-i18n/es/format-message';
 import ChoiceTypeTable from "../shared/ChoiceTypeTable/index.js";
-import { jsx } from '@instructure/emotion';
+import { jsx, withStyle } from '@instructure/emotion';
 import ChoiceTypeWithInfo from "./ChoiceTypeWithInfo/index.js";
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
 import { Flex } from '@instructure/ui-flex';
 import { numericTypeAnswerSummaryPropType } from "../../../common/propTypes.js";
-import { withStyleOverrides } from '@instructure/quiz-common';
-export var NumericType = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_NumericType = /*#__PURE__*/function (_Component) {
+export var NumericType = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = (_NumericType = /*#__PURE__*/function (_Component) {
   _inherits(NumericType, _Component);
   var _super = _createSuper(NumericType);
   function NumericType() {
@@ -213,7 +212,7 @@ export var NumericType = (_dec = withStyleOverrides(generateStyle, generateCompo
     return _this;
   }
   return NumericType;
-}(Component), _NumericType.displayName = 'NumericType', _NumericType.componentId = "Quizzes".concat(_NumericType.displayName), _NumericType.propTypes = {
+}(Component), _NumericType.propTypes = {
   itemId: PropTypes.number.isRequired,
   answerSummary: numericTypeAnswerSummaryPropType.isRequired,
   styles: PropTypes.object

package/es/reporting/components/resources/NewQuizAndItemAnalysis/AnswerFrequencySummary/RichFillBlankType/ChoiceGroupTypeTable/presenter.js

@@ -11,12 +11,11 @@ import { Text } from '@instructure/ui-text';
 import t from '@instructure/quiz-i18n/es/format-message';
 import ChoiceTypeTable from "../../shared/ChoiceTypeTable/index.js";
 import BlankIcon from "../../../NewItemAnalysis/BlankIcon/index.js";
-import { jsx } from '@instructure/emotion';
+import { withStyle, jsx } from '@instructure/emotion';
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
 import ExpandableCard from "../../shared/ExpandableCard/index.js";
-import { withStyleOverrides } from '@instructure/quiz-common';
-export var ChoiceGroupTypeTable = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_ChoiceGroupTypeTable = /*#__PURE__*/function (_Component) {
+export var ChoiceGroupTypeTable = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = (_ChoiceGroupTypeTable = /*#__PURE__*/function (_Component) {
   _inherits(ChoiceGroupTypeTable, _Component);
   var _super = _createSuper(ChoiceGroupTypeTable);
   function ChoiceGroupTypeTable() {
@@ -120,7 +119,7 @@ export var ChoiceGroupTypeTable = (_dec = withStyleOverrides(generateStyle, gene
     return _this;
   }
   return ChoiceGroupTypeTable;
-}(Component), _ChoiceGroupTypeTable.displayName = 'ChoiceGroupTypeTable', _ChoiceGroupTypeTable.componentId = "Quizzes".concat(_ChoiceGroupTypeTable.displayName), _ChoiceGroupTypeTable.propTypes = {
+}(Component), _ChoiceGroupTypeTable.propTypes = {
   itemId: PropTypes.number.isRequired,
   blank: PropTypes.shape({
     choices: PropTypes.arrayOf(choiceTypeObject).isRequired,

package/es/reporting/components/resources/NewQuizAndItemAnalysis/AnswerFrequencySummary/ScoreDistributionType/Table/index.js

@@ -9,11 +9,10 @@ import { Component } from 'react';
 import t from '@instructure/quiz-i18n/es/format-message';
 import { Table } from '@instructure/ui-table';
 import PropTypes from 'prop-types';
-import { jsx } from '@instructure/emotion';
+import { withStyle, jsx } from '@instructure/emotion';
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
-import { withStyleOverrides } from '@instructure/quiz-common';
-export var ScoreDistributionTypeTable = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_ScoreDistributionTypeTable = /*#__PURE__*/function (_Component) {
+export var ScoreDistributionTypeTable = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = (_ScoreDistributionTypeTable = /*#__PURE__*/function (_Component) {
   _inherits(ScoreDistributionTypeTable, _Component);
   var _super = _createSuper(ScoreDistributionTypeTable);
   function ScoreDistributionTypeTable() {
@@ -97,7 +96,7 @@ export var ScoreDistributionTypeTable = (_dec = withStyleOverrides(generateStyle
   }]);
   ScoreDistributionTypeTable.displayName = "ScoreDistributionTypeTable";
   return ScoreDistributionTypeTable;
-}(Component), _ScoreDistributionTypeTable.displayName = 'ScoreDistributionTypeTable', _ScoreDistributionTypeTable.componentId = "Quizzes".concat(_ScoreDistributionTypeTable.displayName), _ScoreDistributionTypeTable.propTypes = {
+}(Component), _ScoreDistributionTypeTable.propTypes = {
   itemId: PropTypes.number.isRequired,
   scores: PropTypes.arrayOf(scoreDistributionType).isRequired,
   makeStyles: PropTypes.func,

package/es/reporting/components/resources/NewQuizAndItemAnalysis/AnswerFrequencySummary/shared/AfsPartsContainer/presenter.js

@@ -6,11 +6,10 @@ var _dec, _class, _AfsPartsContainer;
 /** @jsx jsx */
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { jsx } from '@instructure/emotion';
+import { withStyle, jsx } from '@instructure/emotion';
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
-import { withStyleOverrides } from '@instructure/quiz-common';
-export var AfsPartsContainer = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_AfsPartsContainer = /*#__PURE__*/function (_Component) {
+export var AfsPartsContainer = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = (_AfsPartsContainer = /*#__PURE__*/function (_Component) {
   _inherits(AfsPartsContainer, _Component);
   var _super = _createSuper(AfsPartsContainer);
   function AfsPartsContainer() {
@@ -49,7 +48,7 @@ export var AfsPartsContainer = (_dec = withStyleOverrides(generateStyle, generat
     }
   }]);
   return AfsPartsContainer;
-}(Component), _AfsPartsContainer.displayName = 'AfsPartsContainer', _AfsPartsContainer.componentId = "Quizzes".concat(_AfsPartsContainer.displayName), _AfsPartsContainer.propTypes = {
+}(Component), _AfsPartsContainer.propTypes = {
   afsTable: PropTypes.node,
   aggregationTable: PropTypes.node,
   styles: PropTypes.object,