@instructure/quiz-core 20.37.1 → 21.0.0

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

@@ -1,6 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,7 +10,7 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/createSuper"));
-var _react = require("react");
+var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _uiButtons = require("@instructure/ui-buttons");
 var _uiCheckbox = require("@instructure/ui-checkbox");
@@ -20,20 +21,15 @@ var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/f
 var _Bank = _interopRequireDefault(require("../../../common/records/Bank.js"));
 var _instUIMessages = require("../../../common/util/instUIMessages.js");
 var _quizCommon = require("@instructure/quiz-common");
-var _styles = _interopRequireDefault(require("./styles.js"));
-var _theme = _interopRequireDefault(require("./theme.js"));
-var _dec, _class, _CreateBankModal;
+var _CreateBankModal;
 /** @jsx jsx */
-var CreateBankModal = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default, _theme.default), _dec(_class = (_CreateBankModal = /*#__PURE__*/function (_Component) {
+var CreateBankModal = /*#__PURE__*/function (_Component) {
   (0, _inherits2.default)(CreateBankModal, _Component);
   var _super = (0, _createSuper2.default)(CreateBankModal);
-  function CreateBankModal() {
+  function CreateBankModal(props) {
     var _this;
     (0, _classCallCheck2.default)(this, CreateBankModal);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _super.call.apply(_super, [this].concat(args));
+    _this = _super.call(this, props);
     _this.state = {
       shareWithCourse: false
     };
@@ -45,7 +41,8 @@ var CreateBankModal = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defaul
         _this.props.onCreateBank();
         _this.closeAction();
       } else {
-        _this.props.screenreaderNotification((0, _formatMessage.default)('Bank name cannot be blank.'));
+        var _this$bankNameInput$c;
+        (_this$bankNameInput$c = _this.bankNameInput.current) === null || _this$bankNameInput$c === void 0 ? void 0 : _this$bankNameInput$c.focus();
       }
     };
     _this.closeAction = function () {
@@ -75,6 +72,7 @@ var CreateBankModal = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defaul
         shareWithCourse: event.target.checked
       });
     };
+    _this.bankNameInput = /*#__PURE__*/_react.default.createRef();
     return _this;
   }
   (0, _createClass2.default)(CreateBankModal, [{
@@ -99,17 +97,14 @@ var CreateBankModal = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defaul
   }, {
     key: "renderContent",
     value: function renderContent() {
-      return (0, _emotion.jsx)("div", {
-        css: this.props.styles.bankNameInput
-      }, (0, _emotion.jsx)(_quizCommon.TextInput, {
+      return (0, _emotion.jsx)("div", null, (0, _emotion.jsx)(_quizCommon.TextInput, {
         messages: this.getErrors(),
         onChange: this.onNameChange,
-        renderLabel: (0, _emotion.jsx)("div", {
-          css: this.props.styles.bankNameLabel
-        }, (0, _formatMessage.default)('Bank Name')),
+        renderLabel: (0, _formatMessage.default)('Bank Name'),
+        isRequired: true,
         type: "text",
-        placeholder: (0, _formatMessage.default)('Enter a name...'),
-        "data-automation": "sdk-create-bank-name-textinput"
+        "data-automation": "sdk-create-bank-name-textinput",
+        ref: this.bankNameInput
       }), this.renderCheckbox());
     }
   }, {
@@ -141,7 +136,6 @@ var CreateBankModal = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defaul
         label: (0, _formatMessage.default)('Item Bank'),
         "data-automation": "sdk-create-bank-modal"
       }, (0, _emotion.jsx)(_quizCommon.ModalHeader, null, (0, _emotion.jsx)(_uiHeading.Heading, {
-        level: "reset",
         as: "h2"
       }, (0, _formatMessage.default)('New Item Bank')), (0, _emotion.jsx)(_uiButtons.CloseButton, {
         onClick: this.closeAction,
@@ -153,7 +147,12 @@ var CreateBankModal = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defaul
   }]);
   CreateBankModal.displayName = "CreateBankModal";
   return CreateBankModal;
-}(_react.Component), _CreateBankModal.displayName = 'CreateBankModal', _CreateBankModal.componentId = "Quizzes".concat(_CreateBankModal.displayName), _CreateBankModal.propTypes = {
+}(_react.Component);
+exports.CreateBankModal = CreateBankModal;
+_CreateBankModal = CreateBankModal;
+CreateBankModal.displayName = 'CreateBankModal';
+CreateBankModal.componentId = "Quizzes".concat(_CreateBankModal.displayName);
+CreateBankModal.propTypes = {
   modalOpen: _propTypes.default.bool.isRequired,
   modalTrigger: _propTypes.default.instanceOf(_react.Component),
   temporaryBank: _propTypes.default.instanceOf(_Bank.default).isRequired,
@@ -176,13 +175,13 @@ var CreateBankModal = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defaul
     root_account_name: _propTypes.default.string
   }),
   styles: _propTypes.default.object
-}, _CreateBankModal.defaultProps = {
+};
+CreateBankModal.defaultProps = {
   displayError: false,
   modalTrigger: null,
   showShareBankOnCreate: false,
   itemBanksScope: {},
   onCreateBank: function onCreateBank() {}
-}, _CreateBankModal)) || _class);
-exports.CreateBankModal = CreateBankModal;
+};
 var _default = CreateBankModal;
 exports.default = _default;

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

