@instructure/quiz-core 17.27.1-rc.0 → 17.28.1-rc.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [17.28.0](https://gerrit.instructure.com/quizzes-ui/compare/v17.27.0...v17.28.0) (2022-03-09)
+
+
+### Features
+
+* **quizzes-ui:** Reintroduce TinyMCE v5 to load based on a feature flag ([7bc7fb3](https://gerrit.instructure.com/quizzes-ui/commits/7bc7fb3bf3cd25f2bde5313dfcc60e63d4569937))
+
+
+
+
+
 # [17.27.0](https://gerrit.instructure.com/quizzes-ui/compare/v17.26.0...v17.27.0) (2022-03-08)
 
 

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/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/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/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/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.27.1-rc.0+7e90f0bf2",
+  "version": "17.28.1-rc.0+1a117b107",
   "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.27.1-rc.0+7e90f0bf2",
-    "@instructure/quiz-i18n": "17.27.1-rc.0+7e90f0bf2",
-    "@instructure/quiz-interactions": "17.27.1-rc.0+7e90f0bf2",
-    "@instructure/quiz-number-input": "17.27.1-rc.0+7e90f0bf2",
-    "@instructure/quiz-rce": "17.27.1-rc.0+7e90f0bf2",
+    "@instructure/quiz-common": "17.28.1-rc.0+1a117b107",
+    "@instructure/quiz-i18n": "17.28.1-rc.0+1a117b107",
+    "@instructure/quiz-interactions": "17.28.1-rc.0+1a117b107",
+    "@instructure/quiz-number-input": "17.28.1-rc.0+1a117b107",
+    "@instructure/quiz-rce": "17.28.1-rc.0+1a117b107",
     "@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.27.1-rc.0+7e90f0bf2",
+    "instructure-validations": "17.28.1-rc.0+1a117b107",
     "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.27.1-rc.0+7e90f0bf2",
+    "@instructure/quiz-scripts": "17.28.1-rc.0+1a117b107",
     "@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.27.1-rc.0+7e90f0bf2",
+    "quiz-presets": "17.28.1-rc.0+1a117b107",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -172,5 +172,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7e90f0bf2874da693ec833a5fbb66a56e899551a"
+  "gitHead": "1a117b1073c0a0065672ce1cffa15e15fa9f38f3"
 }