@instructure/quiz-core 17.36.0 → 17.36.1-rc.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (27) hide show
  1. package/es/building/components/resources/quizEntry/QuizEntryShow/presenter.js +2 -1
  2. package/es/common/actions/taking.js +7 -1
  3. package/es/common/components/layout/header/HeaderMenuButton/index.js +6 -2
  4. package/es/common/components/layout/header/HeaderMenuButton/presenter.js +24 -5
  5. package/es/common/components/layout/sidebar/Sidebar/index.js +31 -17
  6. package/es/common/components/layout/sidebar/SidebarItem/presenter.js +10 -6
  7. package/es/common/components/layout/sidebar/Stimulus/presenter.js +14 -7
  8. package/es/common/components/resources/quiz/instructions/Instructions.js +2 -1
  9. package/es/common/components/resources/quiz/title/Title.js +2 -1
  10. package/es/common/components/resources/stimulus/StimulusEditInfo/presenter.js +3 -1
  11. package/es/common/components/resources/stimulus/StimulusShowInfo/index.js +8 -3
  12. package/es/common/reducers/taking.js +9 -2
  13. package/es/index.js +1 -1
  14. package/lib/building/components/resources/quizEntry/QuizEntryShow/presenter.js +2 -1
  15. package/lib/common/actions/taking.js +10 -1
  16. package/lib/common/components/layout/header/HeaderMenuButton/index.js +7 -2
  17. package/lib/common/components/layout/header/HeaderMenuButton/presenter.js +26 -5
  18. package/lib/common/components/layout/sidebar/Sidebar/index.js +32 -18
  19. package/lib/common/components/layout/sidebar/SidebarItem/presenter.js +10 -6
  20. package/lib/common/components/layout/sidebar/Stimulus/presenter.js +14 -8
  21. package/lib/common/components/resources/quiz/instructions/Instructions.js +2 -1
  22. package/lib/common/components/resources/quiz/title/Title.js +2 -1
  23. package/lib/common/components/resources/stimulus/StimulusEditInfo/presenter.js +3 -1
  24. package/lib/common/components/resources/stimulus/StimulusShowInfo/index.js +9 -3
  25. package/lib/common/reducers/taking.js +8 -1
  26. package/lib/index.js +7 -0
  27. package/package.json +10 -10
@@ -291,7 +291,8 @@ var QuizEntryShow = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cl
291
291
  className: styles.connectingLines
