@instructure/quiz-core 17.46.2-rc.5 → 17.46.2-rc.7

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

@@ -20,7 +20,6 @@ import { PresentationContent, ScreenReaderContent } from '@instructure/ui-a11y-c
 import { Alert } from '@instructure/ui-alerts';
 import { themeable } from '@instructure/ui-themeable';
 import { RichContentRenderer } from '@instructure/quiz-rce';
-import { isNewRCEEnabled } from "../../../common/util/rceChecker.js";
 import { BUILD_TRAY_POSITION, COPY_MOVE_BANK_ENTRY_MODAL, SET_EDIT_BUTTON_FOCUS, withI18nSupport } from '@instructure/quiz-common';
 import { extractTextFromHtml } from '@instructure/quiz-interactions';
 import t from '@instructure/quiz-i18n/es/format-message';
@@ -280,8 +279,7 @@ export var BankEntryRow = (_dec = themeable(theme, styles), _dec(_class = (_temp
       if (itemOrStimulus.itemBody) {
         return /*#__PURE__*/React.createElement(RichContentRenderer, {
           customStyles: styles.stem,
-          content: itemOrStimulus.itemBody,
-          useNewRce: isNewRCEEnabled()
+          content: itemOrStimulus.itemBody
         });
       } else {
         return /*#__PURE__*/React.createElement("div", {

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

@@ -12,7 +12,6 @@ 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 { 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';
@@ -108,7 +107,6 @@ export var ItemFeedbackModal = (_dec = themeable(theme, styles), _dec(_class = (
         parentType: this.props.parentType,
         parentId: this.props.parentId,
         importModalCloseOverride: this.returnToFeedback,
-        useNewRce: isNewRCEEnabled(),
         height: RCE_THREE_LINES_HEIGHT
       }));
     }
@@ -117,8 +115,7 @@ export var ItemFeedbackModal = (_dec = themeable(theme, styles), _dec(_class = (
     value: function renderContent() {
       return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(RichContentRenderer, {
         customStyles: styles.itemStem,
-        content: this.props.item.itemBody,
-        useNewRce: isNewRCEEnabled()
+        content: this.props.item.itemBody
       }), this.renderRichContentInput('correct', t('For a correct answer')), this.renderRichContentInput('incorrect', t('For an incorrect answer')), this.renderRichContentInput('neutral', t('Provide general feedback (regardless of answer)')));
     }
   }, {

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

@@ -11,7 +11,6 @@ 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";
@@ -89,8 +88,7 @@ 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,
-        useNewRce: isNewRCEEnabled()
+        parentId: this.props.quizId
       }), /*#__PURE__*/React.createElement("div", {
         className: styles.footer
       }, /*#__PURE__*/React.createElement(Button, {

package/es/building/components/resources/quiz/instructions/Show/index.js

@@ -9,7 +9,6 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { themeable } from '@instructure/ui-themeable';
 import { RichContentRenderer } from '@instructure/quiz-rce';
-import { isNewRCEEnabled } from "../../../../../../common/util/rceChecker.js";
 import Overlay from "../../../../../../common/components/shared/overlay/Overlay.js";
 import makeScrollable from "../../../../../../common/components/shared/functionality/makeScrollable.js";
 var styles = {
@@ -64,8 +63,7 @@ export var QuizInstructionsShow = (_dec = themeable(theme, styles), _dec(_class
         "data-automation": "instructions-show-text"
       }, /*#__PURE__*/React.createElement(RichContentRenderer, {
         customStyles: styles.instructionsShowText,
-        content: this.props.instructions || t('Add Instructions...'),
-        useNewRce: isNewRCEEnabled()
+        content: this.props.instructions || t('Add Instructions...')
       }))));
     }
   }]);

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

@@ -26,7 +26,6 @@ import ItemOverride from "../../../../../common/components/resources/item/ItemOv
 import AddToBankOptions from "../../AddToBankOptions/index.js";
 import TagDisplay from "../../../../../common/components/shared/TagDisplay/index.js";
 import Item from "../../../../../common/records/Item.js";
-import { isNewRCEEnabled } from "../../../../../common/util/rceChecker.js";
 import { BUILD_TRAY_OPEN, PARENT_TYPE_QUIZ, REGRADE_MODAL, SHOULD_CLONE_ITEM } from '@instructure/quiz-common';
 import QuizEntryShow from "../QuizEntryShow/index.js";
 import QuizEntryEdit from "../QuizEntryEdit/index.js";
@@ -174,8 +173,7 @@ export var QuizEntry = (_dec = themeable(theme, styles), _dec(_class = (_temp =
         initialFocusId: this.props.initialFocusId,
         handleValidationErrorsFromApi: this.props.handleValidationErrorsFromApi,
         clearValidationErrorsFromApi: this.props.clearValidationErrorsFromApi,
-        haveValidationErrorsFromApi: Boolean(Object.values(this.props.validationErrorsFromApi).length),
-        useNewRce: isNewRCEEnabled()
+        haveValidationErrorsFromApi: Boolean(Object.values(this.props.validationErrorsFromApi).length)
       }, pick(this.props, ['displayPosition', 'guid', 'draggingOnBuild', 'newHoverPosition', 'quizEntry', 'quizEntries', 'quizId', 'isContentLockedByBlueprint', 'setUi', 'switchOffEditing', 'switchOnEditing', 'shouldClone', 'scrollKey', 'editQuizEntryToggle', 'onEditQuizEntryToggle', 'stimulusOrientation']));
     }
   }, {

package/es/common/components/layout/sidebar/SidebarItem/presenter.js

@@ -17,7 +17,6 @@ import { themeable } from '@instructure/ui-themeable';
 import PositionSummary from "../PositionSummary/index.js";
 import t from '@instructure/quiz-i18n/es/format-message';
 import { RichContentRenderer } from '@instructure/quiz-rce';
-import { isNewRCEEnabled } from "../../../../util/rceChecker.js";
 var styles = {
   componentId: 'cwwgG',
   template: function template(theme) {
@@ -160,8 +159,7 @@ export var SidebarItem = (_dec = themeable(theme, styles), _dec(_class = (_temp
       }, this.getPointsText(pointsPossible || 0))), /*#__PURE__*/React.createElement("div", {
         className: styles.itemBody
       }, /*#__PURE__*/React.createElement(RichContentRenderer, {
-        content: this.props.itemBody,
-        useNewRce: isNewRCEEnabled()
+        content: this.props.itemBody
       })))), /*#__PURE__*/React.createElement(Flex.Item, null, /*#__PURE__*/React.createElement("div", {
         className: styles.pinWrapper
       }, children))));

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

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

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

@@ -180,7 +180,6 @@ 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,
@@ -199,7 +198,6 @@ ItemEdit.defaultProps = {
   partialScoringEnabled: false,
   initialFocusId: null,
   showCalculator: false,
-  useNewRce: false,
   validationErrorsFromApi: {}
 };
 export default ItemEdit;

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

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

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

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

package/es/common/components/resources/quiz/instructions/Instructions.js

@@ -10,7 +10,6 @@ import React, { Component } from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { themeable } from '@instructure/ui-themeable';
 import { RichContentRenderer } from '@instructure/quiz-rce';
-import { isNewRCEEnabled } from "../../../../util/rceChecker.js";
 import makeScrollable from "../../../shared/functionality/makeScrollable.js"; // ================================
 // renders the quiz instructions on
 // the Preview and Take pages
@@ -44,8 +43,7 @@ export var QuizInstructions = (_dec = themeable(theme, styles), _dec(_class = (_
         tabIndex: "-1"
       }, /*#__PURE__*/React.createElement(RichContentRenderer, {
         customStyles: styles.text,
-        content: this.props.quiz.instructions,
-        useNewRce: isNewRCEEnabled()
+        content: this.props.quiz.instructions
       }));
     }
   }]);

