@instructure/quiz-core 20.35.2 → 20.35.3-rc.1

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

@@ -6,15 +6,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.AddToBankModal = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 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 = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _reactImmutableProptypes = _interopRequireDefault(require("react-immutable-proptypes"));
 var _uiButtons = require("@instructure/ui-buttons");
 var _uiHeading = require("@instructure/ui-heading");
 var _uiTextInput = require("@instructure/ui-text-input");
@@ -22,24 +19,10 @@ var _uiRadioInput = require("@instructure/ui-radio-input");
 var _uiA11yContent = require("@instructure/ui-a11y-content");
 var _Bank = _interopRequireDefault(require("../../../common/records/Bank.js"));
 var _presenter = _interopRequireDefault(require("../../../common/components/resources/BankSelection/presenter.js"));
-var _uiSpinner = require("@instructure/ui-spinner");
-var _uiText = require("@instructure/ui-text");
-var _uiIcons = require("@instructure/ui-icons");
-var _uiView = require("@instructure/ui-view");
-var _uiFlex = require("@instructure/ui-flex");
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 var _quizCommon = require("@instructure/quiz-common");
 var _featureCheck = require("../../../common/util/featureCheck.js");
-var _ref2 = /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
-  padding: "0 small 0 0"
-}, /*#__PURE__*/_react.default.createElement(_uiIcons.IconNoLine, {
-  color: "error",
-  size: "small"
-}));
-var _ref3 = /*#__PURE__*/_react.default.createElement(_uiIcons.IconWarningLine, {
-  color: "warning"
-});
-var _ref4 = /*#__PURE__*/_react.default.createElement("br", null);
+var _ref = /*#__PURE__*/_react.default.createElement("br", null);
 var AddToBankModal = /*#__PURE__*/function (_Component) {
   (0, _inherits2.default)(AddToBankModal, _Component);
   var _super = (0, _createSuper2.default)(AddToBankModal);
@@ -52,7 +35,6 @@ var AddToBankModal = /*#__PURE__*/function (_Component) {
     _this = _super.call.apply(_super, [this].concat(args));
     _this.state = {
       bankType: 'existing',
-      contentShareable: 'loading',
       newBankTitle: '',
       selectedBank: null
     };
@@ -113,57 +95,6 @@ var AddToBankModal = /*#__PURE__*/function (_Component) {
     return _this;
   }
   (0, _createClass2.default)(AddToBankModal, [{
-    key: "componentDidUpdate",
-    value: function componentDidUpdate(prevProps) {
-      var _this2 = this;
-      var _this$props = this.props,
-        canvasOrigin = _this$props.canvasOrigin,
-        modalOpen = _this$props.modalOpen,
-        checkContentShareability = _this$props.checkContentShareability,
-        workingEntry = _this$props.workingEntry;
-      if (modalOpen && !prevProps.modalOpen) {
-        this.setState({
-          contentShareable: 'loading'
-        });
-        checkContentShareability(workingEntry, canvasOrigin).then(function () {
-          _this2.setState({
-            contentShareable: 'true'
-          });
-        }).catch(/*#__PURE__*/function () {
-          var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(err) {
-            var _err$response, _err$response2;
-            var body;
-            return _regenerator.default.wrap(function _callee$(_context) {
-              while (1) {
-                switch (_context.prev = _context.next) {
-                  case 0:
-                    _context.next = 2;
-                    return (_err$response = err.response) === null || _err$response === void 0 ? void 0 : _err$response.json();
-                  case 2:
-                    body = _context.sent;
-                    if (((_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : _err$response2.status) === 400 && body.shareable === false) {
-                      _this2.setState({
-                        contentShareable: 'false'
-                      });
-                    } else {
-                      _this2.setState({
-                        contentShareable: 'unknown'
-                      });
-                    }
-                  case 4:
-                  case "end":
-                    return _context.stop();
-                }
-              }
-            }, _callee);
-          }));
-          return function (_x) {
-            return _ref.apply(this, arguments);
-          };
-        }());
-      }
-    }
-  }, {
     key: "cancelButton",
     value: function cancelButton() {
       return /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {
@@ -176,10 +107,8 @@ var AddToBankModal = /*#__PURE__*/function (_Component) {
     value: function addToBankButton() {
       var _this$state = this.state,
         bankType = _this$state.bankType,
-        newBankTitle = _this$state.newBankTitle,
-        contentShareable = _this$state.contentShareable;
-      var contentShareableLoading = contentShareable === 'loading';
-      var disabled = bankType === 'existing' && !this.state.selectedBank || bankType === 'new' && (!newBankTitle || !newBankTitle.trim()) || contentShareableLoading;
+        newBankTitle = _this$state.newBankTitle;
+      var disabled = bankType === 'existing' && !this.state.selectedBank || bankType === 'new' && (!newBankTitle || !newBankTitle.trim());
       return /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {
         type: "button",
         color: "primary",
@@ -187,7 +116,7 @@ var AddToBankModal = /*#__PURE__*/function (_Component) {
         disabled: disabled,
         margin: _quizCommon.XSMALL_SIDE_MARGIN,
         "data-automation": "sdk-add-to-bank-button"
-      }, !contentShareableLoading && contentShareable !== 'true' ? (0, _formatMessage.default)('Add anyway') : (0, _formatMessage.default)('Add'));
+      }, (0, _formatMessage.default)('Add'));
     }
   }, {
     key: "renderBankTypeContent",
@@ -206,35 +135,6 @@ var AddToBankModal = /*#__PURE__*/function (_Component) {
         type: "text"
       });
     }
-  }, {
-    key: "renderContentShareabilityMessage",
-    value: function renderContentShareabilityMessage() {
-      var content = null;
-      if (this.state.contentShareable === 'loading') {
-        content = /*#__PURE__*/_react.default.createElement(_uiText.Text, null, /*#__PURE__*/_react.default.createElement(_uiSpinner.Spinner, {
-          size: "x-small",
-          renderTitle: (0, _formatMessage.default)('Checking content shareability...')
-        }), "\xA0", (0, _formatMessage.default)('Validating content...'));
-      } else if (this.state.contentShareable === 'true') {
-        // No message needed. The API call to check shareability is very fast in most cases,
-        // so the user may be distracted by a message here.
-        content = null;
-      } else if (this.state.contentShareable === 'false') {
-        content = /*#__PURE__*/_react.default.createElement(_uiFlex.Flex, null, _ref2, /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
-          shouldShrink: true
-        }, /*#__PURE__*/_react.default.createElement(_uiText.Text, {
-          color: "danger"
-        }, (0, _formatMessage.default)('You are attempting to add content containing course links which may not work when used in other courses.'))));
-      } else {
-        content = /*#__PURE__*/_react.default.createElement(_uiText.Text, {
-          color: "warning"
-        }, _ref3, "\xA0", (0, _formatMessage.default)('There was an error attempting to validate shareability.'));
-      }
-      return /*#__PURE__*/_react.default.createElement(_uiView.View, {
-        as: "div",
-        margin: "small 0 0 0"
-      }, content);
-    }
   }, {
     key: "renderContent",
     value: function renderContent() {
@@ -249,7 +149,7 @@ var AddToBankModal = /*#__PURE__*/function (_Component) {
       }), /*#__PURE__*/_react.default.createElement(_uiRadioInput.RadioInput, {
         value: "new",
         label: (0, _formatMessage.default)('New item bank')
-      })), _ref4, this.renderBankTypeContent(), this.renderContentShareabilityMessage());
+      })), _ref, this.renderBankTypeContent());
     }
   }, {
     key: "render",
@@ -276,8 +176,6 @@ var AddToBankModal = /*#__PURE__*/function (_Component) {
 }(_react.Component);
 exports.AddToBankModal = AddToBankModal;
 AddToBankModal.propTypes = {
-  canvasOrigin: _propTypes.default.string,
-  checkContentShareability: _propTypes.default.func.isRequired,
   closeModal: _propTypes.default.func.isRequired,
   createBank: _propTypes.default.func.isRequired,
   moveBankEntryFromQuizEntry: _propTypes.default.func.isRequired,
@@ -296,11 +194,9 @@ AddToBankModal.propTypes = {
   onAdd: _propTypes.default.func,
   onContinue: _propTypes.default.func,
   uiSet: _propTypes.default.func.isRequired,
-  workingEntry: _reactImmutableProptypes.default.record.isRequired,
   quizId: _propTypes.default.string.isRequired
 };
 AddToBankModal.defaultProps = {
-  canvasOrigin: '',
   handleValidationErrorsFromApi: function handleValidationErrorsFromApi() {},
   onAdd: function onAdd() {},
   onContinue: function onContinue() {}

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

@@ -155,14 +155,12 @@ var BankEntry = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default, _th
         clearChanges: _this.clearChanges,
         clearValidationErrorsFromApi: _this.clearValidationErrorsFromApi,
         contextUuid: null,
-        disableSubmit: Boolean(_this.state.validationErrorsFromApi && Object.values(_this.state.validationErrorsFromApi).length),
         entry: entry,
         guid: "".concat(_this.props.bankEntry.id, "_bank_entry_edit"),
         handleQuizEntryPointsChange: _this.handlePointsChange,
         itemEditArea: _this.itemEditArea,
         parentId: _this.props.bankId,
         parentType: _quizCommon.PARENT_TYPE_BANK,
-        shouldValidateShareableContent: true,
         stimulus: entry,
         submitHandler: _this.submitHandler,
         validationErrorsFromApi: _this.state.validationErrorsFromApi,

package/lib/building/api/items.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getItem = getItem;
-exports.checkItemShareability = checkItemShareability;
 exports.createItem = createItem;
 exports.updateItem = updateItem;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
@@ -43,19 +42,6 @@ function getItem(itemId) {
     });
   };
 }
