@instructure/quiz-core 20.36.2 → 20.38.0

package/es/common/reducers/modifications.js

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

package/es/common/util/warningHelpers.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import partial from 'lodash/partial';
 import { Text } from '@instructure/ui-text';
+import { View } from '@instructure/ui-view';
 import t from '@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';
@@ -82,12 +83,21 @@ export var propsForItemBankEntryEditPrompt = function propsForItemBankEntryEditP
   }, /*#__PURE__*/React.createElement("b", null, t('Banked Item.')), "\xA0", t('Some options and the points value can be changed here but editing must take place within the bank.'))]));
 };
 export 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.createElement(Text, {
+  var isPassage = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : false;
+  var title = isPassage ? t('Banked Passage.') : t('Banked Stimulus.');
+  var content = isPassage ? t('Editing of this passage must take place within the bank.') : t('Editing of this stimulus must take place within the bank.');
+  var promptComponent = /*#__PURE__*/React.createElement(View, {
+    as: "div",
     "data-automation": "sdk-editInBanks-warning"
-  }, /*#__PURE__*/React.createElement("b", null, t('Banked Stimulus.')), "\xA0", t('Editing of this stimulus must take place within the bank.'))]));
+  }, /*#__PURE__*/React.createElement(Text, {
+    weight: "bold"
+  }, title), /*#__PURE__*/React.createElement(View, {
+    margin: "0 0 0 xx-small"
+  }, /*#__PURE__*/React.createElement(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]));
 };
 export var propsForBankEntryUnauthorizedEdit = function propsForBankEntryUnauthorizedEdit(isEditing) {
   if (!isEditing) return {

package/es/index.js

@@ -79,7 +79,9 @@ export { Provider } from "./common/react-redux.js";
 export { FormattedTimer } from "./common/components/shared/FormattedDuration/index.js";
 export { default as TagWrapper } from "./common/components/shared/TagWrapper/index.js";
 export { RetryGradePassbackButton } from "./moderating/components/resources/RetryGradePassbackButton/index.js";
-export { GenericAsyncSearch } from "./common/components/shared/GenericAsyncSearch/GenericAsyncSearch.js"; // Utilities
+export { GenericAsyncSearch } from "./common/components/shared/GenericAsyncSearch/GenericAsyncSearch.js";
+export { MaskedTextInput } from "./common/components/MaskedTextInput/index.js";
+export { AccessCodeTextInput } from "./common/components/AccessCodeTextInput/index.js"; // Utilities
 export { environment as config } from "./config.js";
 export { Fetcher } from "./common/util/Fetcher.js";
 export { httpHeaders } from "./common/util/httpHeaders.js";

package/es/moderating/components/resources/AccommodationsModal/ExtraTimeSettings/index.js

@@ -6,7 +6,7 @@ import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { View } from '@instructure/ui-view';
-import { SimpleSelect } from '@instructure/ui-simple-select';
+import { SimpleSelect } from '@instructure/quiz-common';
 import TimeUnitsInput from "../../../../../common/components/shared/TimeUnitsInput/index.js";
 import ExtraTimeMultiplier from "../ExtraTimeMultiplier/index.js";
 import { HOUR_IN_SECONDS } from "../../../../../common/components/shared/FormattedDuration/index.js";
@@ -94,7 +94,7 @@ export var ExtraTimeSettings = /*#__PURE__*/function (_Component) {
         minutesLabel: t('Minutes'),
         minutesDataAutomation: "sdk-moderation-time-minutes",
         description: t('Additional time'),
-        margin: "medium none"
+        margin: "medium none none none"
       }), timeAdjustmentType === 'timerMultiplierEnabled' && /*#__PURE__*/React.createElement(ExtraTimeMultiplier, {
         onChange: this.onChangeMultiplier,
         timerMultiplierValue: timerSettings.timerMultiplierValue,

package/es/moderating/components/resources/AccommodationsModal/index.js

@@ -4,7 +4,6 @@ import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { Text } from '@instructure/ui-text';
 import { Tooltip } from '@instructure/ui-tooltip';
 import { Modal } from '@instructure/ui-modal';
 import { TruncateText } from '@instructure/ui-truncate-text';
@@ -13,8 +12,6 @@ import { View } from '@instructure/ui-view';
 import { Button, CloseButton } from '@instructure/ui-buttons';
 import t from '@instructure/quiz-i18n/es/format-message';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
-import { featureOn } from "../../../../common/util/featureCheck.js";
-import { IfFeature } from "../../../../common/components/shared/IfFeature/index.js";
 export var AccommodationModal = /*#__PURE__*/function (_Component) {
   _inherits(AccommodationModal, _Component);
   var _super = _createSuper(AccommodationModal);
@@ -57,7 +54,7 @@ export var AccommodationModal = /*#__PURE__*/function (_Component) {
       }, _this.props.studentName));
     };
     _this.renderHeading = function () {
-      if (featureOn('atteq_apply_changes_to_current_quiz_attempts')) {
+      if (_this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled) {
         return /*#__PURE__*/React.createElement(Heading, null, /*#__PURE__*/React.createElement(ScreenReaderContent, null, t('Student Accommodation')), t('Student Accommodation'));
       }
       var _this$props = _this.props,
@@ -84,7 +81,7 @@ export var AccommodationModal = /*#__PURE__*/function (_Component) {
   _createClass(AccommodationModal, [{
     key: "labelText",
     value: function labelText() {
-      if (featureOn('atteq_apply_changes_to_current_quiz_attempts')) {
+      if (this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled) {
         return t('Student Accommodation');
       }
       return this.props.studentName || t('Accommodations Modal');
@@ -93,7 +90,6 @@ export var AccommodationModal = /*#__PURE__*/function (_Component) {
     key: "render",
     value: function render() {
       var _this$props2 = this.props,
-        studentName = _this$props2.studentName,
         open = _this$props2.open,
         closeModal = _this$props2.closeModal,
         mountNode = _this$props2.mountNode,
@@ -109,12 +105,7 @@ export var AccommodationModal = /*#__PURE__*/function (_Component) {
         placement: "end",
         offset: "medium",
         screenReaderLabel: t('Close')
-      }), this.renderHeading()), /*#__PURE__*/React.createElement(Modal.Body, null, /*#__PURE__*/React.createElement(IfFeature, {
-        name: "atteq_apply_changes_to_current_quiz_attempts"
-      }, /*#__PURE__*/React.createElement(Text, {
-        weight: "bold",
-        as: "h2"
-      }, studentName)), children), /*#__PURE__*/React.createElement(Modal.Footer, null, /*#__PURE__*/React.createElement(Button, {
+      }), this.renderHeading()), /*#__PURE__*/React.createElement(Modal.Body, null, children), /*#__PURE__*/React.createElement(Modal.Footer, null, /*#__PURE__*/React.createElement(Button, {
         onClick: this.cancelAction,
         margin: "xxx-small",
         "data-automation": "sdk-moderation-cancel"
@@ -137,7 +128,8 @@ AccommodationModal.propTypes = {
   onDismiss: PropTypes.func,
   mountNode: PropTypes.string,
   // this is just to fix chromatic
-  children: PropTypes.oneOfType([PropTypes.node, PropTypes.arrayOf(PropTypes.node)])
+  children: PropTypes.oneOfType([PropTypes.node, PropTypes.arrayOf(PropTypes.node)]),
+  atteqApplyChangesToCurrentQuizAttemptsEnabled: PropTypes.bool.isRequired
 };
 AccommodationModal.defaultProps = {
   children: [],

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

@@ -11,7 +11,6 @@ import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { Text } from '@instructure/ui-text';
 import { Link } from '@instructure/ui-link';
-import { Flex } from '@instructure/ui-flex';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import { Table } from '@instructure/ui-table';
 import { IconButton } from '@instructure/ui-buttons';
@@ -26,7 +25,7 @@ import Spinner from "../../../../common/components/shared/spinner/Spinner.js";
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
 import ResetQuiz from "../../sidebar/ResetQuiz/index.js";
-import { OUTSTANDING_QUIZZES_MODAL, withStyleOverrides } from '@instructure/quiz-common';
+import { Flex, OUTSTANDING_QUIZZES_MODAL, withStyleOverrides } from '@instructure/quiz-common';
 import { chunk } from 'lodash';
 var _ref2 = jsx(Flex.Item, null, jsx(IconInfoLine, null));
 var _ref4 = jsx(IconConfigureLine, null);
@@ -325,7 +324,8 @@ export var ModerateTable = (_dec = withStyleOverrides(generateStyle, generateCom
         css: this.props.styles.page
       }, jsx(ModerateTray, {
         onClose: this.onCloseTray,
-        onSave: this.props.onSaveTray
+        onSave: this.props.onSaveTray,
+        atteqApplyChangesToCurrentQuizAttemptsEnabled: this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled
       }, jsx(Flex.Item, null, !this.props.anonymousGrading && _ref6), this.props.children), this.renderContent());
     }
   }]);
@@ -380,7 +380,8 @@ export var ModerateTable = (_dec = withStyleOverrides(generateStyle, generateCom
   getQuizSessions: PropTypes.func.isRequired,
   addSuccess: PropTypes.func.isRequired,
   styles: PropTypes.object,
-  makeStyles: PropTypes.func
+  makeStyles: PropTypes.func,
+  atteqApplyChangesToCurrentQuizAttemptsEnabled: PropTypes.bool.isRequired
 }, _ModerateTable.defaultProps = {
   anonymousGrading: false,
   children: void 0,

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

@@ -5,17 +5,16 @@ import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import t from '@instructure/quiz-i18n/es/format-message';
-import { Flex } from '@instructure/ui-flex';
 import { View } from '@instructure/ui-view';
 import { Text } from '@instructure/ui-text';
+import { Heading } from '@instructure/ui-heading';
 import { Tooltip } from '@instructure/ui-tooltip';
 import { Tray } from '@instructure/ui-tray';
 import { Button, CloseButton } from '@instructure/ui-buttons';
 import { TruncateText } from '@instructure/ui-truncate-text';
 import { Modal } from '@instructure/ui-modal';
-import { liveRegion } from '@instructure/quiz-common';
+import { Flex, liveRegion } from '@instructure/quiz-common';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
-import { featureOn } from "../../../../common/util/featureCheck.js";
 export var ModerateTray = /*#__PURE__*/function (_Component) {
   _inherits(ModerateTray, _Component);
   var _super = _createSuper(ModerateTray);
@@ -67,20 +66,15 @@ export var ModerateTray = /*#__PURE__*/function (_Component) {
       _this.props.closeTray();
     };
     _this.renderTitleAndCloseButton = function () {
-      return /*#__PURE__*/React.createElement(Flex, {
-        justifyItems: "space-between"
-      }, /*#__PURE__*/React.createElement(Flex.Item, {
-        shouldGrow: true,
-        shouldShrink: true
-      }, featureOn('atteq_apply_changes_to_current_quiz_attempts') ? /*#__PURE__*/React.createElement(Text, {
-        as: "h2",
-        size: "large",
-        weight: "bold"
-      }, t('In Progress Accommodation')) : _this.renderHeading()), /*#__PURE__*/React.createElement(Flex.Item, null, /*#__PURE__*/React.createElement(CloseButton, {
+      return /*#__PURE__*/React.createElement(Modal.Header, null, /*#__PURE__*/React.createElement(CloseButton, {
         onClick: _this.props.closeTray,
         elementRef: _this.setCloseRef,
+        placement: "end",
+        offset: "medium",
         screenReaderLabel: t('Close')
-      })));
+      }), _this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled ? /*#__PURE__*/React.createElement(Heading, {
+        level: "h3"
+      }, /*#__PURE__*/React.createElement(ScreenReaderContent, null, t('In Progress Accommodation')), t('In Progress Accommodation')) : _this.renderHeading());
     };
     _this.renderChildren = function () {
       return React.Children.map(_this.props.children, function (child) {
@@ -128,12 +122,12 @@ export var ModerateTray = /*#__PURE__*/function (_Component) {
         /*#__PURE__*/
         // When using TruncateText inside a Tooltip, a focusable wrapper element is required
         // tabIndex={0} makes the div focusable and allows KO users to access the tooltip
-        React.createElement(View, {
+        React.createElement(Heading, {
           display: "block",
           borderRadius: "small",
           position: "relative",
           withFocusOutline: this.state.titleIsTruncated && focused,
-          as: "h2",
+          level: "h3",
           tabIndex: this.state.isTruncated ? 0 : null
         }, /*#__PURE__*/React.createElement(ScreenReaderContent, null, this.labelText()), /*#__PURE__*/React.createElement(TruncateText, {
           "aria-hidden": "true",
@@ -146,9 +140,6 @@ export var ModerateTray = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderName",
     value: function renderName(renderProps) {
-      if (!featureOn('atteq_apply_changes_to_current_quiz_attempts')) {
-        return null;
-      }
       var focused = renderProps && renderProps.focused;
       return (
         /*#__PURE__*/
@@ -159,8 +150,7 @@ export var ModerateTray = /*#__PURE__*/function (_Component) {
           borderRadius: "small",
           position: "relative",
           withFocusOutline: this.state.participantNameIsTruncated && focused,
-          tabIndex: this.state.participantNameIsTruncated ? 0 : null,
-          margin: "small 0"
+          tabIndex: this.state.participantNameIsTruncated ? 0 : null
         }, /*#__PURE__*/React.createElement(ScreenReaderContent, null, this.props.participantName), /*#__PURE__*/React.createElement(TruncateText, {
           "aria-hidden": "true",
           maxLines: 2,
@@ -175,9 +165,6 @@ export var ModerateTray = /*#__PURE__*/function (_Component) {
     key: "renderNameWithTooltip",
     value: function renderNameWithTooltip() {
       var _this3 = this;
-      if (!featureOn('atteq_apply_changes_to_current_quiz_attempts')) {
-        return null;
-      }
       return this.state.titleIsTruncated ? /*#__PURE__*/React.createElement(Tooltip, {
         placement: "start",
         renderTip: this.props.participantName,
@@ -192,7 +179,7 @@ export var ModerateTray = /*#__PURE__*/function (_Component) {
   }, {
     key: "labelText",
     value: function labelText() {
-      if (featureOn('atteq_apply_changes_to_current_quiz_attempts')) {
+      if (this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled) {
         return t('In Progress Accommodation');
       }
       if (this.props.participantName) {
@@ -211,19 +198,21 @@ export var ModerateTray = /*#__PURE__*/function (_Component) {
         onExited: this.handleTrayExited,
         open: this.props.isOpen,
         placement: "end",
-        size: featureOn('atteq_apply_changes_to_current_quiz_attempts') ? 'regular' : void 0,
+        size: this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled ? 'regular' : void 0,
         shouldCloseOnDocumentClick: true,
         ref: this.setTrayRef
       }, /*#__PURE__*/React.createElement(Flex, {
         as: "div",
         direction: "column",
         height: "100vh"
-      }, /*#__PURE__*/React.createElement(Flex.Item, {
-        padding: "small medium"
-      }, this.renderTitleAndCloseButton()), /*#__PURE__*/React.createElement(Flex.Item, {
+      }, this.renderTitleAndCloseButton(), this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled && /*#__PURE__*/React.createElement(Flex.Item, {
+        padding: "medium medium 0 medium"
+      }, this.renderNameWithTooltip()), /*#__PURE__*/React.createElement(Flex.Item, {
+        padding: "medium"
+      }, t('These settings apply to current and all future attempts.')), /*#__PURE__*/React.createElement(Flex.Item, {
         shouldGrow: true,
         padding: "0 medium"
-      }, this.renderNameWithTooltip(), this.renderChildren()), featureOn('add_time_to_existing_quiz_sessions') && /*#__PURE__*/React.createElement(Flex.Item, null, this.renderFooter())));
+      }, this.renderChildren()), this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled && /*#__PURE__*/React.createElement(Flex.Item, null, this.renderFooter())));
     }
   }]);
   ModerateTray.displayName = "ModerateTray";
@@ -235,7 +224,8 @@ ModerateTray.propTypes = {
   isOpen: PropTypes.bool.isRequired,
   onClose: PropTypes.func,
   onSave: PropTypes.func.isRequired,
-  participantName: PropTypes.string
+  participantName: PropTypes.string,
+  atteqApplyChangesToCurrentQuizAttemptsEnabled: PropTypes.bool.isRequired
 };
 ModerateTray.defaultProps = {
   onClose: void 0,

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

@@ -5,7 +5,6 @@ import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 var _dec, _class, _MatchingTypeTable;
 /** @jsx jsx */
 import { Component } from 'react';
-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';
@@ -17,7 +16,7 @@ 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';
+import { Flex, withStyleOverrides } from '@instructure/quiz-common';
 var _ref = jsx(IconCheckSolid, null);
 var _ref2 = jsx(Flex.Item, {
   width: "46px",

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

@@ -4,7 +4,7 @@ import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { choiceTypeObject } from "../../../../common/propTypes.js";
-import { Flex } from '@instructure/ui-flex';
+import { Flex } from '@instructure/quiz-common';
 import ChoiceTypeTable from "../../shared/ChoiceTypeTable/index.js";
 import { Text } from '@instructure/ui-text';
 import t from '@instructure/quiz-i18n/es/format-message';

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

@@ -16,9 +16,8 @@ import { jsx } 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';
+import { Flex, withStyleOverrides } from '@instructure/quiz-common';
 export var NumericType = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_NumericType = /*#__PURE__*/function (_Component) {
   _inherits(NumericType, _Component);
   var _super = _createSuper(NumericType);

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

@@ -6,7 +6,6 @@ var _dec, _class, _ChoiceGroupTypeTable;
 import { Component } from 'react';
 import PropTypes from 'prop-types';
 import { choiceTypeObject } from "../../../../common/propTypes.js";
-import { Flex } from '@instructure/ui-flex';
 import { Text } from '@instructure/ui-text';
 import t from '@instructure/quiz-i18n/es/format-message';
 import ChoiceTypeTable from "../../shared/ChoiceTypeTable/index.js";
@@ -15,7 +14,7 @@ import { 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';
+import { Flex, withStyleOverrides } from '@instructure/quiz-common';
 export var ChoiceGroupTypeTable = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_ChoiceGroupTypeTable = /*#__PURE__*/function (_Component) {
   _inherits(ChoiceGroupTypeTable, _Component);
   var _super = _createSuper(ChoiceGroupTypeTable);

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

@@ -5,14 +5,13 @@ var _dec, _class, _AfsTableWrapper;
 /** @jsx jsx */
 import { Component } from 'react';
 import t from '@instructure/quiz-i18n/es/format-message';
-import { Flex } from '@instructure/ui-flex';
 import { Heading } from '@instructure/ui-heading';
 import { jsx } from '@instructure/emotion';
 import generateStyle from "./styles.js";
 import PropTypes from 'prop-types';
 import { noAnswerMissing } from "./popoverContent.js";
 import MetricPopover from "../../../MetricPopover/index.js";
-import { withStyleOverrides } from '@instructure/quiz-common';
+import { Flex, withStyleOverrides } from '@instructure/quiz-common';
 export var AfsTableWrapper = (_dec = withStyleOverrides(generateStyle, null), _dec(_class = (_AfsTableWrapper = /*#__PURE__*/function (_Component) {
   _inherits(AfsTableWrapper, _Component);
   var _super = _createSuper(AfsTableWrapper);

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

@@ -12,9 +12,8 @@ import { IconCheckSolid, IconXSolid, IconNoSolid, IconGradebookSolid } from '@in
 import { jsx } from '@instructure/emotion';
 import generateComponentTheme from "./theme.js";
 import generateStyle from "./styles.js";
-import { Flex } from '@instructure/ui-flex';
 import { Text } from '@instructure/ui-text';
-import { withStyleOverrides } from '@instructure/quiz-common';
+import { Flex, withStyleOverrides } from '@instructure/quiz-common';
 var noAnswerKey = 'noAnswer';
 var incorrectKey = 'incorrect';
 var correctKey = 'correct';

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

@@ -16,9 +16,8 @@ import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
 import { IconCheckSolid, IconXSolid } from '@instructure/ui-icons';
 import { extractTextFromHtml } from '@instructure/quiz-interactions';
-import { Flex } from '@instructure/ui-flex';
 import { Text } from '@instructure/ui-text';
-import { withStyleOverrides } from '@instructure/quiz-common';
+import { Flex, withStyleOverrides } from '@instructure/quiz-common';
 var correctAttribute = 'correct';
 var incorrectAttribute = 'incorrect';
 var _ref = jsx(IconCheckSolid, null);

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

@@ -5,14 +5,13 @@ var _dec, _class, _ExpandableCard;
 /** @jsx jsx */
 import { Component } from 'react';
 import Card from "../../../../../../../common/components/shared/Card/index.js";
-import { Flex } from '@instructure/ui-flex';
 import { jsx } from '@instructure/emotion';
 import ExpandButton from "../../../../../../../common/components/shared/ExpandButton/index.js";
 import t from '@instructure/quiz-i18n/es/format-message';
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
 import PropTypes from 'prop-types';
-import { withStyleOverrides } from '@instructure/quiz-common';
+import { Flex, withStyleOverrides } from '@instructure/quiz-common';
 export var ExpandableCard = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_ExpandableCard = /*#__PURE__*/function (_Component) {
   _inherits(ExpandableCard, _Component);
   var _super = _createSuper(ExpandableCard);

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

@@ -21,10 +21,9 @@ import AnalysisPopoverMetric from "../AnalysisPopoverMetric/index.js";
 import { interactionTypesNameDictionary } from "../../../../../common/util/interactionTypeMetadata.js";
 import AnswerFrequencySummary from "../AnswerFrequencySummary/index.js";
 import { afsFlags, itemAnalysisPropType } from "../../common/propTypes.js";
-import { Flex } from '@instructure/ui-flex';
 import { RichContentRenderer } from '@instructure/quiz-rce';
 import { ensureRCEContentIsLoaded } from "../../../../../common/util/rceChecker.js";
-import { RICH_FILL_BLANK_SLUG, withStyleOverrides } from '@instructure/quiz-common';
+import { Flex, RICH_FILL_BLANK_SLUG, withStyleOverrides } from '@instructure/quiz-common';
 var parser = new DOMParser();
 var parsererrorElement = 'parsererror';
 var parseType = 'text/html';

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

@@ -9,7 +9,6 @@ import PropTypes from 'prop-types';
 import t from '@instructure/quiz-i18n/es/format-message';
 import { Text } from '@instructure/ui-text';
 import { Link } from '@instructure/ui-link';
-import { Flex } from '@instructure/ui-flex';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import { jsx } from '@instructure/emotion';
 import Card from "../../../../../common/components/shared/Card/index.js";
@@ -21,7 +20,7 @@ import { AnalysisUpdateDate } from "../../common/AnalysisUpdateDate/index.js";
 import { itemAnalysisPropType, quizAnalysisPropType } from "../../common/propTypes.js";
 import { csvFormat } from "../exportFormats.js";
 import { ExportButton } from "../ExportButton/index.js";
-import { withStyleOverrides } from '@instructure/quiz-common';
+import { Flex, withStyleOverrides } from '@instructure/quiz-common';
 export var NewQuizAndItemAnalysisReportCardPresenter = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_NewQuizAndItemAnalysisReportCardPresenter = /*#__PURE__*/function (_Component) {
   _inherits(NewQuizAndItemAnalysisReportCardPresenter, _Component);
   var _super = _createSuper(NewQuizAndItemAnalysisReportCardPresenter);

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

@@ -9,7 +9,6 @@ import { Heading } from '@instructure/ui-heading';
 import NewItemAnalysis from "./NewItemAnalysis/index.js";
 import NewQuizAnalysis from "./NewQuizAnalysis/index.js";
 import t from '@instructure/quiz-i18n/es/format-message';
-import { Flex } from '@instructure/ui-flex';
 import { AnalysisUpdateDate } from "../common/AnalysisUpdateDate/index.js";
 import { itemAnalysisPropType, quizAnalysisPropType } from "../common/propTypes.js";
 import PropTypes from 'prop-types';
@@ -26,7 +25,7 @@ import { ExportButton } from "./ExportButton/index.js";
 import { jsx } from '@instructure/emotion';
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
-import { withStyleOverrides } from '@instructure/quiz-common';
+import { Flex, withStyleOverrides } from '@instructure/quiz-common';
 var _ref = jsx(Flex.Item, {
   align: "center"
 }, jsx(PresentationContent, null, jsx(Img, {

package/es/reporting/components/resources/ReportCard/index.js

@@ -12,9 +12,8 @@ import { jsx } from '@instructure/emotion';
 import Card from "../../../../common/components/shared/Card/index.js";
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
-import { Flex } from '@instructure/ui-flex';
 import t from '@instructure/quiz-i18n/es/format-message';
-import { withStyleOverrides } from '@instructure/quiz-common';
+import { Flex, withStyleOverrides } from '@instructure/quiz-common';
 export var ReportCard = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_ReportCard = /*#__PURE__*/function (_Component) {
   _inherits(ReportCard, _Component);
   var _super = _createSuper(ReportCard);

package/es/reporting/components/resources/StudentAnalysis/ReportCard/presenter.js

@@ -6,7 +6,6 @@ var _dec, _class, _StudentAnalysisReportCardPresenter;
 import React, { Component } from 'react';
 import { Text } from '@instructure/ui-text';
 import { Link } from '@instructure/ui-link';
-import { Flex } from '@instructure/ui-flex';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import t from '@instructure/quiz-i18n/es/format-message';
 import Card from "../../../../../common/components/shared/Card/index.js";
@@ -14,7 +13,7 @@ import { generateStyle } from "./styles.js";
 import { generateComponentTheme } from "./theme.js";
 import { ExportButton } from "../../common/ExportButton/index.js";
 import Spinner from "../../../../../common/components/shared/spinner/Spinner.js";
-import { STUDENT_ANALYSES, withStyleOverrides } from '@instructure/quiz-common';
+import { Flex, STUDENT_ANALYSES, withStyleOverrides } from '@instructure/quiz-common';
 import { AnalysisUpdateDate } from "../../common/AnalysisUpdateDate/index.js";
 export var StudentAnalysisReportCardPresenter = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_StudentAnalysisReportCardPresenter = /*#__PURE__*/function (_Component) {
   _inherits(StudentAnalysisReportCardPresenter, _Component);

package/es/reporting/components/resources/common/AnalysisUpdateDate/index.js

@@ -7,7 +7,7 @@ import PropTypes from 'prop-types';
 import t from '@instructure/quiz-i18n/es/format-message';
 import { displayDateAndTimeInTimezone } from "../../../../../common/util/formatTimespan.js";
 import { Text } from '@instructure/ui-text';
-import { Flex } from '@instructure/ui-flex';
+import { Flex } from '@instructure/quiz-common';
 export var AnalysisUpdateDate = /*#__PURE__*/function (_Component) {
   _inherits(AnalysisUpdateDate, _Component);
   var _super = _createSuper(AnalysisUpdateDate);

package/es/taking/api/taking.js

@@ -181,6 +181,10 @@ var __getResponseForSessionItem = function __getResponseForSessionItem(sessionIt
 var __remainingQuestionPositions = function __remainingQuestionPositions(sessionItems, responses) {
   return sessionItems.toList().sortBy(function (si) {
     return si.get('position');
+  }).filterNot(function (si) {
+    var item = si.get('item');
+    var interactionType = item.get('interactionType');
+    return typeof interactionType === 'undefined' || interactionType === 'no-interaction';
   }).filterNot(function (si) {
     var item = new Item(si.get('item'));
     var itemUserResponse = __getResponseForSessionItem(si, responses);

package/lib/banks/components/AddToBankModal/presenter.js

@@ -14,7 +14,6 @@ var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _uiButtons = require("@instructure/ui-buttons");
 var _uiHeading = require("@instructure/ui-heading");
-var _uiTextInput = require("@instructure/ui-text-input");
 var _uiRadioInput = require("@instructure/ui-radio-input");
 var _uiA11yContent = require("@instructure/ui-a11y-content");
 var _Bank = _interopRequireDefault(require("../../../common/records/Bank.js"));
@@ -128,7 +127,7 @@ var AddToBankModal = /*#__PURE__*/function (_Component) {
           "data-automation": "sdk-bank-selection"
         });
       }
-      return /*#__PURE__*/_react.default.createElement(_uiTextInput.TextInput, {
+      return /*#__PURE__*/_react.default.createElement(_quizCommon.TextInput, {
         onChange: this.onTitleChange,
         value: this.state.newBankTitle,
         renderLabel: (0, _formatMessage.default)('New Bank Title'),