package/es/common/components/resources/sessionItemResult/ResultStimulus/index.js

@@ -10,7 +10,6 @@ import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { themeable } from '@instructure/ui-themeable';
 import { RichContentRenderer } from '@instructure/quiz-rce';
-import { isNewRCEEnabled } from "../../../../util/rceChecker.js";
 import t from '@instructure/quiz-i18n/es/format-message';
 var styles = {
   componentId: 'fcFqb',
@@ -66,8 +65,7 @@ export var ResultStimulus = (_dec = themeable(theme, styles), _dec(_class = (_te
       }, /*#__PURE__*/React.createElement("div", {
         className: styles.title
       }, title)), /*#__PURE__*/React.createElement(RichContentRenderer, {
-        content: body,
-        useNewRce: isNewRCEEnabled()
+        content: body
       }));
     }
   }, {

package/es/common/components/resources/sessionItemResult/SessionItemResult/presenter.js

@@ -18,7 +18,6 @@ import { View } from '@instructure/ui-view';
 import { PresentationContent } from '@instructure/ui-a11y-content';
 import { themeable } from '@instructure/ui-themeable';
 import { RichContentRenderer } from '@instructure/quiz-rce';
-import { isNewRCEEnabled } from "../../../../util/rceChecker.js";
 import t from '@instructure/quiz-i18n/es/format-message';
 import PositionBox from "../../positionBox/PositionBox.js";
 import { COMPONENT_RESULT } from '@instructure/quiz-common';
@@ -191,8 +190,7 @@ export var SessionItemResult = (_dec = themeable(theme, styles), _dec(_class = (
           className: styles.textPadding
         }, /*#__PURE__*/React.createElement(RichContentRenderer, {
           customStyles: styles.itemFeedbackText,
-          content: feedbackContent,
-          useNewRce: isNewRCEEnabled()
+          content: feedbackContent
         })));
       }
     }