-function checkItemShareability(item, canvasOrigin) {
-  var url = '/api/items/check_shareability';
-  var requestBody = JSON.stringify({
-    item: updateItemParams(item),
-    source_origin: canvasOrigin
-  });
-  var fetcher = new _Fetcher.default({
-    onError: function onError() {}
-  });
-  return fetcher.post(url, {
-    body: requestBody
-  });
-}
 function createItem(item, parentId, parentType) {
   var parentItemId = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : null;
   var resource = parentType === 'bank' ? 'banks' : 'quizzes';

package/lib/building/api/stimuli.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createStimulus = createStimulus;
 exports.updateStimulus = updateStimulus;
-exports.checkStimulusShareability = checkStimulusShareability;
 var _quizCommon = require("@instructure/quiz-common");
 var _alerts = require("../../common/actions/alerts.js");
 var _callHandlers = require("../../common/api/callHandlers.js");
@@ -87,17 +86,4 @@ function updateStimulus(stimulus, parentId, parentType) {
       return stimulusData;
     });
   };
-}
-function checkStimulusShareability(stimulus, canvasOrigin) {
-  var url = '/api/stimuli/check_shareability';
-  var requestBody = JSON.stringify({
-    stimulus: updateStimulusParams(stimulus),
-    source_origin: canvasOrigin
-  });
-  var fetcher = new _Fetcher.default({
-    onError: function onError() {}
-  });
-  return fetcher.post(url, {
-    body: requestBody
-  });
 }

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

