@instructure/quiz-core 17.22.1 → 17.23.0

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [17.23.0](https://gerrit.instructure.com/quizzes-ui/compare/v17.22.1...v17.23.0) (2022-01-25)
+
+
+### Bug Fixes
+
+* **PrintTrigger:** Fix Firefox print preview issues ([e111d87](https://gerrit.instructure.com/quizzes-ui/commits/e111d87ac50f9213db4232c74b1f3c638b0494e7))
+
+
+### Features
+
+* **quizzes-ui:** Reintroduce TinyMCE v5 to load based on a feature flag ([0021bba](https://gerrit.instructure.com/quizzes-ui/commits/0021bbab61162ff6f16f1ba58a910a1cdd28b72b))
+
+
+
+
+
 ## [17.22.1](https://gerrit.instructure.com/quizzes-ui/compare/v17.22.0...v17.22.1) (2022-01-12)
 
 

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

@@ -12,6 +12,7 @@ import { Button, CloseButton } from '@instructure/ui-buttons';
 import { Heading } from '@instructure/ui-heading';
 import { themeable } from '@instructure/ui-themeable';
 import { RichContentRenderer } from '@instructure/quiz-rce';
+import { isNewRCEEnabled } from "../../../../common/util/rceChecker.js";
 import RichContentInput from "../../../../common/components/RichContentInput/index.js";
 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';
@@ -103,7 +104,8 @@ export var ItemFeedbackModal = (_dec = themeable(theme, styles), _dec(_class = (
         onChange: this.onFeedbackChange,
         parentType: this.props.parentType,
         parentId: this.props.parentId,
-        importModalCloseOverride: this.returnToFeedback
+        importModalCloseOverride: this.returnToFeedback,
+        useNewRce: isNewRCEEnabled()
       }));
     }
   }, {

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

@@ -11,6 +11,7 @@ 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 { isNewRCEEnabled } from "../../../../../../common/util/rceChecker.js";
 import wrapWithOutsideClick from "../../../../../../common/components/shared/functionality/componentWithOutsideClick.js";
 import CustomPropTypes from "../../../../../../common/util/CustomPropTypes.js";
 import elementsForSelectors from "../../../../../../common/util/ElementsForSelectors.js";
@@ -88,7 +89,8 @@ var QuizInstructionsEdit = (_dec = themeable(theme, styles), _dec(_class = (_tem
         onKeyUp: this.props.onInputChange,
         onChange: this.props.onInputChange,
         parentType: PARENT_TYPE_QUIZ,
-        parentId: this.props.quizId
+        parentId: this.props.quizId,
+        useNewRce: isNewRCEEnabled()
       }), /*#__PURE__*/React.createElement("div", {
         className: styles.footer
       }, /*#__PURE__*/React.createElement(Button, {

package/es/building/components/resources/quizEntry/QuizEntryShow/presenter.js

@@ -22,23 +22,23 @@ import { ItemTypes, dragSource, collectDrag } from "../../../../../common/compon
 import PositionBox from "../../../../../common/components/resources/positionBox/PositionBox.js";
 import DragAndDropZone from "../../../../../common/components/shared/drag_and_drop/DragAndDropZone/index.js";
 var styles = {
-  componentId: 'fohHO',
+  componentId: 'cjiDL',
   template: function template(theme) {
-    return "\n\n.fohHO_eLmg{transform:translateZ(0)}\n\n.fohHO_TMNr{background-color:".concat(theme.quizEntryShowBackgroundColor || 'inherit', ";padding:").concat(theme.quizEntryShowPadding || 'inherit', "}\n\n.fohHO_fsuY{align-items:stretch;display:flex;flex-direction:row;flex-wrap:nowrap;height:").concat(theme.headerHeight || 'inherit', ";padding-right:").concat(theme.headerRightPadding || 'inherit', "}\n\n.fohHO_bscQ{border:").concat(theme.dndBorder || 'inherit', "}\n\n.fohHO_cKlw{align-items:center;display:inline-flex;flex:8 0 0;overflow:hidden}\n\n.fohHO_eGWt{border-bottom:").concat(theme.phoneConnectingLinesBorderWidth || 'inherit', " dotted;border-color:").concat(theme.phoneConnectingLinesBorderColor || 'inherit', ";border-left:").concat(theme.phoneConnectingLinesBorderWidth || 'inherit', " dotted;height:2rem;margin-right:1.2rem;margin-top:-0.8rem;width:1.2rem}\n\n.fohHO_eGWt,.fohHO_IoDT{display:inline-flex;flex:0 0 auto}\n\n.fohHO_IoDT{color:").concat(theme.rightHeaderColor || 'inherit', ";text-align:right;z-index:").concat(theme.rightHeaderZIndex || 'inherit', "}\n\n[dir=ltr] .fohHO_IoDT,[dir=rtl] .fohHO_IoDT{text-align:right}\n\n.fohHO_IoDT button{background-color:transparent;background-color:initial}\n\n.fohHO_eCZW,.fohHO_cwte,.fohHO_nvdO{color:").concat(theme.titleInteractionTypeNamePointsColor || 'inherit', ";font-size:").concat(theme.titleInteractionTypeNamePointsFontSize || 'inherit', ";margin-left:").concat(theme.titleInteractionTypeNamePointsLeftMargin || 'inherit', ";margin-right:").concat(theme.titleInteractionTypeNamePointsRightMargin || 'inherit', ";overflow:hidden;text-overflow:ellipsis;white-space:nowrap}\n\n.fohHO_csjx{margin:").concat(theme.itemHolderMargin || 'inherit', "}\n\n.fohHO_fPOQ,.fohHO_gaTA{background-color:transparent;border:none;color:inherit;font-size:").concat(theme.optionsButtonDragDropHandleFontSize || 'inherit', ";margin:").concat(theme.optionsButtonDragDropHandleMargin || 'inherit', "}\n\n.fohHO_gaTA{cursor:pointer}\n\n@media print{.fohHO_eLmg{page-break-inside:avoid}}");
+    return "\n\n.cjiDL_eLmg{transform:translateZ(0)}\n\n.cjiDL_TMNr{background-color:".concat(theme.quizEntryShowBackgroundColor || 'inherit', ";padding:").concat(theme.quizEntryShowPadding || 'inherit', "}\n\n.cjiDL_fsuY{align-items:stretch;display:flex;flex-direction:row;flex-wrap:nowrap;height:").concat(theme.headerHeight || 'inherit', ";padding-right:").concat(theme.headerRightPadding || 'inherit', "}\n\n.cjiDL_bscQ{border:").concat(theme.dndBorder || 'inherit', "}\n\n.cjiDL_cKlw{align-items:center;display:inline-flex;flex:8 0 0;overflow:hidden}\n\n.cjiDL_eGWt{border-bottom:").concat(theme.phoneConnectingLinesBorderWidth || 'inherit', " dotted;border-color:").concat(theme.phoneConnectingLinesBorderColor || 'inherit', ";border-left:").concat(theme.phoneConnectingLinesBorderWidth || 'inherit', " dotted;height:2rem;margin-right:1.2rem;margin-top:-0.8rem;width:1.2rem}\n\n.cjiDL_eGWt,.cjiDL_IoDT{display:inline-flex;flex:0 0 auto}\n\n.cjiDL_IoDT{color:").concat(theme.rightHeaderColor || 'inherit', ";text-align:right;z-index:").concat(theme.rightHeaderZIndex || 'inherit', "}\n\n[dir=ltr] .cjiDL_IoDT,[dir=rtl] .cjiDL_IoDT{text-align:right}\n\n.cjiDL_IoDT button{background-color:transparent;background-color:initial}\n\n.cjiDL_eCZW,.cjiDL_cwte,.cjiDL_nvdO{color:").concat(theme.titleInteractionTypeNamePointsColor || 'inherit', ";font-size:").concat(theme.titleInteractionTypeNamePointsFontSize || 'inherit', ";margin-left:").concat(theme.titleInteractionTypeNamePointsLeftMargin || 'inherit', ";margin-right:").concat(theme.titleInteractionTypeNamePointsRightMargin || 'inherit', ";overflow:hidden;text-overflow:ellipsis;white-space:nowrap}\n\n.cjiDL_csjx{margin:").concat(theme.itemHolderMargin || 'inherit', "}\n\n.cjiDL_fPOQ,.cjiDL_gaTA{background-color:transparent;border:none;color:inherit;font-size:").concat(theme.optionsButtonDragDropHandleFontSize || 'inherit', ";margin:").concat(theme.optionsButtonDragDropHandleMargin || 'inherit', "}\n\n.cjiDL_gaTA{cursor:pointer}\n\n@media print{.cjiDL_eLmg{break-inside:avoid}}");
   },
-  'quizEntryWrapper': 'fohHO_eLmg',
-  'quizEntryShow': 'fohHO_TMNr',
-  'header': 'fohHO_fsuY',
-  'dndBorder': 'fohHO_bscQ',
-  'leftHeader': 'fohHO_cKlw',
-  'connectingLines': 'fohHO_eGWt',
-  'rightHeader': 'fohHO_IoDT',
-  'interactionTypeName': 'fohHO_eCZW',
-  'points': 'fohHO_cwte',
-  'title': 'fohHO_nvdO',
-  'itemHolder': 'fohHO_csjx',
-  'dragAndDropHandle': 'fohHO_fPOQ',
-  'optionsButton': 'fohHO_gaTA'
+  'quizEntryWrapper': 'cjiDL_eLmg',
+  'quizEntryShow': 'cjiDL_TMNr',
+  'header': 'cjiDL_fsuY',
+  'dndBorder': 'cjiDL_bscQ',
+  'leftHeader': 'cjiDL_cKlw',
+  'connectingLines': 'cjiDL_eGWt',
+  'rightHeader': 'cjiDL_IoDT',
+  'interactionTypeName': 'cjiDL_eCZW',
+  'points': 'cjiDL_cwte',
+  'title': 'cjiDL_nvdO',
+  'itemHolder': 'cjiDL_csjx',
+  'dragAndDropHandle': 'cjiDL_fPOQ',
+  'optionsButton': 'cjiDL_gaTA'
 };
 import theme from "./theme.js";
 

package/es/common/components/PrintFontSizeModal/presenter.js

@@ -112,6 +112,7 @@ export var PrintFontSizeModal = (_dec = themeable(theme, styles), _dec(_class =
       return /*#__PURE__*/React.createElement(Modal, {
         open: this.props.isOpen,
         onDismiss: this.props.onCancel,
+        onExited: this.props.onExited,
         size: "small",
         label: this.text.printQuiz
       }, /*#__PURE__*/React.createElement(ModalHeader, null, /*#__PURE__*/React.createElement(Heading, null, this.text.printQuiz), /*#__PURE__*/React.createElement(CloseButton, {
@@ -170,7 +171,8 @@ export var PrintFontSizeModal = (_dec = themeable(theme, styles), _dec(_class =
   isOpen: PropTypes.bool,
   persistedPrintFontSize: PropTypes.string,
   onSubmit: PropTypes.func.isRequired,
-  onCancel: PropTypes.func.isRequired
+  onCancel: PropTypes.func.isRequired,
+  onExited: PropTypes.func.isRequired
 }, _class2.defaultProps = {
   isOpen: false,
   persistedPrintFontSize: 'medium'

package/es/common/components/layout/Page/index.js

@@ -11,13 +11,13 @@ import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { themeable } from '@instructure/ui-themeable';
 var styles = {
-  componentId: 'bwvTI',
+  componentId: 'KVDkV',
   template: function template(theme) {
-    return "\n\n.bwvTI_gasz{display:flex;font-family:".concat(theme.fontFamily || 'inherit', ";height:100%;margin:0}\n\n@media screen and (--phoneBreakPoint){.bwvTI_caGd{-webkit-overflow-scrolling:touch}}\n\n.bwvTI_caGd{transition:").concat(theme.contentTransition || 'inherit', ";width:100%}\n\n.bwvTI_dxaC{overflow-x:hidden;overflow-y:auto}");
+    return "\n\n.KVDkV_gasz{display:flex;font-family:".concat(theme.fontFamily || 'inherit', ";height:100%;margin:0}\n\n@media screen and (--phoneBreakPoint){.KVDkV_caGd{-webkit-overflow-scrolling:touch}}\n\n.KVDkV_caGd{transition:").concat(theme.contentTransition || 'inherit', ";width:100%}\n\n.KVDkV_dxaC{overflow-x:hidden;overflow-y:auto}\n\n@media print{.KVDkV_gasz{display:block}}");
   },
-  'wrapper': 'bwvTI_gasz',
-  'content': 'bwvTI_caGd',
-  'scrollable': 'bwvTI_dxaC'
+  'wrapper': 'KVDkV_gasz',
+  'content': 'KVDkV_caGd',
+  'scrollable': 'KVDkV_dxaC'
 };
 import theme from "./theme.js";
 export var Page = (_dec = themeable(theme, styles), _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_Component) {

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

@@ -36,7 +36,8 @@ export function mapStateToProps(state, props) {
     partialDeepScoringEnabled: featureOn('partial_deep_scoring'),
     partialScoringEnabled: featureOn('partial_scoring'),
     quizId: getActiveQuizId(state),
-    showCalculator: featureOn('calculator_per_question')
+    showCalculator: featureOn('calculator_per_question'),
+    useNewRce: featureOn('use_new_rce')
   };
 }
 

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

@@ -179,6 +179,7 @@ ItemEdit.propTypes = {
   setUploadStatus: PropTypes.func.isRequired,
   initialFocusId: PropTypes.string,
   showCalculator: PropTypes.bool,
+  useNewRce: PropTypes.bool,
   clearValidationErrorsFromApi: PropTypes.func.isRequired,
   validationErrorsFromApi: PropTypes.objectOf(PropTypes.arrayOf(PropTypes.shape({
     type: PropTypes.string,
@@ -196,6 +197,7 @@ ItemEdit.defaultProps = {
   partialScoringEnabled: false,
   initialFocusId: null,
   showCalculator: false,
+  useNewRce: false,
   validationErrorsFromApi: {}
 };
 export default ItemEdit;

package/es/common/components/resources/item/ItemOverride/index.js

@@ -18,7 +18,8 @@ function mapStateToProps(state, props) {
     oneQuestionAtATime: isActiveQuizWorkingInstanceOneQuestionAtATime(state),
     partialDeepScoringEnabled: featureOn('partial_deep_scoring'),
     partialScoringEnabled: featureOn('partial_scoring'),
-    quizId: getActiveQuizId(state)
+    quizId: getActiveQuizId(state),
+    useNewRce: featureOn('use_new_rce')
   };
 }
 

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

@@ -76,11 +76,13 @@ ItemOverride.propTypes = {
   partialScoringEnabled: PropTypes.bool,
   quizId: PropTypes.string.isRequired,
   screenreaderNotification: PropTypes.func.isRequired,
-  setOneQuestionAtATime: PropTypes.func.isRequired
+  setOneQuestionAtATime: PropTypes.func.isRequired,
+  useNewRce: PropTypes.bool
 };
 ItemOverride.defaultProps = {
   errorsAreShowing: false,
   partialScoringEnabled: false,
-  partialDeepScoringEnabled: false
+  partialDeepScoringEnabled: false,
+  useNewRce: false
 };
 export default ItemOverride;

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

@@ -16,6 +16,7 @@ import { themeable } from '@instructure/ui-themeable';
 import { Heading } from '@instructure/ui-heading';
 import RichContentInput from "../../../RichContentInput/index.js";
 import { toErrors } from "../../../../util/instUIMessages.js";
+import { isNewRCEEnabled } from "../../../../util/rceChecker.js";
 import Errors from "../../../shared/errors/Errors.js";
 import { SimpleSelect } from '@instructure/ui-simple-select';
 import { IconUpdownLine } from '@instructure/ui-icons';
@@ -174,7 +175,8 @@ export var StimulusEditInfo = (_dec = themeable(theme, styles), _dec(_class = (_
         defaultContent: stimulus.get('body'),
         onKeyUp: this.onBodyChange,
         onBlur: this.onBodyChange,
-        uploadPath: this.fileUploadUrl()
+        uploadPath: this.fileUploadUrl(),
+        useNewRce: isNewRCEEnabled()
       }), /*#__PURE__*/React.createElement(Errors, {
         errorList: this.errorsList('body')
       })), /*#__PURE__*/React.createElement("div", {

package/es/common/components/shared/PrintTrigger/presenter.js

@@ -17,36 +17,42 @@ export var PrintTrigger = /*#__PURE__*/function (_Component) {
 
   var _super = _createSuper(PrintTrigger);
 
-  function PrintTrigger() {
+  function PrintTrigger(props) {
     var _this;
 
     _classCallCheck(this, PrintTrigger);
 
-    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 = {
-      waitingForImages: false,
+      waitingForPrintingToBeReady: false,
       printType: PRINT_CURRENT_PAGE,
       // quiz key or blank quiz
       shouldPrint: false
     };
 
-    _this.ensureImagesLoaded = function (cb) {
+    _this.print = function () {
+      printWithCss(_this.fontSize, 100);
+    };
+
+    _this.ensurePrintingIsReady = function (printFontSizeModalClose) {
       _this.setState({
-        waitingForImages: true
+        waitingForPrintingToBeReady: true
       });
 
-      ensureImagesLoaded().then(function () {
-        return _this.setState({
-          waitingForImages: false
-        }, cb);
+      Promise.all([ensureImagesLoaded(), printFontSizeModalClose]).then(function () {
+        _this.setState({
+          waitingForPrintingToBeReady: false
+        });
+
+        _this.onExited = function () {};
       });
     };
 
     _this.handlePrintModalSubmit = function (fontSize, shouldPersist) {
+      var printFontSizeModalClose = new Promise(function (resolve) {
+        _this.onExited = resolve;
+      });
+
       _this.props.closePrintFontSizeModal();
 
       if (shouldPersist) {
@@ -58,12 +64,9 @@ export var PrintTrigger = /*#__PURE__*/function (_Component) {
       if (_this.state.printType === PRINT_BLANK) {
         _this.props.navigateToPreviewPrint();
       } else {
-        // default to printing the current page
-        // 400ms timeout because default transition (for print modal
-        // to exit) is 300ms
-        _this.ensureImagesLoaded(function () {
-          return printWithCss(fontSize, 400);
-        });
+        _this.fontSize = fontSize;
+
+        _this.ensurePrintingIsReady(printFontSizeModalClose);
       }
     };
 
@@ -79,6 +82,9 @@ export var PrintTrigger = /*#__PURE__*/function (_Component) {
       return elementsForSelectors(_this.props.appContainer);
     };
 
+    _this.onExited = function () {};
+
+    _this.fontSize = '';
     return _this;
   }
 
@@ -87,9 +93,10 @@ export var PrintTrigger = /*#__PURE__*/function (_Component) {
     value: function render() {
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Overlay, {
         applicationElement: this.applicationElement,
-        open: this.state.waitingForImages,
+        open: this.state.waitingForPrintingToBeReady,
         shouldContainFocus: true,
         transition: "fade",
+        onExited: this.print,
         label: t('Preparing Print Preview')
       }, /*#__PURE__*/React.createElement(Mask, null, /*#__PURE__*/React.createElement(Spinner, {
         mainText: t('Preparing Print Preview')
@@ -97,6 +104,7 @@ export var PrintTrigger = /*#__PURE__*/function (_Component) {
         isOpen: this.props.printFontSizeModalOpen,
         onSubmit: this.handlePrintModalSubmit,
         onCancel: this.props.closePrintFontSizeModal,
+        onExited: this.onExited,
         persistedPrintFontSize: this.props.persistedPrintFontSize
       }), this.props.render(this.handlePrint));
     }

package/es/common/util/interactionTypePropsHelper.js

@@ -66,7 +66,8 @@ export var propsForInteractionEdit = function propsForInteractionEdit(props, add
     setOneQuestionAtATime: setOneQuestionAtATime,
     stemErrors: props.workingItem.errorsFor('itemBody').toJS(),
     initialFocusId: props.initialFocusId,
-    calculatorType: item.calculatorType
+    calculatorType: item.calculatorType,
+    useNewRce: props.useNewRce
   };
 };
 export var propsForInteractionShow = function propsForInteractionShow(item) {

package/es/common/util/rceChecker.js

@@ -0,0 +1,6 @@
+import { featureOn } from "./featureCheck.js";
+var newRCEFeatureName = 'use_new_rce';
+export function isNewRCEEnabled() {
+  return featureOn(newRCEFeatureName);
+}
+export default isNewRCEEnabled;

package/es/index.js

@@ -89,7 +89,8 @@ export { formatTime } from "./common/util/formatTimespan.js";
 export { connect } from "./common/react-redux.js";
 export { breakdownSeconds, HOUR_IN_SECONDS } from "./common/components/shared/FormattedDuration/index.js";
 export { sessionStore } from "./common/util/sessionStore.js";
-export { printWithCss, ensureImagesLoaded } from "./common/util/printUtils.js"; // APIs
+export { printWithCss, ensureImagesLoaded } from "./common/util/printUtils.js";
+export { isNewRCEEnabled } from "./common/util/rceChecker.js"; // APIs
 
 export { createQuizEntryRegrade } from "./grading/api/quizEntryRegrades.js";
 export { getQuizEntry } from "./building/api/quizEntries.js";

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

@@ -31,6 +31,8 @@ var _uiThemeable = require("@instructure/ui-themeable");
 
 var _quizRce = require("@instructure/quiz-rce");
 
+var _rceChecker = require("../../../../common/util/rceChecker.js");
+
 var _index = _interopRequireDefault(require("../../../../common/components/RichContentInput/index.js"));
 
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
@@ -128,7 +130,8 @@ var ItemFeedbackModal = (_dec = (0, _uiThemeable.themeable)(_theme.default, styl
         onChange: this.onFeedbackChange,
         parentType: this.props.parentType,
         parentId: this.props.parentId,
-        importModalCloseOverride: this.returnToFeedback
+        importModalCloseOverride: this.returnToFeedback,
+        useNewRce: (0, _rceChecker.isNewRCEEnabled)()
       }));
     }
   }, {

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

@@ -29,6 +29,8 @@ var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/f
 
 var _index = _interopRequireDefault(require("../../../../../../common/components/RichContentInput/index.js"));
 
+var _rceChecker = require("../../../../../../common/util/rceChecker.js");
+
 var _componentWithOutsideClick = _interopRequireDefault(require("../../../../../../common/components/shared/functionality/componentWithOutsideClick.js"));
 
 var _CustomPropTypes = _interopRequireDefault(require("../../../../../../common/util/CustomPropTypes.js"));
@@ -113,7 +115,8 @@ var QuizInstructionsEdit = (_dec = (0, _uiThemeable.themeable)(_theme.default, s
         onKeyUp: this.props.onInputChange,
         onChange: this.props.onInputChange,
         parentType: _quizCommon.PARENT_TYPE_QUIZ,
-        parentId: this.props.quizId
+        parentId: this.props.quizId,
+        useNewRce: (0, _rceChecker.isNewRCEEnabled)()
       }), /*#__PURE__*/_react.default.createElement("div", {
         className: styles.footer
       }, /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {

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

@@ -54,23 +54,23 @@ var _theme = _interopRequireDefault(require("./theme.js"));
 var _dec, _class, _class2, _temp;
 
 var styles = {
-  componentId: 'fohHO',
+  componentId: 'cjiDL',
   template: function template(theme) {
-    return "\n\n.fohHO_eLmg{transform:translateZ(0)}\n\n.fohHO_TMNr{background-color:".concat(theme.quizEntryShowBackgroundColor || 'inherit', ";padding:").concat(theme.quizEntryShowPadding || 'inherit', "}\n\n.fohHO_fsuY{align-items:stretch;display:flex;flex-direction:row;flex-wrap:nowrap;height:").concat(theme.headerHeight || 'inherit', ";padding-right:").concat(theme.headerRightPadding || 'inherit', "}\n\n.fohHO_bscQ{border:").concat(theme.dndBorder || 'inherit', "}\n\n.fohHO_cKlw{align-items:center;display:inline-flex;flex:8 0 0;overflow:hidden}\n\n.fohHO_eGWt{border-bottom:").concat(theme.phoneConnectingLinesBorderWidth || 'inherit', " dotted;border-color:").concat(theme.phoneConnectingLinesBorderColor || 'inherit', ";border-left:").concat(theme.phoneConnectingLinesBorderWidth || 'inherit', " dotted;height:2rem;margin-right:1.2rem;margin-top:-0.8rem;width:1.2rem}\n\n.fohHO_eGWt,.fohHO_IoDT{display:inline-flex;flex:0 0 auto}\n\n.fohHO_IoDT{color:").concat(theme.rightHeaderColor || 'inherit', ";text-align:right;z-index:").concat(theme.rightHeaderZIndex || 'inherit', "}\n\n[dir=ltr] .fohHO_IoDT,[dir=rtl] .fohHO_IoDT{text-align:right}\n\n.fohHO_IoDT button{background-color:transparent;background-color:initial}\n\n.fohHO_eCZW,.fohHO_cwte,.fohHO_nvdO{color:").concat(theme.titleInteractionTypeNamePointsColor || 'inherit', ";font-size:").concat(theme.titleInteractionTypeNamePointsFontSize || 'inherit', ";margin-left:").concat(theme.titleInteractionTypeNamePointsLeftMargin || 'inherit', ";margin-right:").concat(theme.titleInteractionTypeNamePointsRightMargin || 'inherit', ";overflow:hidden;text-overflow:ellipsis;white-space:nowrap}\n\n.fohHO_csjx{margin:").concat(theme.itemHolderMargin || 'inherit', "}\n\n.fohHO_fPOQ,.fohHO_gaTA{background-color:transparent;border:none;color:inherit;font-size:").concat(theme.optionsButtonDragDropHandleFontSize || 'inherit', ";margin:").concat(theme.optionsButtonDragDropHandleMargin || 'inherit', "}\n\n.fohHO_gaTA{cursor:pointer}\n\n@media print{.fohHO_eLmg{page-break-inside:avoid}}");
+    return "\n\n.cjiDL_eLmg{transform:translateZ(0)}\n\n.cjiDL_TMNr{background-color:".concat(theme.quizEntryShowBackgroundColor || 'inherit', ";padding:").concat(theme.quizEntryShowPadding || 'inherit', "}\n\n.cjiDL_fsuY{align-items:stretch;display:flex;flex-direction:row;flex-wrap:nowrap;height:").concat(theme.headerHeight || 'inherit', ";padding-right:").concat(theme.headerRightPadding || 'inherit', "}\n\n.cjiDL_bscQ{border:").concat(theme.dndBorder || 'inherit', "}\n\n.cjiDL_cKlw{align-items:center;display:inline-flex;flex:8 0 0;overflow:hidden}\n\n.cjiDL_eGWt{border-bottom:").concat(theme.phoneConnectingLinesBorderWidth || 'inherit', " dotted;border-color:").concat(theme.phoneConnectingLinesBorderColor || 'inherit', ";border-left:").concat(theme.phoneConnectingLinesBorderWidth || 'inherit', " dotted;height:2rem;margin-right:1.2rem;margin-top:-0.8rem;width:1.2rem}\n\n.cjiDL_eGWt,.cjiDL_IoDT{display:inline-flex;flex:0 0 auto}\n\n.cjiDL_IoDT{color:").concat(theme.rightHeaderColor || 'inherit', ";text-align:right;z-index:").concat(theme.rightHeaderZIndex || 'inherit', "}\n\n[dir=ltr] .cjiDL_IoDT,[dir=rtl] .cjiDL_IoDT{text-align:right}\n\n.cjiDL_IoDT button{background-color:transparent;background-color:initial}\n\n.cjiDL_eCZW,.cjiDL_cwte,.cjiDL_nvdO{color:").concat(theme.titleInteractionTypeNamePointsColor || 'inherit', ";font-size:").concat(theme.titleInteractionTypeNamePointsFontSize || 'inherit', ";margin-left:").concat(theme.titleInteractionTypeNamePointsLeftMargin || 'inherit', ";margin-right:").concat(theme.titleInteractionTypeNamePointsRightMargin || 'inherit', ";overflow:hidden;text-overflow:ellipsis;white-space:nowrap}\n\n.cjiDL_csjx{margin:").concat(theme.itemHolderMargin || 'inherit', "}\n\n.cjiDL_fPOQ,.cjiDL_gaTA{background-color:transparent;border:none;color:inherit;font-size:").concat(theme.optionsButtonDragDropHandleFontSize || 'inherit', ";margin:").concat(theme.optionsButtonDragDropHandleMargin || 'inherit', "}\n\n.cjiDL_gaTA{cursor:pointer}\n\n@media print{.cjiDL_eLmg{break-inside:avoid}}");
   },
-  'quizEntryWrapper': 'fohHO_eLmg',
-  'quizEntryShow': 'fohHO_TMNr',
-  'header': 'fohHO_fsuY',
-  'dndBorder': 'fohHO_bscQ',
-  'leftHeader': 'fohHO_cKlw',
-  'connectingLines': 'fohHO_eGWt',
-  'rightHeader': 'fohHO_IoDT',
-  'interactionTypeName': 'fohHO_eCZW',
-  'points': 'fohHO_cwte',
-  'title': 'fohHO_nvdO',
-  'itemHolder': 'fohHO_csjx',
-  'dragAndDropHandle': 'fohHO_fPOQ',
-  'optionsButton': 'fohHO_gaTA'
+  'quizEntryWrapper': 'cjiDL_eLmg',
+  'quizEntryShow': 'cjiDL_TMNr',
+  'header': 'cjiDL_fsuY',
+  'dndBorder': 'cjiDL_bscQ',
+  'leftHeader': 'cjiDL_cKlw',
+  'connectingLines': 'cjiDL_eGWt',
+  'rightHeader': 'cjiDL_IoDT',
+  'interactionTypeName': 'cjiDL_eCZW',
+  'points': 'cjiDL_cwte',
+  'title': 'cjiDL_nvdO',
+  'itemHolder': 'cjiDL_csjx',
+  'dragAndDropHandle': 'cjiDL_fPOQ',
+  'optionsButton': 'cjiDL_gaTA'
 };
 
 var _ref = /*#__PURE__*/_react.default.createElement(_uiIcons.IconBankLine, null);

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

@@ -136,6 +136,7 @@ var PrintFontSizeModal = (_dec = (0, _uiThemeable.themeable)(_theme.default, sty
       return /*#__PURE__*/_react.default.createElement(_quizCommon.Modal, {
         open: this.props.isOpen,
         onDismiss: this.props.onCancel,
+        onExited: this.props.onExited,
         size: "small",
         label: this.text.printQuiz
       }, /*#__PURE__*/_react.default.createElement(_quizCommon.ModalHeader, null, /*#__PURE__*/_react.default.createElement(_uiHeading.Heading, null, this.text.printQuiz), /*#__PURE__*/_react.default.createElement(_uiButtons.CloseButton, {
@@ -194,7 +195,8 @@ var PrintFontSizeModal = (_dec = (0, _uiThemeable.themeable)(_theme.default, sty
   isOpen: _propTypes.default.bool,
   persistedPrintFontSize: _propTypes.default.string,
   onSubmit: _propTypes.default.func.isRequired,
-  onCancel: _propTypes.default.func.isRequired
+  onCancel: _propTypes.default.func.isRequired,
+  onExited: _propTypes.default.func.isRequired
 }, _class2.defaultProps = {
   isOpen: false,
   persistedPrintFontSize: 'medium'

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

@@ -32,13 +32,13 @@ var _theme = _interopRequireDefault(require("./theme.js"));
 var _dec, _class, _class2, _temp;
 
 var styles = {
-  componentId: 'bwvTI',
+  componentId: 'KVDkV',
   template: function template(theme) {
-    return "\n\n.bwvTI_gasz{display:flex;font-family:".concat(theme.fontFamily || 'inherit', ";height:100%;margin:0}\n\n@media screen and (--phoneBreakPoint){.bwvTI_caGd{-webkit-overflow-scrolling:touch}}\n\n.bwvTI_caGd{transition:").concat(theme.contentTransition || 'inherit', ";width:100%}\n\n.bwvTI_dxaC{overflow-x:hidden;overflow-y:auto}");
+    return "\n\n.KVDkV_gasz{display:flex;font-family:".concat(theme.fontFamily || 'inherit', ";height:100%;margin:0}\n\n@media screen and (--phoneBreakPoint){.KVDkV_caGd{-webkit-overflow-scrolling:touch}}\n\n.KVDkV_caGd{transition:").concat(theme.contentTransition || 'inherit', ";width:100%}\n\n.KVDkV_dxaC{overflow-x:hidden;overflow-y:auto}\n\n@media print{.KVDkV_gasz{display:block}}");
   },
-  'wrapper': 'bwvTI_gasz',
-  'content': 'bwvTI_caGd',
-  'scrollable': 'bwvTI_dxaC'
+  'wrapper': 'KVDkV_gasz',
+  'content': 'KVDkV_caGd',
+  'scrollable': 'KVDkV_dxaC'
 };
 var Page = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_Component) {
   (0, _inherits2.default)(Page, _Component);

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

@@ -64,7 +64,8 @@ function mapStateToProps(state, props) {
     partialDeepScoringEnabled: (0, _featureCheck.featureOn)('partial_deep_scoring'),
     partialScoringEnabled: (0, _featureCheck.featureOn)('partial_scoring'),
     quizId: (0, _quizzes2.getActiveQuizId)(state),
-    showCalculator: (0, _featureCheck.featureOn)('calculator_per_question')
+    showCalculator: (0, _featureCheck.featureOn)('calculator_per_question'),
+    useNewRce: (0, _featureCheck.featureOn)('use_new_rce')
   };
 }
 

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

@@ -210,6 +210,7 @@ ItemEdit.propTypes = {
   setUploadStatus: _propTypes.default.func.isRequired,
   initialFocusId: _propTypes.default.string,
   showCalculator: _propTypes.default.bool,
+  useNewRce: _propTypes.default.bool,
   clearValidationErrorsFromApi: _propTypes.default.func.isRequired,
   validationErrorsFromApi: _propTypes.default.objectOf(_propTypes.default.arrayOf(_propTypes.default.shape({
     type: _propTypes.default.string,
@@ -227,6 +228,7 @@ ItemEdit.defaultProps = {
   partialScoringEnabled: false,
   initialFocusId: null,
   showCalculator: false,
+  useNewRce: false,
   validationErrorsFromApi: {}
 };
 var _default = ItemEdit;

package/lib/common/components/resources/item/ItemOverride/index.js

@@ -38,7 +38,8 @@ function mapStateToProps(state, props) {
     oneQuestionAtATime: (0, _quizzes2.isActiveQuizWorkingInstanceOneQuestionAtATime)(state),
     partialDeepScoringEnabled: (0, _featureCheck.featureOn)('partial_deep_scoring'),
     partialScoringEnabled: (0, _featureCheck.featureOn)('partial_scoring'),
-    quizId: (0, _quizzes2.getActiveQuizId)(state)
+    quizId: (0, _quizzes2.getActiveQuizId)(state),
+    useNewRce: (0, _featureCheck.featureOn)('use_new_rce')
   };
 }
 

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

@@ -99,12 +99,14 @@ ItemOverride.propTypes = {
   partialScoringEnabled: _propTypes.default.bool,
   quizId: _propTypes.default.string.isRequired,
   screenreaderNotification: _propTypes.default.func.isRequired,
-  setOneQuestionAtATime: _propTypes.default.func.isRequired
+  setOneQuestionAtATime: _propTypes.default.func.isRequired,
+  useNewRce: _propTypes.default.bool
 };
 ItemOverride.defaultProps = {
   errorsAreShowing: false,
   partialScoringEnabled: false,
-  partialDeepScoringEnabled: false
+  partialDeepScoringEnabled: false,
+  useNewRce: false
 };
 var _default = ItemOverride;
 exports.default = _default;

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

@@ -39,6 +39,8 @@ var _index = _interopRequireDefault(require("../../../RichContentInput/index.js"
 
 var _instUIMessages = require("../../../../util/instUIMessages.js");
 
+var _rceChecker = require("../../../../util/rceChecker.js");
+
 var _Errors = _interopRequireDefault(require("../../../shared/errors/Errors.js"));
 
 var _uiSimpleSelect = require("@instructure/ui-simple-select");
@@ -206,7 +208,8 @@ var StimulusEditInfo = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
         defaultContent: stimulus.get('body'),
         onKeyUp: this.onBodyChange,
         onBlur: this.onBodyChange,
-        uploadPath: this.fileUploadUrl()
+        uploadPath: this.fileUploadUrl(),
+        useNewRce: (0, _rceChecker.isNewRCEEnabled)()
       }), /*#__PURE__*/_react.default.createElement(_Errors.default, {
         errorList: this.errorsList('body')
       })), /*#__PURE__*/_react.default.createElement("div", {

package/lib/common/components/shared/PrintTrigger/presenter.js

@@ -42,36 +42,41 @@ var PrintTrigger = /*#__PURE__*/function (_Component) {
 
   var _super = (0, _createSuper2.default)(PrintTrigger);
 
-  function PrintTrigger() {
+  function PrintTrigger(props) {
     var _this;
 
     (0, _classCallCheck2.default)(this, PrintTrigger);
-
-    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 = {
-      waitingForImages: false,
+      waitingForPrintingToBeReady: false,
       printType: _quizCommon.PRINT_CURRENT_PAGE,
       // quiz key or blank quiz
       shouldPrint: false
     };
 
-    _this.ensureImagesLoaded = function (cb) {
+    _this.print = function () {
+      (0, _printUtils.printWithCss)(_this.fontSize, 100);
+    };
+
+    _this.ensurePrintingIsReady = function (printFontSizeModalClose) {
       _this.setState({
-        waitingForImages: true
+        waitingForPrintingToBeReady: true
       });
 
-      (0, _printUtils.ensureImagesLoaded)().then(function () {
-        return _this.setState({
-          waitingForImages: false
-        }, cb);
+      Promise.all([(0, _printUtils.ensureImagesLoaded)(), printFontSizeModalClose]).then(function () {
+        _this.setState({
+          waitingForPrintingToBeReady: false
+        });
+
+        _this.onExited = function () {};
       });
     };
 
     _this.handlePrintModalSubmit = function (fontSize, shouldPersist) {
+      var printFontSizeModalClose = new Promise(function (resolve) {
+        _this.onExited = resolve;
+      });
+
       _this.props.closePrintFontSizeModal();
 
       if (shouldPersist) {
@@ -83,12 +88,9 @@ var PrintTrigger = /*#__PURE__*/function (_Component) {
       if (_this.state.printType === _quizCommon.PRINT_BLANK) {
         _this.props.navigateToPreviewPrint();
       } else {
-        // default to printing the current page
-        // 400ms timeout because default transition (for print modal
-        // to exit) is 300ms
-        _this.ensureImagesLoaded(function () {
-          return (0, _printUtils.printWithCss)(fontSize, 400);
-        });
+        _this.fontSize = fontSize;
+
+        _this.ensurePrintingIsReady(printFontSizeModalClose);
       }
     };
 
@@ -104,6 +106,9 @@ var PrintTrigger = /*#__PURE__*/function (_Component) {
       return (0, _ElementsForSelectors.default)(_this.props.appContainer);
     };
 
+    _this.onExited = function () {};
+
+    _this.fontSize = '';
     return _this;
   }
 
@@ -112,9 +117,10 @@ var PrintTrigger = /*#__PURE__*/function (_Component) {
     value: function render() {
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_uiOverlays.Overlay, {
         applicationElement: this.applicationElement,
-        open: this.state.waitingForImages,
+        open: this.state.waitingForPrintingToBeReady,
         shouldContainFocus: true,
         transition: "fade",
+        onExited: this.print,
         label: (0, _formatMessage.default)('Preparing Print Preview')
       }, /*#__PURE__*/_react.default.createElement(_uiOverlays.Mask, null, /*#__PURE__*/_react.default.createElement(_Spinner.QuizzesSpinner, {
         mainText: (0, _formatMessage.default)('Preparing Print Preview')
@@ -122,6 +128,7 @@ var PrintTrigger = /*#__PURE__*/function (_Component) {
         isOpen: this.props.printFontSizeModalOpen,
         onSubmit: this.handlePrintModalSubmit,
         onCancel: this.props.closePrintFontSizeModal,
+        onExited: this.onExited,
         persistedPrintFontSize: this.props.persistedPrintFontSize
       }), this.props.render(this.handlePrint));
     }

package/lib/common/util/interactionTypePropsHelper.js

@@ -77,7 +77,8 @@ var propsForInteractionEdit = function propsForInteractionEdit(props, additional
     setOneQuestionAtATime: setOneQuestionAtATime,
     stemErrors: props.workingItem.errorsFor('itemBody').toJS(),
     initialFocusId: props.initialFocusId,
-    calculatorType: item.calculatorType
+    calculatorType: item.calculatorType,
+    useNewRce: props.useNewRce
   };
 };
 

package/lib/common/util/rceChecker.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isNewRCEEnabled = isNewRCEEnabled;
+exports.default = void 0;
+
+var _featureCheck = require("./featureCheck.js");
+
+var newRCEFeatureName = 'use_new_rce';
+
+function isNewRCEEnabled() {
+  return (0, _featureCheck.featureOn)(newRCEFeatureName);
+}
+
+var _default = isNewRCEEnabled;
+exports.default = _default;

package/lib/index.js

@@ -103,6 +103,7 @@ var _exportNames = {
   sessionStore: true,
   printWithCss: true,
   ensureImagesLoaded: true,
+  isNewRCEEnabled: true,
   createQuizEntryRegrade: true,
   getQuizEntry: true,
   moveQuizEntry: true,
@@ -773,6 +774,12 @@ Object.defineProperty(exports, "ensureImagesLoaded", {
     return _printUtils.ensureImagesLoaded;
   }
 });
+Object.defineProperty(exports, "isNewRCEEnabled", {
+  enumerable: true,
+  get: function get() {
+    return _rceChecker.isNewRCEEnabled;
+  }
+});
 Object.defineProperty(exports, "createQuizEntryRegrade", {
   enumerable: true,
   get: function get() {
@@ -1453,6 +1460,8 @@ var _sessionStore = require("./common/util/sessionStore.js");
 
 var _printUtils = require("./common/util/printUtils.js");
 
+var _rceChecker = require("./common/util/rceChecker.js");
+
 var _quizEntryRegrades = require("./grading/api/quizEntryRegrades.js");
 
 var _quizEntries = require("./building/api/quizEntries.js");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "17.22.1",
+  "version": "17.23.0",
   "license": "MIT",
   "description": "The Quiz React SDK by Instructure Inc.",
   "author": "Instructure, Inc. Engineering and Product Design",
@@ -41,11 +41,11 @@
   ],
   "dependencies": {
     "@instructure/outcomes-ui": "^2.1.2",
-    "@instructure/quiz-common": "^17.22.1",
-    "@instructure/quiz-i18n": "^17.22.1",
-    "@instructure/quiz-interactions": "^17.22.1",
-    "@instructure/quiz-number-input": "^17.22.1",
-    "@instructure/quiz-rce": "^17.22.1",
+    "@instructure/quiz-common": "^17.23.0",
+    "@instructure/quiz-i18n": "^17.23.0",
+    "@instructure/quiz-interactions": "^17.23.0",
+    "@instructure/quiz-number-input": "^17.23.0",
+    "@instructure/quiz-rce": "^17.23.0",
     "@instructure/ui-a11y-content": "^7.11.0",
     "@instructure/ui-alerts": "^7.11.0",
     "@instructure/ui-avatar": "^7.11.0",
@@ -106,7 +106,7 @@
     "eventemitter3": "^3.1.0",
     "humps": "^2.0.0",
     "immutable": "^3.8.1",
-    "instructure-validations": "^17.22.1",
+    "instructure-validations": "^17.23.0",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -137,7 +137,7 @@
     "uuid": "^3.2.1"
   },
   "devDependencies": {
-    "@instructure/quiz-scripts": "^17.22.1",
+    "@instructure/quiz-scripts": "^17.23.0",
     "@instructure/ui-axe-check": "^7.11.0",
     "@instructure/ui-babel-preset": "^7.11.0",
     "@instructure/ui-karma-config": "^7.11.0",
@@ -156,7 +156,7 @@
     "intl": "^1.2.4",
     "jquery": "^2.2.3",
     "most-subject": "^5.3.0",
-    "quiz-presets": "^17.22.1",
+    "quiz-presets": "^17.23.0",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -172,5 +172,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "47765f64e5de9a408ba519246426ba408dc942c0"
+  "gitHead": "a7205c2f849e1fc65c29c4528ad35900dcc549ee"
 }