@@ -236,8 +234,7 @@ export var SessionItemResult = (_dec = themeable(theme, styles), _dec(_class = (
             className: styles.itemFeedbackLabel
           }, t('Feedback from grader')), /*#__PURE__*/React.createElement(RichContentRenderer, {
             customStyles: styles.itemFeedbackText,
-            content: graderFeedback.content,
-            useNewRce: isNewRCEEnabled()
+            content: graderFeedback.content
           }));
         } else {
           return this.renderFeedbackBox(graderFeedback.content, t('Feedback from grader'));
@@ -277,8 +274,7 @@ export var SessionItemResult = (_dec = themeable(theme, styles), _dec(_class = (
         properties: simpleItem.properties || {},
         scoringData: simpleSessionItem.scoringData,
         scoredData: simpleSessionItemResult.scoredData,
-        itemResultsModifications: simpleResultsModifications[simpleSessionItem.id],
-        useNewRce: isNewRCEEnabled()
+        itemResultsModifications: simpleResultsModifications[simpleSessionItem.id]
       })), this.renderItemFeedback(simpleSessionItemResult));
     }
   }, {

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

@@ -16,7 +16,6 @@ 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';
@@ -177,8 +176,7 @@ export var StimulusEditInfo = (_dec = themeable(theme, styles), _dec(_class = (_
         onKeyUp: this.onBodyChange,
         onBlur: this.onBodyChange,
         onChange: this.onBodyChange,
-        uploadPath: this.fileUploadUrl(),
-        useNewRce: isNewRCEEnabled()
+        uploadPath: this.fileUploadUrl()
       }), /*#__PURE__*/React.createElement(Errors, {
         errorList: this.errorsList('body')
       })), /*#__PURE__*/React.createElement("div", {

package/es/common/components/resources/stimulus/StimulusShowInfo/index.js

@@ -8,7 +8,6 @@ import { Heading } from '@instructure/ui-heading';
 import { Text } from '@instructure/ui-text';
 import { View } from '@instructure/ui-view';
 import { RichContentRenderer } from '@instructure/quiz-rce';
-import { isNewRCEEnabled } from "../../../../util/rceChecker.js";
 import t from '@instructure/quiz-i18n/es/format-message';
 
 var StimulusShowInfo = /*#__PURE__*/function (_Component) {
@@ -58,8 +57,7 @@ var StimulusShowInfo = /*#__PURE__*/function (_Component) {
       }, this.props.stimulus.title), instructions, /*#__PURE__*/React.createElement("div", {
         "data-automation": "sdk-stimulus-LeftPanelShow-content"
       }, /*#__PURE__*/React.createElement(RichContentRenderer, {
-        content: this.props.stimulus.body,
-        useNewRce: isNewRCEEnabled()
+        content: this.props.stimulus.body
       })));
     }
   }]);

package/es/common/util/RceConfigProvider.js

@@ -14,7 +14,7 @@ import { RceConfigContext, RceConfigKeys } from '@instructure/quiz-common';
 import { addError } from "../actions/alerts.js";
 import t from '@instructure/quiz-i18n/es/format-message';
 import { extractTextFromHtml } from '@instructure/quiz-interactions';