@@ -154,6 +154,7 @@ var QuizEntryEditFooter = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.de
   }, {
     key: "renderPointsSection",
     value: function renderPointsSection() {
+      var currentPointsValue = this.state.points;
       return (0, _emotion.jsx)("div", {
         css: this.props.styles.pointsSection
       }, (0, _emotion.jsx)("span", {
@@ -162,9 +163,10 @@ var QuizEntryEditFooter = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.de
         renderLabel: (0, _emotion.jsx)(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('Points Possible Input')),
         onChange: this.handlePointsChange,
         onBlur: this.handlePointsBlur,
-        value: this.state.points,
+        value: currentPointsValue,
         disabled: this.pointsDisabled(),
-        "data-automation": "sdk-points-possible-numberinput"
+        "data-automation": "sdk-points-possible-numberinput",
+        "aria-valuetext": "".concat(currentPointsValue, " ").concat((0, _formatMessage.default)('Points'))
       })), (0, _emotion.jsx)(_uiView.View, {
         margin: "none none none x-small"
       }, (0, _emotion.jsx)(_uiText.Text, {

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

@@ -333,7 +333,6 @@ var QuizEntryEdit = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default,
         onContinue: this.handleAddToBankContinue,
         onAdd: this.handleAddToBank,
         getEntry: this.getEntryForBank,
-        workingEntry: this.props.workingEntry,
         entryId: this.props.guid,
         entryType: this.props.quizEntry.entryType,
         quizId: this.props.quizId,

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

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

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

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

package/lib/common/components/resources/entry/EntrySave/index.js

@@ -7,21 +7,16 @@ Object.defineProperty(exports, "__esModule", {
 exports.mapStateToProps = mapStateToProps;
 exports.default = void 0;
 var _reactRedux = require("../../../../react-redux.js");
-var _items = require("../../../../../building/api/items.js");
-var _stimuli = require("../../../../../building/api/stimuli.js");
 var _makeEditable = _interopRequireDefault(require("../../../shared/functionality/makeEditable.js"));
 var _errorsShowing = require("../../../../actions/errorsShowing.js");
 var _alerts = require("../../../../actions/alerts.js");
 var _modifications = require("../../../../actions/modifications.js");
-var _modal = require("../../../../actions/modal.js");
 var _presenter = _interopRequireDefault(require("./presenter.js"));
 function mapStateToProps(state, props) {
   // Error Related:
   var workingEntry = props.entry.getWorkingInstance();
   var isValid = props.isValid !== void 0 ? props.isValid : workingEntry.isValid();
   return {
-    canvasOrigin: state.getIn(['config', 'canvasOrigin']),
-    checkContentShareability: props.entry.isStimulus ? _stimuli.checkStimulusShareability : _items.checkItemShareability,
     isValid: isValid
   };
 }
@@ -29,8 +24,7 @@ var mapDispatchToProps = {
   clearNextQuizEntry: _modifications.clearNextQuizEntry,
   hideError: _errorsShowing.hideError,
   screenreaderNotification: _alerts.screenreaderNotification,
-  showError: _errorsShowing.showError,
-  withConfirm: _modal.withConfirm
+  showError: _errorsShowing.showError
 };
 var _default = (0, _makeEditable.default)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_presenter.default));
 exports.default = _default;

package/lib/common/components/resources/entry/EntrySave/presenter.js

@@ -14,7 +14,6 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/createSuper"));
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _reactImmutableProptypes = _interopRequireDefault(require("react-immutable-proptypes"));
 var _reactDom = _interopRequireDefault(require("react-dom"));
 var _uiButtons = require("@instructure/ui-buttons");
 var _uiView = require("@instructure/ui-view");
@@ -41,91 +40,36 @@ var EntrySave = /*#__PURE__*/function (_Component) {
       });
       _this.props.screenreaderNotification(msg);
     };
-    _this.confirmShareableContent = function () {
-      var _this$props = _this.props,
-        canvasOrigin = _this$props.canvasOrigin,
-        checkContentShareability = _this$props.checkContentShareability,
-        entry = _this$props.entry,
-        withConfirm = _this$props.withConfirm;
-      _this.setState({
-        canSubmit: false
-      });
-      checkContentShareability(entry.getWorkingInstance(), canvasOrigin).then(function () {
-        _this.successfulSubmit();
-      }).catch(/*#__PURE__*/function () {
-        var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(err) {
-          var _err$response, _err$response2;
-          var body, text;
-          return _regenerator.default.wrap(function _callee$(_context) {
-            while (1) {
-              switch (_context.prev = _context.next) {
-                case 0:
-                  _context.next = 2;
-                  return (_err$response = err.response) === null || _err$response === void 0 ? void 0 : _err$response.json();
-                case 2:
-                  body = _context.sent;
-                  text = (0, _formatMessage.default)('There was an error attempting to validate shareability.');
-                  if (((_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : _err$response2.status) === 400 && body.shareable === false) {
-                    text = (0, _formatMessage.default)('You are attempting to save content containing course links which may not work when used in other courses.');
-                  }
-                  withConfirm(function () {
-                    _this.successfulSubmit();
-                  }, {
-                    title: (0, _formatMessage.default)('Are you sure?'),
-                    text: text,
-                    continueText: (0, _formatMessage.default)('Save anyway'),
-                    onCancel: function onCancel() {
-                      _this.setState({
-                        canSubmit: true
-                      });
-                    }
-                  });
-                case 6:
-                case "end":
-                  return _context.stop();
-              }
-            }
-          }, _callee);
-        }));
-        return function (_x) {
-          return _ref.apply(this, arguments);
-        };
-      }());
-    };
     _this.onSubmit = /*#__PURE__*/function () {
-      var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2(e) {
-        return _regenerator.default.wrap(function _callee2$(_context2) {
+      var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(e) {
+        return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
-            switch (_context2.prev = _context2.next) {
+            switch (_context.prev = _context.next) {
               case 0:
                 e.preventDefault();
                 if (!_this.props.isValid) {
-                  _context2.next = 5;
+                  _context.next = 5;
                   break;
                 }
-                if (_this.props.shouldValidateShareableContent) {
-                  _this.confirmShareableContent();
-                } else {
-                  _this.successfulSubmit();
-                }
-                _context2.next = 10;
+                _this.successfulSubmit();
+                _context.next = 10;
                 break;
               case 5:
                 _this.createScreenReaderNotification();
-                _context2.next = 8;
+                _context.next = 8;
                 return _this.props.showError(_this.props.guid);
               case 8:
                 _this.props.clearNextQuizEntry();
                 _this.focusFirstErrorField();
               case 10:
               case "end":
-                return _context2.stop();
+                return _context.stop();
             }
           }
-        }, _callee2);
+        }, _callee);
       }));
