@instructure/quiz-core 20.37.1 → 20.38.0

package/lib/common/components/resources/stimulus/StimulusShow/index.js

@@ -14,6 +14,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactImmutableProptypes = _interopRequireDefault(require("react-immutable-proptypes"));
 var _uiIcons = require("@instructure/ui-icons");
 var _emotion = require("@instructure/emotion");
+var _uiText = require("@instructure/ui-text");
 var _index = _interopRequireDefault(require("../StimulusShowInfo/index.js"));
 var _index2 = _interopRequireDefault(require("../../../../../building/components/resources/ActionButtons/index.js"));
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
@@ -50,6 +51,7 @@ var StimulusShow = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default,
   }, {
     key: "render",
     value: function render() {
+      var stimulusLabel = this.props.stimulus.passage ? (0, _formatMessage.default)('Passage') : (0, _formatMessage.default)('Stimulus');
       return (0, _emotion.jsx)(_index3.default, {
         onClick: this.switchOnEditing,
         wrapperStyles: this.props.styles.stimulusWrapper,
@@ -61,9 +63,13 @@ var StimulusShow = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default,
         css: this.props.styles.header
       }, (0, _emotion.jsx)("div", {
         css: this.props.styles.leftHeader
-      }, this.renderBankIcon(), (0, _emotion.jsx)("div", {
-        css: this.props.styles.stimulusLabel
-      }, (0, _formatMessage.default)('Stimulus'))), (0, _emotion.jsx)(_index2.default, {
+      }, this.renderBankIcon(), (0, _emotion.jsx)(_quizCommon.Flex, {
+        margin: "0 x-small"
+      }, (0, _emotion.jsx)(_uiText.Text, {
+        size: "small",
+        color: "secondary",
+        margin: "0 x-small"
+      }, stimulusLabel))), (0, _emotion.jsx)(_index2.default, {
         connectDragSource: this.props.connectDragSource,
         displayPosition: this.props.displayPosition,
         onDelete: this.props.openDeleteStimulusModal,

package/lib/common/components/resources/stimulus/StimulusShow/styles.js

@@ -22,13 +22,6 @@ var generateStyle = function generateStyle(componentTheme) {
       display: 'flex',
       overflow: 'hidden'
     },
-    stimulusLabel: {
-      color: componentTheme.stimulusLabelColor,
-      fontSize: componentTheme.stimulusLabelFontSize,
-      margin: "0 ".concat(componentTheme.stimulusLabelMargin),
-      overflow: 'hidden',
-      textOverflow: 'ellipsis'
-    },
     stimulusContent: {
       height: '10%0',
       padding: "".concat(componentTheme.stimulusContentPaddingTop, " ").concat(componentTheme.stimulusContentPaddingLeftRight, " ").concat(componentTheme.stimulusContentPaddingBottom)

package/lib/common/components/resources/stimulus/StimulusShow/theme.js

@@ -11,9 +11,6 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
   return {
     stimulusPadding: spacing.large,
     headerPadding: spacing.small,
-    stimulusLabelColor: colors.ash,
-    stimulusLabelFontSize: typography.fontSizeSmall,
-    stimulusLabelMargin: spacing.xSmall,
     stimulusContentPaddingTop: spacing.large,
     stimulusContentPaddingBottom: spacing.small,
     stimulusContentPaddingLeftRight: spacing.small

package/lib/common/components/shared/InteractionTypes/index.js

@@ -7,8 +7,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _reactRedux = require("../../../react-redux.js");
 var _presenter = _interopRequireDefault(require("./presenter.js"));
+var _featureCheck = require("../../../../common/util/featureCheck.js");
 function mapStateToProps(state) {
-  return {};
+  return {
+    allowPassageCreation: (0, _featureCheck.featureOn)('passage')
+  };
 }
 var _default = (0, _reactRedux.connect)(mapStateToProps)(_presenter.default);
 exports.default = _default;

package/lib/common/components/shared/InteractionTypes/presenter.js

@@ -39,21 +39,37 @@ var InteractionTypes = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defau
     _this = _super.call.apply(_super, [this].concat(args));
     _this.renderInteractionTypeButton = function (intType, i) {
       var onClick, Icon, name, title, automation;
-      if (intType.name === 'Stimulus') {
-        onClick = _this.props.addStimulus;
-        Icon = _uiIcons.IconPlusLine;
-        name = (0, _formatMessage.default)('Stimulus');
-        title = (0, _formatMessage.default)('Add Stimulus');
-        automation = 'sdk-interaction-button-stimulus';
-      } else {
-        onClick = (0, _partial.default)(_this.props.addItem, intType);
-        var metadata = (0, _interactionTypeMetadata.interactionTypeMetadata)(intType);
-        Icon = metadata.icon;
-        name = metadata.name;
-        title = (0, _formatMessage.default)('Add {name} Question', {
-          name: name
-        });
-        automation = "sdk-interaction-button-".concat(intType.slug);
+      switch (intType.name) {
+        case 'Stimulus':
+          onClick = function onClick() {
+            return _this.props.addStimulus(false);
+          };
+          Icon = _uiIcons.IconPlusLine;
+          name = (0, _formatMessage.default)('Stimulus');
+          title = (0, _formatMessage.default)('Add Stimulus');
+          automation = 'sdk-interaction-button-stimulus';
+          break;
+        case 'Passage':
+          onClick = function onClick() {
+            return _this.props.addStimulus(true);
+          };
+          Icon = _uiIcons.IconPlusLine;
+          name = (0, _formatMessage.default)('Passage');
+          title = (0, _formatMessage.default)('Add Passage');
+          automation = 'sdk-interaction-button-passage';
+          break;
+        default:
+          {
+            onClick = (0, _partial.default)(_this.props.addItem, intType);
+            var metadata = (0, _interactionTypeMetadata.interactionTypeMetadata)(intType);
+            Icon = metadata.icon;
+            name = metadata.name;
+            title = (0, _formatMessage.default)('Add {name} Question', {
+              name: name
+            });
+            automation = "sdk-interaction-button-".concat(intType.slug);
+            break;
+          }
       }
       return (0, _emotion.jsx)(_uiButtons.Button, {
         key: intType.slug,
@@ -123,6 +139,12 @@ var InteractionTypes = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defau
         }, _this.renderInteractionTypeButton({
           name: 'Stimulus',
           slug: 'stimulus'
+        })), _this.props.allowPassageCreation && (0, _emotion.jsx)(_uiGrid.Grid.Col, {
+          width: 12 / _this.props.columns,
+          key: "passage"
+        }, _this.renderInteractionTypeButton({
+          name: 'Passage',
+          slug: 'passage'
         })));
         return [dividerRow, stimulusRow];
       }
@@ -146,6 +168,7 @@ var InteractionTypes = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defau
   addItem: _propTypes.default.func.isRequired,
   addStimulus: _propTypes.default.func.isRequired,
   allowStimulusCreation: _propTypes.default.bool,
+  allowPassageCreation: _propTypes.default.bool,
   types: _reactImmutableProptypes.default.list,
   styles: _propTypes.default.object
 }, _InteractionTypes.defaultProps = {

package/lib/common/components/shared/TimeUnitsInput/index.js

@@ -12,10 +12,9 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/createSuper"));
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _uiFormField = require("@instructure/ui-form-field");
+var _quizCommon = require("@instructure/quiz-common");
 var _uiA11yContent = require("@instructure/ui-a11y-content");
 var _uiView = require("@instructure/ui-view");
-var _Errors = _interopRequireDefault(require("../../../../common/components/shared/errors/Errors.js"));
 var _immutable = require("immutable");
 var _index = require("../FormattedDuration/index.js");
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
@@ -176,7 +175,12 @@ var TimeUnitsInput = /*#__PURE__*/function (_Component) {
       daysError && errorArray.push(daysError);
       hoursError && errorArray.push(hoursError);
       minutesError && errorArray.push(minutesError);
-      return (0, _immutable.List)(errorArray);
+      return errorArray.map(function (error) {
+        return {
+          type: 'error',
+          text: error
+        };
+      });
     };
     return _this;
   }
@@ -243,11 +247,12 @@ var TimeUnitsInput = /*#__PURE__*/function (_Component) {
       return /*#__PURE__*/_react.default.createElement(_uiView.View, {
         display: "block",
         margin: this.props.margin
-      }, /*#__PURE__*/_react.default.createElement(_uiFormField.FormFieldGroup, {
+      }, /*#__PURE__*/_react.default.createElement(_quizCommon.FormFieldGroup, {
         description: /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, this.props.description),
         layout: "columns",
         vAlign: "top",
-        startAt: "small"
+        startAt: "small",
+        messages: this.getErrorList()
       }, this.props.includeDays && /*#__PURE__*/_react.default.createElement(_quizNumberInput.NumberInput, {
         renderLabel: this.props.daysLabel,
         min: 0,
@@ -280,10 +285,6 @@ var TimeUnitsInput = /*#__PURE__*/function (_Component) {
         }] : null,
         "data-automation": this.props.minutesDataAutomation,
         width: this.props.inputWidth
-      })), /*#__PURE__*/_react.default.createElement(_uiView.View, {
-        display: "block"
-      }, /*#__PURE__*/_react.default.createElement(_Errors.default, {
-        errorList: this.getErrorList()
       })));
     }
   }]);

package/lib/common/components/shared/drag_and_drop/dragAndDropUtils.js

@@ -46,6 +46,9 @@ var posObjFromQuizEntry = (0, _cachePreviousArgs.default)(function (quizEntryDra
   // handle dragging items over stimulus
   if (!quizEntryDragging.hasStimulus && quizEntryHovered.hasStimulus && (onRightHalf || inSidebar)) {
     if (deepInsideEntry && quizEntryHovered.getNestedEntries().size === 0) {
+      if (quizEntryHovered.isPassage) {
+        return null;
+      }
       newPositionObj.intoEmptyStimulus = true;
       return newPositionObj;
     } else if (deepInsideEntry) {

package/lib/common/records/QuizEntry.js

@@ -365,6 +365,11 @@ var QuizEntry = (_dec = (0, _withStateCache.default)(function () {
     get: function get() {
       return this.entryType === 'Stimulus';
     }
+  }, {
+    key: "isPassage",
+    get: function get() {
+      return Boolean(this.isStimulus && this.getEntry() && this.getEntry().passage);
+    }
   }, {
     key: "isItem",
     get: function get() {

package/lib/common/reducers/modifications.js

@@ -80,9 +80,12 @@ var _default = function _default() {
           quizEntries: [_quizCommon.TEMPORARY_QUIZ_ENTRY_ID]
         };
         var stateWithStimulusQuizMods = updateObjectOfType(state, action.payload.quizId, stimulusQuizMods, 'quizzes');
-        var tempStimulus = new _Stimulus.default({
-          id: _quizCommon.TEMPORARY_STIMULUS_ID
-        }).toJS();
+        var tempStimulus = new _Stimulus.default((0, _objectSpread2.default)({
+          id: _quizCommon.TEMPORARY_STIMULUS_ID,
+          passage: action.payload.isPassage
+        }, action.payload.isPassage && {
+          orientation: 'top'
+        })).toJS();
         var stateWithStimulusMods = updateObjectOfType(stateWithStimulusQuizMods, _quizCommon.TEMPORARY_STIMULUS_ID, tempStimulus, 'stimuli');
         var stimulusPosition = action.payload.position === 0 ? 0.9 : action.payload.position - 0.1;
         var stimulusQuizEntryMods = {

package/lib/common/util/warningHelpers.js

@@ -8,6 +8,7 @@ exports.propsForBankEntryUnauthorizedEdit = exports.propsForStimulusBankEntryEdi
 var _react = _interopRequireDefault(require("react"));
 var _partial = _interopRequireDefault(require("lodash/partial"));
 var _uiText = require("@instructure/ui-text");
+var _uiView = require("@instructure/ui-view");
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 var propsForVersioningWrapper = function propsForVersioningWrapper(copyDescription, immutableDescription, isImmutable, shouldClone, setShouldClone, switchOffEditing, isEditing) {
   var alertType = arguments.length > 7 && arguments[7] !== void 0 ? arguments[7] : 'warning';
@@ -94,12 +95,21 @@ var propsForItemBankEntryEditPrompt = function propsForItemBankEntryEditPrompt()
 };
 exports.propsForItemBankEntryEditPrompt = propsForItemBankEntryEditPrompt;
 var propsForStimulusBankEntryEditPrompt = function propsForStimulusBankEntryEditPrompt() {
-  for (var _len5 = arguments.length, args = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
-    args[_key5] = arguments[_key5];
-  }
-  return propsForBankEntryEditPrompt.apply(void 0, args.concat([/*#__PURE__*/_react.default.createElement(_uiText.Text, {
+  var isPassage = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : false;
+  var title = isPassage ? (0, _formatMessage.default)('Banked Passage.') : (0, _formatMessage.default)('Banked Stimulus.');
+  var content = isPassage ? (0, _formatMessage.default)('Editing of this passage must take place within the bank.') : (0, _formatMessage.default)('Editing of this stimulus must take place within the bank.');
+  var promptComponent = /*#__PURE__*/_react.default.createElement(_uiView.View, {
+    as: "div",
     "data-automation": "sdk-editInBanks-warning"
-  }, /*#__PURE__*/_react.default.createElement("b", null, (0, _formatMessage.default)('Banked Stimulus.')), "\xA0", (0, _formatMessage.default)('Editing of this stimulus must take place within the bank.'))]));
+  }, /*#__PURE__*/_react.default.createElement(_uiText.Text, {
+    weight: "bold"
+  }, title), /*#__PURE__*/_react.default.createElement(_uiView.View, {
+    margin: "0 0 0 xx-small"
+  }, /*#__PURE__*/_react.default.createElement(_uiText.Text, null, content)));
+  for (var _len5 = arguments.length, args = new Array(_len5 > 1 ? _len5 - 1 : 0), _key5 = 1; _key5 < _len5; _key5++) {
+    args[_key5 - 1] = arguments[_key5];
+  }
+  return propsForBankEntryEditPrompt.apply(void 0, args.concat([promptComponent]));
 };
 exports.propsForStimulusBankEntryEditPrompt = propsForStimulusBankEntryEditPrompt;
 var propsForBankEntryUnauthorizedEdit = function propsForBankEntryUnauthorizedEdit(isEditing) {

package/lib/moderating/components/resources/ModerateTable/presenter.js

@@ -16,7 +16,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactImmutableProptypes = _interopRequireDefault(require("react-immutable-proptypes"));
 var _uiText = require("@instructure/ui-text");
 var _uiLink = require("@instructure/ui-link");
-var _uiFlex = require("@instructure/ui-flex");
 var _uiA11yContent = require("@instructure/ui-a11y-content");
 var _uiTable = require("@instructure/ui-table");
 var _uiButtons = require("@instructure/ui-buttons");
@@ -35,7 +34,7 @@ var _quizCommon = require("@instructure/quiz-common");
 var _lodash = require("lodash");
 var _dec, _class, _ModerateTable;
 /** @jsx jsx */
-var _ref2 = (0, _emotion.jsx)(_uiFlex.Flex.Item, null, (0, _emotion.jsx)(_uiIcons.IconInfoLine, null));
+var _ref2 = (0, _emotion.jsx)(_quizCommon.Flex.Item, null, (0, _emotion.jsx)(_uiIcons.IconInfoLine, null));
 var _ref4 = (0, _emotion.jsx)(_uiIcons.IconConfigureLine, null);
 var _ref5 = (0, _emotion.jsx)(_Spinner.default, null);
 var _ref6 = (0, _emotion.jsx)(_index5.default, null);
@@ -247,7 +246,7 @@ var ModerateTable = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default,
       var _this3 = this;
       return (0, _emotion.jsx)("div", null, (0, _emotion.jsx)(_index2.default, {
         name: "manual_submission"
-      }, (0, _emotion.jsx)(_uiFlex.Flex, null, _ref2, (0, _emotion.jsx)(_uiFlex.Flex.Item, {
+      }, (0, _emotion.jsx)(_quizCommon.Flex, null, _ref2, (0, _emotion.jsx)(_quizCommon.Flex.Item, {
         padding: "xx-small"
       }, _formatMessage.default.rich('This assessment has <0>{count, plural, one {# attempt} other {# attempts}}</0> in progress.', {
         count: outstandingAttemptsCount,
@@ -334,7 +333,7 @@ var ModerateTable = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default,
         onClose: this.onCloseTray,
         onSave: this.props.onSaveTray,
         atteqApplyChangesToCurrentQuizAttemptsEnabled: this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled
-      }, (0, _emotion.jsx)(_uiFlex.Flex.Item, null, !this.props.anonymousGrading && _ref6), this.props.children), this.renderContent());
+      }, (0, _emotion.jsx)(_quizCommon.Flex.Item, null, !this.props.anonymousGrading && _ref6), this.props.children), this.renderContent());
     }
   }]);
   ModerateTable.displayName = "ModerateTable";

package/lib/moderating/components/sidebar/ModerateTray/presenter.js

@@ -13,7 +13,6 @@ var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
-var _uiFlex = require("@instructure/ui-flex");
 var _uiView = require("@instructure/ui-view");
 var _uiText = require("@instructure/ui-text");
 var _uiHeading = require("@instructure/ui-heading");
@@ -210,18 +209,18 @@ var ModerateTray = /*#__PURE__*/function (_Component) {
         size: this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled ? 'regular' : void 0,
         shouldCloseOnDocumentClick: true,
         ref: this.setTrayRef
-      }, /*#__PURE__*/_react.default.createElement(_uiFlex.Flex, {
+      }, /*#__PURE__*/_react.default.createElement(_quizCommon.Flex, {
         as: "div",
         direction: "column",
         height: "100vh"
-      }, this.renderTitleAndCloseButton(), this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled && /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
+      }, this.renderTitleAndCloseButton(), this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled && /*#__PURE__*/_react.default.createElement(_quizCommon.Flex.Item, {
         padding: "medium medium 0 medium"
-      }, this.renderNameWithTooltip()), /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
+      }, this.renderNameWithTooltip()), /*#__PURE__*/_react.default.createElement(_quizCommon.Flex.Item, {
         padding: "medium"
-      }, (0, _formatMessage.default)('These settings apply to current and all future attempts.')), /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
+      }, (0, _formatMessage.default)('These settings apply to current and all future attempts.')), /*#__PURE__*/_react.default.createElement(_quizCommon.Flex.Item, {
         shouldGrow: true,
         padding: "0 medium"
-      }, this.renderChildren()), this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled && /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, null, this.renderFooter())));
+      }, this.renderChildren()), this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled && /*#__PURE__*/_react.default.createElement(_quizCommon.Flex.Item, null, this.renderFooter())));
     }
   }]);
   ModerateTray.displayName = "ModerateTray";

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