-import { isDuringQuizTake } from "./windowChecks.js";
+import { isQuizTaking } from "./windowChecks.js";
 
 var _ref4 = /*#__PURE__*/React.createElement(Card, {
   wrapped: true
@@ -100,17 +100,17 @@ export var RceConfigProviderComponent = function RceConfigProviderComponent(prop
   };
 
   var getConfig = function getConfig() {
-    var _ref2, _featureFlags;
+    var _featureFlags, _ref2;
 
     return {
-      rcs: hasAllPropsForRcs() && canvasConfig ? (_ref2 = {}, _defineProperty(_ref2, RceConfigKeys.useNewRce, props.useNewRce), _defineProperty(_ref2, RceConfigKeys.canvasUserId, props.canvasUserId), _defineProperty(_ref2, RceConfigKeys.contextId, props.contextId), _defineProperty(_ref2, RceConfigKeys.contextType, props.contextType), _defineProperty(_ref2, RceConfigKeys.rcsHost, props.rcsHost), _defineProperty(_ref2, RceConfigKeys.rcsJwt, jwt), _defineProperty(_ref2, RceConfigKeys.rcsJwtRefreshFn, refreshToken), _defineProperty(_ref2, RceConfigKeys.canvasConfig, canvasConfig), _ref2) : null,
-      rendererEnhancement: _defineProperty({}, RceConfigKeys.canvasOrigin, props.canvasOrigin),
-      featureFlags: (_featureFlags = {}, _defineProperty(_featureFlags, RceConfigKeys.isNewRCEAppsEnabled, props.isNewRCEAppsEnabled), _defineProperty(_featureFlags, RceConfigKeys.rce5Renderer, props.rce5Renderer), _featureFlags)
+      featureFlags: (_featureFlags = {}, _defineProperty(_featureFlags, RceConfigKeys.isNewRCEEnabled, props.isNewRCEEnabled), _defineProperty(_featureFlags, RceConfigKeys.rce5Renderer, props.rce5Renderer), _defineProperty(_featureFlags, RceConfigKeys.isNewRCEAppsEnabled, props.isNewRCEAppsEnabled), _featureFlags),
+      rcs: hasAllPropsForRcs() && canvasConfig ? (_ref2 = {}, _defineProperty(_ref2, RceConfigKeys.canvasUserId, props.canvasUserId), _defineProperty(_ref2, RceConfigKeys.contextId, props.contextId), _defineProperty(_ref2, RceConfigKeys.contextType, props.contextType), _defineProperty(_ref2, RceConfigKeys.rcsHost, props.rcsHost), _defineProperty(_ref2, RceConfigKeys.rcsJwt, jwt), _defineProperty(_ref2, RceConfigKeys.rcsJwtRefreshFn, refreshToken), _defineProperty(_ref2, RceConfigKeys.canvasConfig, canvasConfig), _ref2) : null,
+      rendererEnhancement: _defineProperty({}, RceConfigKeys.canvasOrigin, props.canvasOrigin)
     };
   };
 
   var setErrorIfDuringTaking = function setErrorIfDuringTaking(errorMessage) {
-    if (!isDuringQuizTake()) {
+    if (!isQuizTaking()) {
       return;
     }
 
@@ -124,7 +124,7 @@ export var RceConfigProviderComponent = function RceConfigProviderComponent(prop
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              if (!(!props.useNewRce && !props.rce5Renderer)) {
+              if (!(!props.isNewRCEEnabled && !props.rce5Renderer)) {
                 _context2.next = 2;
                 break;
               }
@@ -185,10 +185,10 @@ export var RceConfigProviderComponent = function RceConfigProviderComponent(prop
         }
       }, _callee2, null, [[2, 21, 25, 28]]);
     }))();
-  }, [props.useNewRce, props.rce5Renderer]);
+  }, [props.isNewRCEEnabled, props.rce5Renderer]);
 
   if (props.loadedApiFeatures) {
-    if (props.useNewRce || props.rce5Renderer) {
+    if (props.isNewRCEEnabled || props.rce5Renderer) {
       if (!canvasConfigLoading) {
         return /*#__PURE__*/React.createElement(RceConfigContext.Provider, {
           value: getConfig()
@@ -203,7 +203,7 @@ export var RceConfigProviderComponent = function RceConfigProviderComponent(prop
 };
 RceConfigProviderComponent.propTypes = {
   children: PropTypes.node.isRequired,
-  useNewRce: PropTypes.bool.isRequired,
+  isNewRCEEnabled: PropTypes.bool.isRequired,
   rce5Renderer: PropTypes.bool.isRequired,
   isNewRCEAppsEnabled: PropTypes.bool,
   setRCEError: PropTypes.func.isRequired,
@@ -230,7 +230,7 @@ RceConfigProviderComponent.defaultProps = {
 
 var mapStateToProps = function mapStateToProps(state, ownProps) {
   return {
-    useNewRce: isNewRCEEnabled(),
+    isNewRCEEnabled: isNewRCEEnabled(),
     rce5Renderer: isRCE5RendererEnabled(),
     isNewRCEAppsEnabled: isNewRCEAppsEnabled(),
     loadedApiFeatures: state.getIn(['ui', 'loadedApiFeatures']) || ownProps.loadedApiFeatures

package/es/common/util/interactionTypePropsHelper.js

@@ -1,6 +1,5 @@
 import RichContentInput from "../components/RichContentInput/index.js";
 import t from '@instructure/quiz-i18n/es/format-message';
-import { isNewRCEEnabled } from "../../common/util/rceChecker.js";
 export var propsForInteractionEdit = function propsForInteractionEdit(props, additionalOptions) {
   var item = props.workingItem.toJS();
 
@@ -69,8 +68,7 @@ export var propsForInteractionEdit = function propsForInteractionEdit(props, add
     setOneQuestionAtATime: setOneQuestionAtATime,
     stemErrors: props.workingItem.errorsFor('itemBody').toJS(),
     initialFocusId: props.initialFocusId,
-    calculatorType: item.calculatorType,
-    useNewRce: props.useNewRce
+    calculatorType: item.calculatorType
   };
 };
 export var propsForInteractionShow = function propsForInteractionShow(item) {
@@ -83,7 +81,6 @@ export var propsForInteractionShow = function propsForInteractionShow(item) {
     itemBody: item.itemBody || '',
     properties: item.properties,
     notifyScreenreader: true,
-    scoringData: item.scoringData,
-    useNewRce: isNewRCEEnabled()
+    scoringData: item.scoringData
   };
 };

package/es/common/util/windowChecks.js

@@ -1,3 +1,4 @@
+import { isDuringQuizTake } from '@instructure/quiz-common';
 export var media = {
   'phone-break-point': 'only screen and (max-width: 48rem)',
   'tablet-break-point': 'only screen and (max-width: 64rem)'
@@ -12,9 +13,6 @@ export var onTablet = function onTablet() {
   var mediaQueryString = media['tablet-break-point'];
   return !onPhone(windowObj) && windowObj.matchMedia(mediaQueryString).matches;
 };
-export var isDuringQuizTake = function isDuringQuizTake() {
-  var windowObj = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : window;
-  var locationPath = windowObj.location.pathname;
-  var patternOfQuizTakingPath = /taking\/\d+\/take/;
-  return !!locationPath.match(patternOfQuizTakingPath);
+export var isQuizTaking = function isQuizTaking() {
+  return isDuringQuizTake();
 };

package/es/reporting/components/itemAnalysis/ItemAnalysisRow/presenter.js

@@ -14,7 +14,6 @@ import { Heading } from '@instructure/ui-heading';
 import { ScreenReaderContent, PresentationContent } from '@instructure/ui-a11y-content';
 import { themeable } from '@instructure/ui-themeable';
 import { RichContentRenderer } from '@instructure/quiz-rce';
-import { isNewRCEEnabled } from "../../../../common/util/rceChecker.js";
 import Card from "../../../../common/components/shared/Card/index.js";
 import ExpandButton from "../../../../common/components/shared/ExpandButton/index.js";
 import Spinner from "../../../../common/components/shared/spinner/Spinner.js";
@@ -127,8 +126,7 @@ export var ItemAnalysisRow = (_dec = themeable(theme, styles), _dec(_class = (_t
     value: function renderStem() {
       return /*#__PURE__*/React.createElement(RichContentRenderer, {
         customStyles: styles.stem,
-        content: this.props.itemAnalysis.itemBody,
-        useNewRce: isNewRCEEnabled()
+        content: this.props.itemAnalysis.itemBody
       });
     }
   }, {

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

@@ -47,8 +47,6 @@ var _uiThemeable = require("@instructure/ui-themeable");
 
 var _quizRce = require("@instructure/quiz-rce");
 
-var _rceChecker = require("../../../common/util/rceChecker.js");
-
 var _quizCommon = require("@instructure/quiz-common");
 
 var _quizInteractions = require("@instructure/quiz-interactions");
@@ -322,8 +320,7 @@ var BankEntryRow = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles),
       if (itemOrStimulus.itemBody) {
         return /*#__PURE__*/_react.default.createElement(_quizRce.RichContentRenderer, {
           customStyles: styles.stem,
-          content: itemOrStimulus.itemBody,
-          useNewRce: (0, _rceChecker.isNewRCEEnabled)()
+          content: itemOrStimulus.itemBody
         });
       } else {
         return /*#__PURE__*/_react.default.createElement("div", {

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 _rceChecker = require("../../../../common/util/rceChecker.js");
-
 var _index = require("../../../../common/components/RichContentInput/index.js");
 
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
@@ -134,7 +132,6 @@ var ItemFeedbackModal = (_dec = (0, _uiThemeable.themeable)(_theme.default, styl
         parentType: this.props.parentType,
         parentId: this.props.parentId,
         importModalCloseOverride: this.returnToFeedback,
-        useNewRce: (0, _rceChecker.isNewRCEEnabled)(),
         height: _quizRce.RCE_THREE_LINES_HEIGHT
       }));
     }
@@ -143,8 +140,7 @@ var ItemFeedbackModal = (_dec = (0, _uiThemeable.themeable)(_theme.default, styl
     value: function renderContent() {
       return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_quizRce.RichContentRenderer, {
         customStyles: styles.itemStem,
-        content: this.props.item.itemBody,
-        useNewRce: (0, _rceChecker.isNewRCEEnabled)()
+        content: this.props.item.itemBody
       }), this.renderRichContentInput('correct', (0, _formatMessage.default)('For a correct answer')), this.renderRichContentInput('incorrect', (0, _formatMessage.default)('For an incorrect answer')), this.renderRichContentInput('neutral', (0, _formatMessage.default)('Provide general feedback (regardless of answer)')));
     }
   }, {

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

@@ -29,8 +29,6 @@ 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"));
@@ -115,8 +113,7 @@ 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,
-        useNewRce: (0, _rceChecker.isNewRCEEnabled)()
+        parentId: this.props.quizId
       }), /*#__PURE__*/_react.default.createElement("div", {
         className: styles.footer
       }, /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {

package/lib/building/components/resources/quiz/instructions/Show/index.js

@@ -25,8 +25,6 @@ var _uiThemeable = require("@instructure/ui-themeable");
 
 var _quizRce = require("@instructure/quiz-rce");
 
-var _rceChecker = require("../../../../../../common/util/rceChecker.js");
-
 var _Overlay = _interopRequireDefault(require("../../../../../../common/components/shared/overlay/Overlay.js"));
 
 var _makeScrollable = _interopRequireDefault(require("../../../../../../common/components/shared/functionality/makeScrollable.js"));
@@ -87,8 +85,7 @@ var QuizInstructionsShow = (_dec = (0, _uiThemeable.themeable)(_theme.default, s
         "data-automation": "instructions-show-text"
       }, /*#__PURE__*/_react.default.createElement(_quizRce.RichContentRenderer, {
         customStyles: styles.instructionsShowText,
-        content: this.props.instructions || (0, _formatMessage.default)('Add Instructions...'),
-        useNewRce: (0, _rceChecker.isNewRCEEnabled)()
+        content: this.props.instructions || (0, _formatMessage.default)('Add Instructions...')
       }))));
     }
   }]);

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

@@ -59,8 +59,6 @@ var _index8 = _interopRequireDefault(require("../../../../../common/components/s
 
 var _Item = _interopRequireDefault(require("../../../../../common/records/Item.js"));
 
-var _rceChecker = require("../../../../../common/util/rceChecker.js");
-
 var _quizCommon = require("@instructure/quiz-common");
 
 var _index9 = _interopRequireDefault(require("../QuizEntryShow/index.js"));
@@ -216,8 +214,7 @@ var QuizEntry = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _de
         initialFocusId: this.props.initialFocusId,
         handleValidationErrorsFromApi: this.props.handleValidationErrorsFromApi,
         clearValidationErrorsFromApi: this.props.clearValidationErrorsFromApi,
-        haveValidationErrorsFromApi: Boolean(Object.values(this.props.validationErrorsFromApi).length),
-        useNewRce: (0, _rceChecker.isNewRCEEnabled)()
+        haveValidationErrorsFromApi: Boolean(Object.values(this.props.validationErrorsFromApi).length)
       }, (0, _pick.default)(this.props, ['displayPosition', 'guid', 'draggingOnBuild', 'newHoverPosition', 'quizEntry', 'quizEntries', 'quizId', 'isContentLockedByBlueprint', 'setUi', 'switchOffEditing', 'switchOnEditing', 'shouldClone', 'scrollKey', 'editQuizEntryToggle', 'onEditQuizEntryToggle', 'stimulusOrientation']));
     }
   }, {

package/lib/common/components/layout/sidebar/SidebarItem/presenter.js

@@ -41,8 +41,6 @@ var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/f
 
 var _quizRce = require("@instructure/quiz-rce");
 
-var _rceChecker = require("../../../../util/rceChecker.js");
-
 var _theme = _interopRequireDefault(require("./theme.js"));
 
 var _dec, _class, _class2, _temp;
@@ -188,8 +186,7 @@ var SidebarItem = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
       }, this.getPointsText(pointsPossible || 0))), /*#__PURE__*/_react.default.createElement("div", {
         className: styles.itemBody
       }, /*#__PURE__*/_react.default.createElement(_quizRce.RichContentRenderer, {
-        content: this.props.itemBody,
-        useNewRce: (0, _rceChecker.isNewRCEEnabled)()
+        content: this.props.itemBody
       })))), /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, null, /*#__PURE__*/_react.default.createElement("div", {
         className: styles.pinWrapper
       }, children))));

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

