@instructure/quiz-core 20.36.1-rc.2 → 20.36.1-rc.20

package/lib/moderating/components/sidebar/ModerateTray/presenter.js

@@ -16,6 +16,7 @@ var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/f
 var _uiFlex = require("@instructure/ui-flex");
 var _uiView = require("@instructure/ui-view");
 var _uiText = require("@instructure/ui-text");
+var _uiHeading = require("@instructure/ui-heading");
 var _uiTooltip = require("@instructure/ui-tooltip");
 var _uiTray = require("@instructure/ui-tray");
 var _uiButtons = require("@instructure/ui-buttons");
@@ -23,7 +24,6 @@ var _uiTruncateText = require("@instructure/ui-truncate-text");
 var _uiModal = require("@instructure/ui-modal");
 var _quizCommon = require("@instructure/quiz-common");
 var _uiA11yContent = require("@instructure/ui-a11y-content");
-var _featureCheck = require("../../../../common/util/featureCheck.js");
 var ModerateTray = /*#__PURE__*/function (_Component) {
   (0, _inherits2.default)(ModerateTray, _Component);
   var _super = (0, _createSuper2.default)(ModerateTray);
@@ -75,20 +75,15 @@ var ModerateTray = /*#__PURE__*/function (_Component) {
       _this.props.closeTray();
     };
     _this.renderTitleAndCloseButton = function () {
-      return /*#__PURE__*/_react.default.createElement(_uiFlex.Flex, {
-        justifyItems: "space-between"
-      }, /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
-        shouldGrow: true,
-        shouldShrink: true
-      }, (0, _featureCheck.featureOn)('atteq_apply_changes_to_current_quiz_attempts') ? /*#__PURE__*/_react.default.createElement(_uiText.Text, {
-        as: "h2",
-        size: "large",
-        weight: "bold"
-      }, (0, _formatMessage.default)('In Progress Accommodation')) : _this.renderHeading()), /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, null, /*#__PURE__*/_react.default.createElement(_uiButtons.CloseButton, {
+      return /*#__PURE__*/_react.default.createElement(_uiModal.Modal.Header, null, /*#__PURE__*/_react.default.createElement(_uiButtons.CloseButton, {
         onClick: _this.props.closeTray,
         elementRef: _this.setCloseRef,
+        placement: "end",
+        offset: "medium",
         screenReaderLabel: (0, _formatMessage.default)('Close')
-      })));
+      }), _this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled ? /*#__PURE__*/_react.default.createElement(_uiHeading.Heading, {
+        level: "h3"
+      }, /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('In Progress Accommodation')), (0, _formatMessage.default)('In Progress Accommodation')) : _this.renderHeading());
     };
     _this.renderChildren = function () {
       return _react.default.Children.map(_this.props.children, function (child) {
@@ -136,12 +131,12 @@ var ModerateTray = /*#__PURE__*/function (_Component) {
         /*#__PURE__*/
         // When using TruncateText inside a Tooltip, a focusable wrapper element is required
         // tabIndex={0} makes the div focusable and allows KO users to access the tooltip
-        _react.default.createElement(_uiView.View, {
+        _react.default.createElement(_uiHeading.Heading, {
           display: "block",
           borderRadius: "small",
           position: "relative",
           withFocusOutline: this.state.titleIsTruncated && focused,
-          as: "h2",
+          level: "h3",
           tabIndex: this.state.isTruncated ? 0 : null
         }, /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, this.labelText()), /*#__PURE__*/_react.default.createElement(_uiTruncateText.TruncateText, {
           "aria-hidden": "true",
@@ -154,9 +149,6 @@ var ModerateTray = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderName",
     value: function renderName(renderProps) {
-      if (!(0, _featureCheck.featureOn)('atteq_apply_changes_to_current_quiz_attempts')) {
-        return null;
-      }
       var focused = renderProps && renderProps.focused;
       return (
         /*#__PURE__*/
@@ -167,8 +159,7 @@ var ModerateTray = /*#__PURE__*/function (_Component) {
           borderRadius: "small",
           position: "relative",
           withFocusOutline: this.state.participantNameIsTruncated && focused,
-          tabIndex: this.state.participantNameIsTruncated ? 0 : null,
-          margin: "small 0"
+          tabIndex: this.state.participantNameIsTruncated ? 0 : null
         }, /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, this.props.participantName), /*#__PURE__*/_react.default.createElement(_uiTruncateText.TruncateText, {
           "aria-hidden": "true",
           maxLines: 2,
@@ -183,9 +174,6 @@ var ModerateTray = /*#__PURE__*/function (_Component) {
     key: "renderNameWithTooltip",
     value: function renderNameWithTooltip() {
       var _this3 = this;
-      if (!(0, _featureCheck.featureOn)('atteq_apply_changes_to_current_quiz_attempts')) {
-        return null;
-      }
       return this.state.titleIsTruncated ? /*#__PURE__*/_react.default.createElement(_uiTooltip.Tooltip, {
         placement: "start",
         renderTip: this.props.participantName,
@@ -200,7 +188,7 @@ var ModerateTray = /*#__PURE__*/function (_Component) {
   }, {
     key: "labelText",
     value: function labelText() {
-      if ((0, _featureCheck.featureOn)('atteq_apply_changes_to_current_quiz_attempts')) {
+      if (this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled) {
         return (0, _formatMessage.default)('In Progress Accommodation');
       }
       if (this.props.participantName) {
@@ -219,19 +207,21 @@ var ModerateTray = /*#__PURE__*/function (_Component) {
         onExited: this.handleTrayExited,
         open: this.props.isOpen,
         placement: "end",
-        size: (0, _featureCheck.featureOn)('atteq_apply_changes_to_current_quiz_attempts') ? 'regular' : void 0,
+        size: this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled ? 'regular' : void 0,
         shouldCloseOnDocumentClick: true,
         ref: this.setTrayRef
       }, /*#__PURE__*/_react.default.createElement(_uiFlex.Flex, {
         as: "div",
         direction: "column",
         height: "100vh"
-      }, /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
-        padding: "small medium"
-      }, this.renderTitleAndCloseButton()), /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
+      }, this.renderTitleAndCloseButton(), this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled && /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
+        padding: "medium medium 0 medium"
+      }, this.renderNameWithTooltip()), /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
+        padding: "medium"
+      }, (0, _formatMessage.default)('These settings apply to current and all future attempts.')), /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
         shouldGrow: true,
         padding: "0 medium"
-      }, this.renderNameWithTooltip(), this.renderChildren()), (0, _featureCheck.featureOn)('add_time_to_existing_quiz_sessions') && /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, null, this.renderFooter())));
+      }, this.renderChildren()), this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled && /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, null, this.renderFooter())));
     }
   }]);
   ModerateTray.displayName = "ModerateTray";
