@instructure/quiz-core 21.0.1-rc.23 → 21.0.1-rc.27

package/es/common/components/layout/sidebar/Stimulus/Collection/presenter.js

@@ -89,6 +89,7 @@ export var Collection = (_dec = withStyleOverrides(generateStyle, generateCompon
         }, _this3.props.renderSidebarItem(item, displayPosition, sidebarOpen));
       });
       var transitionType = isShowingItems ? 'slide-down' : 'slide-up';
+      var screenReaderText = this.props.isPassage ? t('Collapse passage questions') : t('Collapse stimulus questions');
       return jsx(Transition, {
         "in": isShowingItems || this.shouldDisplayAllItems(),
         type: transitionType
@@ -100,7 +101,7 @@ export var Collection = (_dec = withStyleOverrides(generateStyle, generateCompon
         withBackground: false,
         withBorder: false,
         renderIcon: IconArrowOpenUpLine,
-        screenReaderLabel: t('Collapse stimulus questions')
+        screenReaderLabel: screenReaderText
       })), jsx("div", null, itemComponents)));
     }
   }, {
@@ -111,6 +112,7 @@ export var Collection = (_dec = withStyleOverrides(generateStyle, generateCompon
         itemCollection = _this$props2.itemCollection,
         isShowingItems = _this$props2.isShowingItems;
       var transitionType = !isShowingItems ? 'slide-up' : 'slide-down';
+      var screenReaderText = this.props.isPassage ? t('Expand passage questions') : t('Expand stimulus questions');
       return jsx(Transition, {
         "in": !isShowingItems,
         type: transitionType
@@ -124,7 +126,7 @@ export var Collection = (_dec = withStyleOverrides(generateStyle, generateCompon
         withBackground: false,
         withBorder: false,
         renderIcon: IconArrowOpenDownLine,
-        screenReaderLabel: t('Expand stimulus questions')
+        screenReaderLabel: screenReaderText
       })));
     }
   }, {
@@ -155,7 +157,8 @@ export var Collection = (_dec = withStyleOverrides(generateStyle, generateCompon
   // set in connect
   setSidebarStimulusIsShowing: PropTypes.func.isRequired,
   styles: PropTypes.object,
-  makeStyles: PropTypes.func
+  makeStyles: PropTypes.func,
+  isPassage: PropTypes.bool
 }), _defineProperty(_Collection, "defaultProps", {
   isShowingItems: false
 }), _Collection)) || _class);

package/es/common/components/layout/sidebar/Stimulus/presenter.js

@@ -35,6 +35,8 @@ import t from '@instructure/quiz-i18n/es/format-message';
 import { Flex, END_EDITING_TRIGGER_CLASSNAME, withStyleOverrides } from '@instructure/quiz-common';
 import { Tooltip } from '@instructure/ui-tooltip';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