@@ -65,8 +65,7 @@ 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'),
-    useNewRce: (0, _featureCheck.featureOn)('use_new_rce')
+    showCalculator: (0, _featureCheck.featureOn)('calculator_per_question')
   };
 }
 

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

@@ -211,7 +211,6 @@ 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,
@@ -230,7 +229,6 @@ ItemEdit.defaultProps = {
   partialScoringEnabled: false,
   initialFocusId: null,
   showCalculator: false,
-  useNewRce: false,
   validationErrorsFromApi: {}
 };
 var _default = ItemEdit;

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

@@ -38,8 +38,7 @@ 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),
-    useNewRce: (0, _featureCheck.featureOn)('use_new_rce')
+    quizId: (0, _quizzes2.getActiveQuizId)(state)
   };
 }
 

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

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

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

@@ -25,8 +25,6 @@ var _uiThemeable = require("@instructure/ui-themeable");
 
 var _quizRce = require("@instructure/quiz-rce");
 
-var _rceChecker = require("../../../../util/rceChecker.js");
-
 var _makeScrollable = _interopRequireDefault(require("../../../shared/functionality/makeScrollable.js"));
 
 var _theme = _interopRequireDefault(require("./theme.js"));
@@ -63,8 +61,7 @@ var QuizInstructions = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
         tabIndex: "-1"
       }, /*#__PURE__*/_react.default.createElement(_quizRce.RichContentRenderer, {
         customStyles: styles.text,
-        content: this.props.quiz.instructions,
-        useNewRce: (0, _rceChecker.isNewRCEEnabled)()
+        content: this.props.quiz.instructions
       }));
     }
   }]);

