@instructure/quiz-core 20.36.1-rc.0 → 20.36.1-rc.3

package/es/banks/components/NavWrapper/externalStyles.js

@@ -0,0 +1,5 @@
+export var generateExternalStyle = function generateExternalStyle() {
+  return {
+    showReturnButton: true
+  };
+};

package/es/banks/components/NavWrapper/styles.js

@@ -1,6 +1,7 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import { generateExternalStyle } from "./externalStyles.js";
 var generateStyle = function generateStyle(componentTheme) {
-  return {
-    showReturnButton: true,
+  return _objectSpread({
     nav: {
       display: 'flex',
       flexDirection: 'row',
@@ -25,6 +26,6 @@ var generateStyle = function generateStyle(componentTheme) {
     crumbs: {
       flex: 1
     }
-  };
+  }, generateExternalStyle());
 };
 export default generateStyle;

package/es/common/components/layout/navbar/externalStyles.js

@@ -0,0 +1,7 @@
+export var generateExternalStyle = function generateExternalStyle() {
+  return {
+    showBrandIcon: true,
+    desktopBottomBorder: true,
+    desktopBottomBorderInverse: true
+  };
+};

package/es/common/components/layout/navbar/styles.js

@@ -1,10 +1,9 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import { generateExternalStyle } from "./externalStyles.js";
 var generateStyle = function generateStyle(componentTheme) {
-  return {
-    showBrandIcon: true,
-    desktopBottomBorder: true,
-    desktopBottomBorderInverse: true,
+  return _objectSpread({
     backgroundColor: componentTheme.backgroundColor,
     phoneBreakPoint: componentTheme.phoneBreakPoint
-  };
+  }, generateExternalStyle());
 };
 export default generateStyle;

package/es/common/components/layout/sidebar/Sidebar/externalStyles.js

@@ -0,0 +1,10 @@
+export var generateExternalStyle = function generateExternalStyle(componentTheme) {
+  return {
+    sidebar: {
+      borderTop: "".concat(componentTheme.sidebarBorderWidth, " solid ").concat(componentTheme.sidebarBorderColor),
+      borderRight: "".concat(componentTheme.sidebarBorderWidth, " solid ").concat(componentTheme.sidebarBorderColor),
+      borderBottom: "".concat(componentTheme.sidebarBorderWidth, " solid ").concat(componentTheme.sidebarBorderColor),
+      borderLeft: "".concat(componentTheme.sidebarBorderWidth, " solid ").concat(componentTheme.sidebarBorderColor)
+    }
+  };
+};

package/es/common/components/layout/sidebar/Sidebar/styles.js

@@ -1,18 +1,16 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import merge from 'lodash/merge';
+import { generateExternalStyle } from "./externalStyles.js";
 var generateStyle = function generateStyle(componentTheme, props) {
   var _commonContainer;
   var mq = "@media screen and (".concat(componentTheme.phoneBreakPoint, ")");
   var mp = '@media print';
-  return {
+  return merge({
     sidebar: _objectSpread(_objectSpread(_defineProperty({
       boxSizing: 'border-box',
       width: componentTheme.sidebarWidthClosed,
       backgroundColor: componentTheme.sidebarBackgroundColor,
-      borderTop: "".concat(componentTheme.sidebarBorderWidth, " solid ").concat(componentTheme.sidebarBorderColor),
-      borderRight: "".concat(componentTheme.sidebarBorderWidth, " solid ").concat(componentTheme.sidebarBorderColor),
-      borderBottom: "".concat(componentTheme.sidebarBorderWidth, " solid ").concat(componentTheme.sidebarBorderColor),
-      borderLeft: "".concat(componentTheme.sidebarBorderWidth, " solid ").concat(componentTheme.sidebarBorderColor),
       color: componentTheme.sidebarColor,
       height: '100%',
       overflow: 'hidden',
@@ -111,6 +109,6 @@ var generateStyle = function generateStyle(componentTheme, props) {
     }), _defineProperty(_commonContainer, mp, {
       display: 'none'
     }), _commonContainer)
-  };
+  }, generateExternalStyle(componentTheme));
 };
 export default generateStyle;

package/es/moderating/components/resources/AccommodationsModal/ExtraTimeSettings/index.js

@@ -94,7 +94,7 @@ export var ExtraTimeSettings = /*#__PURE__*/function (_Component) {
         minutesLabel: t('Minutes'),
         minutesDataAutomation: "sdk-moderation-time-minutes",
         description: t('Additional time'),
-        margin: "medium none"
+        margin: "medium none none none"
       }), timeAdjustmentType === 'timerMultiplierEnabled' && /*#__PURE__*/React.createElement(ExtraTimeMultiplier, {
         onChange: this.onChangeMultiplier,
         timerMultiplierValue: timerSettings.timerMultiplierValue,

package/es/moderating/components/resources/AccommodationsModal/index.js

@@ -4,7 +4,6 @@ import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { Text } from '@instructure/ui-text';
 import { Tooltip } from '@instructure/ui-tooltip';
 import { Modal } from '@instructure/ui-modal';
 import { TruncateText } from '@instructure/ui-truncate-text';
@@ -13,8 +12,6 @@ import { View } from '@instructure/ui-view';
 import { Button, CloseButton } from '@instructure/ui-buttons';
 import t from '@instructure/quiz-i18n/es/format-message';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
-import { featureOn } from "../../../../common/util/featureCheck.js";
-import { IfFeature } from "../../../../common/components/shared/IfFeature/index.js";
 export var AccommodationModal = /*#__PURE__*/function (_Component) {
   _inherits(AccommodationModal, _Component);
   var _super = _createSuper(AccommodationModal);
@@ -57,7 +54,7 @@ export var AccommodationModal = /*#__PURE__*/function (_Component) {
       }, _this.props.studentName));
     };
     _this.renderHeading = function () {
-      if (featureOn('atteq_apply_changes_to_current_quiz_attempts')) {
+      if (_this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled) {
         return /*#__PURE__*/React.createElement(Heading, null, /*#__PURE__*/React.createElement(ScreenReaderContent, null, t('Student Accommodation')), t('Student Accommodation'));
       }
       var _this$props = _this.props,
@@ -84,7 +81,7 @@ export var AccommodationModal = /*#__PURE__*/function (_Component) {
   _createClass(AccommodationModal, [{
     key: "labelText",
     value: function labelText() {
-      if (featureOn('atteq_apply_changes_to_current_quiz_attempts')) {
+      if (this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled) {
         return t('Student Accommodation');
       }
       return this.props.studentName || t('Accommodations Modal');
@@ -93,7 +90,6 @@ export var AccommodationModal = /*#__PURE__*/function (_Component) {
     key: "render",
     value: function render() {
       var _this$props2 = this.props,
-        studentName = _this$props2.studentName,
         open = _this$props2.open,
         closeModal = _this$props2.closeModal,
         mountNode = _this$props2.mountNode,
@@ -109,12 +105,7 @@ export var AccommodationModal = /*#__PURE__*/function (_Component) {
         placement: "end",
         offset: "medium",
         screenReaderLabel: t('Close')
-      }), this.renderHeading()), /*#__PURE__*/React.createElement(Modal.Body, null, /*#__PURE__*/React.createElement(IfFeature, {
-        name: "atteq_apply_changes_to_current_quiz_attempts"
-      }, /*#__PURE__*/React.createElement(Text, {
-        weight: "bold",
-        as: "h2"
-      }, studentName)), children), /*#__PURE__*/React.createElement(Modal.Footer, null, /*#__PURE__*/React.createElement(Button, {
+      }), this.renderHeading()), /*#__PURE__*/React.createElement(Modal.Body, null, children), /*#__PURE__*/React.createElement(Modal.Footer, null, /*#__PURE__*/React.createElement(Button, {
         onClick: this.cancelAction,
         margin: "xxx-small",
         "data-automation": "sdk-moderation-cancel"
@@ -137,7 +128,8 @@ AccommodationModal.propTypes = {
   onDismiss: PropTypes.func,
   mountNode: PropTypes.string,
   // this is just to fix chromatic
-  children: PropTypes.oneOfType([PropTypes.node, PropTypes.arrayOf(PropTypes.node)])
+  children: PropTypes.oneOfType([PropTypes.node, PropTypes.arrayOf(PropTypes.node)]),
+  atteqApplyChangesToCurrentQuizAttemptsEnabled: PropTypes.bool.isRequired
 };
 AccommodationModal.defaultProps = {
   children: [],

package/es/moderating/components/resources/ModerateTable/presenter.js

@@ -325,7 +325,8 @@ export var ModerateTable = (_dec = withStyleOverrides(generateStyle, generateCom
         css: this.props.styles.page
       }, jsx(ModerateTray, {
         onClose: this.onCloseTray,
-        onSave: this.props.onSaveTray
+        onSave: this.props.onSaveTray,
+        atteqApplyChangesToCurrentQuizAttemptsEnabled: this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled
       }, jsx(Flex.Item, null, !this.props.anonymousGrading && _ref6), this.props.children), this.renderContent());
     }
   }]);
@@ -380,7 +381,8 @@ export var ModerateTable = (_dec = withStyleOverrides(generateStyle, generateCom
   getQuizSessions: PropTypes.func.isRequired,
   addSuccess: PropTypes.func.isRequired,
   styles: PropTypes.object,
-  makeStyles: PropTypes.func
+  makeStyles: PropTypes.func,
+  atteqApplyChangesToCurrentQuizAttemptsEnabled: PropTypes.bool.isRequired
 }, _ModerateTable.defaultProps = {
   anonymousGrading: false,
   children: void 0,

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

@@ -8,6 +8,7 @@ import t from '@instructure/quiz-i18n/es/format-message';
 import { Flex } from '@instructure/ui-flex';
 import { View } from '@instructure/ui-view';
 import { Text } from '@instructure/ui-text';
+import { Heading } from '@instructure/ui-heading';
 import { Tooltip } from '@instructure/ui-tooltip';
 import { Tray } from '@instructure/ui-tray';
 import { Button, CloseButton } from '@instructure/ui-buttons';
@@ -15,7 +16,6 @@ import { TruncateText } from '@instructure/ui-truncate-text';
 import { Modal } from '@instructure/ui-modal';
 import { liveRegion } from '@instructure/quiz-common';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
-import { featureOn } from "../../../../common/util/featureCheck.js";
 export var ModerateTray = /*#__PURE__*/function (_Component) {
   _inherits(ModerateTray, _Component);
   var _super = _createSuper(ModerateTray);
@@ -67,20 +67,15 @@ export var ModerateTray = /*#__PURE__*/function (_Component) {
       _this.props.closeTray();
     };
     _this.renderTitleAndCloseButton = function () {
-      return /*#__PURE__*/React.createElement(Flex, {
-        justifyItems: "space-between"
-      }, /*#__PURE__*/React.createElement(Flex.Item, {
-        shouldGrow: true,
-        shouldShrink: true
-      }, featureOn('atteq_apply_changes_to_current_quiz_attempts') ? /*#__PURE__*/React.createElement(Text, {
-        as: "h2",
-        size: "large",
-        weight: "bold"
-      }, t('In Progress Accommodation')) : _this.renderHeading()), /*#__PURE__*/React.createElement(Flex.Item, null, /*#__PURE__*/React.createElement(CloseButton, {
+      return /*#__PURE__*/React.createElement(Modal.Header, null, /*#__PURE__*/React.createElement(CloseButton, {
         onClick: _this.props.closeTray,
         elementRef: _this.setCloseRef,
+        placement: "end",
+        offset: "medium",
         screenReaderLabel: t('Close')
-      })));
+      }), _this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled ? /*#__PURE__*/React.createElement(Heading, {
+        level: "h3"
+      }, /*#__PURE__*/React.createElement(ScreenReaderContent, null, t('In Progress Accommodation')), t('In Progress Accommodation')) : _this.renderHeading());
     };
     _this.renderChildren = function () {
       return React.Children.map(_this.props.children, function (child) {
@@ -128,12 +123,12 @@ export 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.createElement(View, {
+        React.createElement(Heading, {
           display: "block",
           borderRadius: "small",
           position: "relative",
           withFocusOutline: this.state.titleIsTruncated && focused,
-          as: "h2",
+          level: "h3",
           tabIndex: this.state.isTruncated ? 0 : null
         }, /*#__PURE__*/React.createElement(ScreenReaderContent, null, this.labelText()), /*#__PURE__*/React.createElement(TruncateText, {
           "aria-hidden": "true",
@@ -146,9 +141,6 @@ export var ModerateTray = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderName",
     value: function renderName(renderProps) {
-      if (!featureOn('atteq_apply_changes_to_current_quiz_attempts')) {
-        return null;
-      }
       var focused = renderProps && renderProps.focused;
       return (
         /*#__PURE__*/
@@ -159,8 +151,7 @@ export 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.createElement(ScreenReaderContent, null, this.props.participantName), /*#__PURE__*/React.createElement(TruncateText, {
           "aria-hidden": "true",
           maxLines: 2,
@@ -175,9 +166,6 @@ export var ModerateTray = /*#__PURE__*/function (_Component) {
     key: "renderNameWithTooltip",
     value: function renderNameWithTooltip() {
       var _this3 = this;
-      if (!featureOn('atteq_apply_changes_to_current_quiz_attempts')) {
-        return null;
-      }
       return this.state.titleIsTruncated ? /*#__PURE__*/React.createElement(Tooltip, {
         placement: "start",
         renderTip: this.props.participantName,
@@ -192,7 +180,7 @@ export var ModerateTray = /*#__PURE__*/function (_Component) {
   }, {
     key: "labelText",
     value: function labelText() {
-      if (featureOn('atteq_apply_changes_to_current_quiz_attempts')) {
+      if (this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled) {
         return t('In Progress Accommodation');
       }
       if (this.props.participantName) {
@@ -211,19 +199,21 @@ export var ModerateTray = /*#__PURE__*/function (_Component) {
         onExited: this.handleTrayExited,
         open: this.props.isOpen,
         placement: "end",
-        size: 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.createElement(Flex, {
         as: "div",
         direction: "column",
         height: "100vh"
-      }, /*#__PURE__*/React.createElement(Flex.Item, {
-        padding: "small medium"
-      }, this.renderTitleAndCloseButton()), /*#__PURE__*/React.createElement(Flex.Item, {
+      }, this.renderTitleAndCloseButton(), this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled && /*#__PURE__*/React.createElement(Flex.Item, {
+        padding: "medium medium 0 medium"
+      }, this.renderNameWithTooltip()), /*#__PURE__*/React.createElement(Flex.Item, {
+        padding: "medium"
+      }, t('These settings apply to current and all future attempts.')), /*#__PURE__*/React.createElement(Flex.Item, {
         shouldGrow: true,
         padding: "0 medium"
-      }, this.renderNameWithTooltip(), this.renderChildren()), featureOn('add_time_to_existing_quiz_sessions') && /*#__PURE__*/React.createElement(Flex.Item, null, this.renderFooter())));
+      }, this.renderChildren()), this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled && /*#__PURE__*/React.createElement(Flex.Item, null, this.renderFooter())));
     }
   }]);
   ModerateTray.displayName = "ModerateTray";
@@ -235,7 +225,8 @@ ModerateTray.propTypes = {
   isOpen: PropTypes.bool.isRequired,
   onClose: PropTypes.func,
   onSave: PropTypes.func.isRequired,
-  participantName: PropTypes.string
+  participantName: PropTypes.string,
+  atteqApplyChangesToCurrentQuizAttemptsEnabled: PropTypes.bool.isRequired
 };
 ModerateTray.defaultProps = {
   onClose: void 0,

package/lib/banks/components/NavWrapper/externalStyles.js

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.generateExternalStyle = void 0;
+var generateExternalStyle = function generateExternalStyle() {
+  return {
+    showReturnButton: true
+  };
+};
+exports.generateExternalStyle = generateExternalStyle;

package/lib/banks/components/NavWrapper/styles.js

@@ -1,12 +1,14 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _externalStyles = require("./externalStyles.js");
 var generateStyle = function generateStyle(componentTheme) {
-  return {
-    showReturnButton: true,
+  return (0, _objectSpread2.default)({
     nav: {
       display: 'flex',
       flexDirection: 'row',
@@ -31,7 +33,7 @@ var generateStyle = function generateStyle(componentTheme) {
     crumbs: {
       flex: 1
     }
-  };
+  }, (0, _externalStyles.generateExternalStyle)());
 };
 var _default = generateStyle;
 exports.default = _default;

package/lib/common/components/layout/navbar/externalStyles.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.generateExternalStyle = void 0;
+var generateExternalStyle = function generateExternalStyle() {
+  return {
+    showBrandIcon: true,
+    desktopBottomBorder: true,
+    desktopBottomBorderInverse: true
+  };
+};
+exports.generateExternalStyle = generateExternalStyle;

package/lib/common/components/layout/navbar/styles.js

@@ -1,17 +1,17 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _externalStyles = require("./externalStyles.js");
 var generateStyle = function generateStyle(componentTheme) {
-  return {
-    showBrandIcon: true,
-    desktopBottomBorder: true,
-    desktopBottomBorderInverse: true,
+  return (0, _objectSpread2.default)({
     backgroundColor: componentTheme.backgroundColor,
     phoneBreakPoint: componentTheme.phoneBreakPoint
-  };
+  }, (0, _externalStyles.generateExternalStyle)());
 };
 var _default = generateStyle;
 exports.default = _default;

package/lib/common/components/layout/sidebar/Sidebar/externalStyles.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.generateExternalStyle = void 0;
+var generateExternalStyle = function generateExternalStyle(componentTheme) {
+  return {
+    sidebar: {
+      borderTop: "".concat(componentTheme.sidebarBorderWidth, " solid ").concat(componentTheme.sidebarBorderColor),
+      borderRight: "".concat(componentTheme.sidebarBorderWidth, " solid ").concat(componentTheme.sidebarBorderColor),
+      borderBottom: "".concat(componentTheme.sidebarBorderWidth, " solid ").concat(componentTheme.sidebarBorderColor),
+      borderLeft: "".concat(componentTheme.sidebarBorderWidth, " solid ").concat(componentTheme.sidebarBorderColor)
+    }
+  };
+};
+exports.generateExternalStyle = generateExternalStyle;

package/lib/common/components/layout/sidebar/Sidebar/styles.js

@@ -7,19 +7,17 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _merge = _interopRequireDefault(require("lodash/merge"));
+var _externalStyles = require("./externalStyles.js");
 var generateStyle = function generateStyle(componentTheme, props) {
   var _commonContainer;
   var mq = "@media screen and (".concat(componentTheme.phoneBreakPoint, ")");
   var mp = '@media print';
-  return {
+  return (0, _merge.default)({
     sidebar: (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _defineProperty2.default)({
       boxSizing: 'border-box',
       width: componentTheme.sidebarWidthClosed,
       backgroundColor: componentTheme.sidebarBackgroundColor,
-      borderTop: "".concat(componentTheme.sidebarBorderWidth, " solid ").concat(componentTheme.sidebarBorderColor),
-      borderRight: "".concat(componentTheme.sidebarBorderWidth, " solid ").concat(componentTheme.sidebarBorderColor),
-      borderBottom: "".concat(componentTheme.sidebarBorderWidth, " solid ").concat(componentTheme.sidebarBorderColor),
-      borderLeft: "".concat(componentTheme.sidebarBorderWidth, " solid ").concat(componentTheme.sidebarBorderColor),
       color: componentTheme.sidebarColor,
       height: '100%',
       overflow: 'hidden',
@@ -118,7 +116,7 @@ var generateStyle = function generateStyle(componentTheme, props) {
     }), (0, _defineProperty2.default)(_commonContainer, mp, {
       display: 'none'
     }), _commonContainer)
-  };
+  }, (0, _externalStyles.generateExternalStyle)(componentTheme));
 };
 var _default = generateStyle;
 exports.default = _default;

package/lib/moderating/components/resources/AccommodationsModal/ExtraTimeSettings/index.js

@@ -102,7 +102,7 @@ var ExtraTimeSettings = /*#__PURE__*/function (_Component) {
         minutesLabel: (0, _formatMessage.default)('Minutes'),
         minutesDataAutomation: "sdk-moderation-time-minutes",
         description: (0, _formatMessage.default)('Additional time'),
-        margin: "medium none"
+        margin: "medium none none none"
       }), timeAdjustmentType === 'timerMultiplierEnabled' && /*#__PURE__*/_react.default.createElement(_index2.default, {
         onChange: this.onChangeMultiplier,
         timerMultiplierValue: timerSettings.timerMultiplierValue,

package/lib/moderating/components/resources/AccommodationsModal/index.js

@@ -12,7 +12,6 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/createSuper"));
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _uiText = require("@instructure/ui-text");
 var _uiTooltip = require("@instructure/ui-tooltip");
 var _uiModal = require("@instructure/ui-modal");
 var _uiTruncateText = require("@instructure/ui-truncate-text");
@@ -21,8 +20,6 @@ var _uiView = require("@instructure/ui-view");
 var _uiButtons = require("@instructure/ui-buttons");
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 var _uiA11yContent = require("@instructure/ui-a11y-content");
-var _featureCheck = require("../../../../common/util/featureCheck.js");
-var _index = require("../../../../common/components/shared/IfFeature/index.js");
 var AccommodationModal = /*#__PURE__*/function (_Component) {
   (0, _inherits2.default)(AccommodationModal, _Component);
   var _super = (0, _createSuper2.default)(AccommodationModal);
@@ -65,7 +62,7 @@ var AccommodationModal = /*#__PURE__*/function (_Component) {
       }, _this.props.studentName));
     };
     _this.renderHeading = function () {
-      if ((0, _featureCheck.featureOn)('atteq_apply_changes_to_current_quiz_attempts')) {
+      if (_this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled) {
         return /*#__PURE__*/_react.default.createElement(_uiHeading.Heading, null, /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('Student Accommodation')), (0, _formatMessage.default)('Student Accommodation'));
       }
       var _this$props = _this.props,
@@ -92,7 +89,7 @@ var AccommodationModal = /*#__PURE__*/function (_Component) {
   (0, _createClass2.default)(AccommodationModal, [{
     key: "labelText",
     value: function labelText() {
-      if ((0, _featureCheck.featureOn)('atteq_apply_changes_to_current_quiz_attempts')) {
+      if (this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled) {
         return (0, _formatMessage.default)('Student Accommodation');
       }
       return this.props.studentName || (0, _formatMessage.default)('Accommodations Modal');
@@ -101,7 +98,6 @@ var AccommodationModal = /*#__PURE__*/function (_Component) {
     key: "render",
     value: function render() {
       var _this$props2 = this.props,
-        studentName = _this$props2.studentName,
         open = _this$props2.open,
         closeModal = _this$props2.closeModal,
         mountNode = _this$props2.mountNode,
@@ -117,12 +113,7 @@ var AccommodationModal = /*#__PURE__*/function (_Component) {
         placement: "end",
         offset: "medium",
         screenReaderLabel: (0, _formatMessage.default)('Close')
-      }), this.renderHeading()), /*#__PURE__*/_react.default.createElement(_uiModal.Modal.Body, null, /*#__PURE__*/_react.default.createElement(_index.IfFeature, {
-        name: "atteq_apply_changes_to_current_quiz_attempts"
-      }, /*#__PURE__*/_react.default.createElement(_uiText.Text, {
-        weight: "bold",
-        as: "h2"
-      }, studentName)), children), /*#__PURE__*/_react.default.createElement(_uiModal.Modal.Footer, null, /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {
+      }), this.renderHeading()), /*#__PURE__*/_react.default.createElement(_uiModal.Modal.Body, null, children), /*#__PURE__*/_react.default.createElement(_uiModal.Modal.Footer, null, /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {
         onClick: this.cancelAction,
         margin: "xxx-small",
         "data-automation": "sdk-moderation-cancel"
@@ -146,7 +137,8 @@ AccommodationModal.propTypes = {
   onDismiss: _propTypes.default.func,
   mountNode: _propTypes.default.string,
   // this is just to fix chromatic
-  children: _propTypes.default.oneOfType([_propTypes.default.node, _propTypes.default.arrayOf(_propTypes.default.node)])
+  children: _propTypes.default.oneOfType([_propTypes.default.node, _propTypes.default.arrayOf(_propTypes.default.node)]),
+  atteqApplyChangesToCurrentQuizAttemptsEnabled: _propTypes.default.bool.isRequired
 };
 AccommodationModal.defaultProps = {
   children: [],

package/lib/moderating/components/resources/ModerateTable/presenter.js

@@ -332,7 +332,8 @@ var ModerateTable = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default,
         css: this.props.styles.page
       }, (0, _emotion.jsx)(_index4.default, {
         onClose: this.onCloseTray,
-        onSave: this.props.onSaveTray
+        onSave: this.props.onSaveTray,
+        atteqApplyChangesToCurrentQuizAttemptsEnabled: this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled
       }, (0, _emotion.jsx)(_uiFlex.Flex.Item, null, !this.props.anonymousGrading && _ref6), this.props.children), this.renderContent());
     }
   }]);
@@ -387,7 +388,8 @@ var ModerateTable = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default,
   getQuizSessions: _propTypes.default.func.isRequired,
   addSuccess: _propTypes.default.func.isRequired,
   styles: _propTypes.default.object,
-  makeStyles: _propTypes.default.func
+  makeStyles: _propTypes.default.func,
+  atteqApplyChangesToCurrentQuizAttemptsEnabled: _propTypes.default.bool.isRequired
 }, _ModerateTable.defaultProps = {
   anonymousGrading: false,
   children: void 0,

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.0+05c338c49",
+  "version": "20.36.1-rc.3+c9b688fb5",
   "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.0+05c338c49",
-    "@instructure/quiz-i18n": "^20.36.1-rc.0+05c338c49",
-    "@instructure/quiz-interactions": "^20.36.1-rc.0+05c338c49",
-    "@instructure/quiz-number-input": "^20.36.1-rc.0+05c338c49",
-    "@instructure/quiz-rce": "^20.36.1-rc.0+05c338c49",
+    "@instructure/quiz-common": "^20.36.1-rc.3+c9b688fb5",
+    "@instructure/quiz-i18n": "^20.36.1-rc.3+c9b688fb5",
+    "@instructure/quiz-interactions": "^20.36.1-rc.3+c9b688fb5",
+    "@instructure/quiz-number-input": "^20.36.1-rc.3+c9b688fb5",
+    "@instructure/quiz-rce": "^20.36.1-rc.3+c9b688fb5",
     "@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.0+05c338c49",
+    "instructure-validations": "^20.36.1-rc.3+c9b688fb5",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -163,7 +163,7 @@
     "jquery": "^2.2.3",
     "karma-junit-reporter": "^2.0.1",
     "most-subject": "^5.3.0",
-    "quiz-presets": "^20.36.1-rc.0+05c338c49",
+    "quiz-presets": "^20.36.1-rc.3+c9b688fb5",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -179,5 +179,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "05c338c49b1c856049e0a62f812e1ceaa8326df8"
+  "gitHead": "c9b688fb57c71b74ea4c045c17f11147dc5e0187"
 }