@instructure/quiz-core 20.16.1-rc.6 → 20.16.1-rc.8

package/es/common/actions/alerts.js

@@ -1,19 +1,21 @@
 import { v4 as uuid } from 'uuid';
-import { ADD_ALERT, REMOVE_ALERT, DEFAULT_ALERT_TIME } from '@instructure/quiz-common';
+import { ADD_ALERT, REMOVE_ALERT, DEFAULT_ALERT_TIME, ASSERTIVE } from '@instructure/quiz-common';
 export function addAlert(_ref) {
   var message = _ref.message,
       variant = _ref.variant,
       _ref$removeIn = _ref.removeIn,
       removeIn = _ref$removeIn === void 0 ? DEFAULT_ALERT_TIME : _ref$removeIn,
       _ref$guid = _ref.guid,
-      guid = _ref$guid === void 0 ? uuid() : _ref$guid;
+      guid = _ref$guid === void 0 ? uuid() : _ref$guid,
+      politeness = _ref.politeness;
   return {
     type: ADD_ALERT,
     payload: {
       message: message,
       removeIn: removeIn,
       uuid: guid,
-      variant: variant
+      variant: variant,
+      politeness: politeness
     }
   };
 }
@@ -45,10 +47,12 @@ export function addInfo(message) {
   });
 }
 export function screenreaderNotification(message) {
+  var politeness = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : ASSERTIVE;
   return addAlert({
     message: message,
     variant: 'screenreader',
-    removeIn: 2000
+    removeIn: 2000,
+    politeness: politeness
   });
 }
 export function removeAlert(uuid) {

package/es/common/components/alerts/index.js

@@ -4,12 +4,14 @@ import { removeAlert } from "../../actions/alerts.js";
 import Alert from "../../records/Alert.js";
 import Alerts from "./presenter.js";
 
-var mapStateToProps = function mapStateToProps(state) {
+var mapStateToProps = function mapStateToProps(state, props) {
   var alerts = state.get('alerts', Map());
   return {
     alerts: alerts.map(function (data) {
       return new Alert(data);
-    }).valueSeq().toList()
+    }).valueSeq().toList().filter(function (alert) {
+      return props.politeness === alert.politeness;
+    })
   };
 };
 

package/es/common/components/layout/header/Timer/presenter.js

@@ -11,6 +11,7 @@ import PropTypes from 'prop-types';
 import partial from 'lodash/partial';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import { IconClockLine, IconClockSolid, IconArrowOpenStartLine } from '@instructure/ui-icons';
+import * as platform from 'platform';
 import { Button } from '@instructure/ui-buttons';
 import { TopNavBar } from '@instructure/ui-top-nav-bar';
 import { View } from '@instructure/ui-view';