package/lib/common/components/resources/sessionItemResult/ResultStimulus/index.js

@@ -27,8 +27,6 @@ var _uiThemeable = require("@instructure/ui-themeable");
 
 var _quizRce = require("@instructure/quiz-rce");
 
-var _rceChecker = require("../../../../util/rceChecker.js");
-
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 
 var _theme = _interopRequireDefault(require("./theme.js"));
@@ -87,8 +85,7 @@ var ResultStimulus = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles)
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: styles.title
       }, title)), /*#__PURE__*/_react.default.createElement(_quizRce.RichContentRenderer, {
-        content: body,
-        useNewRce: (0, _rceChecker.isNewRCEEnabled)()
+        content: body
       }));
     }
   }, {

package/lib/common/components/resources/sessionItemResult/SessionItemResult/presenter.js

@@ -41,8 +41,6 @@ var _uiThemeable = require("@instructure/ui-themeable");
 
 var _quizRce = require("@instructure/quiz-rce");
 
-var _rceChecker = require("../../../../util/rceChecker.js");
-
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 
 var _PositionBox = _interopRequireDefault(require("../../positionBox/PositionBox.js"));
@@ -224,8 +222,7 @@ var SessionItemResult = (_dec = (0, _uiThemeable.themeable)(_theme.default, styl
           className: styles.textPadding
         }, /*#__PURE__*/_react.default.createElement(_quizRce.RichContentRenderer, {
           customStyles: styles.itemFeedbackText,
-          content: feedbackContent,
-          useNewRce: (0, _rceChecker.isNewRCEEnabled)()
+          content: feedbackContent
         })));
       }
     }
@@ -269,8 +266,7 @@ var SessionItemResult = (_dec = (0, _uiThemeable.themeable)(_theme.default, styl
             className: styles.itemFeedbackLabel
           }, (0, _formatMessage.default)('Feedback from grader')), /*#__PURE__*/_react.default.createElement(_quizRce.RichContentRenderer, {
             customStyles: styles.itemFeedbackText,
-            content: graderFeedback.content,
-            useNewRce: (0, _rceChecker.isNewRCEEnabled)()
+            content: graderFeedback.content
           }));
         } else {
           return this.renderFeedbackBox(graderFeedback.content, (0, _formatMessage.default)('Feedback from grader'));
@@ -310,8 +306,7 @@ var SessionItemResult = (_dec = (0, _uiThemeable.themeable)(_theme.default, styl
         properties: simpleItem.properties || {},
         scoringData: simpleSessionItem.scoringData,
         scoredData: simpleSessionItemResult.scoredData,
-        itemResultsModifications: simpleResultsModifications[simpleSessionItem.id],
-        useNewRce: (0, _rceChecker.isNewRCEEnabled)()
+        itemResultsModifications: simpleResultsModifications[simpleSessionItem.id]
       })), this.renderItemFeedback(simpleSessionItemResult));
     }
   }, {

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

@@ -39,8 +39,6 @@ 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");
@@ -210,8 +208,7 @@ var StimulusEditInfo = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
         onKeyUp: this.onBodyChange,
         onBlur: this.onBodyChange,
         onChange: this.onBodyChange,
-        uploadPath: this.fileUploadUrl(),
-        useNewRce: (0, _rceChecker.isNewRCEEnabled)()
+        uploadPath: this.fileUploadUrl()
       }), /*#__PURE__*/_react.default.createElement(_Errors.default, {
         errorList: this.errorsList('body')
       })), /*#__PURE__*/_react.default.createElement("div", {

package/lib/common/components/resources/stimulus/StimulusShowInfo/index.js

@@ -29,8 +29,6 @@ var _uiView = require("@instructure/ui-view");
 
 var _quizRce = require("@instructure/quiz-rce");
 
-var _rceChecker = require("../../../../util/rceChecker.js");
-
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 
 var StimulusShowInfo = /*#__PURE__*/function (_Component) {
@@ -80,8 +78,7 @@ var StimulusShowInfo = /*#__PURE__*/function (_Component) {
       }, this.props.stimulus.title), instructions, /*#__PURE__*/_react.default.createElement("div", {
         "data-automation": "sdk-stimulus-LeftPanelShow-content"
       }, /*#__PURE__*/_react.default.createElement(_quizRce.RichContentRenderer, {
-        content: this.props.stimulus.body,
-        useNewRce: (0, _rceChecker.isNewRCEEnabled)()
+        content: this.props.stimulus.body
       })));
     }
   }]);