+import { View } from '@instructure/ui-view';
+import { Text } from '@instructure/ui-text';
 export var DISPLAY_AS_SUMMARY_LIMIT = 5;
 export var SidebarStimulus = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_SidebarStimulus = /*#__PURE__*/function (_Component) {
   function SidebarStimulus() {
@@ -64,18 +66,26 @@ export var SidebarStimulus = (_dec = withStyleOverrides(generateStyle, generateC
     value: function componentDidUpdate() {
       this.props.makeStyles();
     }
+  }, {
+    key: "stimulusIsPassage",
+    value: function stimulusIsPassage() {
+      var _this$props$stimulus;
+      return (_this$props$stimulus = this.props.stimulus) === null || _this$props$stimulus === void 0 ? void 0 : _this$props$stimulus.isPassage;
+    }
   }, {
     key: "renderCollection",
     value: function renderCollection() {
-      if (this.props.isDragging) {
-        return;
-      }
+      var _this$props$stimulus2;
       var _this$props = this.props,
         displayPosition = _this$props.displayPosition,
         isOver = _this$props.isOver,
         isShowingItems = _this$props.isShowingItems,
         renderSidebarItem = _this$props.renderSidebarItem,
-        sidebarOpen = _this$props.sidebarOpen;
+        sidebarOpen = _this$props.sidebarOpen,
+        isDragging = _this$props.isDragging;
+      if (this.stimulusIsPassage() || isDragging) {
+        return null;
+      }
       return jsx(Collection, {
         firstPosition: displayPosition,
         isOver: isOver,
@@ -83,22 +93,30 @@ export var SidebarStimulus = (_dec = withStyleOverrides(generateStyle, generateC
         itemCollection: this.props.childEntries,
         renderSidebarItem: renderSidebarItem,
         sidebarOpen: sidebarOpen,
-        stimulusId: this.props.stimulus.id
+        stimulusId: this.props.stimulus.id,
+        isPassage: (_this$props$stimulus2 = this.props.stimulus) === null || _this$props$stimulus2 === void 0 ? void 0 : _this$props$stimulus2.isPassage
       });
     }
   }, {
     key: "renderButton",
     value: function renderButton() {
-      var displayPosition = this.props.displayPosition;
-      var textForNavigation = t('Navigate to stimulus at position {displayPosition}', {
+      var _this$props2 = this.props,
+        displayPosition = _this$props2.displayPosition,
+        sidebarOpen = _this$props2.sidebarOpen;
+      var itemName = this.stimulusIsPassage() ? 'passage' : 'stimulus';
+      var textForNavigation = t('Navigate to {itemName} at position {displayPosition}', {
+        itemName: itemName,
         displayPosition: displayPosition
       });
+      var content = sidebarOpen ? '' : textForNavigation;
+      var tip = jsx(Text, {
+        "aria-hidden": !sidebarOpen,
+        "aria-label": content
+      }, content);
       return jsx(Tooltip, {
-        renderTip: this.props.sidebarOpen ? '' : jsx("span", {
-          "aria-hidden": "true"
-        }, textForNavigation),
+        renderTip: tip,
         placement: "start",
-        on: this.props.sidebarOpen ? [] : ['hover', 'focus']
+        on: sidebarOpen ? [] : ['hover', 'focus']
       }, jsx(Link, {
         href: "#",
         margin: "small",
@@ -110,33 +128,82 @@ export var SidebarStimulus = (_dec = withStyleOverrides(generateStyle, generateC
         className: END_EDITING_TRIGGER_CLASSNAME
       }, jsx(ScreenReaderContent, null, textForNavigation)));
     }
+  }, {
+    key: "infoHeaderLabel",
+    value: function infoHeaderLabel() {
+      return this.stimulusIsPassage() ? t('Passage') : t('Stimulus');
+    }
+  }, {
+    key: "renderSummary",
+    value: function renderSummary() {
+      var _this$props3 = this.props,
+        displayPosition = _this$props3.displayPosition,
+        isDragging = _this$props3.isDragging,
+        isShowingItems = _this$props3.isShowingItems,
+        sidebarOpen = _this$props3.sidebarOpen,
+        stimulus = _this$props3.stimulus;
+      if (this.stimulusIsPassage()) {
+        return null;
+      }
+      return jsx(Summary, {
+        startPosition: displayPosition,
+        isDragging: isDragging,
+        isShowingItems: isShowingItems,
+        stimulusId: stimulus.id,
+        sidebarOpen: sidebarOpen,
+        numberOfItems: this.props.childEntries.size
+      });
+    }
+  }, {
+    key: "stimulusHoverCss",
+    value: function stimulusHoverCss() {
+      return {
+        // TODO: figure out how to get rid of the last of these styles.
+        ':hover': this.props.styles.onHover
+      };
+    }
   }, {
     key: "renderClosed",
     value: function renderClosed() {
-      return jsx("div", {
-        css: this.props.styles.sidebarItem
-      }, jsx("div", {
-        css: this.props.styles.sidebarItemClosedButton
+      return jsx(View, {
+        borderWidth: "0 0 small 0",
+        borderColor: "primary",
+        as: "div"
+      }, jsx(View, {
+        textAlign: "center",
+        padding: "xx-small 0",
+        borderWidth: "none large none none",
+        borderColor: "transparent",
+        css: this.stimulusHoverCss(),
+        as: "div"
       }, this.renderButton()), this.renderCollection());
     }
   }, {
     key: "renderOpen",
     value: function renderOpen() {
-      var _this$props2 = this.props,
-        children = _this$props2.children,
-        displayPosition = _this$props2.displayPosition,
-        isDragging = _this$props2.isDragging,
-        isShowingItems = _this$props2.isShowingItems,
-        sidebarOpen = _this$props2.sidebarOpen,
-        stimulus = _this$props2.stimulus;
-      return jsx("div", {
-        css: this.props.styles.sidebarItem
-      }, jsx("div", {
-        css: this.props.styles.stimulusHeader
-      }, jsx("div", {
-        css: this.props.styles.infoHeader
-      }, t('Stimulus')), jsx("div", {
-        css: this.props.styles.stimulusBody
+      var _this$props4 = this.props,
+        stimulus = _this$props4.stimulus,
+        children = _this$props4.children;
+      return jsx(View, {
+        borderWidth: "0 0 small 0",
+        borderColor: "primary",
+        as: "div"
+      }, jsx(View, {
+        padding: "small 0",
+        borderWidth: "none large none none",
+        borderColor: "transparent",
+        css: this.stimulusHoverCss(),
+        as: "div"
+      }, jsx(View, {
+        margin: "auto auto x-small x-small",
+        padding: "auto auto auto x-small",
+        as: "div"
+      }, jsx(Text, {
+        size: "x-small",
+        color: "secondary"
+      }, this.infoHeaderLabel())), jsx(View, {
+        margin: "auto auto auto small",
+        as: "div"
       }, jsx(Flex, {
         justifyItems: "space-between"
       }, jsx(Flex.Item, null, this.renderButton()), jsx(Flex.Item, {
@@ -146,14 +213,7 @@ export var SidebarStimulus = (_dec = withStyleOverrides(generateStyle, generateC
         tabIndex: "-1"
       }, jsx(Title, {
         title: stimulus.title
-      })), jsx(Flex.Item, null, children)), jsx(Summary, {
-        startPosition: displayPosition,
-        isDragging: isDragging,
-        isShowingItems: isShowingItems,
-        sidebarOpen: sidebarOpen,
-        stimulusId: stimulus.id,
-        numberOfItems: this.props.childEntries.size
-      }))), this.renderCollection());
+      })), jsx(Flex.Item, null, children)), this.renderSummary())), this.renderCollection());
     }
   }, {
     key: "render",

package/es/common/components/layout/sidebar/Stimulus/styles.js

@@ -1,31 +1,7 @@
 var generateStyle = function generateStyle(componentTheme) {
   return {
-    sidebarItem: {
-      borderBottom: "".concat(componentTheme.sidebarItemBorderWidth, " solid ").concat(componentTheme.sidebarItemBorderColor)
-    },
-    sidebarItemClosedButton: {
-      borderRight: "".concat(componentTheme.hoverBorderWidth, " solid ").concat(componentTheme.borderColor),
-      padding: componentTheme.sidebarClosedButtonPadding,
-      textAlign: 'center',
-      '&:hover': {
-        borderRight: "".concat(componentTheme.hoverBorderWidth, " solid ").concat(componentTheme.hoverBorderColor)
-      }
-    },
-    stimulusHeader: {
-      padding: "".concat(componentTheme.sidebarHeaderPadding, " 0"),
-      borderRight: "".concat(componentTheme.hoverBorderWidth, " solid ").concat(componentTheme.borderColor),
-      '&:hover:': {
-        borderRight: "".concat(componentTheme.hoverBorderWidth, " solid ").concat(componentTheme.hoverBorderColor)
-      }
-    },
-    stimulusBody: {
-      marginLeft: '5%'
-    },
-    infoHeader: {
-      fontSize: componentTheme.sidebarIsOpenInfoHeaderFontSize,
-      color: componentTheme.sidebarIsOpenInfoHeaderColor,
-      marginBottom: componentTheme.sidebarIsOpenInfoHeaderMargin,
-      paddingLeft: componentTheme.sidebarIsOpenInfoHeaderPadding
+    onHover: {
+      borderRight: "".concat(componentTheme.hoverBorderWidth, " solid ").concat(componentTheme.hoverBorderColor)
     }
   };
 };

package/es/common/components/layout/sidebar/Stimulus/theme.js

@@ -5,16 +5,7 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
     typography = _ref.typography;
   return {
     borderColor: colors.contrasts.white1010,
-    hoverBorderColor: colors.contrasts.blue4570,
-    hoverBorderWidth: borders.widthLarge,
-    sidebarClosedButtonPadding: "".concat(spacing.xxSmall, " 0"),
-    sidebarHeaderPadding: spacing.small,
-    sidebarItemBorderWidth: borders.widthSmall,
-    sidebarItemBorderColor: colors.contrasts.grey1214,
-    sidebarIsOpenInfoHeaderFontSize: typography.fontSizeXSmall,
-    sidebarIsOpenInfoHeaderPadding: spacing.xSmall,
-    sidebarIsOpenInfoHeaderMargin: spacing.xSmall,
-    sidebarIsOpenInfoHeaderColor: colors.contrasts.grey4570
+    hoverBorderColor: colors.contrasts.blue4570
   };
 };
 export default generateComponentTheme;

package/es/common/components/resources/sessionItemResult/SessionItemResult/presenter.js

@@ -91,9 +91,9 @@ export var SessionItemResult = (_dec = withStyleOverrides(generateStyle, generat
       return typeof this.pointsPossible === 'number';
     }
   }, {
-    key: "position",
-    value: function position() {
-      return this.props.sessionItem.position;
+    key: "questionNumber",
+    value: function questionNumber() {
+      return this.props.sessionItem.questionNumber;
     }
   }, {
     key: "unscorable",
@@ -179,38 +179,38 @@ export var SessionItemResult = (_dec = withStyleOverrides(generateStyle, generat
     value: function renderHeader() {
       return jsx("div", {
         css: this.props.styles.sessionItemResultHeader
-      }, this.renderResultPosition(), !this.props.restrictQuantitativeData && (this.hasRegradeInfo() ? this.renderRegradePoints() : this.renderPoints()));
+      }, this.renderResultQuestionNumber(), !this.props.restrictQuantitativeData && (this.hasRegradeInfo() ? this.renderRegradePoints() : this.renderPoints()));
     }
   }, {
-    key: "renderResultPosition",
-    value: function renderResultPosition() {
-      var position = this.position();
-      var positionText;
+    key: "renderResultQuestionNumber",
+    value: function renderResultQuestionNumber() {
+      var questionNumber = this.questionNumber();
+      var questionNumberText;
       if (this.regraded() && this.unscorable()) {
-        positionText = t('Results for question {position, number}. There was a problem grading this question. This question has been regraded.', {
-          position: position
+        questionNumberText = t('Results for question {questionNumber, number}. There was a problem grading this question. This question has been regraded.', {
+          questionNumber: questionNumber
         });
       } else if (this.regraded()) {
-        positionText = t('Results for question {position, number}. This question has been regraded.', {
-          position: position
+        questionNumberText = t('Results for question {questionNumber, number}. This question has been regraded.', {
+          questionNumber: questionNumber
         });
       } else if (this.unscorable() && this.props.editGraderFeedback) {
-        positionText = t('Results for question {position, number}. There was a problem grading this question.', {
-          position: position
+        questionNumberText = t('Results for question {questionNumber, number}. There was a problem grading this question.', {
+          questionNumber: questionNumber
         });
       } else if (this.unscorable()) {
-        positionText = t('Results for question {position, number}. There was a problem grading this question. Please inform your instructor.', {
-          position: position
+        questionNumberText = t('Results for question {questionNumber, number}. There was a problem grading this question. Please inform your instructor.', {
+          questionNumber: questionNumber
         });
       } else {
-        positionText = t('Results for question {position, number}.', {
-          position: position
+        questionNumberText = t('Results for question {questionNumber, number}.', {
+          questionNumber: questionNumber
         });
       }
       return jsx(PositionBox, {
-        position: position,
+        position: questionNumber,
         headingLevel: "h3",
-        headingText: positionText
+        headingText: questionNumberText
       });
     }
   }, {

package/es/common/components/resources/stimulus/StimulusEdit/presenter.js

@@ -145,73 +145,74 @@ export var StimulusEdit = (_dec = withStyleOverrides(generateStyle, generateComp
     });
     _defineProperty(_this2, "onSubmit", /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(e) {
-        var _this2$props2, stimulus, workingStimulus, quizId, quizEntry, stimulusData;
+        var _this2$props2, stimulus, workingStimulus, quizId, quizEntry, message, stimulusData;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _this2$props2 = _this2.props, stimulus = _this2$props2.stimulus, workingStimulus = _this2$props2.workingStimulus, quizId = _this2$props2.quizId, quizEntry = _this2$props2.quizEntry;
               if (workingStimulus.isValid()) {
-                _context2.next = 8;
+                _context2.next = 9;
                 break;
               }
-              _context2.next = 4;
+              message = _this2.isPassage() ? t('Passage not saved due to validation errors with the data.') : t('Stimulus not saved due to validation errors with the data.');
+              _context2.next = 5;
               return _this2.props.showError(_this2.props.guid);
-            case 4:
-              _this2.props.screenreaderNotification(t('Simulus not saved due to validation errors with the data.'));
+            case 5:
+              _this2.props.screenreaderNotification(message);
               _this2.props.clearNextQuizEntry();
               _this2.focusFirstErrorField();
               return _context2.abrupt("return");
-            case 8:
+            case 9:
               _this2.setState({
                 canSubmit: false
               });
               _this2.props.hideError(_this2.props.guid);
-              _context2.prev = 10;
+              _context2.prev = 11;
               if (!stimulus.isTemporary()) {
-                _context2.next = 17;
+                _context2.next = 18;
                 break;
               }
-              _context2.next = 14;
+              _context2.next = 15;
               return _this2.props.createStimulusAndQuizEntry(quizId, workingStimulus.toJS(), quizEntry);
-            case 14:
+            case 15:
               _this2.props.clearTemporaryStimulus(quizId);
-              _context2.next = 28;
+              _context2.next = 29;
               break;
-            case 17:
+            case 18:
               if (!_this2.props.shouldClone) {
-                _context2.next = 26;
+                _context2.next = 27;
                 break;
               }
-              _context2.next = 20;
+              _context2.next = 21;
               return _this2.props.createStimulus(workingStimulus, _this2.props.quizId, 'quiz', workingStimulus.id);
-            case 20:
+            case 21:
               stimulusData = _context2.sent;
-              _context2.next = 23;
+              _context2.next = 24;
               return _this2.handleStimulusCreated(stimulusData);
-            case 23:
+            case 24:
               _this2.props.clearTemporaryStimulus(quizId);
-              _context2.next = 28;
+              _context2.next = 29;
               break;
-            case 26:
-              _context2.next = 28;
+            case 27:
+              _context2.next = 29;
               return _this2.props.updateStimulus(workingStimulus.toJS(), quizId);
-            case 28:
-              _context2.next = 34;
+            case 29:
+              _context2.next = 35;
               break;
-            case 30:
-              _context2.prev = 30;
-              _context2.t0 = _context2["catch"](10);
+            case 31:
+              _context2.prev = 31;
+              _context2.t0 = _context2["catch"](11);
               _this2.setState({
                 canSubmit: true
               });
               throw _context2.t0;
-            case 34:
-              _this2.afterSubmit();
             case 35:
+              _this2.afterSubmit();
+            case 36:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, null, [[10, 30]]);
+        }, _callee2, null, [[11, 31]]);
       }));
       return function (_x2) {
         return _ref2.apply(this, arguments);
@@ -315,10 +316,11 @@ export var StimulusEdit = (_dec = withStyleOverrides(generateStyle, generateComp
   }, {
     key: "afterSubmit",
     value: function afterSubmit() {
+      var message = this.isPassage() ? t('Changes to passage saved.') : t('Changes to stimulus saved.');
       this.props.switchOffEditing();
       this.clearModifications();
       this.props.setUi(SHOULD_CLONE_ITEM, false);
-      this.props.screenreaderNotification(t('Changes to stimulus saved.'));
+      this.props.screenreaderNotification(message);
       if (this.props.nextQuizEntry) {
         this.createNextQuizEntry();
       }

package/es/common/components/resources/stimulus/StimulusEditInfo/presenter.js

@@ -164,9 +164,10 @@ export var StimulusEditInfo = (_dec = withStyleOverrides(generateStyle, generate
       var textAreaId = "stimulusBodyEdit_".concat(stimulus.id, "_").concat(this.props.isBankedContent);
       var stimulusBodyId = "stimulusBodyEdit_".concat(stimulus.id, "_body");
       var automationPrefix = stimulus.passage ? 'passage' : 'stimulus';
+      var message = stimulus.passage ? t('Edit Passage') : t('Edit Stimulus');
       return jsx(FormFieldGroup, {
         messages: this.inputErrors('onSelf'),
-        description: jsx(ScreenReaderContent, null, t('Edit Stimulus'))
+        description: jsx(ScreenReaderContent, null, message)
       }, jsx(Heading, {
         level: "h3",
         as: "h2"

package/es/common/records/QuizEntry.js

@@ -366,51 +366,63 @@ export var QuizEntry = (_dec = withStateCache(function () {
       // their own possible string so that translators can better translate the meaning
       var type;
       if (this.hasStimulus || this.isBank) {
+        if (this.isPassage) {
+          type = t('Passage');
+          var opts = {
+            type: type,
+            start: displayPosition - 1
+          };
+          return {
+            Remove: t('Remove {type} located after position {start, number}.', opts),
+            Edit: t('Edit {type} located after position {start, number}.', opts),
+            Move: t('Move {type} located after position {start, number}.', opts)
+          }[verb];
+        }
         type = this.hasStimulus ? t('Stimulus') : t('Bank');
         if (this.numItems > 1) {
-          var opts = {
+          var _opts = {
             type: type,
             start: displayPosition,
             end: displayPosition + this.numItems - 1
           };
           return {
-            Remove: t('Remove {type} containing questions {start, number} through {end, number}.', opts),
-            Edit: t('Edit {type} containing questions {start, number} through {end, number}.', opts),
-            Move: t('Move {type} containing questions {start, number} through {end, number}.', opts)
+            Remove: t('Remove {type} containing questions {start, number} through {end, number}.', _opts),
+            Edit: t('Edit {type} containing questions {start, number} through {end, number}.', _opts),
+            Move: t('Move {type} containing questions {start, number} through {end, number}.', _opts)
           }[verb];
         } else if (this.numItems === 1) {
-          var _opts = {
+          var _opts2 = {
             type: type,
             start: displayPosition
           };
           return {
-            Remove: t('Remove {type} containing question {start, number}.', _opts),
-            Edit: t('Edit {type} containing question {start, number}.', _opts),
-            Move: t('Move {type} containing question {start, number}.', _opts)
+            Remove: t('Remove {type} containing question {start, number}.', _opts2),
+            Edit: t('Edit {type} containing question {start, number}.', _opts2),
+            Move: t('Move {type} containing question {start, number}.', _opts2)
           }[verb];
         } else {
-          var _opts2 = {
+          var _opts3 = {
             type: type,
             start: displayPosition - 1
           };
           return {
-            Remove: t('Remove empty {type} located after position {start, number}.', _opts2),
-            Edit: t('Edit empty {type} located after position {start, number}.', _opts2),
-            Move: t('Move empty {type} located after position {start, number}.', _opts2)
+            Remove: t('Remove empty {type} located after position {start, number}.', _opts3),
+            Edit: t('Edit empty {type} located after position {start, number}.', _opts3),
+            Move: t('Move empty {type} located after position {start, number}.', _opts3)
           }[verb];
         }
       } else {
         type = t('Question');
-        var _opts3 = {
+        var _opts4 = {
           verb: verb,
           type: type,
           position: displayPosition
         };
         return {
-          Remove: t('Remove {type} at position {position, number}.', _opts3),
-          Edit: t('Edit {type} at position {position, number}.', _opts3),
-          Move: t('Move {type} at position {position, number}.', _opts3),
-          Copy: t('Copy {type} at position {position, number}.', _opts3)
+          Remove: t('Remove {type} at position {position, number}.', _opts4),
+          Edit: t('Edit {type} at position {position, number}.', _opts4),
+          Move: t('Move {type} at position {position, number}.', _opts4),
+          Copy: t('Copy {type} at position {position, number}.', _opts4)
         }[verb];
       }
     }

package/es/common/records/SessionItem.js

@@ -85,6 +85,11 @@ export var SessionItem = /*#__PURE__*/function (_ReduxRecord) {
     get: function get() {
       return this.type === 'Stimulus';
     }
+  }, {
+    key: "isPassage",
+    get: function get() {
+      return this.isStimulus && this.stimulusRecord.isPassage;
+    }
   }, {
     key: "stimulusRecord",
     get: function get() {
@@ -123,6 +128,7 @@ export var SessionItem = /*#__PURE__*/function (_ReduxRecord) {
   item: {},
   pointsPossible: null,
   position: null,
+  questionNumber: null,
   quizEntryId: null,
   quizSessionId: null,
   scoringData: {},

package/es/taking/api/taking.js

@@ -211,7 +211,7 @@ var __remainingQuestionPositions = function __remainingQuestionPositions(session
     var itemUserResponse = __getResponseForSessionItem(si, responses);
     return item.hasResponse(itemUserResponse);
   }).map(function (si) {
-    return si.get('position');
+    return si.get('questionNumber');
   }).toSet().toJS();
 };
 export function showSubmitConfirmModal(quizSessionId) {

package/lib/common/components/layout/sidebar/Stimulus/Collection/presenter.js

@@ -96,6 +96,7 @@ var Collection = exports.Collection = (_dec = (0, _quizCommon.withStyleOverrides
         }, _this3.props.renderSidebarItem(item, displayPosition, sidebarOpen));
       });
       var transitionType = isShowingItems ? 'slide-down' : 'slide-up';
+      var screenReaderText = this.props.isPassage ? (0, _formatMessage["default"])('Collapse passage questions') : (0, _formatMessage["default"])('Collapse stimulus questions');
       return (0, _emotion.jsx)(_uiMotion.Transition, {
         "in": isShowingItems || this.shouldDisplayAllItems(),
         type: transitionType
@@ -107,7 +108,7 @@ var Collection = exports.Collection = (_dec = (0, _quizCommon.withStyleOverrides
         withBackground: false,
         withBorder: false,
         renderIcon: _uiIcons.IconArrowOpenUpLine,
-        screenReaderLabel: (0, _formatMessage["default"])('Collapse stimulus questions')
+        screenReaderLabel: screenReaderText
       })), (0, _emotion.jsx)("div", null, itemComponents)));
     }
   }, {
@@ -118,6 +119,7 @@ var Collection = exports.Collection = (_dec = (0, _quizCommon.withStyleOverrides
         itemCollection = _this$props2.itemCollection,
         isShowingItems = _this$props2.isShowingItems;
       var transitionType = !isShowingItems ? 'slide-up' : 'slide-down';
+      var screenReaderText = this.props.isPassage ? (0, _formatMessage["default"])('Expand passage questions') : (0, _formatMessage["default"])('Expand stimulus questions');
       return (0, _emotion.jsx)(_uiMotion.Transition, {
         "in": !isShowingItems,
         type: transitionType
@@ -131,7 +133,7 @@ var Collection = exports.Collection = (_dec = (0, _quizCommon.withStyleOverrides
         withBackground: false,
         withBorder: false,
         renderIcon: _uiIcons.IconArrowOpenDownLine,
-        screenReaderLabel: (0, _formatMessage["default"])('Expand stimulus questions')
+        screenReaderLabel: screenReaderText
       })));
     }
   }, {
@@ -162,7 +164,8 @@ var Collection = exports.Collection = (_dec = (0, _quizCommon.withStyleOverrides
   // set in connect
   setSidebarStimulusIsShowing: _propTypes["default"].func.isRequired,
   styles: _propTypes["default"].object,
-  makeStyles: _propTypes["default"].func
+  makeStyles: _propTypes["default"].func,
+  isPassage: _propTypes["default"].bool
 }), (0, _defineProperty2["default"])(_Collection, "defaultProps", {
   isShowingItems: false
 }), _Collection)) || _class);

package/lib/common/components/layout/sidebar/Stimulus/presenter.js

@@ -26,6 +26,8 @@ var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/f
 var _quizCommon = require("@instructure/quiz-common");
 var _uiTooltip = require("@instructure/ui-tooltip");
 var _uiA11yContent = require("@instructure/ui-a11y-content");
+var _uiView = require("@instructure/ui-view");
+var _uiText = require("@instructure/ui-text");
 var _dec, _class, _SidebarStimulus;
 /** @jsx jsx */
 function _callSuper(_this, derived, args) {
@@ -71,18 +73,26 @@ var SidebarStimulus = exports.SidebarStimulus = (_dec = (0, _quizCommon.withStyl
     value: function componentDidUpdate() {
       this.props.makeStyles();
     }
+  }, {
+    key: "stimulusIsPassage",
+    value: function stimulusIsPassage() {
+      var _this$props$stimulus;
+      return (_this$props$stimulus = this.props.stimulus) === null || _this$props$stimulus === void 0 ? void 0 : _this$props$stimulus.isPassage;
+    }
   }, {
     key: "renderCollection",
     value: function renderCollection() {
-      if (this.props.isDragging) {
-        return;
-      }
+      var _this$props$stimulus2;
       var _this$props = this.props,
         displayPosition = _this$props.displayPosition,
         isOver = _this$props.isOver,
         isShowingItems = _this$props.isShowingItems,
         renderSidebarItem = _this$props.renderSidebarItem,
-        sidebarOpen = _this$props.sidebarOpen;
+        sidebarOpen = _this$props.sidebarOpen,
+        isDragging = _this$props.isDragging;
+      if (this.stimulusIsPassage() || isDragging) {
+        return null;
+      }
       return (0, _emotion.jsx)(_Collection["default"], {
         firstPosition: displayPosition,
         isOver: isOver,
@@ -90,22 +100,30 @@ var SidebarStimulus = exports.SidebarStimulus = (_dec = (0, _quizCommon.withStyl
         itemCollection: this.props.childEntries,
         renderSidebarItem: renderSidebarItem,
         sidebarOpen: sidebarOpen,
-        stimulusId: this.props.stimulus.id
+        stimulusId: this.props.stimulus.id,
+        isPassage: (_this$props$stimulus2 = this.props.stimulus) === null || _this$props$stimulus2 === void 0 ? void 0 : _this$props$stimulus2.isPassage
       });
     }
   }, {
     key: "renderButton",
     value: function renderButton() {
-      var displayPosition = this.props.displayPosition;
-      var textForNavigation = (0, _formatMessage["default"])('Navigate to stimulus at position {displayPosition}', {
+      var _this$props2 = this.props,
+        displayPosition = _this$props2.displayPosition,
+        sidebarOpen = _this$props2.sidebarOpen;
+      var itemName = this.stimulusIsPassage() ? 'passage' : 'stimulus';
+      var textForNavigation = (0, _formatMessage["default"])('Navigate to {itemName} at position {displayPosition}', {
+        itemName: itemName,
         displayPosition: displayPosition
       });
+      var content = sidebarOpen ? '' : textForNavigation;
+      var tip = (0, _emotion.jsx)(_uiText.Text, {
+        "aria-hidden": !sidebarOpen,
+        "aria-label": content
+      }, content);
       return (0, _emotion.jsx)(_uiTooltip.Tooltip, {
-        renderTip: this.props.sidebarOpen ? '' : (0, _emotion.jsx)("span", {
-          "aria-hidden": "true"
-        }, textForNavigation),
+        renderTip: tip,
         placement: "start",
-        on: this.props.sidebarOpen ? [] : ['hover', 'focus']
+        on: sidebarOpen ? [] : ['hover', 'focus']
       }, (0, _emotion.jsx)(_uiLink.Link, {
         href: "#",
         margin: "small",
@@ -117,33 +135,82 @@ var SidebarStimulus = exports.SidebarStimulus = (_dec = (0, _quizCommon.withStyl
         className: _quizCommon.END_EDITING_TRIGGER_CLASSNAME
       }, (0, _emotion.jsx)(_uiA11yContent.ScreenReaderContent, null, textForNavigation)));
     }
+  }, {
+    key: "infoHeaderLabel",
+    value: function infoHeaderLabel() {
+      return this.stimulusIsPassage() ? (0, _formatMessage["default"])('Passage') : (0, _formatMessage["default"])('Stimulus');
+    }
+  }, {
+    key: "renderSummary",
+    value: function renderSummary() {
+      var _this$props3 = this.props,
+        displayPosition = _this$props3.displayPosition,
+        isDragging = _this$props3.isDragging,
+        isShowingItems = _this$props3.isShowingItems,
+        sidebarOpen = _this$props3.sidebarOpen,
+        stimulus = _this$props3.stimulus;
+      if (this.stimulusIsPassage()) {
+        return null;
+      }
+      return (0, _emotion.jsx)(_Summary["default"], {
+        startPosition: displayPosition,
+        isDragging: isDragging,
+        isShowingItems: isShowingItems,
+        stimulusId: stimulus.id,
+        sidebarOpen: sidebarOpen,
+        numberOfItems: this.props.childEntries.size
+      });
+    }
+  }, {
+    key: "stimulusHoverCss",
+    value: function stimulusHoverCss() {
+      return {
+        // TODO: figure out how to get rid of the last of these styles.
+        ':hover': this.props.styles.onHover
+      };
+    }
   }, {
     key: "renderClosed",
     value: function renderClosed() {
-      return (0, _emotion.jsx)("div", {
-        css: this.props.styles.sidebarItem
-      }, (0, _emotion.jsx)("div", {
-        css: this.props.styles.sidebarItemClosedButton
+      return (0, _emotion.jsx)(_uiView.View, {
+        borderWidth: "0 0 small 0",
+        borderColor: "primary",
+        as: "div"
+      }, (0, _emotion.jsx)(_uiView.View, {
+        textAlign: "center",
+        padding: "xx-small 0",
+        borderWidth: "none large none none",
+        borderColor: "transparent",
+        css: this.stimulusHoverCss(),
+        as: "div"
       }, this.renderButton()), this.renderCollection());
     }
   }, {
     key: "renderOpen",
     value: function renderOpen() {
-      var _this$props2 = this.props,
-        children = _this$props2.children,
-        displayPosition = _this$props2.displayPosition,
-        isDragging = _this$props2.isDragging,
-        isShowingItems = _this$props2.isShowingItems,
-        sidebarOpen = _this$props2.sidebarOpen,
-        stimulus = _this$props2.stimulus;
-      return (0, _emotion.jsx)("div", {
-        css: this.props.styles.sidebarItem
-      }, (0, _emotion.jsx)("div", {
-        css: this.props.styles.stimulusHeader
-      }, (0, _emotion.jsx)("div", {
-        css: this.props.styles.infoHeader
-      }, (0, _formatMessage["default"])('Stimulus')), (0, _emotion.jsx)("div", {
-        css: this.props.styles.stimulusBody
+      var _this$props4 = this.props,
+        stimulus = _this$props4.stimulus,
+        children = _this$props4.children;
+      return (0, _emotion.jsx)(_uiView.View, {
+        borderWidth: "0 0 small 0",
+        borderColor: "primary",
+        as: "div"
+      }, (0, _emotion.jsx)(_uiView.View, {
+        padding: "small 0",
+        borderWidth: "none large none none",
+        borderColor: "transparent",
+        css: this.stimulusHoverCss(),
+        as: "div"
+      }, (0, _emotion.jsx)(_uiView.View, {
+        margin: "auto auto x-small x-small",
+        padding: "auto auto auto x-small",
+        as: "div"
+      }, (0, _emotion.jsx)(_uiText.Text, {
+        size: "x-small",
+        color: "secondary"
+      }, this.infoHeaderLabel())), (0, _emotion.jsx)(_uiView.View, {
+        margin: "auto auto auto small",
+        as: "div"
       }, (0, _emotion.jsx)(_quizCommon.Flex, {
         justifyItems: "space-between"
       }, (0, _emotion.jsx)(_quizCommon.Flex.Item, null, this.renderButton()), (0, _emotion.jsx)(_quizCommon.Flex.Item, {
@@ -153,14 +220,7 @@ var SidebarStimulus = exports.SidebarStimulus = (_dec = (0, _quizCommon.withStyl
         tabIndex: "-1"
       }, (0, _emotion.jsx)(_Title["default"], {
         title: stimulus.title
-      })), (0, _emotion.jsx)(_quizCommon.Flex.Item, null, children)), (0, _emotion.jsx)(_Summary["default"], {
-        startPosition: displayPosition,
-        isDragging: isDragging,
-        isShowingItems: isShowingItems,
-        sidebarOpen: sidebarOpen,
-        stimulusId: stimulus.id,
-        numberOfItems: this.props.childEntries.size
-      }))), this.renderCollection());
+      })), (0, _emotion.jsx)(_quizCommon.Flex.Item, null, children)), this.renderSummary())), this.renderCollection());
     }
   }, {
     key: "render",

package/lib/common/components/layout/sidebar/Stimulus/styles.js

@@ -6,32 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var generateStyle = function generateStyle(componentTheme) {
   return {
-    sidebarItem: {
-      borderBottom: "".concat(componentTheme.sidebarItemBorderWidth, " solid ").concat(componentTheme.sidebarItemBorderColor)
-    },
-    sidebarItemClosedButton: {
-      borderRight: "".concat(componentTheme.hoverBorderWidth, " solid ").concat(componentTheme.borderColor),
-      padding: componentTheme.sidebarClosedButtonPadding,
-      textAlign: 'center',
-      '&:hover': {
-        borderRight: "".concat(componentTheme.hoverBorderWidth, " solid ").concat(componentTheme.hoverBorderColor)
-      }
-    },
-    stimulusHeader: {
-      padding: "".concat(componentTheme.sidebarHeaderPadding, " 0"),
-      borderRight: "".concat(componentTheme.hoverBorderWidth, " solid ").concat(componentTheme.borderColor),
-      '&:hover:': {
-        borderRight: "".concat(componentTheme.hoverBorderWidth, " solid ").concat(componentTheme.hoverBorderColor)
-      }
-    },
-    stimulusBody: {
-      marginLeft: '5%'
-    },
-    infoHeader: {
-      fontSize: componentTheme.sidebarIsOpenInfoHeaderFontSize,
-      color: componentTheme.sidebarIsOpenInfoHeaderColor,
-      marginBottom: componentTheme.sidebarIsOpenInfoHeaderMargin,
-      paddingLeft: componentTheme.sidebarIsOpenInfoHeaderPadding
+    onHover: {
+      borderRight: "".concat(componentTheme.hoverBorderWidth, " solid ").concat(componentTheme.hoverBorderColor)
     }
   };
 };

package/lib/common/components/layout/sidebar/Stimulus/theme.js

@@ -11,16 +11,7 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
     typography = _ref.typography;
   return {
     borderColor: colors.contrasts.white1010,
-    hoverBorderColor: colors.contrasts.blue4570,
-    hoverBorderWidth: borders.widthLarge,
-    sidebarClosedButtonPadding: "".concat(spacing.xxSmall, " 0"),
-    sidebarHeaderPadding: spacing.small,
-    sidebarItemBorderWidth: borders.widthSmall,
-    sidebarItemBorderColor: colors.contrasts.grey1214,
-    sidebarIsOpenInfoHeaderFontSize: typography.fontSizeXSmall,
-    sidebarIsOpenInfoHeaderPadding: spacing.xSmall,
-    sidebarIsOpenInfoHeaderMargin: spacing.xSmall,
-    sidebarIsOpenInfoHeaderColor: colors.contrasts.grey4570
+    hoverBorderColor: colors.contrasts.blue4570
   };
 };
 var _default = exports["default"] = generateComponentTheme;

package/lib/common/components/resources/sessionItemResult/SessionItemResult/presenter.js

@@ -98,9 +98,9 @@ var SessionItemResult = exports.SessionItemResult = (_dec = (0, _quizCommon.with
       return typeof this.pointsPossible === 'number';
     }
   }, {
-    key: "position",
-    value: function position() {
-      return this.props.sessionItem.position;
+    key: "questionNumber",
+    value: function questionNumber() {
+      return this.props.sessionItem.questionNumber;
     }
   }, {
     key: "unscorable",
@@ -186,38 +186,38 @@ var SessionItemResult = exports.SessionItemResult = (_dec = (0, _quizCommon.with
     value: function renderHeader() {
       return (0, _emotion.jsx)("div", {
         css: this.props.styles.sessionItemResultHeader
-      }, this.renderResultPosition(), !this.props.restrictQuantitativeData && (this.hasRegradeInfo() ? this.renderRegradePoints() : this.renderPoints()));
+      }, this.renderResultQuestionNumber(), !this.props.restrictQuantitativeData && (this.hasRegradeInfo() ? this.renderRegradePoints() : this.renderPoints()));
     }
   }, {
-    key: "renderResultPosition",
-    value: function renderResultPosition() {
-      var position = this.position();
-      var positionText;
+    key: "renderResultQuestionNumber",
+    value: function renderResultQuestionNumber() {
+      var questionNumber = this.questionNumber();
+      var questionNumberText;
       if (this.regraded() && this.unscorable()) {
-        positionText = (0, _formatMessage["default"])('Results for question {position, number}. There was a problem grading this question. This question has been regraded.', {
-          position: position
+        questionNumberText = (0, _formatMessage["default"])('Results for question {questionNumber, number}. There was a problem grading this question. This question has been regraded.', {
+          questionNumber: questionNumber
         });
       } else if (this.regraded()) {
-        positionText = (0, _formatMessage["default"])('Results for question {position, number}. This question has been regraded.', {
-          position: position
+        questionNumberText = (0, _formatMessage["default"])('Results for question {questionNumber, number}. This question has been regraded.', {
+          questionNumber: questionNumber
         });
       } else if (this.unscorable() && this.props.editGraderFeedback) {
-        positionText = (0, _formatMessage["default"])('Results for question {position, number}. There was a problem grading this question.', {
-          position: position
+        questionNumberText = (0, _formatMessage["default"])('Results for question {questionNumber, number}. There was a problem grading this question.', {
+          questionNumber: questionNumber
         });
       } else if (this.unscorable()) {
-        positionText = (0, _formatMessage["default"])('Results for question {position, number}. There was a problem grading this question. Please inform your instructor.', {
-          position: position
+        questionNumberText = (0, _formatMessage["default"])('Results for question {questionNumber, number}. There was a problem grading this question. Please inform your instructor.', {
+          questionNumber: questionNumber
         });
       } else {
-        positionText = (0, _formatMessage["default"])('Results for question {position, number}.', {
-          position: position
+        questionNumberText = (0, _formatMessage["default"])('Results for question {questionNumber, number}.', {
+          questionNumber: questionNumber
         });
       }
       return (0, _emotion.jsx)(_PositionBox["default"], {
-        position: position,
+        position: questionNumber,
         headingLevel: "h3",
-        headingText: positionText
+        headingText: questionNumberText
       });
     }
   }, {

package/lib/common/components/resources/stimulus/StimulusEdit/presenter.js

@@ -152,73 +152,74 @@ var StimulusEdit = exports.StimulusEdit = (_dec = (0, _quizCommon.withStyleOverr
     });
     (0, _defineProperty2["default"])(_this2, "onSubmit", /*#__PURE__*/function () {
       var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(e) {
-        var _this2$props2, stimulus, workingStimulus, quizId, quizEntry, stimulusData;
+        var _this2$props2, stimulus, workingStimulus, quizId, quizEntry, message, stimulusData;
         return _regenerator["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _this2$props2 = _this2.props, stimulus = _this2$props2.stimulus, workingStimulus = _this2$props2.workingStimulus, quizId = _this2$props2.quizId, quizEntry = _this2$props2.quizEntry;
               if (workingStimulus.isValid()) {
-                _context2.next = 8;
+                _context2.next = 9;
                 break;
               }
-              _context2.next = 4;
+              message = _this2.isPassage() ? (0, _formatMessage["default"])('Passage not saved due to validation errors with the data.') : (0, _formatMessage["default"])('Stimulus not saved due to validation errors with the data.');
+              _context2.next = 5;
               return _this2.props.showError(_this2.props.guid);
-            case 4:
-              _this2.props.screenreaderNotification((0, _formatMessage["default"])('Simulus not saved due to validation errors with the data.'));
+            case 5:
+              _this2.props.screenreaderNotification(message);
               _this2.props.clearNextQuizEntry();
               _this2.focusFirstErrorField();
               return _context2.abrupt("return");
-            case 8:
+            case 9:
               _this2.setState({
                 canSubmit: false
               });
               _this2.props.hideError(_this2.props.guid);
-              _context2.prev = 10;
+              _context2.prev = 11;
               if (!stimulus.isTemporary()) {
-                _context2.next = 17;
+                _context2.next = 18;
                 break;
               }
-              _context2.next = 14;
+              _context2.next = 15;
               return _this2.props.createStimulusAndQuizEntry(quizId, workingStimulus.toJS(), quizEntry);
-            case 14:
+            case 15:
               _this2.props.clearTemporaryStimulus(quizId);
-              _context2.next = 28;
+              _context2.next = 29;
               break;
-            case 17:
+            case 18:
               if (!_this2.props.shouldClone) {
-                _context2.next = 26;
+                _context2.next = 27;
                 break;
               }
-              _context2.next = 20;
+              _context2.next = 21;
               return _this2.props.createStimulus(workingStimulus, _this2.props.quizId, 'quiz', workingStimulus.id);
-            case 20:
+            case 21:
               stimulusData = _context2.sent;
-              _context2.next = 23;
+              _context2.next = 24;
               return _this2.handleStimulusCreated(stimulusData);
-            case 23:
+            case 24:
               _this2.props.clearTemporaryStimulus(quizId);
-              _context2.next = 28;
+              _context2.next = 29;
               break;
-            case 26:
-              _context2.next = 28;
+            case 27:
+              _context2.next = 29;
               return _this2.props.updateStimulus(workingStimulus.toJS(), quizId);
-            case 28:
-              _context2.next = 34;
+            case 29:
+              _context2.next = 35;
               break;
-            case 30:
-              _context2.prev = 30;
-              _context2.t0 = _context2["catch"](10);
+            case 31:
+              _context2.prev = 31;
+              _context2.t0 = _context2["catch"](11);
               _this2.setState({
                 canSubmit: true
               });
               throw _context2.t0;
-            case 34:
-              _this2.afterSubmit();
             case 35:
+              _this2.afterSubmit();
+            case 36:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, null, [[10, 30]]);
+        }, _callee2, null, [[11, 31]]);
       }));
       return function (_x2) {
         return _ref2.apply(this, arguments);
@@ -322,10 +323,11 @@ var StimulusEdit = exports.StimulusEdit = (_dec = (0, _quizCommon.withStyleOverr
   }, {
     key: "afterSubmit",
     value: function afterSubmit() {
+      var message = this.isPassage() ? (0, _formatMessage["default"])('Changes to passage saved.') : (0, _formatMessage["default"])('Changes to stimulus saved.');
       this.props.switchOffEditing();
       this.clearModifications();
       this.props.setUi(_quizCommon.SHOULD_CLONE_ITEM, false);
-      this.props.screenreaderNotification((0, _formatMessage["default"])('Changes to stimulus saved.'));
+      this.props.screenreaderNotification(message);
       if (this.props.nextQuizEntry) {
         this.createNextQuizEntry();
       }

package/lib/common/components/resources/stimulus/StimulusEditInfo/presenter.js

@@ -171,9 +171,10 @@ var StimulusEditInfo = exports.StimulusEditInfo = (_dec = (0, _quizCommon.withSt
       var textAreaId = "stimulusBodyEdit_".concat(stimulus.id, "_").concat(this.props.isBankedContent);
       var stimulusBodyId = "stimulusBodyEdit_".concat(stimulus.id, "_body");
       var automationPrefix = stimulus.passage ? 'passage' : 'stimulus';
+      var message = stimulus.passage ? (0, _formatMessage["default"])('Edit Passage') : (0, _formatMessage["default"])('Edit Stimulus');
       return (0, _emotion.jsx)(_quizCommon.FormFieldGroup, {
         messages: this.inputErrors('onSelf'),
-        description: (0, _emotion.jsx)(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage["default"])('Edit Stimulus'))
+        description: (0, _emotion.jsx)(_uiA11yContent.ScreenReaderContent, null, message)
       }, (0, _emotion.jsx)(_uiHeading.Heading, {
         level: "h3",
         as: "h2"

package/lib/common/records/QuizEntry.js

@@ -375,51 +375,63 @@ var QuizEntry = exports.QuizEntry = (_dec = (0, _withStateCache["default"])(func
       // their own possible string so that translators can better translate the meaning
       var type;
       if (this.hasStimulus || this.isBank) {
+        if (this.isPassage) {
+          type = (0, _formatMessage["default"])('Passage');
+          var opts = {
+            type: type,
+            start: displayPosition - 1
+          };
+          return {
+            Remove: (0, _formatMessage["default"])('Remove {type} located after position {start, number}.', opts),
+            Edit: (0, _formatMessage["default"])('Edit {type} located after position {start, number}.', opts),
+            Move: (0, _formatMessage["default"])('Move {type} located after position {start, number}.', opts)
+          }[verb];
+        }
         type = this.hasStimulus ? (0, _formatMessage["default"])('Stimulus') : (0, _formatMessage["default"])('Bank');
         if (this.numItems > 1) {
-          var opts = {
+          var _opts = {
             type: type,
             start: displayPosition,
             end: displayPosition + this.numItems - 1
           };
           return {
-            Remove: (0, _formatMessage["default"])('Remove {type} containing questions {start, number} through {end, number}.', opts),
-            Edit: (0, _formatMessage["default"])('Edit {type} containing questions {start, number} through {end, number}.', opts),
-            Move: (0, _formatMessage["default"])('Move {type} containing questions {start, number} through {end, number}.', opts)
+            Remove: (0, _formatMessage["default"])('Remove {type} containing questions {start, number} through {end, number}.', _opts),
+            Edit: (0, _formatMessage["default"])('Edit {type} containing questions {start, number} through {end, number}.', _opts),
+            Move: (0, _formatMessage["default"])('Move {type} containing questions {start, number} through {end, number}.', _opts)
           }[verb];
         } else if (this.numItems === 1) {
-          var _opts = {
+          var _opts2 = {
             type: type,
             start: displayPosition
           };
           return {
-            Remove: (0, _formatMessage["default"])('Remove {type} containing question {start, number}.', _opts),
-            Edit: (0, _formatMessage["default"])('Edit {type} containing question {start, number}.', _opts),
-            Move: (0, _formatMessage["default"])('Move {type} containing question {start, number}.', _opts)
+            Remove: (0, _formatMessage["default"])('Remove {type} containing question {start, number}.', _opts2),
+            Edit: (0, _formatMessage["default"])('Edit {type} containing question {start, number}.', _opts2),
+            Move: (0, _formatMessage["default"])('Move {type} containing question {start, number}.', _opts2)
           }[verb];
         } else {
-          var _opts2 = {
+          var _opts3 = {
             type: type,
             start: displayPosition - 1
           };
           return {
-            Remove: (0, _formatMessage["default"])('Remove empty {type} located after position {start, number}.', _opts2),
-            Edit: (0, _formatMessage["default"])('Edit empty {type} located after position {start, number}.', _opts2),
-            Move: (0, _formatMessage["default"])('Move empty {type} located after position {start, number}.', _opts2)
+            Remove: (0, _formatMessage["default"])('Remove empty {type} located after position {start, number}.', _opts3),
+            Edit: (0, _formatMessage["default"])('Edit empty {type} located after position {start, number}.', _opts3),
+            Move: (0, _formatMessage["default"])('Move empty {type} located after position {start, number}.', _opts3)
           }[verb];
         }
       } else {
         type = (0, _formatMessage["default"])('Question');
-        var _opts3 = {
+        var _opts4 = {
           verb: verb,
           type: type,
           position: displayPosition
         };
         return {
-          Remove: (0, _formatMessage["default"])('Remove {type} at position {position, number}.', _opts3),
-          Edit: (0, _formatMessage["default"])('Edit {type} at position {position, number}.', _opts3),
-          Move: (0, _formatMessage["default"])('Move {type} at position {position, number}.', _opts3),
-          Copy: (0, _formatMessage["default"])('Copy {type} at position {position, number}.', _opts3)
+          Remove: (0, _formatMessage["default"])('Remove {type} at position {position, number}.', _opts4),
+          Edit: (0, _formatMessage["default"])('Edit {type} at position {position, number}.', _opts4),
+          Move: (0, _formatMessage["default"])('Move {type} at position {position, number}.', _opts4),
+          Copy: (0, _formatMessage["default"])('Copy {type} at position {position, number}.', _opts4)
         }[verb];
       }
     }

package/lib/common/records/SessionItem.js

@@ -92,6 +92,11 @@ var SessionItem = exports.SessionItem = /*#__PURE__*/function (_ReduxRecord) {
     get: function get() {
       return this.type === 'Stimulus';
     }
+  }, {
+    key: "isPassage",
+    get: function get() {
+      return this.isStimulus && this.stimulusRecord.isPassage;
+    }
   }, {
     key: "stimulusRecord",
     get: function get() {
@@ -130,6 +135,7 @@ var SessionItem = exports.SessionItem = /*#__PURE__*/function (_ReduxRecord) {
   item: {},
   pointsPossible: null,
   position: null,
+  questionNumber: null,
   quizEntryId: null,
   quizSessionId: null,
   scoringData: {},

package/lib/taking/api/taking.js

@@ -234,7 +234,7 @@ var __remainingQuestionPositions = function __remainingQuestionPositions(session
     var itemUserResponse = __getResponseForSessionItem(si, responses);
     return item.hasResponse(itemUserResponse);
   }).map(function (si) {
-    return si.get('position');
+    return si.get('questionNumber');
   }).toSet().toJS();
 };
 function showSubmitConfirmModal(quizSessionId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "21.0.1-rc.23+ba016039f",
+  "version": "21.0.1-rc.27+2e775b6c8",
   "license": "MIT",
   "description": "The Quiz React SDK by Instructure Inc.",
   "author": "Instructure, Inc. Engineering and Product Design",
@@ -46,11 +46,11 @@
     "@instructure/emotion": "10.14.0",
     "@instructure/grading-utils": "^1.0.0",
     "@instructure/outcomes-ui": "3.2.3",
-    "@instructure/quiz-common": "21.0.1-rc.23+ba016039f",
-    "@instructure/quiz-i18n": "21.0.1-rc.23+ba016039f",
-    "@instructure/quiz-interactions": "21.0.1-rc.23+ba016039f",
-    "@instructure/quiz-number-input": "21.0.1-rc.23+ba016039f",
-    "@instructure/quiz-rce": "21.0.1-rc.23+ba016039f",
+    "@instructure/quiz-common": "21.0.1-rc.27+2e775b6c8",
+    "@instructure/quiz-i18n": "21.0.1-rc.27+2e775b6c8",
+    "@instructure/quiz-interactions": "21.0.1-rc.27+2e775b6c8",
+    "@instructure/quiz-number-input": "21.0.1-rc.27+2e775b6c8",
+    "@instructure/quiz-rce": "21.0.1-rc.27+2e775b6c8",
     "@instructure/ui-a11y-content": "10.14.0",
     "@instructure/ui-alerts": "10.14.0",
     "@instructure/ui-avatar": "10.14.0",
@@ -109,7 +109,7 @@
     "file-saver": "~2.0.5",
     "humps": "^2.0.0",
     "immutable": "^3.8.1",
-    "instructure-validations": "21.0.1-rc.23+ba016039f",
+    "instructure-validations": "21.0.1-rc.27+2e775b6c8",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -158,7 +158,7 @@
     "jquery": "^2.2.3",
     "karma-junit-reporter": "^2.0.1",
     "most-subject": "^5.3.0",
-    "quiz-presets": "21.0.1-rc.23+ba016039f",
+    "quiz-presets": "21.0.1-rc.27+2e775b6c8",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -174,5 +174,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ba016039fc4b110fe972fb73aa16f5d17159c7c8"
+  "gitHead": "2e775b6c8301807d61316c23c7ad71256d239485"
 }