@@ -111,7 +112,10 @@ export var Timer = (_dec = withStyle(generateStyle, generateComponentTheme), _de
   }, {
     key: "renderHelpScreenreaderText",
     value: function renderHelpScreenreaderText() {
-      return jsx(ScreenReaderContent, null, t('During the quiz, press Alt+Shift+T to have the remaining time read'));
+      var shortcutKey = platform.os.toString().startsWith('OS X') ? 'Option+Shift+T' : 'Alt+Shift+T';
+      return jsx(ScreenReaderContent, null, t('During the quiz, press {shortcutKey} to have the remaining time read', {
+        shortcutKey: shortcutKey
+      }));
     }
   }, {
     key: "renderMinimizedTimer",

package/es/common/records/Alert.js

@@ -17,6 +17,7 @@ export var Alert = /*#__PURE__*/function (_Record) {
 }(Record({
   message: null,
   uuid: null,
-  variant: 'info'
+  variant: 'info',
+  politeness: 'assertive'
 }));
 export default Alert;

package/es/common/util/renderAlerts.js

@@ -1,17 +1,29 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { liveRegion } from '@instructure/quiz-common';
+import { liveRegion, politeLiveRegion, POLITE, ASSERTIVE } from '@instructure/quiz-common';
 import { Provider } from "../react-redux.js";
 import Alerts from "../components/alerts/index.js"; // alert has to be in the html on render in
 // order for screenreaders to pick up on role="alert",
 // so we're rendering a sub-app into it so that so that
 // we dont accidentally remove it with react
 
-var _ref = /*#__PURE__*/React.createElement(Alerts, null);
+var _ref = /*#__PURE__*/React.createElement(Alerts, {
+  politeness: ASSERTIVE
+});
+
+var _ref2 = /*#__PURE__*/React.createElement(Alerts, {
+  politeness: POLITE
+});
 
 export function renderAlerts(store) {
   ReactDOM.render( /*#__PURE__*/React.createElement(Provider, {
     store: store
   }, _ref), liveRegion());
+
+  if (politeLiveRegion()) {
+    ReactDOM.render( /*#__PURE__*/React.createElement(Provider, {
+      store: store
+    }, _ref2), politeLiveRegion());
+  }
 }
 export default renderAlerts;

package/es/taking/api/taking.js

@@ -15,7 +15,7 @@ import { screenreaderNotification } from "../../common/actions/alerts.js";
 import Item from "../../common/records/Item.js";
 import { featureOn } from "../../common/util/featureCheck.js";
 import { fetchLogger } from "../../common/kinesis/QuizEventsLogger.js";
-import { STUDENT_ACCESS_CODE_STATUS } from '@instructure/quiz-common';
+import { POLITE, STUDENT_ACCESS_CODE_STATUS } from '@instructure/quiz-common';
 import * as uiActions from "../../common/actions/ui.js";
 import { fetchQuizSession, fetchResumeData, fetchTime, recordTime, singleResponseSubmit, submitQuizSession, submitStudentAccessCode as submitStudentAccessCodeApi, takeQuizSession } from "../../common/api/quizSessions.js";
 import { getSessionItems, handleQuizSessionFetch } from "../../common/actions/quizSessions.js";
@@ -58,7 +58,7 @@ export var submitStudentAccessCode = function submitStudentAccessCode(quizSessio
       dispatch(uiActions.set(STUDENT_ACCESS_CODE_STATUS, sessionData.accepted_student_access_code));
 
       if (sessionData.accepted_student_access_code) {
-        dispatch(screenreaderNotification(t('Access code successful. You may now begin this assessment')));
+        dispatch(screenreaderNotification(t('Access code successful. You may now begin this assessment'), POLITE));
       } else {
         dispatch(screenreaderNotification(t('Invalid access code')));
       }

package/lib/common/actions/alerts.js

@@ -21,14 +21,16 @@ function addAlert(_ref) {
       _ref$removeIn = _ref.removeIn,
       removeIn = _ref$removeIn === void 0 ? _quizCommon.DEFAULT_ALERT_TIME : _ref$removeIn,
       _ref$guid = _ref.guid,
-      guid = _ref$guid === void 0 ? (0, _uuid.v4)() : _ref$guid;
+      guid = _ref$guid === void 0 ? (0, _uuid.v4)() : _ref$guid,
+      politeness = _ref.politeness;
   return {
     type: _quizCommon.ADD_ALERT,
     payload: {
       message: message,
       removeIn: removeIn,
       uuid: guid,
-      variant: variant
+      variant: variant,
+      politeness: politeness
     }
   };
 }
@@ -65,10 +67,12 @@ function addInfo(message) {
 }
 
 function screenreaderNotification(message) {
+  var politeness = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : _quizCommon.ASSERTIVE;
   return addAlert({
     message: message,
     variant: 'screenreader',
-    removeIn: 2000
+    removeIn: 2000,
+    politeness: politeness
   });
 }
 

package/lib/common/components/alerts/index.js

@@ -17,12 +17,14 @@ var _Alert = _interopRequireDefault(require("../../records/Alert.js"));
 
 var _presenter = _interopRequireDefault(require("./presenter.js"));
 
-var mapStateToProps = function mapStateToProps(state) {
+var mapStateToProps = function mapStateToProps(state, props) {
   var alerts = state.get('alerts', (0, _immutable.Map)());
   return {
     alerts: alerts.map(function (data) {
       return new _Alert.default(data);
-    }).valueSeq().toList()
+    }).valueSeq().toList().filter(function (alert) {
+      return props.politeness === alert.politeness;
+    })
   };
 };
 

package/lib/common/components/layout/header/Timer/presenter.js

@@ -2,6 +2,8 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -25,6 +27,8 @@ var _uiA11yContent = require("@instructure/ui-a11y-content");
 
 var _uiIcons = require("@instructure/ui-icons");
 
+var platform = _interopRequireWildcard(require("platform"));
+
 var _uiButtons = require("@instructure/ui-buttons");
 
 var _uiTopNavBar = require("@instructure/ui-top-nav-bar");
@@ -135,7 +139,10 @@ var Timer = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _d
   }, {
     key: "renderHelpScreenreaderText",
     value: function renderHelpScreenreaderText() {
-      return (0, _emotion.jsx)(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('During the quiz, press Alt+Shift+T to have the remaining time read'));
+      var shortcutKey = platform.os.toString().startsWith('OS X') ? 'Option+Shift+T' : 'Alt+Shift+T';
+      return (0, _emotion.jsx)(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('During the quiz, press {shortcutKey} to have the remaining time read', {
+        shortcutKey: shortcutKey
+      }));
     }
   }, {
     key: "renderMinimizedTimer",

package/lib/common/records/Alert.js

@@ -29,7 +29,8 @@ var Alert = /*#__PURE__*/function (_Record) {
 }((0, _immutable.Record)({
   message: null,
   uuid: null,
-  variant: 'info'
+  variant: 'info',
+  politeness: 'assertive'
 }));
 
 exports.Alert = Alert;

package/lib/common/util/renderAlerts.js

@@ -18,7 +18,13 @@ var _reactRedux = require("../react-redux.js");
 
 var _index = _interopRequireDefault(require("../components/alerts/index.js"));
 
-var _ref = /*#__PURE__*/_react.default.createElement(_index.default, null);
+var _ref = /*#__PURE__*/_react.default.createElement(_index.default, {
+  politeness: _quizCommon.ASSERTIVE
+});
+
+var _ref2 = /*#__PURE__*/_react.default.createElement(_index.default, {
+  politeness: _quizCommon.POLITE
+});
 
 // alert has to be in the html on render in
 // order for screenreaders to pick up on role="alert",
@@ -28,6 +34,12 @@ function renderAlerts(store) {
   _reactDom.default.render( /*#__PURE__*/_react.default.createElement(_reactRedux.Provider, {
     store: store
   }, _ref), (0, _quizCommon.liveRegion)());
+
+  if ((0, _quizCommon.politeLiveRegion)()) {
+    _reactDom.default.render( /*#__PURE__*/_react.default.createElement(_reactRedux.Provider, {
+      store: store
+    }, _ref2), (0, _quizCommon.politeLiveRegion)());
+  }
 }
 
 var _default = renderAlerts;

package/lib/taking/api/taking.js

@@ -100,7 +100,7 @@ var submitStudentAccessCode = function submitStudentAccessCode(quizSessionId, ac
       dispatch(uiActions.set(_quizCommon.STUDENT_ACCESS_CODE_STATUS, sessionData.accepted_student_access_code));
 
       if (sessionData.accepted_student_access_code) {
-        dispatch((0, _alerts.screenreaderNotification)((0, _formatMessage.default)('Access code successful. You may now begin this assessment')));
+        dispatch((0, _alerts.screenreaderNotification)((0, _formatMessage.default)('Access code successful. You may now begin this assessment'), _quizCommon.POLITE));
       } else {
         dispatch((0, _alerts.screenreaderNotification)((0, _formatMessage.default)('Invalid access code')));
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "20.16.1-rc.6+34f8d91a7",
+  "version": "20.16.1-rc.8+80dd509d0",
   "license": "MIT",
   "description": "The Quiz React SDK by Instructure Inc.",
   "author": "Instructure, Inc. Engineering and Product Design",
@@ -44,11 +44,11 @@
     "@instructure/emotion": "^8.51.0",
     "@instructure/grading-utils": "^1.0.0",
     "@instructure/outcomes-ui": "^3.2.2",
-    "@instructure/quiz-common": "20.16.1-rc.6+34f8d91a7",
-    "@instructure/quiz-i18n": "20.16.1-rc.6+34f8d91a7",
-    "@instructure/quiz-interactions": "20.16.1-rc.6+34f8d91a7",
-    "@instructure/quiz-number-input": "20.16.1-rc.6+34f8d91a7",
-    "@instructure/quiz-rce": "20.16.1-rc.6+34f8d91a7",
+    "@instructure/quiz-common": "20.16.1-rc.8+80dd509d0",
+    "@instructure/quiz-i18n": "20.16.1-rc.8+80dd509d0",
+    "@instructure/quiz-interactions": "20.16.1-rc.8+80dd509d0",
+    "@instructure/quiz-number-input": "20.16.1-rc.8+80dd509d0",
+    "@instructure/quiz-rce": "20.16.1-rc.8+80dd509d0",
     "@instructure/ui-a11y-content": "^8.51.0",
     "@instructure/ui-alerts": "^8.51.0",
     "@instructure/ui-avatar": "^8.51.0",
@@ -111,7 +111,7 @@
     "file-saver": "~2.0.5",
     "humps": "^2.0.0",
     "immutable": "^3.8.1",
-    "instructure-validations": "20.16.1-rc.6+34f8d91a7",
+    "instructure-validations": "20.16.1-rc.8+80dd509d0",
     "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.16.1-rc.6+34f8d91a7",
+    "quiz-presets": "20.16.1-rc.8+80dd509d0",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -179,5 +179,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "34f8d91a721ddb30f72cf27aac15ee36b03a6c7a"
+  "gitHead": "80dd509d088767c8d222f534bbf703a95c183760"
 }