package/lib/common/util/RceConfigProvider.js

@@ -127,17 +127,17 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
   };
 
   var getConfig = function getConfig() {
-    var _ref2, _featureFlags;
+    var _featureFlags, _ref2;
 
     return {
-      rcs: hasAllPropsForRcs() && canvasConfig ? (_ref2 = {}, (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.useNewRce, props.useNewRce), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.canvasUserId, props.canvasUserId), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.contextId, props.contextId), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.contextType, props.contextType), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.rcsHost, props.rcsHost), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.rcsJwt, jwt), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.rcsJwtRefreshFn, refreshToken), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.canvasConfig, canvasConfig), _ref2) : null,
-      rendererEnhancement: (0, _defineProperty2.default)({}, _quizCommon.RceConfigKeys.canvasOrigin, props.canvasOrigin),
-      featureFlags: (_featureFlags = {}, (0, _defineProperty2.default)(_featureFlags, _quizCommon.RceConfigKeys.isNewRCEAppsEnabled, props.isNewRCEAppsEnabled), (0, _defineProperty2.default)(_featureFlags, _quizCommon.RceConfigKeys.rce5Renderer, props.rce5Renderer), _featureFlags)
+      featureFlags: (_featureFlags = {}, (0, _defineProperty2.default)(_featureFlags, _quizCommon.RceConfigKeys.isNewRCEEnabled, props.isNewRCEEnabled), (0, _defineProperty2.default)(_featureFlags, _quizCommon.RceConfigKeys.rce5Renderer, props.rce5Renderer), (0, _defineProperty2.default)(_featureFlags, _quizCommon.RceConfigKeys.isNewRCEAppsEnabled, props.isNewRCEAppsEnabled), _featureFlags),
+      rcs: hasAllPropsForRcs() && canvasConfig ? (_ref2 = {}, (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.canvasUserId, props.canvasUserId), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.contextId, props.contextId), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.contextType, props.contextType), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.rcsHost, props.rcsHost), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.rcsJwt, jwt), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.rcsJwtRefreshFn, refreshToken), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.canvasConfig, canvasConfig), _ref2) : null,
+      rendererEnhancement: (0, _defineProperty2.default)({}, _quizCommon.RceConfigKeys.canvasOrigin, props.canvasOrigin)
     };
   };
 
   var setErrorIfDuringTaking = function setErrorIfDuringTaking(errorMessage) {
-    if (!(0, _windowChecks.isDuringQuizTake)()) {
+    if (!(0, _windowChecks.isQuizTaking)()) {
       return;
     }
 
@@ -151,7 +151,7 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              if (!(!props.useNewRce && !props.rce5Renderer)) {
+              if (!(!props.isNewRCEEnabled && !props.rce5Renderer)) {
                 _context2.next = 2;
                 break;
               }
@@ -212,10 +212,10 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
         }
       }, _callee2, null, [[2, 21, 25, 28]]);
     }))();