-      return function (_x2) {
-        return _ref2.apply(this, arguments);
+      return function (_x) {
+        return _ref.apply(this, arguments);
       };
     }();
     _this.focusFirstErrorField = function () {
@@ -163,46 +107,46 @@ var EntrySave = /*#__PURE__*/function (_Component) {
   }, {
     key: "successfulSubmit",
     value: function () {
-      var _successfulSubmit = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee3() {
+      var _successfulSubmit = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2() {
         var validationResult;
-        return _regenerator.default.wrap(function _callee3$(_context3) {
+        return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
-            switch (_context3.prev = _context3.next) {
+            switch (_context2.prev = _context2.next) {
               case 0:
                 this.setState({
                   canSubmit: false
                 });
-                _context3.prev = 1;
-                _context3.next = 4;
+                _context2.prev = 1;
+                _context2.next = 4;
                 return this.props.submitHandler();
               case 4:
-                validationResult = _context3.sent;
+                validationResult = _context2.sent;
                 if (!(validationResult === _quizCommon.API_INPUT_VALIDATION_ERROR)) {
-                  _context3.next = 8;
+                  _context2.next = 8;
                   break;
                 }
                 this.createScreenReaderNotification();
                 throw new Error('User input validation error received from API.');
               case 8:
-                _context3.next = 14;
+                _context2.next = 14;
                 break;
               case 10:
-                _context3.prev = 10;
-                _context3.t0 = _context3["catch"](1);
+                _context2.prev = 10;
+                _context2.t0 = _context2["catch"](1);
                 this.setState({
                   canSubmit: true
                 });
-                return _context3.abrupt("return");
+                return _context2.abrupt("return");
               case 14:
                 this.props.switchOffEditing();
                 this.props.hideError(this.props.guid);
                 this.props.screenreaderNotification((0, _formatMessage.default)('Changes to question saved.'));
               case 17:
               case "end":
-                return _context3.stop();
+                return _context2.stop();
             }
           }
-        }, _callee3, this, [[1, 10]]);
+        }, _callee2, this, [[1, 10]]);
       }));
       function successfulSubmit() {
         return _successfulSubmit.apply(this, arguments);
@@ -236,14 +180,11 @@ var EntrySave = /*#__PURE__*/function (_Component) {
 exports.EntrySave = EntrySave;
 EntrySave.propTypes = {
   cancelHandler: _propTypes.default.func,
-  canvasOrigin: _propTypes.default.string,
-  checkContentShareability: _propTypes.default.func.isRequired,
   clearChanges: _propTypes.default.func.isRequired,
   // From connected component
   clearNextQuizEntry: _propTypes.default.func.isRequired,
   disableSubmit: _propTypes.default.bool,
   displayPosition: _propTypes.default.number,
-  entry: _reactImmutableProptypes.default.record.isRequired,
   guid: _propTypes.default.string,
   hideError: _propTypes.default.func.isRequired,
   initialFocusId: _propTypes.default.string,
@@ -251,22 +192,18 @@ EntrySave.propTypes = {
   itemEditArea: _propTypes.default.object,
   showError: _propTypes.default.func.isRequired,
   screenreaderNotification: _propTypes.default.func.isRequired,
-  shouldValidateShareableContent: _propTypes.default.bool,
   submitHandler: _propTypes.default.func.isRequired,
   // from makescrollable / from props being passed in occasionally
   switchOnEditing: _propTypes.default.func.isRequired,
-  switchOffEditing: _propTypes.default.func.isRequired,
-  withConfirm: _propTypes.default.func.isRequired
+  switchOffEditing: _propTypes.default.func.isRequired
 };
 EntrySave.defaultProps = {
   cancelHandler: _noop.default,
-  canvasOrigin: '',
-  displayPosition: null,
   disableSubmit: false,
+  displayPosition: null,
   guid: null,
   initialFocusId: null,
-  itemEditArea: null,
-  shouldValidateShareableContent: false
+  itemEditArea: null
 };
 var _default = EntrySave;
 exports.default = _default;

package/lib/common/components/resources/quiz/instructions/styles.js

@@ -16,6 +16,15 @@ var generateStyle = function generateStyle(componentTheme) {
         clear: 'both',
         content: '""',
         display: 'table'
+      },
+      '.user_content p': {
+        margin: componentTheme.userContentMargin,
+        '&:first-of-type': {
+          marginTop: componentTheme.userContentZeroMargin
+        },
+        '&:last-child': {
+          marginBottom: componentTheme.userContentMargin
+        }
       }
     },
     text: {

package/lib/common/components/resources/quiz/instructions/theme.js

@@ -9,7 +9,9 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
     typography = _ref.typography;
   return {
     wrapperPadding: spacing.large,
-    textFontSize: typography.fontSizeMedium
+    textFontSize: typography.fontSizeMedium,
+    userContentMargin: spacing.mediumSmall,
+    userContentZeroMargin: 0
   };
 };
 var _default = generateComponentTheme;

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

@@ -317,7 +317,6 @@ var StimulusEdit = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default,
         onAdd: this.handleAddToBank,
         onContinue: this.handleAddToBankContinue,
         getEntry: this.getEntryForBank,
-        workingEntry: this.props.workingStimulus,
         quizId: this.props.quizId,
         entryId: this.props.guid,
         entryType: this.props.quizEntry.entryType