@@ -1,6 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,7 +10,7 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/createSuper"));
-var _react = require("react");
+var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _uiButtons = require("@instructure/ui-buttons");
 var _uiHeading = require("@instructure/ui-heading");
@@ -18,25 +19,23 @@ var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/f
 var _instUIMessages = require("../../../common/util/instUIMessages.js");
 var _quizCommon = require("@instructure/quiz-common");
 var _Bank = _interopRequireDefault(require("../../../common/records/Bank.js"));
-var _styles = _interopRequireDefault(require("./styles.js"));
-var _theme = _interopRequireDefault(require("./theme.js"));
-var _dec, _class, _EditBankModal;
+var _EditBankModal;
 /** @jsx jsx */
-var EditBankModal = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default, _theme.default), _dec(_class = (_EditBankModal = /*#__PURE__*/function (_Component) {
+var EditBankModal = /*#__PURE__*/function (_Component) {
   (0, _inherits2.default)(EditBankModal, _Component);
   var _super = (0, _createSuper2.default)(EditBankModal);
-  function EditBankModal() {
+  function EditBankModal(props) {
     var _this;
     (0, _classCallCheck2.default)(this, EditBankModal);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _super.call.apply(_super, [this].concat(args));
+    _this = _super.call(this, props);
     _this.continueAction = function () {
       _this.props.showError(_this.props.errorKey);
       if (_this.props.workingBank.isValid()) {
         _this.props.updateBank(_this.props.workingBank);
         _this.closeAction();
+      } else {
+        var _this$bankNameInput$c;
+        (_this$bankNameInput$c = _this.bankNameInput.current) === null || _this$bankNameInput$c === void 0 ? void 0 : _this$bankNameInput$c.focus();
       }
     };
     _this.closeAction = function () {
@@ -58,6 +57,7 @@ var EditBankModal = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default,
         return (0, _instUIMessages.toErrors)(_this.props.workingBank.errorsFor('title').toJS());
       }
     };
+    _this.bankNameInput = /*#__PURE__*/_react.default.createRef();
     return _this;
   }
   (0, _createClass2.default)(EditBankModal, [{
@@ -82,17 +82,16 @@ var EditBankModal = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default,
   }, {
     key: "renderContent",
     value: function renderContent() {
-      return (0, _emotion.jsx)("div", {
-        css: this.props.styles.bankNameInput
-      }, (0, _emotion.jsx)(_quizCommon.TextInput, {
+      return (0, _emotion.jsx)(_quizCommon.TextInput, {
         value: this.props.workingBank.title,
         messages: this.getErrors(),
         onChange: this.onNameChange,
-        renderLabel: (0, _emotion.jsx)("div", null, (0, _formatMessage.default)('Bank Name')),
+        renderLabel: (0, _formatMessage.default)('Bank Name'),
         type: "text",
-        placeholder: (0, _formatMessage.default)('Enter a name...'),
-        "data-automation": "sdk-edit-bank-name-textinput"
-      }));
+        isRequired: true,
+        "data-automation": "sdk-edit-bank-name-textinput",
+        ref: this.bankNameInput
+      });
     }
   }, {
     key: "render",
@@ -104,7 +103,6 @@ var EditBankModal = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default,
         label: (0, _formatMessage.default)('Item Bank'),
         "data-automation": "sdk-edit-bank-modal"
       }, (0, _emotion.jsx)(_quizCommon.ModalHeader, null, (0, _emotion.jsx)(_uiHeading.Heading, {
-        level: "reset",
         as: "h2"
       }, (0, _formatMessage.default)('Edit Item Bank')), (0, _emotion.jsx)(_uiButtons.CloseButton, {
         onClick: this.closeAction,
@@ -116,7 +114,12 @@ var EditBankModal = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default,
   }]);
   EditBankModal.displayName = "EditBankModal";
   return EditBankModal;
-}(_react.Component), _EditBankModal.displayName = 'EditBankModal', _EditBankModal.componentId = "Quizzes".concat(_EditBankModal.displayName), _EditBankModal.propTypes = {
+}(_react.Component);
+exports.EditBankModal = EditBankModal;
+_EditBankModal = EditBankModal;
+EditBankModal.displayName = 'EditBankModal';
+EditBankModal.componentId = "Quizzes".concat(_EditBankModal.displayName);
+EditBankModal.propTypes = {
   modalOpen: _propTypes.default.bool.isRequired,
   modalTrigger: _propTypes.default.instanceOf(_react.Component),
   workingBank: _propTypes.default.instanceOf(_Bank.default).isRequired,
@@ -129,10 +132,10 @@ var EditBankModal = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default,
   hideError: _propTypes.default.func.isRequired,
   closeModal: _propTypes.default.func.isRequired,
   styles: _propTypes.default.object
-}, _EditBankModal.defaultProps = {
+};
+EditBankModal.defaultProps = {
   displayError: false,
   modalTrigger: null
-}, _EditBankModal)) || _class);
-exports.EditBankModal = EditBankModal;
+};
 var _default = EditBankModal;
 exports.default = _default;

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

@@ -28,7 +28,6 @@ var _uiGrid = require("@instructure/ui-grid");
 var _uiTabs = require("@instructure/ui-tabs");
 var _uiText = require("@instructure/ui-text");
 var _emotion = require("@instructure/emotion");
-var _ElementsForSelectors = _interopRequireDefault(require("../../../common/util/ElementsForSelectors.js"));
 var _CustomPropTypes = _interopRequireDefault(require("../../../common/util/CustomPropTypes.js"));
 var _index = _interopRequireDefault(require("./ShareList/index.js"));
 var _index2 = _interopRequireDefault(require("../AsyncSearch/index.js"));
@@ -62,9 +61,6 @@ var SharingModalPresenter = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.
     };
     _this.shareListRef = null;
     _this.shareButtonRef = null;
