@pie-element/ebsr 10.3.5-next.3 → 10.3.5-next.38

package/module/element.js

@@ -12719,8 +12719,6 @@ class MultipleChoice$1 extends React$2.Component {
     this.handleChange = event => {
       const {value, checked} = event.target;
       const {maxSelections, onChoiceChanged, session} = this.props;
-      const {detail} = event.nativeEvent;
-      let selector = detail ? 'Mouse' : 'Keyboard';
       if (session.value && session.value.length >= maxSelections) {
         this.setState({
           maxSelectionsErrorState: checked
@@ -12732,7 +12730,7 @@ class MultipleChoice$1 extends React$2.Component {
       onChoiceChanged({
         value,
         selected: checked,
-        selector
+        selector: 'Mouse'
       });
     };
   }
@@ -12816,14 +12814,14 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 214
+        lineNumber: 210
       }
     }, "Multiple Choice Question") : React$2.createElement('h2', {
       className: classes.srOnly,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 216
+        lineNumber: 212
       }
     }, "Multiple Select Question");
   }
@@ -12845,7 +12843,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 251
+        lineNumber: 247
       }
     });
     const getMultipleChoiceMinSelectionErrorMessage = () => {
@@ -12872,21 +12870,21 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 274
+        lineNumber: 270
       }
     }, partLabel && React$2.createElement('h3', {
       className: classes.partLabel,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 275
+        lineNumber: 271
       }
     }, partLabel), this.renderHeading(), teacherInstructions && React$2.createElement('div', {
       className: classes.teacherInstructions,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 280
+        lineNumber: 276
       }
     }, !animationsDisabled ? React$2.createElement(Collapsible, {
       labels: {
@@ -12896,14 +12894,14 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 282
+        lineNumber: 278
       }
     }, teacherInstructionsDiv) : teacherInstructionsDiv), React$2.createElement('fieldset', {
       className: classes.fieldset,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 296
+        lineNumber: 292
       }
     }, React$2.createElement(PreviewPrompt, {
       className: "prompt",
@@ -12914,7 +12912,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 297
+        lineNumber: 293
       }
     }), !alwaysShowCorrect && React$2.createElement(CorrectAnswerToggle, {
       show: showCorrectAnswerToggle,
@@ -12924,7 +12922,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 306
+        lineNumber: 302
       }
     }), React$2.createElement('div', {
       className: classNames({
@@ -12935,7 +12933,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 314
+        lineNumber: 310
       }
     }, choices.map((choice, index) => React$2.createElement(StyledChoice, {
       choicesLayout: this.props.choicesLayout,
@@ -12958,21 +12956,21 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 322
+        lineNumber: 318
       }
     })))), choiceMode === 'checkbox' && selections < minSelections && React$2.createElement('div', {
       className: classes.errorText,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 346
+        lineNumber: 342
       }
     }, getMultipleChoiceMinSelectionErrorMessage()), choiceMode === 'checkbox' && maxSelectionsErrorState && React$2.createElement('div', {
       className: classes.errorText,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 351
+        lineNumber: 347
       }
     }, translator.t(`translation:multipleChoice:maxSelections_${maxSelections === 1 ? 'one' : 'other'}`, {
       lng: language,
@@ -13085,6 +13083,13 @@ function updateSessionValue(session, choiceMode, data) {
   }
   session.selector = data.selector;
 }
+function updateSessionMetadata(session, metadata) {
+  session.audioStartTime = metadata.audioStartTime || session.audioStartTime;
+  session.audioEndTime = metadata.audioEndTime || session.audioEndTime;
+  if (!session.waitTime && session.audioStartTime && session.audioEndTime) {
+    session.waitTime = (session.audioEndTime - session.audioStartTime) / 1000;
+  }
+}
 const React = _dll_react;
 const ReactDOM = _dll_react_dom;
 const {debounce: debounce} = _dll_lodash;
@@ -13115,6 +13120,8 @@ class MultipleChoice extends HTMLElement {
     this._model = null;
     this._session = null;
     this.audioComplete = false;
+    this._boundHandleKeyDown = this.handleKeyDown.bind(this);
+    this._keyboardEventsEnabled = false;
     this._rerender = debounce(() => {
       if (this._model && this._session) {
         var element = React.createElement(Root, {
@@ -13130,7 +13137,7 @@ class MultipleChoice extends HTMLElement {
           log$1('render complete - render math');
           renderMath(this);
         });
-        if (this._model.keyboardEventsEnabled === true) {
+        if (this._model.keyboardEventsEnabled === true && !this._keyboardEventsEnabled) {
           this.enableKeyboardEvents();
         }
       } else {
@@ -13215,6 +13222,9 @@ class MultipleChoice extends HTMLElement {
           const enableAudio = () => {
             if (this.querySelector('#play-audio-info')) {
               audio.play();
+              updateSessionMetadata(this._session, {
+                audioStartTime: new Date().getTime()
+              });
               container.removeChild(info);
             }
             document.removeEventListener('click', enableAudio);
@@ -13236,6 +13246,9 @@ class MultipleChoice extends HTMLElement {
           };
           audio.addEventListener('playing', handlePlaying);
           const handleEnded = () => {
+            updateSessionMetadata(this._session, {
+              audioEndTime: new Date().getTime()
+            });
             this.audioComplete = true;
             this._dispatchResponseChanged();
             audio.removeEventListener('ended', handleEnded);
@@ -13251,10 +13264,16 @@ class MultipleChoice extends HTMLElement {
     });
   }
   enableKeyboardEvents() {
-    window.addEventListener('keydown', this.handleKeyDown.bind(this));
+    if (!this._keyboardEventsEnabled) {
+      window.addEventListener('keydown', this._boundHandleKeyDown);
+      this._keyboardEventsEnabled = true;
+    }
   }
   disconnectedCallback() {
-    window.removeEventListener('keydown', this.handleKeyDown.bind(this));
+    if (this._keyboardEventsEnabled) {
+      window.removeEventListener('keydown', this._boundHandleKeyDown);
+      this._keyboardEventsEnabled = false;
+    }
   }
   handleKeyDown(event) {
     if (!this._model || !this._session) {
@@ -13273,7 +13292,8 @@ class MultipleChoice extends HTMLElement {
     const choiceId = this._model.choices[choiceIndex].value;
     const newValue = {
       value: choiceId,
-      selected: !currentValue.includes(choiceId)
+      selected: !currentValue.includes(choiceId),
+      selector: 'Keyboard'
     };
     this._onChange(newValue);
   }

package/module/print.js

@@ -12682,8 +12682,6 @@ class MultipleChoice$1 extends React$2.Component {
     this.handleChange = event => {
       const {value, checked} = event.target;
       const {maxSelections, onChoiceChanged, session} = this.props;
-      const {detail} = event.nativeEvent;
-      let selector = detail ? 'Mouse' : 'Keyboard';
       if (session.value && session.value.length >= maxSelections) {
         this.setState({
           maxSelectionsErrorState: checked
@@ -12695,7 +12693,7 @@ class MultipleChoice$1 extends React$2.Component {
       onChoiceChanged({
         value,
         selected: checked,
-        selector
+        selector: 'Mouse'
       });
     };
   }
@@ -12779,14 +12777,14 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 214
+        lineNumber: 210
       }
     }, "Multiple Choice Question") : React$2.createElement('h2', {
       className: classes.srOnly,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 216
+        lineNumber: 212
       }
     }, "Multiple Select Question");
   }
@@ -12808,7 +12806,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 251
+        lineNumber: 247
       }
     });
     const getMultipleChoiceMinSelectionErrorMessage = () => {
@@ -12835,21 +12833,21 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 274
+        lineNumber: 270
       }
     }, partLabel && React$2.createElement('h3', {
       className: classes.partLabel,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 275
+        lineNumber: 271
       }
     }, partLabel), this.renderHeading(), teacherInstructions && React$2.createElement('div', {
       className: classes.teacherInstructions,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 280
+        lineNumber: 276
       }
     }, !animationsDisabled ? React$2.createElement(Collapsible, {
       labels: {
@@ -12859,14 +12857,14 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 282
+        lineNumber: 278
       }
     }, teacherInstructionsDiv) : teacherInstructionsDiv), React$2.createElement('fieldset', {
       className: classes.fieldset,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 296
+        lineNumber: 292
       }
     }, React$2.createElement(PreviewPrompt, {
       className: "prompt",
@@ -12877,7 +12875,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 297
+        lineNumber: 293
       }
     }), !alwaysShowCorrect && React$2.createElement(CorrectAnswerToggle, {
       show: showCorrectAnswerToggle,
@@ -12887,7 +12885,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 306
+        lineNumber: 302
       }
     }), React$2.createElement('div', {
       className: classNames({
@@ -12898,7 +12896,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 314
+        lineNumber: 310
       }
     }, choices.map((choice, index) => React$2.createElement(StyledChoice, {
       choicesLayout: this.props.choicesLayout,
@@ -12921,21 +12919,21 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 322
+        lineNumber: 318
       }
     })))), choiceMode === 'checkbox' && selections < minSelections && React$2.createElement('div', {
       className: classes.errorText,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 346
+        lineNumber: 342
       }
     }, getMultipleChoiceMinSelectionErrorMessage()), choiceMode === 'checkbox' && maxSelectionsErrorState && React$2.createElement('div', {
       className: classes.errorText,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 351
+        lineNumber: 347
       }
     }, translator$1.t(`translation:multipleChoice:maxSelections_${maxSelections === 1 ? 'one' : 'other'}`, {
       lng: language,
@@ -13085,6 +13083,13 @@ function updateSessionValue(session, choiceMode, data) {
   }
   session.selector = data.selector;
 }
+function updateSessionMetadata(session, metadata) {
+  session.audioStartTime = metadata.audioStartTime || session.audioStartTime;
+  session.audioEndTime = metadata.audioEndTime || session.audioEndTime;
+  if (!session.waitTime && session.audioStartTime && session.audioEndTime) {
+    session.waitTime = (session.audioEndTime - session.audioStartTime) / 1000;
+  }
+}
 const React = _dll_react;
 const ReactDOM = _dll_react_dom;
 const {debounce: debounce} = _dll_lodash;
@@ -13115,6 +13120,8 @@ class MultipleChoice extends HTMLElement {
     this._model = null;
     this._session = null;
     this.audioComplete = false;
+    this._boundHandleKeyDown = this.handleKeyDown.bind(this);
+    this._keyboardEventsEnabled = false;
     this._rerender = debounce(() => {
       if (this._model && this._session) {
         var element = React.createElement(Root, {
@@ -13130,7 +13137,7 @@ class MultipleChoice extends HTMLElement {
           log$1('render complete - render math');
           renderMath(this);
         });
-        if (this._model.keyboardEventsEnabled === true) {
+        if (this._model.keyboardEventsEnabled === true && !this._keyboardEventsEnabled) {
           this.enableKeyboardEvents();
         }
       } else {
@@ -13215,6 +13222,9 @@ class MultipleChoice extends HTMLElement {
           const enableAudio = () => {
             if (this.querySelector('#play-audio-info')) {
               audio.play();
+              updateSessionMetadata(this._session, {
+                audioStartTime: new Date().getTime()
+              });
               container.removeChild(info);
             }
             document.removeEventListener('click', enableAudio);
@@ -13236,6 +13246,9 @@ class MultipleChoice extends HTMLElement {
           };
           audio.addEventListener('playing', handlePlaying);
           const handleEnded = () => {
+            updateSessionMetadata(this._session, {
+              audioEndTime: new Date().getTime()
+            });
             this.audioComplete = true;
             this._dispatchResponseChanged();
             audio.removeEventListener('ended', handleEnded);
@@ -13251,10 +13264,16 @@ class MultipleChoice extends HTMLElement {
     });
   }
   enableKeyboardEvents() {
-    window.addEventListener('keydown', this.handleKeyDown.bind(this));
+    if (!this._keyboardEventsEnabled) {
+      window.addEventListener('keydown', this._boundHandleKeyDown);
+      this._keyboardEventsEnabled = true;
+    }
   }
   disconnectedCallback() {
-    window.removeEventListener('keydown', this.handleKeyDown.bind(this));
+    if (this._keyboardEventsEnabled) {
+      window.removeEventListener('keydown', this._boundHandleKeyDown);
+      this._keyboardEventsEnabled = false;
+    }
   }
   handleKeyDown(event) {
     if (!this._model || !this._session) {
@@ -13273,7 +13292,8 @@ class MultipleChoice extends HTMLElement {
     const choiceId = this._model.choices[choiceIndex].value;
     const newValue = {
       value: choiceId,
-      selected: !currentValue.includes(choiceId)
+      selected: !currentValue.includes(choiceId),
+      selector: 'Keyboard'
     };
     this._onChange(newValue);
   }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@pie-element/ebsr",
-  "version": "10.3.5-next.3+443865f9d",
+  "version": "10.3.5-next.38+fc40873ed",
   "description": "",
   "repository": "pie-framework/pie-elements",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@pie-element/multiple-choice": "^9.11.1-next.3+443865f9d",
+    "@pie-element/multiple-choice": "^9.11.1-next.38+fc40873ed",
     "@pie-framework/pie-player-events": "^0.1.0",
     "@pie-lib/pie-toolbox": "2.9.0",
     "classnames": "^2.2.5",
@@ -16,7 +16,7 @@
   },
   "author": "pie framework developers",
   "license": "ISC",
-  "gitHead": "443865f9d09e5801edd4a02be6a022e5fb4d825c",
+  "gitHead": "fc40873edb985e6509b57f2e733ea3582551b19e",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
   },