292
292
  }), /*#__PURE__*/React.createElement(PositionBox, {
293
293
  position: positionToDisplay,
294
- headingText: positionText
294
+ headingText: positionText,
295
+ headingLevel: quizEntry.isInStimulus ? 'h3' : 'h2'
295
296
  }), this.renderLeftHeader(), /*#__PURE__*/React.createElement(ActionButtons, {
296
297
  connectDragSource: this.props.connectDragSource,
297
298
  displayPosition: this.props.displayPosition,
@@ -1,5 +1,5 @@
1
1
  import { v4 as uuid } from 'uuid';
2
- import { BACKTRACKING_NEXT_QUESTION, LOAD_RESUME_DATA, PREVIEW_RESPONSE, PREVIOUS_QUESTION, QUIZ_SUBMISSION_EVENT, UPDATE_QUIZ_SUBMIT_FLAG, RESPONSE, SESSION_STARTED_OR_RESUMED_EVENT, SET_CURRENT_SESSION_ITEM_POSITION, UPDATE_IS_TAKING, UPDATE_QUIZ_SESSION_STATUS_ON_PAGE_LOAD, UPDATE_TIMER_MINIMIZED, UPDATE_TIMER_INFO } from '@instructure/quiz-common';
2
+ import { BACKTRACKING_NEXT_QUESTION, CLEAR_FOCUS_CURRENT_SESSION_ITEM, LOAD_RESUME_DATA, PREVIEW_RESPONSE, PREVIOUS_QUESTION, QUIZ_SUBMISSION_EVENT, UPDATE_QUIZ_SUBMIT_FLAG, RESPONSE, SESSION_STARTED_OR_RESUMED_EVENT, SET_CURRENT_SESSION_ITEM_POSITION, UPDATE_IS_TAKING, UPDATE_QUIZ_SESSION_STATUS_ON_PAGE_LOAD, UPDATE_TIMER_MINIMIZED, UPDATE_TIMER_INFO } from '@instructure/quiz-common';
3
3
  export var setCurrentSessionItemPosition = function setCurrentSessionItemPosition(position) {
4
4
  return {
5
5
  type: SET_CURRENT_SESSION_ITEM_POSITION,
@@ -8,6 +8,12 @@ export var setCurrentSessionItemPosition = function setCurrentSessionItemPositio
8
8
  }
9
9
  };
10
10
  };
11
+ export var clearFocusCurrentSessionItem = function clearFocusCurrentSessionItem() {
12
+ return {
13
+ type: CLEAR_FOCUS_CURRENT_SESSION_ITEM,
14
+ payload: {}
15
+ };
16
+ };
11
17
  export var previousQuestion = function previousQuestion() {
12
18
  return {
13
19
  type: PREVIOUS_QUESTION,
@@ -2,18 +2,22 @@ import { bindActionCreators } from 'redux';
2
2
  import { connect } from "../../../../react-redux.js";
3
3
  import { isOneQuestionAtATime, getBacktrackingIsAllowed, getActiveQuizSessionId } from "../../../../selectors/quizSessions.js";
4
4
  import { toggleSidebar } from "../../../../actions/sidebar.js";
5
+ import { screenreaderNotification as screenreaderNotificationAction } from "../../../../actions/alerts.js";
5
6
  import { HeaderMenuButton as HeaderMenuButtonPresenter } from "./presenter.js";
6
7
  export var mapStateToProps = function mapStateToProps(state, props) {
7
8
  var hideOnTake = isOneQuestionAtATime(state) && !getBacktrackingIsAllowed(state);
8
9
  var quizSessionNotLoaded = getActiveQuizSessionId(state) === '0';
9
10
  var hidden = !!props.onTake && (hideOnTake || quizSessionNotLoaded);
11
+ var sidebarOpen = props.sidebarOpen || state.getIn(['sidebar', 'isOpen']);
10
12
  return {
11
- hidden: hidden
13
+ hidden: hidden,
14
+ sidebarOpen: sidebarOpen
12
15
  };
13
16
  };
14
17
  export function mapDispatchToProps(dispatch, props) {
15
18
  return {
16
- sidebarMenuClick: props.sidebarMenuClick || bindActionCreators(toggleSidebar, dispatch)
19
+ sidebarMenuClick: props.sidebarMenuClick || bindActionCreators(toggleSidebar, dispatch),
20
+ screenreaderNotification: bindActionCreators(screenreaderNotificationAction, dispatch)
17
21
  };
18
22
  }
19
23
  export var HeaderMenuButton = connect(mapStateToProps, mapDispatchToProps)(HeaderMenuButtonPresenter);
@@ -1,5 +1,6 @@
1
1
  import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
2
2
  import _createClass from "@babel/runtime/helpers/esm/createClass";
3
+ import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
3
4
  import _inherits from "@babel/runtime/helpers/esm/inherits";
4
5
  import _createSuper from "@babel/runtime/helpers/esm/createSuper";
5
6
 
@@ -29,9 +30,25 @@ export var HeaderMenuButton = (_dec = themeable(theme, styles), _dec(_class = (_
29
30
  var _super = _createSuper(HeaderMenuButton);
30
31
 
31
32
  function HeaderMenuButton() {
33
+ var _this;
34
+
32
35
  _classCallCheck(this, HeaderMenuButton);
33
36
 
34
- return _super.apply(this, arguments);
37
+ for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
38
+ args[_key] = arguments[_key];
39
+ }
40
+
41
+ _this = _super.call.apply(_super, [this].concat(args));
42
+
43
+ _this.toggleNavigator = function () {
44
+ var msg = _this.props.sidebarOpen ? t('Closed Question Navigator') : t('Opened Question Navigator');
45
+
46
+ _this.props.screenreaderNotification(msg);
47
+
48
+ _this.props.sidebarMenuClick();
49
+ }.bind(_assertThisInitialized(_this));
50
+
51
+ return _this;
35
52
  }
36
53
 
37
54
  _createClass(HeaderMenuButton, [{
@@ -39,7 +56,7 @@ export var HeaderMenuButton = (_dec = themeable(theme, styles), _dec(_class = (_
39
56
  value: function render() {
40
57
  var _this$props = this.props,
41
58
  hidden = _this$props.hidden,
42
- sidebarMenuClick = _this$props.sidebarMenuClick;
59
+ sidebarOpen = _this$props.sidebarOpen;
43
60
 
44
61
  if (hidden) {
45
62
  return null;
@@ -49,10 +66,10 @@ export var HeaderMenuButton = (_dec = themeable(theme, styles), _dec(_class = (_
49
66
  className: styles.title
50
67
  }, /*#__PURE__*/React.createElement("button", {
51
68
  className: styles.menuButton,
52
- onClick: sidebarMenuClick,
69
+ onClick: this.toggleNavigator,
53
70
  tabIndex: "0",
54
71
  "data-automation": "sdk-hamburger-button"
55
- }, _ref, /*#__PURE__*/React.createElement(ScreenReaderContent, null, t('Open Menu'))));
72
+ }, _ref, /*#__PURE__*/React.createElement(ScreenReaderContent, null, sidebarOpen ? t('Close Question Navigator') : t('Open Question Navigator'))));
56
73
  }
57
74
  }]);
58
75
 
@@ -60,6 +77,8 @@ export var HeaderMenuButton = (_dec = themeable(theme, styles), _dec(_class = (_
60
77
  return HeaderMenuButton;
61
78
  }(Component), _class2.propTypes = {
62
79
  sidebarMenuClick: PropTypes.func.isRequired,
63
- hidden: PropTypes.bool.isRequired
80
+ hidden: PropTypes.bool.isRequired,
81
+ sidebarOpen: PropTypes.bool.isRequired,
82
+ screenreaderNotification: PropTypes.func.isRequired
64
83
  }, _temp)) || _class);
65
84
  export default HeaderMenuButton;
@@ -15,11 +15,11 @@ import classNames from 'classnames';
15
15
  import { IconMoveStartLine, IconMoveEndLine, IconPinSolid, IconQuizInstructionsLine, IconQuizTitleLine } from '@instructure/ui-icons';
16
16
  import { AccessibleContent, ScreenReaderContent, PresentationContent } from '@instructure/ui-a11y-content';
17
17
  import { Button } from '@instructure/ui-buttons';
18
+ import { Link } from '@instructure/ui-link';
18
19
  import { Text } from '@instructure/ui-text';
19
20
  import { View } from '@instructure/ui-view';
20
21
  import { themeable } from '@instructure/ui-themeable';
21
22
  import t from '@instructure/quiz-i18n/es/format-message';
22
- import keyboardClickable from "../../../../util/keyboardClickable.js";
23
23
  import { onPhone } from "../../../../util/windowChecks.js";
24
24
  import CustomPropTypes from "../../../../util/CustomPropTypes.js";
25
25
  import { SIDEBAR_NAV_ID } from '@instructure/quiz-common';
@@ -46,7 +46,15 @@ var styles = {
46
46
  };
47
47
  import theme from "./theme.js";
48
48
 
49
- var _ref = /*#__PURE__*/React.createElement(IconPinSolid, null);
49
+ var _ref = /*#__PURE__*/React.createElement(IconQuizTitleLine, {
50
+ color: "primary"
51
+ });
52
+
53
+ var _ref2 = /*#__PURE__*/React.createElement(IconQuizInstructionsLine, {
54
+ color: "primary"
55
+ });
56
+
57
+ var _ref3 = /*#__PURE__*/React.createElement(IconPinSolid, null);
50
58
 
51
59
  export var Sidebar = (_dec = themeable(theme, styles), _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_Component) {
52
60
  _inherits(Sidebar, _Component);
@@ -64,11 +72,15 @@ export var Sidebar = (_dec = themeable(theme, styles), _dec(_class = (_temp = _c
64
72
 
65
73
  _this = _super.call.apply(_super, [this].concat(args));
66
74
 
67
- _this.scrollToTitle = function () {
75
+ _this.scrollToTitle = function (e) {
76
+ e.preventDefault(); // prevent default link navigation
77
+
68
78
  _this.props.scrollToItem(null)('title');
69
79
  };
70
80
 
71
- _this.scrollToInfo = function () {
81
+ _this.scrollToInfo = function (e) {
82
+ e.preventDefault(); // prevent default link navigation
83
+
72
84
  _this.props.scrollToItem(null)('instructions');
73
85
  };
74
86
 
@@ -115,12 +127,13 @@ export var Sidebar = (_dec = themeable(theme, styles), _dec(_class = (_temp = _c
115
127
  value: function renderTitle() {
116
128
  return /*#__PURE__*/React.createElement("div", {
117
129
  className: styles.actionableInfo
118
- }, /*#__PURE__*/React.createElement(Button, {
119
- icon: IconQuizTitleLine,
130
+ }, /*#__PURE__*/React.createElement(Link, {
131
+ href: "#",
132
+ margin: "small",
133
+ forceButtonRole: false,
120
134
  onClick: this.scrollToTitle,
121
- onKeyDown: keyboardClickable,
122
- variant: "icon"
123
- }, /*#__PURE__*/React.createElement(ScreenReaderContent, null, t('Scroll to title'))), /*#__PURE__*/React.createElement(PresentationContent, null, /*#__PURE__*/React.createElement("span", {
135
+ renderIcon: _ref
136
+ }, /*#__PURE__*/React.createElement(ScreenReaderContent, null, t('Navigate to title'))), /*#__PURE__*/React.createElement(PresentationContent, null, /*#__PURE__*/React.createElement("span", {
124
137
  className: styles.description,
125
138
  onClick: this.scrollToTitle,
126
139
  tabIndex: "-1"
@@ -131,13 +144,14 @@ export var Sidebar = (_dec = themeable(theme, styles), _dec(_class = (_temp = _c
131
144
  value: function renderInstructions() {
132
145
  return /*#__PURE__*/React.createElement("div", {
133
146
  className: styles.actionableInfo
134
- }, /*#__PURE__*/React.createElement(Button, {
135
- icon: IconQuizInstructionsLine,
147
+ }, /*#__PURE__*/React.createElement(Link, {
148
+ href: "#",
149
+ margin: "small",
150
+ forceButtonRole: false,
136
151
  onClick: this.scrollToInfo,
137
- onKeyDown: keyboardClickable,
138
- "data-automation": "sidebar-instructions-button",
139
- variant: "icon"
140
- }, /*#__PURE__*/React.createElement(ScreenReaderContent, null, t('Scroll to instructions'))), /*#__PURE__*/React.createElement(PresentationContent, null, /*#__PURE__*/React.createElement("span", {
152
+ renderIcon: _ref2,
153
+ "data-automation": "sidebar-instructions-button"
154
+ }, /*#__PURE__*/React.createElement(ScreenReaderContent, null, t('Navigate to instructions'))), /*#__PURE__*/React.createElement(PresentationContent, null, /*#__PURE__*/React.createElement("span", {
141
155
  className: styles.description,
142
156
  "data-automation": "sidebar-instructions-text",
143
157
  onClick: this.scrollToInfo,
@@ -167,7 +181,7 @@ export var Sidebar = (_dec = themeable(theme, styles), _dec(_class = (_temp = _c
167
181
  "data-automation": "sidebar-toggle-button"
168
182
  }, /*#__PURE__*/React.createElement(Text, {
169
183
  size: "small"
170
- }, /*#__PURE__*/React.createElement(SidebarIcon, null)), /*#__PURE__*/React.createElement(ScreenReaderContent, null, sidebarOpen ? t('Close Menu') : t('Open Menu')))));
184
+ }, /*#__PURE__*/React.createElement(SidebarIcon, null)), /*#__PURE__*/React.createElement(ScreenReaderContent, null, sidebarOpen ? t('Close Question Navigator') : t('Open Question Navigator')))));
171
185
  }
172
186
  }, {
173
187
  key: "renderTotalPointsPossible",
@@ -239,7 +253,7 @@ export var Sidebar = (_dec = themeable(theme, styles), _dec(_class = (_temp = _c
239
253
  size: "x-small",
240
254
  "aria-label": t('Pinned Questions'),
241
255
  role: "img"
242
- }, _ref))), /*#__PURE__*/React.createElement("div", {
256
+ }, _ref3))), /*#__PURE__*/React.createElement("div", {
243
257
  className: closedClasses
244
258
  }, pinnedItems.map(function (pin) {
245
259
  return /*#__PURE__*/React.createElement(Pin, {
@@ -11,7 +11,7 @@ import PropTypes from 'prop-types';
11
11
  import ImmutablePropTypes from 'react-immutable-proptypes';
12
12
  import classNames from 'classnames';
13
13
  import { AccessibleContent } from '@instructure/ui-a11y-content';
14
- import { Button } from '@instructure/ui-buttons';
14
+ import { Link } from '@instructure/ui-link';
15
15
  import { Flex } from '@instructure/ui-flex';
16
16
  import { themeable } from '@instructure/ui-themeable';
17
17
  import PositionSummary from "../PositionSummary/index.js";
@@ -53,6 +53,8 @@ export var SidebarItem = (_dec = themeable(theme, styles), _dec(_class = (_temp
53
53
  _this = _super.call.apply(_super, [this].concat(args));
54
54
 
55
55
  _this.scrollToItem = function (e) {
56
+ e.preventDefault(); // prevent default link navigation
57
+
56
58
  if (_this.props.preventScrollToItem) {
57
59
  return;
58
60
  } // this can be a real scroll or a oqaat change
@@ -106,15 +108,17 @@ export var SidebarItem = (_dec = themeable(theme, styles), _dec(_class = (_temp
106
108
  var _this$props2 = this.props,
107
109
  displayPosition = _this$props2.displayPosition,
108
110
  itemId = _this$props2.itemId;
109
- return /*#__PURE__*/React.createElement(Button, {
111
+ return /*#__PURE__*/React.createElement(Link, {
112
+ href: "#",
113
+ size: "small",
114
+ margin: "small",
115
+ isWithinText: false,
116
+ forceButtonRole: false,
110
117
  onClick: this.scrollToItem,
111
118
  "data-automation-item-id": itemId,
112
- variant: "link",
113
- size: "small",
114
- margin: "xxx-small",
115
119
  "data-automation": "sdk-sidebar-item-button"
116
120
  }, /*#__PURE__*/React.createElement(AccessibleContent, {
117
- alt: t('Scroll to item at position {displayPosition}', {
121
+ alt: t('Navigate to item at position {displayPosition}', {
118
122
  displayPosition: displayPosition
119
123
  })
120
124
  }, this.renderPosition()));
@@ -10,10 +10,9 @@ import PropTypes from 'prop-types';
10
10
  import ImmutablePropTypes from 'react-immutable-proptypes';
11
11
  import { IconTextLeftLine } from '@instructure/ui-icons';
12
12
  import { themeable } from '@instructure/ui-themeable';
13
- import { Button } from '@instructure/ui-buttons';
13
+ import { Link } from '@instructure/ui-link';
14
14
  import { Flex } from '@instructure/ui-flex';
15
15
  import { ScreenReaderContent } from '@instructure/ui-a11y-content';
16
- import keyboardClickable from "../../../../../common/util/keyboardClickable.js";
17
16
  import Collection from "./Collection/index.js";
18
17
  import Title from "./Title/index.js";
19
18
  import Summary from "./Summary/index.js";
@@ -31,6 +30,11 @@ var styles = {
31
30
  import theme from "./theme.js";
32
31
  import t from '@instructure/quiz-i18n/es/format-message';
33
32
  export var DISPLAY_AS_SUMMARY_LIMIT = 5;
33
+
34
+ var _ref = /*#__PURE__*/React.createElement(IconTextLeftLine, {
35
+ color: "primary"
36
+ });
37
+
34
38
  export var SidebarStimulus = (_dec = themeable(theme, styles), _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_Component) {
35
39
  _inherits(SidebarStimulus, _Component);
36
40
 
@@ -48,8 +52,10 @@ export var SidebarStimulus = (_dec = themeable(theme, styles), _dec(_class = (_t
48
52
  _this = _super.call.apply(_super, [this].concat(args));
49
53
 
50
54
  _this.scrollToItem = function (e) {
55
+ e.preventDefault(); // prevent default link navigation
51
56
  // this can be a real scroll or a oqaat change
52
57
  // depending on whether is is oqaat or not
58
+
53
59
  _this.props.scrollToItem(_this.props.stimulusParent.id);
54
60
 
55
61
  e.stopPropagation();
@@ -85,12 +91,13 @@ export var SidebarStimulus = (_dec = themeable(theme, styles), _dec(_class = (_t
85
91
  key: "renderButton",
86
92
  value: function renderButton() {
87
93
  var displayPosition = this.props.displayPosition;
88
- return /*#__PURE__*/React.createElement(Button, {
89
- icon: IconTextLeftLine,
94
+ return /*#__PURE__*/React.createElement(Link, {
95
+ href: "#",
96
+ margin: "small",
97
+ forceButtonRole: false,
90
98
  onClick: this.scrollToItem,
91
- onKeyDown: keyboardClickable,
92
- variant: "icon"
93
- }, /*#__PURE__*/React.createElement(ScreenReaderContent, null, t('Scroll to stimulus at position { displayPosition }', {
99
+ renderIcon: _ref
100
+ }, /*#__PURE__*/React.createElement(ScreenReaderContent, null, t('Navigate to stimulus at position { displayPosition }', {
94
101
  displayPosition: displayPosition
95
102
  })));
96
103
  }
@@ -40,7 +40,8 @@ export var QuizInstructions = (_dec = themeable(theme, styles), _dec(_class = (_
40
40
  key: "render",
41
41
  value: function render() {
42
42
  return /*#__PURE__*/React.createElement("div", {
43
- className: styles.wrapper
43
+ className: styles.wrapper,
44
+ tabIndex: "-1"
44
45
  }, /*#__PURE__*/React.createElement(RichContentRenderer, {
45
46
  customStyles: styles.text,
46
47
  content: this.props.quiz.instructions,
@@ -38,7 +38,8 @@ export var QuizTitle = (_dec = themeable(theme, styles), _dec(_class = (_temp =
38
38
  key: "render",
39
39
  value: function render() {
40
40
  return /*#__PURE__*/React.createElement("div", {
41
- className: styles.wrapper
41
+ className: styles.wrapper,
42
+ tabIndex: "-1"
42
43
  }, /*#__PURE__*/React.createElement(Heading, {
43
44
  level: "h1"
44
45
  }, /*#__PURE__*/React.createElement("span", {
@@ -149,7 +149,8 @@ export var StimulusEditInfo = (_dec = themeable(theme, styles), _dec(_class = (_
149
149
  messages: this.inputErrors('onSelf'),
150
150
  description: /*#__PURE__*/React.createElement(ScreenReaderContent, null, t('Edit Stimulus'))
151
151
  }, /*#__PURE__*/React.createElement(Heading, {
152
- level: "h3"
152
+ level: "h3",
153
+ as: "h2"
153
154
  }, this.headerText()), /*#__PURE__*/React.createElement("div", {
154
155
  className: styles.section
155
156
  }, /*#__PURE__*/React.createElement(TextInput, {
@@ -175,6 +176,7 @@ export var StimulusEditInfo = (_dec = themeable(theme, styles), _dec(_class = (_
175
176
  defaultContent: stimulus.get('body'),
176
177
  onKeyUp: this.onBodyChange,
177
178
  onBlur: this.onBodyChange,
179
+ onChange: this.onBodyChange,
178
180
  uploadPath: this.fileUploadUrl(),
179
181
  useNewRce: isNewRCEEnabled()
180
182
  }), /*#__PURE__*/React.createElement(Errors, {
@@ -4,6 +4,7 @@ import _inherits from "@babel/runtime/helpers/esm/inherits";
4
4
  import _createSuper from "@babel/runtime/helpers/esm/createSuper";
5
5
  import React, { Component } from 'react';
6
6
  import ImmutablePropTypes from 'react-immutable-proptypes';
7
+ import { Heading } from '@instructure/ui-heading';
7
8
  import { Text } from '@instructure/ui-text';
8
9
  import { View } from '@instructure/ui-view';
9
10
  import { RichContentRenderer } from '@instructure/quiz-rce';
@@ -46,10 +47,14 @@ var StimulusShowInfo = /*#__PURE__*/function (_Component) {
46
47
  }, this.props.stimulus.instructions))));
47
48
  return /*#__PURE__*/React.createElement(View, {
48
49
  as: "div"
49
- }, /*#__PURE__*/React.createElement(Text, {
50
+ }, this.props.stimulus.title && /*#__PURE__*/React.createElement(Heading, {
51
+ level: "h3",
52
+ as: "h2",
50
53
  color: "primary",
51
- weight: "bold",
52
- size: "large"
54
+ margin: "0 0 small",
55
+ theme: {
56
+ h2FontWeight: '700'
57
+ }
53
58
  }, this.props.stimulus.title), instructions, /*#__PURE__*/React.createElement("div", {
54
59
  "data-automation": "sdk-stimulus-LeftPanelShow-content"
55
60
  }, /*#__PURE__*/React.createElement(RichContentRenderer, {
@@ -1,5 +1,5 @@
1
1
  import { Map } from 'immutable';
2
- import { ACTIVE_QUIZ_SESSION_CHANGE, UPDATE_TIMER_INFO, UPDATE_IS_TAKING, UPDATE_QUIZ_SESSION_STATUS_ON_PAGE_LOAD, UPDATE_TIMER_MINIMIZED, LOAD_RESUME_DATA, PREVIEW_RESPONSE, PREVIOUS_QUESTION, BACKTRACKING_NEXT_QUESTION, RESPONSE, SESSION_STARTED_OR_RESUMED_EVENT, SET_CURRENT_SESSION_ITEM_POSITION, UPDATE_QUIZ_SUBMIT_FLAG } from '@instructure/quiz-common';
2
+ import { ACTIVE_QUIZ_SESSION_CHANGE, UPDATE_TIMER_INFO, UPDATE_IS_TAKING, UPDATE_QUIZ_SESSION_STATUS_ON_PAGE_LOAD, UPDATE_TIMER_MINIMIZED, LOAD_RESUME_DATA, PREVIEW_RESPONSE, PREVIOUS_QUESTION, BACKTRACKING_NEXT_QUESTION, RESPONSE, SESSION_STARTED_OR_RESUMED_EVENT, SET_CURRENT_SESSION_ITEM_POSITION, CLEAR_FOCUS_CURRENT_SESSION_ITEM, UPDATE_QUIZ_SUBMIT_FLAG } from '@instructure/quiz-common';
3
3
 
4
4
  var defaultResponse = function defaultResponse(payload) {
5
5
  return Map({
@@ -28,7 +28,11 @@ var updateQuizSessionStatusOnPageLoad = function updateQuizSessionStatusOnPageLo
28
28
  };
29
29
 
30
30
  var setCurrentSessionItemPosition = function setCurrentSessionItemPosition(state, payload) {
31
- return state.set('currentSessionItemPosition', payload.position);
31
+ return state.set('currentSessionItemPosition', payload.position).set('focusCurrentSessionItem', true);
32
+ };
33
+
34
+ var clearFocusCurrentSessionItem = function clearFocusCurrentSessionItem(state, payload) {
35
+ return state.set('focusCurrentSessionItem', false);
32
36
  };
33
37
 
34
38
  var previousQuestion = function previousQuestion(state, payload) {
@@ -121,6 +125,9 @@ export default (function () {
121
125
  case SET_CURRENT_SESSION_ITEM_POSITION:
122
126
  return setCurrentSessionItemPosition(state, action.payload);
123
127
 
128
+ case CLEAR_FOCUS_CURRENT_SESSION_ITEM:
129
+ return clearFocusCurrentSessionItem(state, action.payload);
130
+
124
131
  case UPDATE_QUIZ_SESSION_STATUS_ON_PAGE_LOAD:
125
132
  return updateQuizSessionStatusOnPageLoad(state, action.payload);
126
133
 
package/es/index.js CHANGED
@@ -111,7 +111,7 @@ export { openModal, closeModal } from "./common/actions/modal.js";
111
111
  export { setRegradingPayload, setScoreReconciliation, toggleRegradingEditMode } from "./common/actions/regrading.js";
112
112
  export { showError, hideError, clearErrorsShowing } from "./common/actions/errorsShowing.js";
113
113
  export { changeItemState, changeQuizEntryPoints, changeQuizEntryProperties, clearModifications, moveTemporaryQuizEntry, changeQuizOutcomeAlignmentSetGuid, changeFudgePoints, sessionItemResultsModification } from "./common/actions/modifications.js";
114
- export { previousQuestion, editResponse, previewResponse, setCurrentSessionItemPosition } from "./common/actions/taking.js";
114
+ export { previousQuestion, editResponse, previewResponse, setCurrentSessionItemPosition, clearFocusCurrentSessionItem } from "./common/actions/taking.js";
115
115
  export { scrollToItem } from "./common/actions/scrolling.js";
116
116
  export { toggleSidebar } from "./common/actions/sidebar.js";
117
117
  export { newHoverPosition } from "./common/actions/dragAndDrop.js";
@@ -324,7 +324,8 @@ var QuizEntryShow = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles),
324
324
  className: styles.connectingLines
325
325
  }), /*#__PURE__*/_react.default.createElement(_PositionBox.default, {
326
326
  position: positionToDisplay,
327
- headingText: positionText
327
+ headingText: positionText,
328
+ headingLevel: quizEntry.isInStimulus ? 'h3' : 'h2'
328
329
  }), this.renderLeftHeader(), /*#__PURE__*/_react.default.createElement(_index.default, {
329
330
  connectDragSource: this.props.connectDragSource,
330
331
  displayPosition: this.props.displayPosition,
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.updateQuizSubmitFlag = exports.submitQuizSessionEvent = exports.sessionStartOrResumeEvent = exports.loadResumeData = exports.editResponse = exports.previewResponse = exports.updateTimerInfo = exports.updateQuizSessionStatusOnPageLoad = exports.updateIsTaking = exports.updateTimerMinimized = exports.backtrackingNextQuestion = exports.previousQuestion = exports.setCurrentSessionItemPosition = void 0;
6
+ exports.updateQuizSubmitFlag = exports.submitQuizSessionEvent = exports.sessionStartOrResumeEvent = exports.loadResumeData = exports.editResponse = exports.previewResponse = exports.updateTimerInfo = exports.updateQuizSessionStatusOnPageLoad = exports.updateIsTaking = exports.updateTimerMinimized = exports.backtrackingNextQuestion = exports.previousQuestion = exports.clearFocusCurrentSessionItem = exports.setCurrentSessionItemPosition = void 0;
7
7
 
8
8
  var _uuid = require("uuid");
9
9
 
@@ -20,6 +20,15 @@ var setCurrentSessionItemPosition = function setCurrentSessionItemPosition(posit
20
20
 
21
21
  exports.setCurrentSessionItemPosition = setCurrentSessionItemPosition;
22
22
 
23
+ var clearFocusCurrentSessionItem = function clearFocusCurrentSessionItem() {
24
+ return {
25
+ type: _quizCommon.CLEAR_FOCUS_CURRENT_SESSION_ITEM,
26
+ payload: {}
27
+ };
28
+ };
29
+
30
+ exports.clearFocusCurrentSessionItem = clearFocusCurrentSessionItem;
31
+
23
32
  var previousQuestion = function previousQuestion() {
24
33
  return {
25
34
  type: _quizCommon.PREVIOUS_QUESTION,
@@ -14,14 +14,18 @@ var _quizSessions = require("../../../../selectors/quizSessions.js");
14
14
 
15
15
  var _sidebar = require("../../../../actions/sidebar.js");
16
16
 
17
+ var _alerts = require("../../../../actions/alerts.js");
18
+
17
19
  var _presenter = require("./presenter.js");
18
20
 
19
21
  var mapStateToProps = function mapStateToProps(state, props) {
20
22
  var hideOnTake = (0, _quizSessions.isOneQuestionAtATime)(state) && !(0, _quizSessions.getBacktrackingIsAllowed)(state);
21
23
  var quizSessionNotLoaded = (0, _quizSessions.getActiveQuizSessionId)(state) === '0';
22
24
  var hidden = !!props.onTake && (hideOnTake || quizSessionNotLoaded);
25
+ var sidebarOpen = props.sidebarOpen || state.getIn(['sidebar', 'isOpen']);
23
26
  return {
24
- hidden: hidden
27
+ hidden: hidden,
28
+ sidebarOpen: sidebarOpen
25
29
  };
26
30
  };
27
31
 
@@ -29,7 +33,8 @@ exports.mapStateToProps = mapStateToProps;
29
33
 
30
34
  function mapDispatchToProps(dispatch, props) {
31
35
  return {
32
- sidebarMenuClick: props.sidebarMenuClick || (0, _redux.bindActionCreators)(_sidebar.toggleSidebar, dispatch)
36
+ sidebarMenuClick: props.sidebarMenuClick || (0, _redux.bindActionCreators)(_sidebar.toggleSidebar, dispatch),
37
+ screenreaderNotification: (0, _redux.bindActionCreators)(_alerts.screenreaderNotification, dispatch)
33
38
  };
34
39
  }
35
40
 
@@ -13,6 +13,8 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
13
13
 
14
14
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
15
15
 
16
+ var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
17
+
16
18
  var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
17
19
 
18
20
  var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/createSuper"));
@@ -50,8 +52,25 @@ var HeaderMenuButton = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
50
52
  var _super = (0, _createSuper2.default)(HeaderMenuButton);
51
53
 
52
54
  function HeaderMenuButton() {
55
+ var _this;
56
+
53
57
  (0, _classCallCheck2.default)(this, HeaderMenuButton);
54
- return _super.apply(this, arguments);
58
+
59
+ for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
60
+ args[_key] = arguments[_key];
61
+ }
62
+
63
+ _this = _super.call.apply(_super, [this].concat(args));
64
+
65
+ _this.toggleNavigator = function () {
66
+ var msg = _this.props.sidebarOpen ? (0, _formatMessage.default)('Closed Question Navigator') : (0, _formatMessage.default)('Opened Question Navigator');
67
+
68
+ _this.props.screenreaderNotification(msg);
69
+
70
+ _this.props.sidebarMenuClick();
71
+ }.bind((0, _assertThisInitialized2.default)(_this));
72
+
73
+ return _this;
55
74
  }
56
75
 
57
76
  (0, _createClass2.default)(HeaderMenuButton, [{
@@ -59,7 +78,7 @@ var HeaderMenuButton = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
59
78
  value: function render() {
60
79
  var _this$props = this.props,
61
80
  hidden = _this$props.hidden,
62
- sidebarMenuClick = _this$props.sidebarMenuClick;
81
+ sidebarOpen = _this$props.sidebarOpen;
63
82
 
64
83
  if (hidden) {
65
84
  return null;
@@ -69,17 +88,19 @@ var HeaderMenuButton = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
69
88
  className: styles.title
70
89
  }, /*#__PURE__*/_react.default.createElement("button", {
71
90
  className: styles.menuButton,
72
- onClick: sidebarMenuClick,
91
+ onClick: this.toggleNavigator,
73
92
  tabIndex: "0",
74
93
  "data-automation": "sdk-hamburger-button"
75
- }, _ref, /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('Open Menu'))));
94
+ }, _ref, /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, sidebarOpen ? (0, _formatMessage.default)('Close Question Navigator') : (0, _formatMessage.default)('Open Question Navigator'))));
76
95
  }
77
96
  }]);
78
97
  HeaderMenuButton.displayName = "HeaderMenuButton";
79
98
  return HeaderMenuButton;
80
99
  }(_react.Component), _class2.propTypes = {
81
100
  sidebarMenuClick: _propTypes.default.func.isRequired,
82
- hidden: _propTypes.default.bool.isRequired
101
+ hidden: _propTypes.default.bool.isRequired,
102
+ sidebarOpen: _propTypes.default.bool.isRequired,
103
+ screenreaderNotification: _propTypes.default.func.isRequired
83
104
  }, _temp)) || _class);
84
105
  exports.HeaderMenuButton = HeaderMenuButton;
85
106
  var _default = HeaderMenuButton;
@@ -35,6 +35,8 @@ var _uiA11yContent = require("@instructure/ui-a11y-content");
35
35
 
36
36
  var _uiButtons = require("@instructure/ui-buttons");
37
37
 
38
+ var _uiLink = require("@instructure/ui-link");
39
+
38
40
  var _uiText = require("@instructure/ui-text");
39
41
 
40
42
  var _uiView = require("@instructure/ui-view");
@@ -43,8 +45,6 @@ var _uiThemeable = require("@instructure/ui-themeable");
43
45
 
44
46
  var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
45
47
 
46
- var _keyboardClickable = _interopRequireDefault(require("../../../../util/keyboardClickable.js"));
47
-
48
48
  var _windowChecks = require("../../../../util/windowChecks.js");
49
49
 
50
50
  var _CustomPropTypes = _interopRequireDefault(require("../../../../util/CustomPropTypes.js"));
@@ -79,7 +79,15 @@ var styles = {
79
79
  'commonContainer': 'jUsaR_eYHq'
80
80
  };
81
81
 
82
- var _ref = /*#__PURE__*/_react.default.createElement(_uiIcons.IconPinSolid, null);
82
+ var _ref = /*#__PURE__*/_react.default.createElement(_uiIcons.IconQuizTitleLine, {
83
+ color: "primary"
84
+ });
85
+
86
+ var _ref2 = /*#__PURE__*/_react.default.createElement(_uiIcons.IconQuizInstructionsLine, {
87
+ color: "primary"
88
+ });
89
+
90
+ var _ref3 = /*#__PURE__*/_react.default.createElement(_uiIcons.IconPinSolid, null);
83
91
 
84
92
  var Sidebar = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_Component) {
85
93
  (0, _inherits2.default)(Sidebar, _Component);
@@ -97,11 +105,15 @@ var Sidebar = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(
97
105
 
98
106
  _this = _super.call.apply(_super, [this].concat(args));
99
107
 
100
- _this.scrollToTitle = function () {
108
+ _this.scrollToTitle = function (e) {
109
+ e.preventDefault(); // prevent default link navigation
110
+
101
111
  _this.props.scrollToItem(null)('title');
102
112
  };
103
113
 
104
- _this.scrollToInfo = function () {
114
+ _this.scrollToInfo = function (e) {
115
+ e.preventDefault(); // prevent default link navigation
116
+
105
117
  _this.props.scrollToItem(null)('instructions');
106
118
  };
107
119
 
@@ -148,12 +160,13 @@ var Sidebar = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(
148
160
  value: function renderTitle() {
149
161
  return /*#__PURE__*/_react.default.createElement("div", {
150
162
  className: styles.actionableInfo
151
- }, /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {
152
- icon: _uiIcons.IconQuizTitleLine,
163
+ }, /*#__PURE__*/_react.default.createElement(_uiLink.Link, {
164
+ href: "#",
165
+ margin: "small",
166
+ forceButtonRole: false,
153
167
  onClick: this.scrollToTitle,
154
- onKeyDown: _keyboardClickable.default,
155
- variant: "icon"
156
- }, /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('Scroll to title'))), /*#__PURE__*/_react.default.createElement(_uiA11yContent.PresentationContent, null, /*#__PURE__*/_react.default.createElement("span", {
168
+ renderIcon: _ref
169
+ }, /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('Navigate to title'))), /*#__PURE__*/_react.default.createElement(_uiA11yContent.PresentationContent, null, /*#__PURE__*/_react.default.createElement("span", {
157
170
  className: styles.description,
158
171
  onClick: this.scrollToTitle,
159
172
  tabIndex: "-1"
@@ -164,13 +177,14 @@ var Sidebar = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(
164
177
  value: function renderInstructions() {
165
178
  return /*#__PURE__*/_react.default.createElement("div", {
166
179
  className: styles.actionableInfo
167
- }, /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {
168
- icon: _uiIcons.IconQuizInstructionsLine,
180
+ }, /*#__PURE__*/_react.default.createElement(_uiLink.Link, {
181
+ href: "#",
182
+ margin: "small",
183
+ forceButtonRole: false,
169
184
  onClick: this.scrollToInfo,
170
- onKeyDown: _keyboardClickable.default,
171
- "data-automation": "sidebar-instructions-button",
172
- variant: "icon"
173
- }, /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('Scroll to instructions'))), /*#__PURE__*/_react.default.createElement(_uiA11yContent.PresentationContent, null, /*#__PURE__*/_react.default.createElement("span", {
185
+ renderIcon: _ref2,
186
+ "data-automation": "sidebar-instructions-button"
187
+ }, /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('Navigate to instructions'))), /*#__PURE__*/_react.default.createElement(_uiA11yContent.PresentationContent, null, /*#__PURE__*/_react.default.createElement("span", {
174
188
  className: styles.description,
175
189
  "data-automation": "sidebar-instructions-text",
176
190
  onClick: this.scrollToInfo,
@@ -200,7 +214,7 @@ var Sidebar = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(
200
214
  "data-automation": "sidebar-toggle-button"
201
215
  }, /*#__PURE__*/_react.default.createElement(_uiText.Text, {
202
216
  size: "small"
203
- }, /*#__PURE__*/_react.default.createElement(SidebarIcon, null)), /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, sidebarOpen ? (0, _formatMessage.default)('Close Menu') : (0, _formatMessage.default)('Open Menu')))));
217
+ }, /*#__PURE__*/_react.default.createElement(SidebarIcon, null)), /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, sidebarOpen ? (0, _formatMessage.default)('Close Question Navigator') : (0, _formatMessage.default)('Open Question Navigator')))));
204
218
  }
205
219
  }, {
206
220
  key: "renderTotalPointsPossible",
@@ -273,7 +287,7 @@ var Sidebar = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(
273
287
  size: "x-small",
274
288
  "aria-label": (0, _formatMessage.default)('Pinned Questions'),
275
289
  role: "img"
276
- }, _ref))), /*#__PURE__*/_react.default.createElement("div", {
290
+ }, _ref3))), /*#__PURE__*/_react.default.createElement("div", {
277
291
  className: closedClasses
278
292
  }, pinnedItems.map(function (pin) {
279
293
  return /*#__PURE__*/_react.default.createElement(_Pin.default, {
@@ -29,7 +29,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
29
29
 
30
30
  var _uiA11yContent = require("@instructure/ui-a11y-content");
31
31
 
32
- var _uiButtons = require("@instructure/ui-buttons");
32
+ var _uiLink = require("@instructure/ui-link");
33
33
 
34
34
  var _uiFlex = require("@instructure/ui-flex");
35
35
 
@@ -81,6 +81,8 @@ var SidebarItem = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
81
81
  _this = _super.call.apply(_super, [this].concat(args));
82
82
 
83
83
  _this.scrollToItem = function (e) {
84
+ e.preventDefault(); // prevent default link navigation
85
+
84
86
  if (_this.props.preventScrollToItem) {
85
87
  return;
86
88
  } // this can be a real scroll or a oqaat change
@@ -134,15 +136,17 @@ var SidebarItem = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
134
136
  var _this$props2 = this.props,
135
137
  displayPosition = _this$props2.displayPosition,
136
138
  itemId = _this$props2.itemId;
137
- return /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {
139
+ return /*#__PURE__*/_react.default.createElement(_uiLink.Link, {
140
+ href: "#",
141
+ size: "small",
142
+ margin: "small",
143
+ isWithinText: false,
144
+ forceButtonRole: false,
138
145
  onClick: this.scrollToItem,
139
146
  "data-automation-item-id": itemId,
140
- variant: "link",
141
- size: "small",
142
- margin: "xxx-small",
143
147
  "data-automation": "sdk-sidebar-item-button"
144
148
  }, /*#__PURE__*/_react.default.createElement(_uiA11yContent.AccessibleContent, {
145
- alt: (0, _formatMessage.default)('Scroll to item at position {displayPosition}', {
149
+ alt: (0, _formatMessage.default)('Navigate to item at position {displayPosition}', {
146
150
  displayPosition: displayPosition
147
151
  })
148
152
  }, this.renderPosition()));
@@ -27,14 +27,12 @@ var _uiIcons = require("@instructure/ui-icons");
27
27
 
28
28
  var _uiThemeable = require("@instructure/ui-themeable");
29
29
 
30
- var _uiButtons = require("@instructure/ui-buttons");
30
+ var _uiLink = require("@instructure/ui-link");
31
31
 
32
32
  var _uiFlex = require("@instructure/ui-flex");
33
33
 
34
34
  var _uiA11yContent = require("@instructure/ui-a11y-content");
35
35
 
36
- var _keyboardClickable = _interopRequireDefault(require("../../../../../common/util/keyboardClickable.js"));
37
-
38
36
  var _index = _interopRequireDefault(require("./Collection/index.js"));
39
37
 
40
38
  var _index2 = _interopRequireDefault(require("./Title/index.js"));
@@ -60,6 +58,11 @@ var styles = {
60
58
  };
61
59
  var DISPLAY_AS_SUMMARY_LIMIT = 5;
62
60
  exports.DISPLAY_AS_SUMMARY_LIMIT = DISPLAY_AS_SUMMARY_LIMIT;
61
+
62
+ var _ref = /*#__PURE__*/_react.default.createElement(_uiIcons.IconTextLeftLine, {
63
+ color: "primary"
64
+ });
65
+
63
66
  var SidebarStimulus = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_Component) {
64
67
  (0, _inherits2.default)(SidebarStimulus, _Component);
65
68
 
@@ -77,8 +80,10 @@ var SidebarStimulus = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
77
80
  _this = _super.call.apply(_super, [this].concat(args));
78
81
 
79
82
  _this.scrollToItem = function (e) {
83
+ e.preventDefault(); // prevent default link navigation
80
84
  // this can be a real scroll or a oqaat change
81
85
  // depending on whether is is oqaat or not
86
+
82
87
  _this.props.scrollToItem(_this.props.stimulusParent.id);
83
88
 
84
89
  e.stopPropagation();
@@ -114,12 +119,13 @@ var SidebarStimulus = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
114
119
  key: "renderButton",
115
120
  value: function renderButton() {
116
121
  var displayPosition = this.props.displayPosition;
117
- return /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {
118
- icon: _uiIcons.IconTextLeftLine,
122
+ return /*#__PURE__*/_react.default.createElement(_uiLink.Link, {
123
+ href: "#",
124
+ margin: "small",
125
+ forceButtonRole: false,
119
126
  onClick: this.scrollToItem,
120
- onKeyDown: _keyboardClickable.default,
121
- variant: "icon"
122
- }, /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('Scroll to stimulus at position { displayPosition }', {
127
+ renderIcon: _ref
128
+ }, /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('Navigate to stimulus at position { displayPosition }', {
123
129
  displayPosition: displayPosition
124
130
  })));
125
131
  }
@@ -59,7 +59,8 @@ var QuizInstructions = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
59
59
  key: "render",
60
60
  value: function render() {
61
61
  return /*#__PURE__*/_react.default.createElement("div", {
62
- className: styles.wrapper
62
+ className: styles.wrapper,
63
+ tabIndex: "-1"
63
64
  }, /*#__PURE__*/_react.default.createElement(_quizRce.RichContentRenderer, {
64
65
  customStyles: styles.text,
65
66
  content: this.props.quiz.instructions,
@@ -57,7 +57,8 @@ var QuizTitle = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _de
57
57
  key: "render",
58
58
  value: function render() {
59
59
  return /*#__PURE__*/_react.default.createElement("div", {
60
- className: styles.wrapper
60
+ className: styles.wrapper,
61
+ tabIndex: "-1"
61
62
  }, /*#__PURE__*/_react.default.createElement(_uiHeading.Heading, {
62
63
  level: "h1"
63
64
  }, /*#__PURE__*/_react.default.createElement("span", {
@@ -182,7 +182,8 @@ var StimulusEditInfo = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
182
182
  messages: this.inputErrors('onSelf'),
183
183
  description: /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('Edit Stimulus'))
184
184
  }, /*#__PURE__*/_react.default.createElement(_uiHeading.Heading, {
185
- level: "h3"
185
+ level: "h3",
186
+ as: "h2"
186
187
  }, this.headerText()), /*#__PURE__*/_react.default.createElement("div", {
187
188
  className: styles.section
188
189
  }, /*#__PURE__*/_react.default.createElement(_uiTextInput.TextInput, {
@@ -208,6 +209,7 @@ var StimulusEditInfo = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
208
209
  defaultContent: stimulus.get('body'),
209
210
  onKeyUp: this.onBodyChange,
210
211
  onBlur: this.onBodyChange,
212
+ onChange: this.onBodyChange,
211
213
  uploadPath: this.fileUploadUrl(),
212
214
  useNewRce: (0, _rceChecker.isNewRCEEnabled)()
213
215
  }), /*#__PURE__*/_react.default.createElement(_Errors.default, {
@@ -21,6 +21,8 @@ var _react = _interopRequireWildcard(require("react"));
21
21
 
22
22
  var _reactImmutableProptypes = _interopRequireDefault(require("react-immutable-proptypes"));
23
23
 
24
+ var _uiHeading = require("@instructure/ui-heading");
25
+
24
26
  var _uiText = require("@instructure/ui-text");
25
27
 
26
28
  var _uiView = require("@instructure/ui-view");
@@ -67,10 +69,14 @@ var StimulusShowInfo = /*#__PURE__*/function (_Component) {
67
69
 
68
70
  return /*#__PURE__*/_react.default.createElement(_uiView.View, {
69
71
  as: "div"
70
- }, /*#__PURE__*/_react.default.createElement(_uiText.Text, {
72
+ }, this.props.stimulus.title && /*#__PURE__*/_react.default.createElement(_uiHeading.Heading, {
73
+ level: "h3",
74
+ as: "h2",
71
75
  color: "primary",
72
- weight: "bold",
73
- size: "large"
76
+ margin: "0 0 small",
77
+ theme: {
78
+ h2FontWeight: '700'
79
+ }
74
80
  }, this.props.stimulus.title), instructions, /*#__PURE__*/_react.default.createElement("div", {
75
81
  "data-automation": "sdk-stimulus-LeftPanelShow-content"
76
82
  }, /*#__PURE__*/_react.default.createElement(_quizRce.RichContentRenderer, {
@@ -36,7 +36,11 @@ var updateQuizSessionStatusOnPageLoad = function updateQuizSessionStatusOnPageLo
36
36
  };
37
37
 
38
38
  var setCurrentSessionItemPosition = function setCurrentSessionItemPosition(state, payload) {
39
- return state.set('currentSessionItemPosition', payload.position);
39
+ return state.set('currentSessionItemPosition', payload.position).set('focusCurrentSessionItem', true);
40
+ };
41
+
42
+ var clearFocusCurrentSessionItem = function clearFocusCurrentSessionItem(state, payload) {
43
+ return state.set('focusCurrentSessionItem', false);
40
44
  };
41
45
 
42
46
  var previousQuestion = function previousQuestion(state, payload) {
@@ -129,6 +133,9 @@ var _default = function _default() {
129
133
  case _quizCommon.SET_CURRENT_SESSION_ITEM_POSITION:
130
134
  return setCurrentSessionItemPosition(state, action.payload);
131
135
 
136
+ case _quizCommon.CLEAR_FOCUS_CURRENT_SESSION_ITEM:
137
+ return clearFocusCurrentSessionItem(state, action.payload);
138
+
132
139
  case _quizCommon.UPDATE_QUIZ_SESSION_STATUS_ON_PAGE_LOAD:
133
140
  return updateQuizSessionStatusOnPageLoad(state, action.payload);
134
141
 
package/lib/index.js CHANGED
@@ -163,6 +163,7 @@ var _exportNames = {
163
163
  editResponse: true,
164
164
  previewResponse: true,
165
165
  setCurrentSessionItemPosition: true,
166
+ clearFocusCurrentSessionItem: true,
166
167
  takingActionCreators: true,
167
168
  scrollToItem: true,
168
169
  toggleSidebar: true,
@@ -1122,6 +1123,12 @@ Object.defineProperty(exports, "setCurrentSessionItemPosition", {
1122
1123
  return takingActionCreators.setCurrentSessionItemPosition;
1123
1124
  }
1124
1125
  });
1126
+ Object.defineProperty(exports, "clearFocusCurrentSessionItem", {
1127
+ enumerable: true,
1128
+ get: function get() {
1129
+ return takingActionCreators.clearFocusCurrentSessionItem;
1130
+ }
1131
+ });
1125
1132
  Object.defineProperty(exports, "scrollToItem", {
1126
1133
  enumerable: true,
1127
1134
  get: function get() {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@instructure/quiz-core",
3
- "version": "17.36.0",
3
+ "version": "17.36.1-rc.10+76a5a438d",
4
4
  "license": "MIT",
5
5
  "description": "The Quiz React SDK by Instructure Inc.",
6
6
  "author": "Instructure, Inc. Engineering and Product Design",
@@ -41,11 +41,11 @@
41
41
  ],
42
42
  "dependencies": {
43
43
  "@instructure/outcomes-ui": "^2.1.2",
44
- "@instructure/quiz-common": "^17.36.0",
45
- "@instructure/quiz-i18n": "^17.36.0",
46
- "@instructure/quiz-interactions": "^17.36.0",
47
- "@instructure/quiz-number-input": "^17.36.0",
48
- "@instructure/quiz-rce": "^17.36.0",
44
+ "@instructure/quiz-common": "17.36.1-rc.10+76a5a438d",
45
+ "@instructure/quiz-i18n": "17.36.1-rc.10+76a5a438d",
46
+ "@instructure/quiz-interactions": "17.36.1-rc.10+76a5a438d",
47
+ "@instructure/quiz-number-input": "17.36.1-rc.10+76a5a438d",
48
+ "@instructure/quiz-rce": "17.36.1-rc.10+76a5a438d",
49
49
  "@instructure/ui-a11y-content": "^7.20.0",
50
50
  "@instructure/ui-alerts": "^7.20.0",
51
51
  "@instructure/ui-avatar": "^7.20.0",
@@ -106,7 +106,7 @@
106
106
  "eventemitter3": "^3.1.0",
107
107
  "humps": "^2.0.0",
108
108
  "immutable": "^3.8.1",
109
- "instructure-validations": "^17.36.0",
109
+ "instructure-validations": "17.36.1-rc.10+76a5a438d",
110
110
  "ipaddr.js": "^1.5.4",
111
111
  "isomorphic-fetch": "^2.2.0",
112
112
  "isuuid": "^0.1.0",
@@ -137,7 +137,7 @@
137
137
  "uuid": "^3.2.1"
138
138
  },
139
139
  "devDependencies": {
140
- "@instructure/quiz-scripts": "^17.36.0",
140
+ "@instructure/quiz-scripts": "17.36.1-rc.10+76a5a438d",
141
141
  "@instructure/ui-axe-check": "^7.20.0",
142
142
  "@instructure/ui-babel-preset": "^7.20.0",
143
143
  "@instructure/ui-karma-config": "^7.20.0",
@@ -156,7 +156,7 @@
156
156
  "intl": "^1.2.4",
157
157
  "jquery": "^2.2.3",
158
158
  "most-subject": "^5.3.0",
159
- "quiz-presets": "^17.36.0",
159
+ "quiz-presets": "17.36.1-rc.10+76a5a438d",
160
160
  "react": "^16.8.6",
161
161
  "react-addons-test-utils": "^15.6.2",
162
162
  "react-dom": "^16.8.6",
@@ -172,5 +172,5 @@
172
172
  "publishConfig": {
173
173
  "access": "public"
174
174
  },
175
- "gitHead": "ce2a1aa8536186e28551e4945b0200e29fcdc830"
175
+ "gitHead": "76a5a438d7e03e124ca14b6ce70f00fc4d6d4482"
176
176
  }