-    _this.applicationElement = function () {
-      return (0, _ElementsForSelectors.default)(_this.props.appContainer);
-    };
     // =============
     //   LIFECYCLE
     // =============

package/lib/building/api/stimuli.js

@@ -28,7 +28,8 @@ function createStimulus(stimulus, parentId, parentType) {
     parent_stimulus_id: parentStimulusId,
     source_url: stimulus.sourceUrl,
     stimulus_type: stimulus.stimulusType,
-    title: stimulus.title
+    title: stimulus.title,
+    passage: stimulus.passage
   };
   var requestBody = JSON.stringify({
     stimulus: stimulusParams

package/lib/building/components/resources/DeleteStimulusModal/presenter.js

@@ -121,6 +121,12 @@ var DeleteStimulusModal = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.de
         cancelText: (0, _formatMessage.default)('Cancel')
       };
     }
+  }, {
+    key: "isPassage",
+    value: function isPassage() {
+      var _this$props$stimulusE;
+      return (_this$props$stimulusE = this.props.stimulusEntry) === null || _this$props$stimulusE === void 0 ? void 0 : _this$props$stimulusE.getEntry().passage;
+    }
   }, {
     key: "anyImmutableKeepers",
     value: function anyImmutableKeepers() {
@@ -149,8 +155,8 @@ var DeleteStimulusModal = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.de
       return (0, _emotion.jsx)(_uiButtons.Button, {
         onClick: this.closeAction,
         margin: _quizCommon.XSMALL_SIDE_MARGIN,
-        "data-automation": "sdk-keep-stimulus-button"
-      }, (0, _formatMessage.default)('Keep Stimulus'));
+        "data-automation": "sdk-keep-".concat(this.isPassage() ? 'passage' : 'stimulus', "-button")
+      }, this.isPassage() ? (0, _formatMessage.default)('Keep Passage') : (0, _formatMessage.default)('Keep Stimulus'));
     }
   }, {
     key: "doneButton",
@@ -164,8 +170,8 @@ var DeleteStimulusModal = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.de
         color: "primary",
         onClick: this.handleSubmit,
         margin: _quizCommon.XSMALL_SIDE_MARGIN,
-        "data-automation": "sdk-remove-stimulus-button"
-      }, (0, _formatMessage.default)('Remove Stimulus'));
+        "data-automation": "sdk-remove-".concat(this.isPassage() ? 'passage' : 'stimulus', "-button")
+      }, this.isPassage() ? (0, _formatMessage.default)('Remove Passage') : (0, _formatMessage.default)('Remove Stimulus'));
     }
   }, {
     key: "renderChooseWhich",
@@ -206,7 +212,8 @@ var DeleteStimulusModal = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.de
   }, {
     key: "renderContent",
     value: function renderContent() {
-      var content = this.props.childEntries.size === 0 ? (0, _emotion.jsx)("span", null, (0, _formatMessage.default)('Are you sure you want to remove this stimulus?')) : this.renderMainMenu();
+      var message = this.isPassage() ? (0, _formatMessage.default)('Are you sure you want to remove this passage?') : (0, _formatMessage.default)('Are you sure you want to remove this stimulus?');
+      var content = this.props.childEntries.size === 0 ? (0, _emotion.jsx)("span", null, message) : this.renderMainMenu();
       var stimulusTitle = this.props.stimulusEntry && this.props.stimulusEntry.getEntry().title;
       return (0, _emotion.jsx)("div", {
         className: "deleteStimulusModal",
@@ -222,11 +229,11 @@ var DeleteStimulusModal = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.de
         open: this.props.modalOpen,
         onDismiss: this.closeAction,
         size: "small",
-        label: (0, _formatMessage.default)('Confirm Stimulus Removal')
+        label: this.isPassage() ? (0, _formatMessage.default)('Confirm Passage Removal') : (0, _formatMessage.default)('Confirm Stimulus Removal')
       }, (0, _emotion.jsx)(_quizCommon.ModalHeader, null, (0, _emotion.jsx)(_uiHeading.Heading, {
         level: "reset",
         as: "h2"
-      }, (0, _formatMessage.default)('Confirm Stimulus Removal')), (0, _emotion.jsx)(_uiButtons.CloseButton, {
+      }, this.isPassage() ? (0, _formatMessage.default)('Confirm Passage Removal') : (0, _formatMessage.default)('Confirm Stimulus Removal')), (0, _emotion.jsx)(_uiButtons.CloseButton, {
         onClick: this.closeAction,
         placement: "end",
         offset: "medium",

package/lib/building/components/resources/quizEntry/QuizEntry/presenter.js

@@ -45,10 +45,10 @@ var QuizEntry = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default, _th
   function QuizEntry() {
     var _this;
     (0, _classCallCheck2.default)(this, QuizEntry);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
+    for (var _len = arguments.length, _args = new Array(_len), _key = 0; _key < _len; _key++) {
+      _args[_key] = arguments[_key];
     }
-    _this = _super.call.apply(_super, [this].concat(args));
+    _this = _super.call.apply(_super, [this].concat(_args));
     _this.itemOverrideTypes = function () {
       return ['choice'].concat((0, _toConsumableArray2.default)(_this.props.partialScoringEnabled ? ['multi-answer'] : []), (0, _toConsumableArray2.default)(_this.props.partialDeepScoringEnabled ? ['matching'] : []));
     };
@@ -103,7 +103,14 @@ var QuizEntry = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default, _th
     };
     _this.bankEntryWarningWrapperProps = function () {
       if (_this.props.quizEntry.entryEditable) {
-        var propsFunc = _this.props.quizEntry.hasStimulus ? _warningHelpers.propsForStimulusBankEntryEditPrompt : _warningHelpers.propsForItemBankEntryEditPrompt;
+        var _this$props$entry;
+        var isPassage = (_this$props$entry = _this.props.entry) === null || _this$props$entry === void 0 ? void 0 : _this$props$entry.passage;
+        var propsFunc = _this.props.quizEntry.hasStimulus ? function () {
+          for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+            args[_key2] = arguments[_key2];
+          }
+          return _warningHelpers.propsForStimulusBankEntryEditPrompt.apply(void 0, [isPassage].concat(args));
+        } : _warningHelpers.propsForItemBankEntryEditPrompt;
         return propsFunc(_this.isEditing(), _this.props.switchOffEditing, function () {
           var bankEntry = _this.props.quizEntry.getEntry();
           _this.props.setUi(_quizCommon.BUILD_TRAY_OPEN, true);

package/lib/building/components/resources/quizEntry/QuizEntryEdit/Footer/presenter.js

@@ -14,7 +14,6 @@ var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactImmutableProptypes = _interopRequireDefault(require("react-immutable-proptypes"));
 var _uiView = require("@instructure/ui-view");
-var _uiFlex = require("@instructure/ui-flex");
 var _uiA11yContent = require("@instructure/ui-a11y-content");
 var _uiText = require("@instructure/ui-text");
 var _quizNumberInput = _interopRequireDefault(require("@instructure/quiz-number-input"));
@@ -205,13 +204,13 @@ var QuizEntryEditFooter = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.de
         as: "div",
         background: "secondary",
         padding: "xx-small none"
-      }, (0, _emotion.jsx)(_uiFlex.Flex, {
+      }, (0, _emotion.jsx)(_quizCommon.Flex, {
         wrap: "wrap",
         justifyItems: "space-between",
         alignItems: "center"
-      }, (0, _emotion.jsx)(_uiFlex.Flex.Item, {
+      }, (0, _emotion.jsx)(_quizCommon.Flex.Item, {
         padding: "xx-small small"
-      }, this.renderLeftFooter()), (0, _emotion.jsx)(_uiFlex.Flex.Item, {
+      }, this.renderLeftFooter()), (0, _emotion.jsx)(_quizCommon.Flex.Item, {
         padding: "xx-small small"
       }, this.renderRightFooter())));
     }

package/lib/common/actions/modifications.js

@@ -520,13 +520,14 @@ function clearTemporaryBankItem(bankId) {
 // =====================
 // =====================
 
-function createStimulus(quizId, position) {
+function createStimulus(quizId, position, isPassage) {
   return function (dispatch, getState) {
     dispatch({
       type: _quizCommon.CREATE_TEMPORARY_STIMULUS,
       payload: {
         quizId: quizId,
-        position: position
+        position: position,
+        isPassage: isPassage
       }
     });
   };

package/lib/common/components/ConfirmationModal/presenter.js

@@ -65,19 +65,20 @@ var ConfirmationModal = /*#__PURE__*/function (_Component) {
         continueText = _this$props2.continueText,
         size = _this$props2.size,
         shouldReturnFocus = _this$props2.shouldReturnFocus,
-        continueVariant = _this$props2.continueVariant;
+        continueVariant = _this$props2.continueVariant,
+        automationPrefix = _this$props2.automationPrefix;
       return /*#__PURE__*/_react.default.createElement(_quizCommon.ImportantModal, {
         open: this.props.modalOpen,
         size: size || 'small',
         label: title || (0, _formatMessage.default)('Confirm'),
         onDismiss: this.cancelAction,
-        "data-automation": "sdk-confirmation-modal",
+        "data-automation": automationPrefix ? "sdk-".concat(automationPrefix, "-confirmation-modal") : 'sdk-confirmation-modal',
         shouldReturnFocus: shouldReturnFocus,
         onClose: this.doAction
       }, /*#__PURE__*/_react.default.createElement(_quizCommon.ModalHeader, null, /*#__PURE__*/_react.default.createElement(_uiHeading.Heading, {
         level: "reset",
         as: "h2",
-        "data-automation": "sdk-confirmation-modal-heading"
+        "data-automation": automationPrefix ? "sdk-".concat(automationPrefix, "-confirmation-modal-heading") : 'sdk-confirmation-modal-heading'
       }, title || (0, _formatMessage.default)('Confirm')), /*#__PURE__*/_react.default.createElement(_uiButtons.CloseButton, {
         onClick: this.cancelAction,
         placement: "end",
@@ -88,12 +89,12 @@ var ConfirmationModal = /*#__PURE__*/function (_Component) {
       }, text || (0, _formatMessage.default)('Are you sure?'))), /*#__PURE__*/_react.default.createElement(_quizCommon.ModalFooter, null, /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {
         onClick: this.cancelAction,
         margin: _quizCommon.XSMALL_SIDE_MARGIN,
-        "data-automation": "sdk-confirmation-modal-cancel"
+        "data-automation": automationPrefix ? "sdk-".concat(automationPrefix, "-confirmation-modal-cancel") : 'sdk-confirmation-modal-cancel'
       }, cancelText || (0, _formatMessage.default)('Cancel')), /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {
         color: continueVariant || 'primary',
         onClick: this.continueAction,
         margin: _quizCommon.XSMALL_SIDE_MARGIN,
-        "data-automation": "sdk-confirmation-modal-confirm"
+        "data-automation": automationPrefix ? "sdk-".concat(automationPrefix, "-confirmation-modal-confirm") : 'sdk-confirmation-modal-confirm'
       }, continueText || (0, _formatMessage.default)('Confirm'))));
     }
   }]);
@@ -112,7 +113,8 @@ ConfirmationModal.propTypes = {
   size: _propTypes.default.string,
   shouldReturnFocus: _propTypes.default.bool,
   onContinue: _propTypes.default.func,
-  onCancel: _propTypes.default.func
+  onCancel: _propTypes.default.func,
+  automationPrefix: _propTypes.default.string
 };
 ConfirmationModal.defaultProps = {
   title: null,
@@ -123,7 +125,8 @@ ConfirmationModal.defaultProps = {
   size: null,
   shouldReturnFocus: true,
   onContinue: null,
-  onCancel: null
+  onCancel: null,
+  automationPrefix: null
 };
 var _default = ConfirmationModal;
 exports.default = _default;

package/lib/common/components/layout/Page/styles.js

@@ -24,7 +24,19 @@ var generateStyle = function generateStyle(componentTheme, props) {
       overflowY: 'auto'
     }), {}, {
       transition: componentTheme.contentTransition,
-      width: '100%'
+      width: '100%',
+      '.user_content p': {
+        margin: "".concat(componentTheme.userContentMargin, " 0"),
+        '&:first-of-type': {
+          margin: "0 0 ".concat(componentTheme.userContentMargin)
+        },
+        '&:last-of-type': {
+          margin: "".concat(componentTheme.userContentMargin, " 0 0")
+        },
+        '&:only-child': {
+          margin: 0
+        }
+      }
     })
   };
 };

package/lib/common/components/layout/Page/theme.js

@@ -12,8 +12,7 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
   return {
     fontFamily: typography.fontFamily,
     contentTransition: "transform ".concat(transitions.duration),
-    userContentMargin: spacing.mediumSmall,
-    userContentZeroMargin: 0
+    userContentMargin: spacing.mediumSmall
   };
 };
 var _default = generateComponentTheme;

package/lib/common/components/layout/navbar/SecondaryNavBarButton/index.js

@@ -14,12 +14,9 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _uiTopNavBar = require("@instructure/ui-top-nav-bar");
 var _emotion = require("@instructure/emotion");
 var _uiReactUtils = require("@instructure/ui-react-utils");
-var _styles = _interopRequireDefault(require("./styles.js"));
-var _theme = _interopRequireDefault(require("./theme.js"));
-var _quizCommon = require("@instructure/quiz-common");
-var _dec, _class, _SecondaryNavBarButton;
+var _SecondaryNavBarButton;
 /** @jsx jsx */
-var SecondaryNavBarButton = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default, _theme.default), _dec(_class = (_SecondaryNavBarButton = /*#__PURE__*/function (_Component) {
+var SecondaryNavBarButton = /*#__PURE__*/function (_Component) {
   (0, _inherits2.default)(SecondaryNavBarButton, _Component);
   var _super = (0, _createSuper2.default)(SecondaryNavBarButton);
   function SecondaryNavBarButton() {
@@ -27,39 +24,23 @@ var SecondaryNavBarButton = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.
     return _super.apply(this, arguments);
   }
   (0, _createClass2.default)(SecondaryNavBarButton, [{
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      this.props.makeStyles();
-    }
-  }, {
-    key: "componentDidUpdate",
-    value: function componentDidUpdate() {
-      this.props.makeStyles();
-    }
-  }, {
     key: "render",
     value: function render() {
-      return (0, _emotion.jsx)(_emotion.InstUISettingsProvider, {
-        theme: {
-          componentOverrides: {
-            BaseButton: {
-              primaryColor: this.props.styles.textColor,
-              primaryBackground: this.props.styles.backgroundColor,
-              primaryHoverBackground: this.props.styles.backgroundHoverColor,
-              primaryBorderColor: this.props.styles.borderColor
-            }
-          }
-        }
-      }, (0, _emotion.jsx)(_uiTopNavBar.TopNavBar.Item, (0, _uiReactUtils.omitProps)(this.props, this.constructor.propTypes), this.props.children));
+      return (0, _emotion.jsx)(_uiTopNavBar.TopNavBar.Item, Object.assign({
+        color: "secondary"
+      }, (0, _uiReactUtils.omitProps)(this.props, this.constructor.propTypes)), this.props.children);
     }
   }]);
   SecondaryNavBarButton.displayName = "SecondaryNavBarButton";
   return SecondaryNavBarButton;
-}(_react.Component), _SecondaryNavBarButton.displayName = 'TopNavBarItem', _SecondaryNavBarButton.componentId = "Quizzes".concat(_SecondaryNavBarButton.displayName), _SecondaryNavBarButton.propTypes = {
-  children: _propTypes.default.string.isRequired,
-  styles: _propTypes.default.object,
-  makeStyles: _propTypes.default.func
-}, _SecondaryNavBarButton)) || _class);
+}(_react.Component);
 exports.SecondaryNavBarButton = SecondaryNavBarButton;
+_SecondaryNavBarButton = SecondaryNavBarButton;
+SecondaryNavBarButton.displayName = 'TopNavBarItem';
+SecondaryNavBarButton.componentId = "Quizzes".concat(_SecondaryNavBarButton.displayName);
+SecondaryNavBarButton.propTypes = {
+  children: _propTypes.default.string.isRequired,
+  styles: _propTypes.default.object
+};
 var _default = SecondaryNavBarButton;
 exports.default = _default;

package/lib/common/components/layout/navbar/index.js

@@ -100,9 +100,6 @@ var NavBar = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default, _theme
             desktopBottomBorderInverse: false
           } : {}),
           navLabel: (0, _formatMessage.default)('Quizzes navigation bar'),
-          desktopConfig: {
-            hideActionsUserSeparator: true
-          },
           smallViewportConfig: {
             dropdownMenuToggleButtonLabel: (0, _formatMessage.default)('Toggle Menu'),
             dropdownMenuLabel: (0, _formatMessage.default)('Main Menu')