@instructure/quiz-core 22.0.0 → 22.1.0

package/es/banks/components/CopyMoveBankEntryModal/presenter.js

@@ -31,17 +31,27 @@ import BankSelection from '../../../common/components/resources/BankSelection/pr
 import { Modal, ModalHeader, ModalBody, ModalFooter, COPY_MOVE_BANK_ENTRY_MODAL_KEEP_COPY, TextInput, XSMALL_SIDE_MARGIN } from '@instructure/quiz-common';
 import { featureOn } from '../../../common/util/featureCheck';
 export var CopyMoveBankEntryModal = /*#__PURE__*/function (_Component) {
-  function CopyMoveBankEntryModal() {
+  function CopyMoveBankEntryModal(props) {
     var _this2;
     _classCallCheck(this, CopyMoveBankEntryModal);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this2 = _callSuper(this, CopyMoveBankEntryModal, [].concat(args));
+    _this2 = _callSuper(this, CopyMoveBankEntryModal, [props]);
+    /**
+     * @type {React.RefObject<RadioInput> | null}
+     */
+    _defineProperty(_this2, "radioInputRef", null);
+    /**
+     * @type {React.RefObject<TextInput> | null}
+     */
+    _defineProperty(_this2, "textInputRef", null);
     _defineProperty(_this2, "state", {
       bankType: 'existing',
       newBankTitle: '',
-      selectedBank: null
+      selectedBank: null,
+      radioValidationError: null,
+      selectValidationError: null
+    });
+    _defineProperty(_this2, "setBankInputRef", function (ref) {
+      _this2.bankSelectionInputRef = ref;
     });
     _defineProperty(_this2, "copyOrMove", function (newBankId) {
       if (_this2.props.keepCopy) {
@@ -51,7 +61,55 @@ export var CopyMoveBankEntryModal = /*#__PURE__*/function (_Component) {
       }
       _this2.closeAction();
     });
+    _defineProperty(_this2, "clearValidationErrors", function () {
+      _this2.setState({
+        radioValidationError: null,
+        selectValidationError: null
+      });
+    });
+    _defineProperty(_this2, "validateAction", function () {
+      var _this2$state = _this2.state,
+        bankType = _this2$state.bankType,
+        newBankTitle = _this2$state.newBankTitle,
+        selectedBank = _this2$state.selectedBank;
+      if (!bankType) {
+        var _this2$radioInputRef;
+        (_this2$radioInputRef = _this2.radioInputRef) === null || _this2$radioInputRef === void 0 || (_this2$radioInputRef = _this2$radioInputRef.current) === null || _this2$radioInputRef === void 0 || _this2$radioInputRef.focus();
+        _this2.setState({
+          radioValidationError: [{
+            text: t('Please choose a Copy/Move option'),
+            type: 'newError'
+          }]
+        });
+        return false;
+      }
+      if (bankType === 'existing' && !selectedBank) {
+        _this2.bankSelectionInputRef.focus();
+        _this2.setState({
+          selectValidationError: [{
+            text: t('Please select a bank'),
+            type: 'newError'
+          }]
+        });
+        return false;
+      }
+      if (bankType === 'new' && (!newBankTitle || !newBankTitle.trim())) {
+        var _this2$textInputRef;
+        (_this2$textInputRef = _this2.textInputRef) === null || _this2$textInputRef === void 0 || (_this2$textInputRef = _this2$textInputRef.current) === null || _this2$textInputRef === void 0 || _this2$textInputRef.focus();
+        _this2.setState({
+          selectValidationError: [{
+            text: t('Please enter a new bank title'),
+            type: 'newError'
+          }]
+        });
+        return false;
+      }
+      return true;
+    });
     _defineProperty(_this2, "continueAction", function () {
+      if (!_this2.validateAction()) {
+        return;
+      }
       if (_this2.state.bankType === 'new') {
         var newBank = Bank.create({
           title: _this2.state.newBankTitle,
@@ -92,12 +150,14 @@ export var CopyMoveBankEntryModal = /*#__PURE__*/function (_Component) {
       return _this2.initiateCopy(newBankId).then(_this2.props.onAdd);
     });
     _defineProperty(_this2, "closeAction", function () {
+      _this2.clearValidationErrors();
       if (_this2.props.modalTrigger) {
         _this2.props.modalTrigger.focus();
       }
       _this2.props.closeModal();
     });
     _defineProperty(_this2, "onBankSelection", function (e, option) {
+      _this2.clearValidationErrors();
       _this2.setState({
         selectedBank: new Bank(option)
       });
@@ -106,15 +166,20 @@ export var CopyMoveBankEntryModal = /*#__PURE__*/function (_Component) {
       _this2.props.uiSet(COPY_MOVE_BANK_ENTRY_MODAL_KEEP_COPY, e.target.checked);
     });
     _defineProperty(_this2, "handleRadioChange", function (event, value) {
+      _this2.clearValidationErrors();
       _this2.setState({
         bankType: value
       });
     });
     _defineProperty(_this2, "onTitleChange", function (e) {
+      _this2.clearValidationErrors();
       _this2.setState({
         newBankTitle: e.target.value
       });
     });
+    _this2.radioInputRef = React.createRef();
+    _this2.textInputRef = React.createRef();
+    _this2.bankSelectionInputRef = React.createRef();
     return _this2;
   }
   _inherits(CopyMoveBankEntryModal, _Component);
@@ -129,14 +194,9 @@ export var CopyMoveBankEntryModal = /*#__PURE__*/function (_Component) {
   }, {
     key: "addToBankButton",
     value: function addToBankButton() {
-      var _this$state = this.state,
-        bankType = _this$state.bankType,
-        newBankTitle = _this$state.newBankTitle;
-      var disabled = bankType === 'existing' && !this.state.selectedBank || bankType === 'new' && (!newBankTitle || !newBankTitle.trim());
       return /*#__PURE__*/React.createElement(Button, {
         color: "primary",
         onClick: this.continueAction,
-        disabled: disabled,
         margin: XSMALL_SIDE_MARGIN,
         "data-automation": "sdk-add-to-bank-button"
       }, t('Add'));
@@ -146,16 +206,22 @@ export var CopyMoveBankEntryModal = /*#__PURE__*/function (_Component) {
     value: function renderBankTypeContent() {
       if (this.state.bankType === 'existing') {
         return /*#__PURE__*/React.createElement(BankSelection, {
+          inputRef: this.setBankInputRef,
           onBankSelection: this.onBankSelection,
           selectedBank: this.state.selectedBank,
-          "data-automation": "sdk-bank-selection"
+          "data-automation": "sdk-bank-selection",
+          externalError: this.state.selectValidationError,
+          isRequired: true
         });
       }
       return /*#__PURE__*/React.createElement(TextInput, {
         onChange: this.onTitleChange,
         value: this.state.newBankTitle,
         renderLabel: t('New Bank Title'),
-        type: "text"
+        type: "text",
+        messages: this.state.selectValidationError,
+        ref: this.textInputRef,
+        isRequired: true
       });
     }
   }, {
@@ -165,10 +231,13 @@ export var CopyMoveBankEntryModal = /*#__PURE__*/function (_Component) {
         onChange: this.handleRadioChange,
         name: t('Bank Type'),
         defaultValue: this.state.bankType,
-        description: /*#__PURE__*/React.createElement(ScreenReaderContent, null, t('Bank Type'))
+        description: /*#__PURE__*/React.createElement(ScreenReaderContent, null, t('Bank Type')),
+        messages: this.state.radioValidationError,
+        isRequired: true
       }, /*#__PURE__*/React.createElement(RadioInput, {
         value: "existing",
-        label: t('Existing item bank')
+        label: t('Existing item bank'),
+        ref: this.radioInputRef
       }), /*#__PURE__*/React.createElement(RadioInput, {
         value: "new",
         label: t('New item bank')

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/BankSelection/presenter.js

@@ -27,13 +27,15 @@ import { toErrors } from '../../../util/instUIMessages';
 import { simpleFetchBanks } from '../../../../banks/api/banks';
 import { GenericAsyncSearch } from '../../shared/GenericAsyncSearch/GenericAsyncSearch';
 export var BankSelection = /*#__PURE__*/function (_Component) {
-  function BankSelection() {
+  function BankSelection(props) {
     var _this2;
     _classCallCheck(this, BankSelection);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this2 = _callSuper(this, BankSelection, [].concat(args));
+    _this2 = _callSuper(this, BankSelection, [props]);
+    _defineProperty(_this2, "setInputRef", function (ref) {
+      var _this2$props$inputRef, _this2$props;
+      _this2.inputRef = ref;
+      (_this2$props$inputRef = (_this2$props = _this2.props).inputRef) === null || _this2$props$inputRef === void 0 || _this2$props$inputRef.call(_this2$props, ref);
+    });
     _defineProperty(_this2, "searchBanks", function (search) {
       return _this2.props.simpleFetchBanks({
         search: search
@@ -56,18 +58,31 @@ export var BankSelection = /*#__PURE__*/function (_Component) {
         archived: bankOption.archived
       });
     });
+    _this2.inputRef = null;
     return _this2;
   }
   _inherits(BankSelection, _Component);
   return _createClass(BankSelection, [{
+    key: "focusSelectField",
+    value: function focusSelectField() {
+      if (this.inputRef) {
+        this.inputRef.focus();
+      }
+    }
+  }, {
     key: "getErrors",
     value: function getErrors() {
       var selectedBank = this.props.selectedBank;
       if (selectedBank && selectedBank.archived) {
+        this.focusSelectField();
         return toErrors([t('The item bank "{ bankTitle }" no longer exists. Please select a valid bank.', {
           bankTitle: selectedBank.title
         })]);
       }
+      if (this.props.externalError) {
+        this.focusSelectField();
+        return this.props.externalError;
+      }
     }
   }, {
     key: "selectedOption",
@@ -83,13 +98,15 @@ export var BankSelection = /*#__PURE__*/function (_Component) {
     key: "render",
     value: function render() {
       return /*#__PURE__*/React.createElement(GenericAsyncSearch, {
+        inputRef: this.setInputRef,
         onSelectionChange: this.onSelect,
         label: this.props.label || t('Select the destination bank'),
         placeholder: t('Search for a bank'),
         selectedOption: this.selectedOption(),
         getOptions: this.searchBanks,
         messages: this.getErrors(),
-        selectAutomation: 'sdk-item-bank-modal'
+        selectAutomation: 'sdk-item-bank-modal',
+        isRequired: this.props.isRequired
       });
     }
   }]);
@@ -98,12 +115,18 @@ _defineProperty(BankSelection, "propTypes", {
   label: PropTypes.string,
   onBankSelection: PropTypes.func,
   selectedBank: ImmutablePropTypes.record,
-  simpleFetchBanks: PropTypes.func
+  simpleFetchBanks: PropTypes.func,
+  externalError: ImmutablePropTypes.record,
+  inputRef: PropTypes.func,
+  isRequired: PropTypes.bool
 });
 _defineProperty(BankSelection, "defaultProps", {
   label: null,
   onBankSelection: function onBankSelection() {},
   selectedBank: null,
-  simpleFetchBanks: simpleFetchBanks
+  simpleFetchBanks: simpleFetchBanks,
+  externalError: null,
+  inputRef: function inputRef() {},
+  isRequired: false
 });
 export default BankSelection;

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
       });
     }
   }, {