@instructure/quiz-core 17.66.2-rc.9 → 17.67.0

package/CHANGELOG.md

@@ -3,6 +3,29 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [17.67.0](https://gerrit.instructure.com/quizzes-ui/compare/v17.66.1...v17.67.0) (2023-09-06)
+
+
+### Bug Fixes
+
+* **a11y:** Add correct answer information to Answer Frequency Summary table ([010f352](https://gerrit.instructure.com/quizzes-ui/commits/010f352ab09eb0e60ad8261f802bb69e4592d3a9))
+* **a11y:** adjust the heading structure of item analysis ([a7d0e14](https://gerrit.instructure.com/quizzes-ui/commits/a7d0e14f3ffee5f0fc19771ed42fd1d4eeac2e53))
+* **a11y:** exclude item stem expand button from screen readers ([3eb129f](https://gerrit.instructure.com/quizzes-ui/commits/3eb129fc6bb41bcfd86285b5f96b95c5bd5b2c6d))
+* **a11y:** Hide expand button when the item analysis card rich content is not high enough ([58de8d5](https://gerrit.instructure.com/quizzes-ui/commits/58de8d55898e0f1899f16476e16ed50786f9cb8d))
+* **a11y:** Item Analysis report cards are fully visible on 320px screen ([bc778cc](https://gerrit.instructure.com/quizzes-ui/commits/bc778cc52a3014879810e06942393d6772f0ccb7))
+* **a11y:** make score distribution chart accessible ([28868d7](https://gerrit.instructure.com/quizzes-ui/commits/28868d7a4a3b2b06b94fbcdd5e535ffc79c3203a))
+* **ItemAnalysis:** Make the new analysis report card have the same height as the others ([1f02d33](https://gerrit.instructure.com/quizzes-ui/commits/1f02d33c09a57ed2bbb1e7b76e5c6b1a4faa65bb))
+
+
+### Features
+
+* **BOLA:** Adds bola position to setssion items ([d5fd33f](https://gerrit.instructure.com/quizzes-ui/commits/d5fd33f05363579b68e0acdd8a968889b4cb61e1))
+* **BOLA:** REVERT Adds bola position to setssion items" ([4fb68a7](https://gerrit.instructure.com/quizzes-ui/commits/4fb68a7754f7630daddb3222a5bf75616f09abe2))
+
+
+
+
+
 ## [17.66.1](https://gerrit.instructure.com/quizzes-ui/compare/v17.66.0...v17.66.1) (2023-08-23)
 
 

package/es/common/records/QuizSession.js

@@ -192,9 +192,7 @@ export var QuizSession = /*#__PURE__*/function (_ReduxRecord) {
   status: '',
   takingData: Map(),
   timerMultiplier: null,
-  user: Map(),
-  // Good candidate for another Record - Still relevant?
-  bolaSessionItemsCount: null,
-  buildOnLastAttempt: null
+  user: Map() // Good candidate for another Record - Still relevant?
+
 }));
 export default QuizSession;

package/es/common/records/SessionItem.js

@@ -126,7 +126,6 @@ export var SessionItem = /*#__PURE__*/function (_ReduxRecord) {
   scoringData: {},
   calculatorType: 'none',
   stimulus: null,
-  stimulusKey: null,
-  bolaPosition: null
+  stimulusKey: null
 }));
 export default SessionItem;

package/es/reporting/components/resources/NewQuizAndItemAnalysis/NewItemAnalysis/presenter.js

@@ -38,8 +38,9 @@ import classnames from 'classnames';
 import { interactionTypesNameDictionary } from "../../../../../common/util/interactionTypeMetadata.js";
 import AnswerSummaryTable from "../AnswerSummaryTable/index.js";
 import { itemAnalysisPropType } from "../propTypes.js";
-import { RichContentRenderer } from '@instructure/quiz-rce';
 import { Flex } from '@instructure/ui-flex';
+import { RichContentRenderer, ensureMathIsReady, ensureMathRendered } from '@instructure/quiz-rce';
+import { ensureImagesLoaded } from "../../../../../common/util/printUtils.js";
 var supportedTables = ['choice', 'true-false', 'multi-answer'];
 export var NewItemAnalysis = (_dec = themeable(theme, styles), _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_Component) {
   _inherits(NewItemAnalysis, _Component);
@@ -58,7 +59,8 @@ export var NewItemAnalysis = (_dec = themeable(theme, styles), _dec(_class = (_t
     _this = _super.call.apply(_super, [this].concat(args));
     _this.state = {
       bodyExpanded: false,
-      metricsExpanded: false
+      metricsExpanded: false,
+      itemCardBodyHeight: 0
     };
 
     _this.mapInteractionTypeToTranslation = function (interactionType) {
@@ -112,7 +114,7 @@ export var NewItemAnalysis = (_dec = themeable(theme, styles), _dec(_class = (_t
       }, _this.mapInteractionTypeToTranslation(interactionType));
     };
 
-    _this.renderRichContent = function (itemBody, itemBodyClass) {
+    _this.renderRichContent = function (itemBody, itemBodyClass, itemId) {
       return /*#__PURE__*/React.createElement(Flex, {
         direction: "row",
         alignItems: "start"
@@ -120,6 +122,7 @@ export var NewItemAnalysis = (_dec = themeable(theme, styles), _dec(_class = (_t
         shouldShrink: true,
         shouldGrow: true
       }, /*#__PURE__*/React.createElement("div", {
+        id: _this.itemCardBodyId(itemId),
         className: itemBodyClass
       }, /*#__PURE__*/React.createElement(RichContentRenderer, {
         content: itemBody
@@ -127,7 +130,7 @@ export var NewItemAnalysis = (_dec = themeable(theme, styles), _dec(_class = (_t
         margin: "none none none x-small"
       }, /*#__PURE__*/React.createElement("div", {
         className: styles.itemBodyToggleButtonWrapper
-      }, /*#__PURE__*/React.createElement(PresentationContent, null, /*#__PURE__*/React.createElement(ExpandButton, {
+      }, _this.isBodyHigherThanContainer() && /*#__PURE__*/React.createElement(PresentationContent, null, /*#__PURE__*/React.createElement(ExpandButton, {
         onClick: _this.handleBodyToggle,
         title: _this.state.bodyExpanded ? t('collapse question stem') : t('expand question stem'),
         isExpanded: _this.state.bodyExpanded
@@ -209,6 +212,38 @@ export var NewItemAnalysis = (_dec = themeable(theme, styles), _dec(_class = (_t
   }
 
   _createClass(NewItemAnalysis, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      var _this2 = this;
+
+      ensureMathIsReady().then(ensureMathRendered).then(ensureImagesLoaded).then(function () {
+        return _this2.calculateItemCardBodyHeight(_this2.props.itemAnalysis.metadata.item_id);
+      });
+    }
+  }, {
+    key: "calculateItemCardBodyHeight",
+    value: function calculateItemCardBodyHeight(id) {
+      var element = document.getElementById(this.itemCardBodyId(id));
+
+      if (element) {
+        var height = element.clientHeight;
+        this.setState({
+          itemCardBodyHeight: height
+        });
+      }
+    }
+  }, {
+    key: "itemCardBodyId",
+    value: function itemCardBodyId(itemId) {
+      return "itemCardBody-".concat(itemId);
+    }
+  }, {
+    key: "isBodyHigherThanContainer",
+    value: function isBodyHigherThanContainer() {
+      var containerHeight = 48;
+      return this.state.itemCardBodyHeight > containerHeight;
+    }
+  }, {
     key: "render",
     value: function render() {
       var _metadata$item_title;
@@ -220,7 +255,7 @@ export var NewItemAnalysis = (_dec = themeable(theme, styles), _dec(_class = (_t
       var itemId = metadata.item_id;
       var isSupportedTable = supportedTables.includes(metadata.interaction_type);
       var metricsClass = classnames(_defineProperty({}, styles.hiddenMetrics, !this.state.metricsExpanded));
-      var itemBodyClass = classnames(styles.itemBody, _defineProperty({}, styles.hiddenItemBody, !this.state.bodyExpanded));
+      var itemBodyClass = classnames(styles.itemBody, _defineProperty({}, styles.hiddenItemBody, this.isBodyHigherThanContainer() && !this.state.bodyExpanded));
       var title = (_metadata$item_title = metadata.item_title) !== null && _metadata$item_title !== void 0 ? _metadata$item_title : t('Untitled item');
       return /*#__PURE__*/React.createElement(Card, {
         className: styles.cardWrapper
@@ -242,7 +277,7 @@ export var NewItemAnalysis = (_dec = themeable(theme, styles), _dec(_class = (_t
         padding: "small xx-small none none",
         overflowY: "hidden",
         size: !this.state.bodyExpanded ? '60px' : void 0
-      }, this.renderRichContent(metadata.item_body, itemBodyClass)))), /*#__PURE__*/React.createElement(Flex.Item, null, this.renderMetrics(scores, metricsClass)))), /*#__PURE__*/React.createElement(Flex.Item, null, this.renderAnswerSummaryTable(itemId, answer_summary, isSupportedTable, metricsClass))));
+      }, this.renderRichContent(metadata.item_body, itemBodyClass, itemId)))), /*#__PURE__*/React.createElement(Flex.Item, null, this.renderMetrics(scores, metricsClass)))), /*#__PURE__*/React.createElement(Flex.Item, null, this.renderAnswerSummaryTable(itemId, answer_summary, isSupportedTable, metricsClass))));
     }
   }]);
 

package/lib/common/records/QuizSession.js

@@ -211,10 +211,8 @@ var QuizSession = /*#__PURE__*/function (_ReduxRecord) {
   status: '',
   takingData: (0, _immutable.Map)(),
   timerMultiplier: null,
-  user: (0, _immutable.Map)(),
-  // Good candidate for another Record - Still relevant?
-  bolaSessionItemsCount: null,
-  buildOnLastAttempt: null
+  user: (0, _immutable.Map)() // Good candidate for another Record - Still relevant?
+
 }));
 
 exports.QuizSession = QuizSession;

package/lib/common/records/SessionItem.js

@@ -142,8 +142,7 @@ var SessionItem = /*#__PURE__*/function (_ReduxRecord) {
   scoringData: {},
   calculatorType: 'none',
   stimulus: null,
-  stimulusKey: null,
-  bolaPosition: null
+  stimulusKey: null
 }));
 
 exports.SessionItem = SessionItem;

package/lib/reporting/components/resources/NewQuizAndItemAnalysis/NewItemAnalysis/presenter.js

@@ -51,9 +51,11 @@ var _index5 = _interopRequireDefault(require("../AnswerSummaryTable/index.js"));
 
 var _propTypes = require("../propTypes.js");
 
+var _uiFlex = require("@instructure/ui-flex");
+
 var _quizRce = require("@instructure/quiz-rce");
 
-var _uiFlex = require("@instructure/ui-flex");
+var _printUtils = require("../../../../../common/util/printUtils.js");
 
 var _dec, _class, _class2, _temp;
 
@@ -91,7 +93,8 @@ var NewItemAnalysis = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
     _this = _super.call.apply(_super, [this].concat(args));
     _this.state = {
       bodyExpanded: false,
-      metricsExpanded: false
+      metricsExpanded: false,
+      itemCardBodyHeight: 0
     };
 
     _this.mapInteractionTypeToTranslation = function (interactionType) {
@@ -145,7 +148,7 @@ var NewItemAnalysis = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
       }, _this.mapInteractionTypeToTranslation(interactionType));
     };
 
-    _this.renderRichContent = function (itemBody, itemBodyClass) {
+    _this.renderRichContent = function (itemBody, itemBodyClass, itemId) {
       return /*#__PURE__*/_react.default.createElement(_uiFlex.Flex, {
         direction: "row",
         alignItems: "start"
@@ -153,6 +156,7 @@ var NewItemAnalysis = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
         shouldShrink: true,
         shouldGrow: true
       }, /*#__PURE__*/_react.default.createElement("div", {
+        id: _this.itemCardBodyId(itemId),
         className: itemBodyClass
       }, /*#__PURE__*/_react.default.createElement(_quizRce.RichContentRenderer, {
         content: itemBody
@@ -160,7 +164,7 @@ var NewItemAnalysis = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
         margin: "none none none x-small"
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: styles.itemBodyToggleButtonWrapper
-      }, /*#__PURE__*/_react.default.createElement(_uiA11yContent.PresentationContent, null, /*#__PURE__*/_react.default.createElement(_index.default, {
+      }, _this.isBodyHigherThanContainer() && /*#__PURE__*/_react.default.createElement(_uiA11yContent.PresentationContent, null, /*#__PURE__*/_react.default.createElement(_index.default, {
         onClick: _this.handleBodyToggle,
         title: _this.state.bodyExpanded ? (0, _formatMessage.default)('collapse question stem') : (0, _formatMessage.default)('expand question stem'),
         isExpanded: _this.state.bodyExpanded
@@ -242,6 +246,38 @@ var NewItemAnalysis = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
   }
 
   (0, _createClass2.default)(NewItemAnalysis, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      var _this2 = this;
+
+      (0, _quizRce.ensureMathIsReady)().then(_quizRce.ensureMathRendered).then(_printUtils.ensureImagesLoaded).then(function () {
+        return _this2.calculateItemCardBodyHeight(_this2.props.itemAnalysis.metadata.item_id);
+      });
+    }
+  }, {
+    key: "calculateItemCardBodyHeight",
+    value: function calculateItemCardBodyHeight(id) {
+      var element = document.getElementById(this.itemCardBodyId(id));
+
+      if (element) {
+        var height = element.clientHeight;
+        this.setState({
+          itemCardBodyHeight: height
+        });
+      }
+    }
+  }, {
+    key: "itemCardBodyId",
+    value: function itemCardBodyId(itemId) {
+      return "itemCardBody-".concat(itemId);
+    }
+  }, {
+    key: "isBodyHigherThanContainer",
+    value: function isBodyHigherThanContainer() {
+      var containerHeight = 48;
+      return this.state.itemCardBodyHeight > containerHeight;
+    }
+  }, {
     key: "render",
     value: function render() {
       var _metadata$item_title;
@@ -253,7 +289,7 @@ var NewItemAnalysis = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
       var itemId = metadata.item_id;
       var isSupportedTable = supportedTables.includes(metadata.interaction_type);
       var metricsClass = (0, _classnames3.default)((0, _defineProperty2.default)({}, styles.hiddenMetrics, !this.state.metricsExpanded));
-      var itemBodyClass = (0, _classnames3.default)(styles.itemBody, (0, _defineProperty2.default)({}, styles.hiddenItemBody, !this.state.bodyExpanded));
+      var itemBodyClass = (0, _classnames3.default)(styles.itemBody, (0, _defineProperty2.default)({}, styles.hiddenItemBody, this.isBodyHigherThanContainer() && !this.state.bodyExpanded));
       var title = (_metadata$item_title = metadata.item_title) !== null && _metadata$item_title !== void 0 ? _metadata$item_title : (0, _formatMessage.default)('Untitled item');
       return /*#__PURE__*/_react.default.createElement(_index2.default, {
         className: styles.cardWrapper
@@ -275,7 +311,7 @@ var NewItemAnalysis = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
         padding: "small xx-small none none",
         overflowY: "hidden",
         size: !this.state.bodyExpanded ? '60px' : void 0
-      }, this.renderRichContent(metadata.item_body, itemBodyClass)))), /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, null, this.renderMetrics(scores, metricsClass)))), /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, null, this.renderAnswerSummaryTable(itemId, answer_summary, isSupportedTable, metricsClass))));
+      }, this.renderRichContent(metadata.item_body, itemBodyClass, itemId)))), /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, null, this.renderMetrics(scores, metricsClass)))), /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, null, this.renderAnswerSummaryTable(itemId, answer_summary, isSupportedTable, metricsClass))));
     }
   }]);
   NewItemAnalysis.displayName = "NewItemAnalysis";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "17.66.2-rc.9+bc778cc52",
+  "version": "17.67.0",
   "license": "MIT",
   "description": "The Quiz React SDK by Instructure Inc.",
   "author": "Instructure, Inc. Engineering and Product Design",
@@ -42,11 +42,11 @@
   "dependencies": {
     "@instructure/grading-utils": "^1.0.0",
     "@instructure/outcomes-ui": "^2.1.9",
-    "@instructure/quiz-common": "17.66.2-rc.9+bc778cc52",
-    "@instructure/quiz-i18n": "17.66.2-rc.9+bc778cc52",
-    "@instructure/quiz-interactions": "17.66.2-rc.9+bc778cc52",
-    "@instructure/quiz-number-input": "17.66.2-rc.9+bc778cc52",
-    "@instructure/quiz-rce": "17.66.2-rc.9+bc778cc52",
+    "@instructure/quiz-common": "^17.67.0",
+    "@instructure/quiz-i18n": "^17.67.0",
+    "@instructure/quiz-interactions": "^17.67.0",
+    "@instructure/quiz-number-input": "^17.67.0",
+    "@instructure/quiz-rce": "^17.67.0",
     "@instructure/ui-a11y-content": "^7.20.0",
     "@instructure/ui-alerts": "^7.20.0",
     "@instructure/ui-avatar": "^7.20.0",
@@ -107,7 +107,7 @@
     "eventemitter3": "^3.1.0",
     "humps": "^2.0.0",
     "immutable": "^3.8.1",
-    "instructure-validations": "17.66.2-rc.9+bc778cc52",
+    "instructure-validations": "^17.67.0",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -139,7 +139,7 @@
     "uuid": "^3.2.1"
   },
   "devDependencies": {
-    "@instructure/quiz-scripts": "17.66.1",
+    "@instructure/quiz-scripts": "^17.67.0",
     "@instructure/ui-axe-check": "^7.20.0",
     "@instructure/ui-babel-preset": "^7.20.0",
     "@instructure/ui-karma-config": "^7.20.0",
@@ -158,7 +158,7 @@
     "intl": "^1.2.4",
     "jquery": "^2.2.3",
     "most-subject": "^5.3.0",
-    "quiz-presets": "17.66.2-rc.9+bc778cc52",
+    "quiz-presets": "^17.67.0",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -174,5 +174,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "bc778cc52a3014879810e06942393d6772f0ccb7"
+  "gitHead": "b2b943153d890a1ba691ba3a346edfcb4d1d6be5"
 }