@@ -10,7 +10,6 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/createSuper"));
 var _react = require("react");
-var _uiFlex = require("@instructure/ui-flex");
 var _styles = _interopRequireDefault(require("./styles.js"));
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 var _uiTable = require("@instructure/ui-table");
@@ -26,7 +25,7 @@ var _quizCommon = require("@instructure/quiz-common");
 var _dec, _class, _MatchingTypeTable;
 /** @jsx jsx */
 var _ref = (0, _emotion.jsx)(_uiIcons.IconCheckSolid, null);
-var _ref2 = (0, _emotion.jsx)(_uiFlex.Flex.Item, {
+var _ref2 = (0, _emotion.jsx)(_quizCommon.Flex.Item, {
   width: "46px",
   textAlign: "center"
 });
@@ -61,9 +60,9 @@ var MatchingTypeTable = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defa
           padding: '0 0 15px 0'
         },
         textAlign: "center"
-      }, (0, _emotion.jsx)(_uiFlex.Flex, {
+      }, (0, _emotion.jsx)(_quizCommon.Flex, {
         direction: "row"
-      }, _ref2, (0, _emotion.jsx)(_uiFlex.Flex.Item, {
+      }, _ref2, (0, _emotion.jsx)(_quizCommon.Flex.Item, {
         shouldShrink: true,
         shouldGrow: true,
         textAlign: "center"
@@ -92,14 +91,14 @@ var MatchingTypeTable = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defa
       }, (0, _emotion.jsx)(_uiA11yContent.ScreenReaderContent, null, correct ? "".concat((0, _formatMessage.default)('Correct answer'), ": ").concat(count) : count), (0, _emotion.jsx)("div", {
         "aria-hidden": "true",
         css: answerRowStyles
-      }, (0, _emotion.jsx)(_uiFlex.Flex, {
+      }, (0, _emotion.jsx)(_quizCommon.Flex, {
         direction: "row",
         alignItems: "center"
-      }, (0, _emotion.jsx)(_uiFlex.Flex.Item, {
+      }, (0, _emotion.jsx)(_quizCommon.Flex.Item, {
         width: "46px",
         textAlign: "center",
         align: "stretch"
-      }, correct && _this.renderIcon()), (0, _emotion.jsx)(_uiFlex.Flex.Item, {
+      }, correct && _this.renderIcon()), (0, _emotion.jsx)(_quizCommon.Flex.Item, {
         shouldShrink: true,
         shouldGrow: true,
         textAlign: "center"

package/lib/reporting/components/resources/NewQuizAndItemAnalysis/AnswerFrequencySummary/NumericType/ChoiceTypeWithInfo/presenter.js

@@ -12,7 +12,7 @@ var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _propTypes2 = require("../../../../common/propTypes.js");
-var _uiFlex = require("@instructure/ui-flex");
+var _quizCommon = require("@instructure/quiz-common");
 var _index = _interopRequireDefault(require("../../shared/ChoiceTypeTable/index.js"));
 var _uiText = require("@instructure/ui-text");
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
@@ -40,7 +40,7 @@ var ChoiceTypeWithInfo = /*#__PURE__*/function (_Component) {
       });
     };
     _this.renderEmptyRequirement = function () {
-      return /*#__PURE__*/_react.default.createElement(_uiFlex.Flex, null, /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
+      return /*#__PURE__*/_react.default.createElement(_quizCommon.Flex, null, /*#__PURE__*/_react.default.createElement(_quizCommon.Flex.Item, {
         padding: "medium none none none"
       }, /*#__PURE__*/_react.default.createElement(_uiText.Text, null, (0, _formatMessage.default)('There are no entries for this requirement.'))));
     };
@@ -49,28 +49,28 @@ var ChoiceTypeWithInfo = /*#__PURE__*/function (_Component) {
         headLine = _this$props2.headLine,
         choices = _this$props2.choices;
       var areThereChoices = Array.isArray(choices) && choices.length > 0;
-      return /*#__PURE__*/_react.default.createElement(_uiFlex.Flex, {
+      return /*#__PURE__*/_react.default.createElement(_quizCommon.Flex, {
         direction: "column",
         justifyItems: "start"
-      }, /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
+      }, /*#__PURE__*/_react.default.createElement(_quizCommon.Flex.Item, {
         overflowY: "visible",
         shouldGrow: true,
         shouldShrink: true
-      }, /*#__PURE__*/_react.default.createElement(_uiFlex.Flex, {
+      }, /*#__PURE__*/_react.default.createElement(_quizCommon.Flex, {
         direction: "column",
         justifyItems: "start"
-      }, /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
+      }, /*#__PURE__*/_react.default.createElement(_quizCommon.Flex.Item, {
         shouldShrink: true,
         padding: "none none none none",
         overflowY: "hidden"
-      }, /*#__PURE__*/_react.default.createElement(_uiFlex.Flex, {
+      }, /*#__PURE__*/_react.default.createElement(_quizCommon.Flex, {
         direction: "row",
         alignItems: "start"
-      }, /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
+      }, /*#__PURE__*/_react.default.createElement(_quizCommon.Flex.Item, {
         shouldShrink: true,
         shouldGrow: true,
         margin: "none none none none"
-      }, headLine))), /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
+      }, headLine))), /*#__PURE__*/_react.default.createElement(_quizCommon.Flex.Item, {
         shouldShrink: true,
         padding: "none none medium none"
       }, areThereChoices ? _this.renderTable() : _this.renderEmptyRequirement()))));

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

@@ -21,7 +21,6 @@ var _emotion = require("@instructure/emotion");
 var _index5 = _interopRequireDefault(require("./ChoiceTypeWithInfo/index.js"));
 var _styles = _interopRequireDefault(require("./styles.js"));
 var _theme = _interopRequireDefault(require("./theme.js"));
-var _uiFlex = require("@instructure/ui-flex");
 var _propTypes2 = require("../../../common/propTypes.js");
 var _quizCommon = require("@instructure/quiz-common");
 var _dec, _class, _NumericType;
@@ -177,12 +176,12 @@ var NumericType = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default, _
       });
     };
     _this.renderEmptyIncorrect = function () {
-      return (0, _emotion.jsx)(_uiFlex.Flex, null, (0, _emotion.jsx)(_uiFlex.Flex.Item, {
+      return (0, _emotion.jsx)(_quizCommon.Flex, null, (0, _emotion.jsx)(_quizCommon.Flex.Item, {
         padding: "small none small none"
       }, (0, _emotion.jsx)(_uiText.Text, null, (0, _formatMessage.default)('There are no incorrect answers.'))));
     };
     _this.renderEmptyCorrect = function () {
-      return (0, _emotion.jsx)(_uiFlex.Flex, null, (0, _emotion.jsx)(_uiFlex.Flex.Item, {
+      return (0, _emotion.jsx)(_quizCommon.Flex, null, (0, _emotion.jsx)(_quizCommon.Flex.Item, {
         padding: "small none small none"
       }, (0, _emotion.jsx)(_uiText.Text, null, (0, _formatMessage.default)('There are no correct answers.'))));
     };

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

@@ -11,7 +11,6 @@ var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _propTypes2 = require("../../../../common/propTypes.js");
-var _uiFlex = require("@instructure/ui-flex");
 var _uiText = require("@instructure/ui-text");
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 var _index = _interopRequireDefault(require("../../shared/ChoiceTypeTable/index.js"));
@@ -92,25 +91,25 @@ var ChoiceGroupTypeTable = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.d
       var blank_text = blank.blank_text,
         blank_type = blank.blank_type;
       var blankTextAndType = "".concat(blank_text, " (").concat(_this.getTranslatedBlankType(blank_type), ")");
-      return (0, _emotion.jsx)(_uiFlex.Flex, {
+      return (0, _emotion.jsx)(_quizCommon.Flex, {
         overflowY: "visible",
         direction: "row",
         alignItems: "start",
         wrap: "wrap"
-      }, (0, _emotion.jsx)(_uiFlex.Flex.Item, null, _this.renderBlankIcon()), (0, _emotion.jsx)(_uiFlex.Flex.Item, {
+      }, (0, _emotion.jsx)(_quizCommon.Flex.Item, null, _this.renderBlankIcon()), (0, _emotion.jsx)(_quizCommon.Flex.Item, {
         margin: "xxx-small medium small x-small"
       }, (0, _emotion.jsx)(_uiText.Text, {
         weight: "bold"
-      }, blankTextAndType)), (0, _emotion.jsx)(_uiFlex.Flex.Item, {
+      }, blankTextAndType)), (0, _emotion.jsx)(_quizCommon.Flex.Item, {
         shouldShrink: true,
         margin: "xxx-small none small none"
       }, _this.renderBlankInfo()));
     };
     _this.renderEmptyInfo = function () {
-      return (0, _emotion.jsx)(_uiFlex.Flex, {
+      return (0, _emotion.jsx)(_quizCommon.Flex, {
         direction: "column",
         justifyItems: "start"
-      }, (0, _emotion.jsx)(_uiFlex.Flex.Item, {
+      }, (0, _emotion.jsx)(_quizCommon.Flex.Item, {
         shouldShrink: true,
         shouldGrow: true,
         padding: "none none x-small none"

package/lib/reporting/components/resources/NewQuizAndItemAnalysis/AnswerFrequencySummary/shared/AfsTableWrapper/presenter.js

@@ -10,7 +10,6 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/createSuper"));
 var _react = require("react");
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
-var _uiFlex = require("@instructure/ui-flex");
 var _uiHeading = require("@instructure/ui-heading");
 var _emotion = require("@instructure/emotion");
 var _styles = _interopRequireDefault(require("./styles.js"));
@@ -36,10 +35,10 @@ var AfsTableWrapper = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defaul
     };
     _this.render = function () {
       var noAnswerMissingPopover = _this.props.noAnswerMissingPopover;
-      return (0, _emotion.jsx)(_uiFlex.Flex, {
+      return (0, _emotion.jsx)(_quizCommon.Flex, {
         direction: "row",
         "data-testid": "AfsTableWrapper"
-      }, (0, _emotion.jsx)(_uiFlex.Flex.Item, {
+      }, (0, _emotion.jsx)(_quizCommon.Flex.Item, {
         shouldGrow: true
       }, (0, _emotion.jsx)("div", {
         css: _this.props.styles.tableWrapper
@@ -48,9 +47,9 @@ var AfsTableWrapper = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defaul
         level: "h3",
         weight: "bold",
         color: "primary"
-      }, (0, _emotion.jsx)(_uiFlex.Flex, {
+      }, (0, _emotion.jsx)(_quizCommon.Flex, {
         gap: "x-small"
-      }, (0, _emotion.jsx)(_uiFlex.Flex.Item, null, _this.getHeader()), (0, _emotion.jsx)(_uiFlex.Flex.Item, null, noAnswerMissingPopover && (0, _emotion.jsx)(_index.default, _popoverContent.noAnswerMissing)))), _this.props.children)));
+      }, (0, _emotion.jsx)(_quizCommon.Flex.Item, null, _this.getHeader()), (0, _emotion.jsx)(_quizCommon.Flex.Item, null, noAnswerMissingPopover && (0, _emotion.jsx)(_index.default, _popoverContent.noAnswerMissing)))), _this.props.children)));
     };
     return _this;
   }

package/lib/reporting/components/resources/NewQuizAndItemAnalysis/AnswerFrequencySummary/shared/AggregationTable/presenter.js

@@ -17,7 +17,6 @@ var _uiIcons = require("@instructure/ui-icons");
 var _emotion = require("@instructure/emotion");
 var _theme = _interopRequireDefault(require("./theme.js"));
 var _styles = _interopRequireDefault(require("./styles.js"));
-var _uiFlex = require("@instructure/ui-flex");
 var _uiText = require("@instructure/ui-text");
 var _quizCommon = require("@instructure/quiz-common");
 var _dec, _class, _AggregationTable;
@@ -67,16 +66,16 @@ var AggregationTable = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defau
         themeOverride: {
           padding: '0px'
         }
-      }, (0, _emotion.jsx)(_uiFlex.Flex, {
+      }, (0, _emotion.jsx)(_quizCommon.Flex, {
         direction: "row",
         alignItems: "center"
-      }, (0, _emotion.jsx)(_uiFlex.Flex.Item, {
+      }, (0, _emotion.jsx)(_quizCommon.Flex.Item, {
         width: "46px",
         textAlign: "center",
         align: "stretch"
       }, (0, _emotion.jsx)("div", {
         css: [_this.props.styles.iconWrapper, backgroundColor]
-      }, icon)), (0, _emotion.jsx)(_uiFlex.Flex.Item, {
+      }, icon)), (0, _emotion.jsx)(_quizCommon.Flex.Item, {
         shouldShrink: true
       }, (0, _emotion.jsx)("div", {
         "data-testid": "label-wrapper",

package/lib/reporting/components/resources/NewQuizAndItemAnalysis/AnswerFrequencySummary/shared/ChoiceTypeTable/presenter.js

@@ -21,7 +21,6 @@ var _styles = _interopRequireDefault(require("./styles.js"));
 var _theme = _interopRequireDefault(require("./theme.js"));
 var _uiIcons = require("@instructure/ui-icons");
 var _quizInteractions = require("@instructure/quiz-interactions");
-var _uiFlex = require("@instructure/ui-flex");
 var _uiText = require("@instructure/ui-text");
 var _quizCommon = require("@instructure/quiz-common");
 var _dec, _class, _ChoiceTypeTable;
@@ -88,17 +87,17 @@ var ChoiceTypeTable = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defaul
         themeOverride: {
           padding: '0'
         }
-      }, (0, _emotion.jsx)(_uiA11yContent.ScreenReaderContent, null, screenReaderContent), (0, _emotion.jsx)(_uiFlex.Flex, {
+      }, (0, _emotion.jsx)(_uiA11yContent.ScreenReaderContent, null, screenReaderContent), (0, _emotion.jsx)(_quizCommon.Flex, {
         direction: "row",
         alignItems: "center"
-      }, (0, _emotion.jsx)(_uiFlex.Flex.Item, {
+      }, (0, _emotion.jsx)(_quizCommon.Flex.Item, {
         width: "46px",
         textAlign: "center",
         align: "stretch"
       }, (0, _emotion.jsx)("div", {
         "data-icon": _this.getDataIconAttribute(correct, choiceIndex),
         css: _this.props.styles.iconWrapper
-      }, _this.renderIcon(correct))), (0, _emotion.jsx)(_uiFlex.Flex.Item, {
+      }, _this.renderIcon(correct))), (0, _emotion.jsx)(_quizCommon.Flex.Item, {
         shouldShrink: true,
         shouldGrow: true
       }, (0, _emotion.jsx)(_uiText.Text, null, _this.renderFirstCell(extractedBody))))), (0, _emotion.jsx)(_uiTable.Table.Cell, {