@instructure/quiz-core 20.6.1-rc.0 → 20.6.1-rc.2

package/es/building/components/resources/ItemFeedbackModal/index.js

@@ -1,7 +1,7 @@
 import { Map } from 'immutable';
 import { connect } from "../../../../common/react-redux.js";
 import { ItemFeedbackModal as ItemFeedbackModalPresenter } from "./presenter.js";
-import { closeModal, openModal } from "../../../../common/actions/modal.js";
+import { closeModal } from "../../../../common/actions/modal.js";
 import { changeItemFeedback } from "../../../../common/actions/modifications.js";
 import Item from "../../../../common/records/Item.js";
 import { set } from "../../../../common/actions/ui.js";
@@ -25,7 +25,6 @@ function mapStateToProps(state, props) {
 var mapDispatchToProps = {
   closeModal: closeModal,
   changeItemFeedback: changeItemFeedback,
-  openModal: openModal,
   setUi: set
 };
 export var ItemFeedbackModal = connect(mapStateToProps, mapDispatchToProps)(ItemFeedbackModalPresenter);

package/es/building/components/resources/ItemFeedbackModal/presenter.js

@@ -11,10 +11,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import { Button, CloseButton } from '@instructure/ui-buttons';
 import { Heading } from '@instructure/ui-heading';
 import { themeable } from '@instructure/ui-themeable';
-import { RichContentRenderer, RCE_THREE_LINES_HEIGHT } from '@instructure/quiz-rce';
-import { RichContentInput } from "../../../../common/components/RichContentInput/index.js";
+import { RichContentRenderer, RichContentInput, RCE_THREE_LINES_HEIGHT } from '@instructure/quiz-rce';
 import t from '@instructure/quiz-i18n/es/format-message';
-import { Modal, ModalHeader, ModalBody, ModalFooter, ITEM_FEEDBACK_MODAL, ITEM_FEEDBACK_MODAL_FEEDBACK, XSMALL_SIDE_MARGIN } from '@instructure/quiz-common';
+import { Modal, ModalHeader, ModalBody, ModalFooter, ITEM_FEEDBACK_MODAL_FEEDBACK, XSMALL_SIDE_MARGIN } from '@instructure/quiz-common';
 var styles = {
   componentId: 'esPWW',
   template: function template(theme) {
@@ -67,12 +66,6 @@ export var ItemFeedbackModal = (_dec = themeable(theme, styles), _dec(_class = (
       _this.props.closeModal();
     };
 
-    _this.returnToFeedback = function () {
-      _this.props.openModal(ITEM_FEEDBACK_MODAL, {
-        modalTrigger: _this.props.modalTrigger
-      });
-    };
-
     return _this;
   }
 
@@ -104,9 +97,6 @@ export var ItemFeedbackModal = (_dec = themeable(theme, styles), _dec(_class = (
         textareaId: key,
         defaultContent: this.props.feedback.get(key),
         onChange: this.onFeedbackWrapper(key),
-        parentType: this.props.parentType,
-        parentId: this.props.parentId,
-        importModalCloseOverride: this.returnToFeedback,
         height: RCE_THREE_LINES_HEIGHT
       }));
     }
@@ -150,9 +140,6 @@ export var ItemFeedbackModal = (_dec = themeable(theme, styles), _dec(_class = (
   importModalOpen: PropTypes.bool.isRequired,
   item: ImmutablePropTypes.record.isRequired,
   modalOpen: PropTypes.bool.isRequired,
-  openModal: PropTypes.func.isRequired,
-  parentId: PropTypes.string.isRequired,
-  parentType: PropTypes.string.isRequired,
   setUi: PropTypes.func.isRequired,
   modalTrigger: PropTypes.instanceOf(Component)
 }, _class2.defaultProps = {

package/es/building/components/resources/quiz/instructions/Edit/presenter.js

@@ -10,11 +10,11 @@ import PropTypes from 'prop-types';
 import { Button } from '@instructure/ui-buttons';
 import { themeable } from '@instructure/ui-themeable';
 import t from '@instructure/quiz-i18n/es/format-message';
-import RichContentInput from "../../../../../../common/components/RichContentInput/index.js";
 import wrapWithOutsideClick from "../../../../../../common/components/shared/functionality/componentWithOutsideClick.js";
 import CustomPropTypes from "../../../../../../common/util/CustomPropTypes.js";
 import elementsForSelectors from "../../../../../../common/util/ElementsForSelectors.js";
-import { PARENT_TYPE_QUIZ, INSTRUCTIONS_EDIT_ID } from '@instructure/quiz-common';
+import { INSTRUCTIONS_EDIT_ID } from '@instructure/quiz-common';
+import { RichContentInput } from '@instructure/quiz-rce';
 var styles = {
   componentId: 'evnrd',
   template: function template(theme) {
@@ -67,9 +67,7 @@ var QuizInstructionsEdit = (_dec = themeable(theme, styles), _dec(_class = (_tem
         textareaClassName: styles.instructionsEditInput,
         defaultContent: this.props.inputValue,
         onKeyUp: this.props.onInputChange,
-        onChange: this.props.onInputChange,
-        parentType: PARENT_TYPE_QUIZ,
-        parentId: this.props.quizId
+        onChange: this.props.onInputChange
       }), /*#__PURE__*/React.createElement("div", {
         className: styles.footer
       }, /*#__PURE__*/React.createElement(Button, {
@@ -89,7 +87,6 @@ var QuizInstructionsEdit = (_dec = themeable(theme, styles), _dec(_class = (_tem
   endEditing: PropTypes.func.isRequired,
   inputValue: PropTypes.string.isRequired,
   onInputChange: PropTypes.func.isRequired,
-  quizId: PropTypes.string.isRequired,
   saveAndPreview: PropTypes.func.isRequired,
   appContainer: CustomPropTypes.selectors.isRequired
 }, _temp)) || _class);

package/es/building/components/resources/quiz/instructions/Instructions/presenter.js

@@ -149,8 +149,7 @@ export var QuizInstructions = (_dec = themeable(theme, styles), _dec(_class = (_
         inputValue: this.workingInstructions(),
         onInputChange: this.updateWorkingInstructions,
         ref: this.setRef('instructionsEdit'),
-        saveAndPreview: this.saveAndPreview,
-        quizId: this.props.quiz.id
+        saveAndPreview: this.saveAndPreview
       });
     }
   }, {

package/es/common/components/resources/item/ItemEdit/presenter.js

@@ -14,7 +14,6 @@ import componentForItem from "../../../../util/componentForItem.js";
 import { liveRegion, COMPONENT_EDIT } from '@instructure/quiz-common';
 import t from '@instructure/quiz-i18n/es/format-message';
 import { propsForInteractionEdit } from "../../../../util/interactionTypePropsHelper.js";
-import RceImageImportModal from "../../../../components/RichContentInput/RceImageImportModal/index.js";
 import elementsForSelectors from "../../../../../common/util/ElementsForSelectors.js";
 import { toErrors } from "../../../../util/instUIMessages.js";
 export var ItemEdit = /*#__PURE__*/function (_Component) {
@@ -63,16 +62,6 @@ export var ItemEdit = /*#__PURE__*/function (_Component) {
       }
     };
 
-    _this.renderImportModal = function (importModalId, onSuccess, onClose) {
-      return /*#__PURE__*/React.createElement(RceImageImportModal, {
-        importModalId: importModalId,
-        onClose: onClose,
-        onSuccess: onSuccess,
-        parentId: _this.props.parentId,
-        parentType: _this.props.parentType
-      });
-    };
-
     return _this;
   }
 
@@ -136,8 +125,7 @@ export var ItemEdit = /*#__PURE__*/function (_Component) {
         name: "edit_item_".concat(this.props.guid) // eslint-disable-line react/jsx-no-literals
 
       }, /*#__PURE__*/React.createElement(Interaction, Object.assign({}, propsForInteraction, {
-        itemId: this.props.guid,
-        renderImportModal: this.renderImportModal
+        itemId: this.props.guid
       })));
     }
   }]);
@@ -169,7 +157,6 @@ ItemEdit.propTypes = {
   handleQuizEntryPointsChange: PropTypes.func.isRequired,
   interactionFileUpload: PropTypes.func.isRequired,
   oneQuestionAtATime: PropTypes.bool.isRequired,
-  openImportModal: PropTypes.func.isRequired,
   parentId: PropTypes.string.isRequired,
   parentType: PropTypes.string.isRequired,
   partialDeepScoringEnabled: PropTypes.bool,

package/es/common/util/interactionTypePropsHelper.js

@@ -1,4 +1,4 @@
-import RichContentInput from "../components/RichContentInput/index.js";
+import { RichContentInput } from '@instructure/quiz-rce';
 import t from '@instructure/quiz-i18n/es/format-message';
 export var propsForInteractionEdit = function propsForInteractionEdit(props, additionalOptions) {
   var item = props.workingItem.toJS();

package/es/index.js

@@ -23,7 +23,6 @@ export { QuizzesSpinner } from "./common/components/shared/spinner/Spinner.js";
 export { PrintTrigger } from "./common/components/shared/PrintTrigger/index.js";
 export { IfFeature } from "./common/components/shared/IfFeature/index.js";
 export { UndecoratedQuizEntryEdit } from "./building/components/resources/quizEntry/QuizEntryEdit/presenter.js";
-export { RichContentInput } from "./common/components/RichContentInput/index.js";
 export { ResultStimulus } from "./common/components/resources/sessionItemResult/ResultStimulus/index.js";
 export { Stimulus as StimulusView } from "./common/components/layout/sidebar/Stimulus/index.js";
 export { Sidebar } from "./common/components/layout/sidebar/Sidebar/index.js";
@@ -42,7 +41,6 @@ export { CentileDistribution } from "./reporting/components/charts/Distribution/
 export { OutcomeAnalysis } from "./reporting/components/resources/OutcomeAnalysis/index.js";
 export { PositionBox } from "./common/components/resources/positionBox/PositionBox.js";
 export { Pin } from "./common/components/Pin/index.js";
-export { RceImageImportModal } from "./common/components/RichContentInput/RceImageImportModal/index.js";
 export { SessionItemResult as SessionItemResultView } from "./common/components/resources/sessionItemResult/SessionItemResult/index.js";
 export { Card } from "./common/components/shared/Card/index.js";
 export { CardContent } from "./common/components/shared/Card/CardContent/index.js";

package/lib/building/components/resources/ItemFeedbackModal/index.js

@@ -43,7 +43,6 @@ function mapStateToProps(state, props) {
 var mapDispatchToProps = {
   closeModal: _modal.closeModal,
   changeItemFeedback: _modifications.changeItemFeedback,
-  openModal: _modal.openModal,
   setUi: _ui.set
 };
 var ItemFeedbackModal = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_presenter.ItemFeedbackModal);

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

@@ -31,8 +31,6 @@ var _uiThemeable = require("@instructure/ui-themeable");
 
 var _quizRce = require("@instructure/quiz-rce");
 
-var _index = require("../../../../common/components/RichContentInput/index.js");
-
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 
 var _quizCommon = require("@instructure/quiz-common");
@@ -92,12 +90,6 @@ var ItemFeedbackModal = (_dec = (0, _uiThemeable.themeable)(_theme.default, styl
       _this.props.closeModal();
     };
 
-    _this.returnToFeedback = function () {
-      _this.props.openModal(_quizCommon.ITEM_FEEDBACK_MODAL, {
-        modalTrigger: _this.props.modalTrigger
-      });
-    };
-
     return _this;
   }
 
@@ -124,14 +116,11 @@ var ItemFeedbackModal = (_dec = (0, _uiThemeable.themeable)(_theme.default, styl
       return /*#__PURE__*/_react.default.createElement("div", null, _ref, /*#__PURE__*/_react.default.createElement("label", {
         className: styles.feedbackLabel,
         htmlFor: key
-      }, label), /*#__PURE__*/_react.default.createElement(_index.RichContentInput, {
+      }, label), /*#__PURE__*/_react.default.createElement(_quizRce.RichContentInput, {
         label: "",
         textareaId: key,
         defaultContent: this.props.feedback.get(key),
         onChange: this.onFeedbackWrapper(key),
-        parentType: this.props.parentType,
-        parentId: this.props.parentId,
-        importModalCloseOverride: this.returnToFeedback,
         height: _quizRce.RCE_THREE_LINES_HEIGHT
       }));
     }
@@ -174,9 +163,6 @@ var ItemFeedbackModal = (_dec = (0, _uiThemeable.themeable)(_theme.default, styl
   importModalOpen: _propTypes.default.bool.isRequired,
   item: _reactImmutableProptypes.default.record.isRequired,
   modalOpen: _propTypes.default.bool.isRequired,
-  openModal: _propTypes.default.func.isRequired,
-  parentId: _propTypes.default.string.isRequired,
-  parentType: _propTypes.default.string.isRequired,
   setUi: _propTypes.default.func.isRequired,
   modalTrigger: _propTypes.default.instanceOf(_react.Component)
 }, _class2.defaultProps = {

package/lib/building/components/resources/quiz/instructions/Edit/presenter.js

@@ -27,8 +27,6 @@ var _uiThemeable = require("@instructure/ui-themeable");
 
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 
-var _index = _interopRequireDefault(require("../../../../../../common/components/RichContentInput/index.js"));
-
 var _componentWithOutsideClick = _interopRequireDefault(require("../../../../../../common/components/shared/functionality/componentWithOutsideClick.js"));
 
 var _CustomPropTypes = _interopRequireDefault(require("../../../../../../common/util/CustomPropTypes.js"));
@@ -37,6 +35,8 @@ var _ElementsForSelectors = _interopRequireDefault(require("../../../../../../co
 
 var _quizCommon = require("@instructure/quiz-common");
 
+var _quizRce = require("@instructure/quiz-rce");
+
 var _theme = _interopRequireDefault(require("./theme.js"));
 
 var _dec, _class, _class2, _temp;
@@ -84,16 +84,14 @@ var QuizInstructionsEdit = (_dec = (0, _uiThemeable.themeable)(_theme.default, s
     value: function render() {
       return /*#__PURE__*/_react.default.createElement("div", {
         className: styles.instructionsEditWrapper
-      }, /*#__PURE__*/_react.default.createElement(_index.default, {
+      }, /*#__PURE__*/_react.default.createElement(_quizRce.RichContentInput, {
         label: "",
         textareaId: _quizCommon.INSTRUCTIONS_EDIT_ID,
         wrapperClassName: styles.instructionsEdit,
         textareaClassName: styles.instructionsEditInput,
         defaultContent: this.props.inputValue,
         onKeyUp: this.props.onInputChange,
-        onChange: this.props.onInputChange,
-        parentType: _quizCommon.PARENT_TYPE_QUIZ,
-        parentId: this.props.quizId
+        onChange: this.props.onInputChange
       }), /*#__PURE__*/_react.default.createElement("div", {
         className: styles.footer
       }, /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {
@@ -112,7 +110,6 @@ var QuizInstructionsEdit = (_dec = (0, _uiThemeable.themeable)(_theme.default, s
   endEditing: _propTypes.default.func.isRequired,
   inputValue: _propTypes.default.string.isRequired,
   onInputChange: _propTypes.default.func.isRequired,
-  quizId: _propTypes.default.string.isRequired,
   saveAndPreview: _propTypes.default.func.isRequired,
   appContainer: _CustomPropTypes.default.selectors.isRequired
 }, _temp)) || _class);

package/lib/building/components/resources/quiz/instructions/Instructions/presenter.js

@@ -173,8 +173,7 @@ var QuizInstructions = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
         inputValue: this.workingInstructions(),
         onInputChange: this.updateWorkingInstructions,
         ref: this.setRef('instructionsEdit'),
-        saveAndPreview: this.saveAndPreview,
-        quizId: this.props.quiz.id
+        saveAndPreview: this.saveAndPreview
       });
     }
   }, {

package/lib/common/components/resources/item/ItemEdit/presenter.js

@@ -41,8 +41,6 @@ var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/f
 
 var _interactionTypePropsHelper = require("../../../../util/interactionTypePropsHelper.js");
 
-var _index = _interopRequireDefault(require("../../../../components/RichContentInput/RceImageImportModal/index.js"));
-
 var _ElementsForSelectors = _interopRequireDefault(require("../../../../../common/util/ElementsForSelectors.js"));
 
 var _instUIMessages = require("../../../../util/instUIMessages.js");
@@ -93,16 +91,6 @@ var ItemEdit = /*#__PURE__*/function (_Component) {
       }
     };
 
-    _this.renderImportModal = function (importModalId, onSuccess, onClose) {
-      return /*#__PURE__*/_react.default.createElement(_index.default, {
-        importModalId: importModalId,
-        onClose: onClose,
-        onSuccess: onSuccess,
-        parentId: _this.props.parentId,
-        parentType: _this.props.parentType
-      });
-    };
-
     return _this;
   }
 
@@ -166,8 +154,7 @@ var ItemEdit = /*#__PURE__*/function (_Component) {
         name: "edit_item_".concat(this.props.guid) // eslint-disable-line react/jsx-no-literals
 
       }, /*#__PURE__*/_react.default.createElement(Interaction, Object.assign({}, propsForInteraction, {
-        itemId: this.props.guid,
-        renderImportModal: this.renderImportModal
+        itemId: this.props.guid
       })));
     }
   }]);
@@ -200,7 +187,6 @@ ItemEdit.propTypes = {
   handleQuizEntryPointsChange: _propTypes.default.func.isRequired,
   interactionFileUpload: _propTypes.default.func.isRequired,
   oneQuestionAtATime: _propTypes.default.bool.isRequired,
-  openImportModal: _propTypes.default.func.isRequired,
   parentId: _propTypes.default.string.isRequired,
   parentType: _propTypes.default.string.isRequired,
   partialDeepScoringEnabled: _propTypes.default.bool,

package/lib/common/util/interactionTypePropsHelper.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.propsForInteractionShow = exports.propsForInteractionEdit = void 0;
 
-var _index = _interopRequireDefault(require("../components/RichContentInput/index.js"));
+var _quizRce = require("@instructure/quiz-rce");
 
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 
@@ -73,7 +73,7 @@ var propsForInteractionEdit = function propsForInteractionEdit(props, additional
     override: props.override,
     overrideEditableForItem: props.overrideEditableForItem,
     overrideEditableForRegrading: props.overrideEditableForRegrading,
-    richContentEditor: _index.default,
+    richContentEditor: _quizRce.RichContentInput,
     scoringAlgorithm: item.scoringAlgorithm,
     scoringData: item.scoringData,
     setOneQuestionAtATime: setOneQuestionAtATime,