-  }, [props.useNewRce, props.rce5Renderer]);
+  }, [props.isNewRCEEnabled, props.rce5Renderer]);
 
   if (props.loadedApiFeatures) {
-    if (props.useNewRce || props.rce5Renderer) {
+    if (props.isNewRCEEnabled || props.rce5Renderer) {
       if (!canvasConfigLoading) {
         return /*#__PURE__*/_react.default.createElement(_quizCommon.RceConfigContext.Provider, {
           value: getConfig()
@@ -232,7 +232,7 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
 exports.RceConfigProviderComponent = RceConfigProviderComponent;
 RceConfigProviderComponent.propTypes = {
   children: _propTypes.default.node.isRequired,
-  useNewRce: _propTypes.default.bool.isRequired,
+  isNewRCEEnabled: _propTypes.default.bool.isRequired,
   rce5Renderer: _propTypes.default.bool.isRequired,
   isNewRCEAppsEnabled: _propTypes.default.bool,
   setRCEError: _propTypes.default.func.isRequired,
@@ -259,7 +259,7 @@ RceConfigProviderComponent.defaultProps = {
 
 var mapStateToProps = function mapStateToProps(state, ownProps) {
   return {
-    useNewRce: (0, _rceChecker.isNewRCEEnabled)(),
+    isNewRCEEnabled: (0, _rceChecker.isNewRCEEnabled)(),
     rce5Renderer: (0, _rceChecker.isRCE5RendererEnabled)(),
     isNewRCEAppsEnabled: (0, _rceChecker.isNewRCEAppsEnabled)(),
     loadedApiFeatures: state.getIn(['ui', 'loadedApiFeatures']) || ownProps.loadedApiFeatures

package/lib/common/util/interactionTypePropsHelper.js

@@ -11,8 +11,6 @@ var _index = _interopRequireDefault(require("../components/RichContentInput/inde
 
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 
-var _rceChecker = require("../../common/util/rceChecker.js");
-
 var propsForInteractionEdit = function propsForInteractionEdit(props, additionalOptions) {
   var item = props.workingItem.toJS();
 
@@ -81,8 +79,7 @@ var propsForInteractionEdit = function propsForInteractionEdit(props, additional
     setOneQuestionAtATime: setOneQuestionAtATime,
     stemErrors: props.workingItem.errorsFor('itemBody').toJS(),
     initialFocusId: props.initialFocusId,
-    calculatorType: item.calculatorType,
-    useNewRce: props.useNewRce
+    calculatorType: item.calculatorType
   };
 };
 
@@ -98,8 +95,7 @@ var propsForInteractionShow = function propsForInteractionShow(item) {
     itemBody: item.itemBody || '',
     properties: item.properties,
     notifyScreenreader: true,
-    scoringData: item.scoringData,
-    useNewRce: (0, _rceChecker.isNewRCEEnabled)()
+    scoringData: item.scoringData
   };
 };
 

package/lib/common/util/windowChecks.js

@@ -3,7 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isDuringQuizTake = exports.onTablet = exports.onPhone = exports.media = void 0;
+exports.isQuizTaking = exports.onTablet = exports.onPhone = exports.media = void 0;
+
+var _quizCommon = require("@instructure/quiz-common");
+
 var media = {
   'phone-break-point': 'only screen and (max-width: 48rem)',
   'tablet-break-point': 'only screen and (max-width: 64rem)'
@@ -26,11 +29,8 @@ var onTablet = function onTablet() {
 
 exports.onTablet = onTablet;
 
-var isDuringQuizTake = function isDuringQuizTake() {
-  var windowObj = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : window;
-  var locationPath = windowObj.location.pathname;
-  var patternOfQuizTakingPath = /taking\/\d+\/take/;
-  return !!locationPath.match(patternOfQuizTakingPath);
+var isQuizTaking = function isQuizTaking() {
+  return (0, _quizCommon.isDuringQuizTake)();
 };
 
-exports.isDuringQuizTake = isDuringQuizTake;
+exports.isQuizTaking = isQuizTaking;

package/lib/reporting/components/itemAnalysis/ItemAnalysisRow/presenter.js

@@ -35,8 +35,6 @@ 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/shared/Card/index.js"));
 
 var _index2 = _interopRequireDefault(require("../../../../common/components/shared/ExpandButton/index.js"));
@@ -162,8 +160,7 @@ var ItemAnalysisRow = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
     value: function renderStem() {
       return /*#__PURE__*/_react.default.createElement(_quizRce.RichContentRenderer, {
         customStyles: styles.stem,
-        content: this.props.itemAnalysis.itemBody,
-        useNewRce: (0, _rceChecker.isNewRCEEnabled)()
+        content: this.props.itemAnalysis.itemBody
       });
     }
   }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "17.46.2-rc.5+37f02b17c",
+  "version": "17.46.2-rc.7+47bea20b0",
   "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.46.2-rc.5+37f02b17c",
-    "@instructure/quiz-i18n": "17.46.2-rc.5+37f02b17c",
-    "@instructure/quiz-interactions": "17.46.2-rc.5+37f02b17c",
-    "@instructure/quiz-number-input": "17.46.2-rc.5+37f02b17c",
-    "@instructure/quiz-rce": "17.46.2-rc.5+37f02b17c",
+    "@instructure/quiz-common": "17.46.2-rc.7+47bea20b0",
+    "@instructure/quiz-i18n": "17.46.2-rc.7+47bea20b0",
+    "@instructure/quiz-interactions": "17.46.2-rc.7+47bea20b0",
+    "@instructure/quiz-number-input": "17.46.2-rc.7+47bea20b0",
+    "@instructure/quiz-rce": "17.46.2-rc.7+47bea20b0",
     "@instructure/ui-a11y-content": "^7.20.0",
     "@instructure/ui-alerts": "^7.20.0",
     "@instructure/ui-avatar": "^7.20.0",
@@ -106,7 +106,7 @@
     "eventemitter3": "^3.1.0",
     "humps": "^2.0.0",
     "immutable": "^3.8.1",
-    "instructure-validations": "17.46.2-rc.5+37f02b17c",
+    "instructure-validations": "17.46.2-rc.7+47bea20b0",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -156,7 +156,7 @@
     "intl": "^1.2.4",
     "jquery": "^2.2.3",
     "most-subject": "^5.3.0",
-    "quiz-presets": "17.46.2-rc.5+37f02b17c",
+    "quiz-presets": "17.46.2-rc.7+47bea20b0",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -172,5 +172,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "37f02b17c1166cbe17de00d9846742a8145c6dc2"
+  "gitHead": "47bea20b09ca5f5297bef941c827eb4fad7b5e05"
 }