@@ -244,7 +234,8 @@ ModerateTray.propTypes = {
   isOpen: _propTypes.default.bool.isRequired,
   onClose: _propTypes.default.func,
   onSave: _propTypes.default.func.isRequired,
-  participantName: _propTypes.default.string
+  participantName: _propTypes.default.string,
+  atteqApplyChangesToCurrentQuizAttemptsEnabled: _propTypes.default.bool.isRequired
 };
 ModerateTray.defaultProps = {
   onClose: void 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "20.36.1-rc.2+e9e02e68b",
+  "version": "20.36.1-rc.20+fc92f4e32",
   "license": "MIT",
   "description": "The Quiz React SDK by Instructure Inc.",
   "author": "Instructure, Inc. Engineering and Product Design",
@@ -46,11 +46,11 @@
     "@instructure/emotion": "^8.56.3",
     "@instructure/grading-utils": "^1.0.0",
     "@instructure/outcomes-ui": "^3.2.2",
-    "@instructure/quiz-common": "^20.36.1-rc.2+e9e02e68b",
-    "@instructure/quiz-i18n": "^20.36.1-rc.2+e9e02e68b",
-    "@instructure/quiz-interactions": "^20.36.1-rc.2+e9e02e68b",
-    "@instructure/quiz-number-input": "^20.36.1-rc.2+e9e02e68b",
-    "@instructure/quiz-rce": "^20.36.1-rc.2+e9e02e68b",
+    "@instructure/quiz-common": "^20.36.1-rc.20+fc92f4e32",
+    "@instructure/quiz-i18n": "^20.36.1-rc.20+fc92f4e32",
+    "@instructure/quiz-interactions": "^20.36.1-rc.20+fc92f4e32",
+    "@instructure/quiz-number-input": "^20.36.1-rc.20+fc92f4e32",
+    "@instructure/quiz-rce": "^20.36.1-rc.20+fc92f4e32",
     "@instructure/ui-a11y-content": "^8.56.3",
     "@instructure/ui-alerts": "^8.56.3",
     "@instructure/ui-avatar": "^8.56.3",
@@ -114,7 +114,7 @@
     "file-saver": "~2.0.5",
     "humps": "^2.0.0",
     "immutable": "^3.8.1",
-    "instructure-validations": "^20.36.1-rc.2+e9e02e68b",
+    "instructure-validations": "^20.36.1-rc.20+fc92f4e32",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -150,6 +150,7 @@
     "@instructure/ui-babel-preset": "^7.22.1",
     "@instructure/ui-test-utils": "^7.22.1",
     "@testing-library/react": "^12.1.5",
+    "@testing-library/user-event": "^12.0.0",
     "chai": "^4.1.2",
     "chai-as-promised": "^7.1.1",
     "chai-enzyme": "^1.0.0-beta.1",
@@ -163,7 +164,7 @@
     "jquery": "^2.2.3",
     "karma-junit-reporter": "^2.0.1",
     "most-subject": "^5.3.0",
-    "quiz-presets": "^20.36.1-rc.2+e9e02e68b",
+    "quiz-presets": "^20.36.1-rc.20+fc92f4e32",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -179,5 +180,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e9e02e68b7ceac79699136f724fe7298b203dd5b"
+  "gitHead": "fc92f4e327d0121f6f338fc1c35c1e63c882470c"
 }