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

package/module/element.js

@@ -12719,6 +12719,8 @@ 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
@@ -12730,7 +12732,7 @@ class MultipleChoice$1 extends React$2.Component {
       onChoiceChanged({
         value,
         selected: checked,
-        selector: 'Mouse'
+        selector
       });
     };
   }
@@ -12814,14 +12816,14 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 210
+        lineNumber: 214
       }
     }, "Multiple Choice Question") : React$2.createElement('h2', {
       className: classes.srOnly,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 212
+        lineNumber: 216
       }
     }, "Multiple Select Question");
   }
@@ -12843,7 +12845,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 247
+        lineNumber: 251
       }
     });
     const getMultipleChoiceMinSelectionErrorMessage = () => {
@@ -12870,21 +12872,21 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 270
+        lineNumber: 274
       }
     }, partLabel && React$2.createElement('h3', {
       className: classes.partLabel,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 271
+        lineNumber: 275
       }
     }, partLabel), this.renderHeading(), teacherInstructions && React$2.createElement('div', {
       className: classes.teacherInstructions,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 276
+        lineNumber: 280
       }
     }, !animationsDisabled ? React$2.createElement(Collapsible, {
       labels: {
@@ -12894,14 +12896,14 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 278
+        lineNumber: 282
       }
     }, teacherInstructionsDiv) : teacherInstructionsDiv), React$2.createElement('fieldset', {
       className: classes.fieldset,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 292
+        lineNumber: 296
       }
     }, React$2.createElement(PreviewPrompt, {
       className: "prompt",
@@ -12912,7 +12914,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 293
+        lineNumber: 297
       }
     }), !alwaysShowCorrect && React$2.createElement(CorrectAnswerToggle, {
       show: showCorrectAnswerToggle,
@@ -12922,7 +12924,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 302
+        lineNumber: 306
       }
     }), React$2.createElement('div', {
       className: classNames({
@@ -12933,7 +12935,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 310
+        lineNumber: 314
       }
     }, choices.map((choice, index) => React$2.createElement(StyledChoice, {
       choicesLayout: this.props.choicesLayout,
@@ -12956,21 +12958,21 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 318
+        lineNumber: 322
       }
     })))), choiceMode === 'checkbox' && selections < minSelections && React$2.createElement('div', {
       className: classes.errorText,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 342
+        lineNumber: 346
       }
     }, getMultipleChoiceMinSelectionErrorMessage()), choiceMode === 'checkbox' && maxSelectionsErrorState && React$2.createElement('div', {
       className: classes.errorText,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 347
+        lineNumber: 351
       }
     }, translator.t(`translation:multipleChoice:maxSelections_${maxSelections === 1 ? 'one' : 'other'}`, {
       lng: language,
@@ -13120,8 +13122,6 @@ 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, {
@@ -13137,7 +13137,7 @@ class MultipleChoice extends HTMLElement {
           log$1('render complete - render math');
           renderMath(this);
         });
-        if (this._model.keyboardEventsEnabled === true && !this._keyboardEventsEnabled) {
+        if (this._model.keyboardEventsEnabled === true) {
           this.enableKeyboardEvents();
         }
       } else {
@@ -13264,16 +13264,10 @@ class MultipleChoice extends HTMLElement {
     });
   }
   enableKeyboardEvents() {
-    if (!this._keyboardEventsEnabled) {
-      window.addEventListener('keydown', this._boundHandleKeyDown);
-      this._keyboardEventsEnabled = true;
-    }
+    window.addEventListener('keydown', this.handleKeyDown.bind(this));
   }
   disconnectedCallback() {
-    if (this._keyboardEventsEnabled) {
-      window.removeEventListener('keydown', this._boundHandleKeyDown);
-      this._keyboardEventsEnabled = false;
-    }
+    window.removeEventListener('keydown', this.handleKeyDown.bind(this));
   }
   handleKeyDown(event) {
     if (!this._model || !this._session) {
@@ -13292,8 +13286,7 @@ class MultipleChoice extends HTMLElement {
     const choiceId = this._model.choices[choiceIndex].value;
     const newValue = {
       value: choiceId,
-      selected: !currentValue.includes(choiceId),
-      selector: 'Keyboard'
+      selected: !currentValue.includes(choiceId)
     };
     this._onChange(newValue);
   }

package/module/print.js

@@ -12682,6 +12682,8 @@ 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
@@ -12693,7 +12695,7 @@ class MultipleChoice$1 extends React$2.Component {
       onChoiceChanged({
         value,
         selected: checked,
-        selector: 'Mouse'
+        selector
       });
     };
   }
@@ -12777,14 +12779,14 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 210
+        lineNumber: 214
       }
     }, "Multiple Choice Question") : React$2.createElement('h2', {
       className: classes.srOnly,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 212
+        lineNumber: 216
       }
     }, "Multiple Select Question");
   }
@@ -12806,7 +12808,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 247
+        lineNumber: 251
       }
     });
     const getMultipleChoiceMinSelectionErrorMessage = () => {
@@ -12833,21 +12835,21 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 270
+        lineNumber: 274
       }
     }, partLabel && React$2.createElement('h3', {
       className: classes.partLabel,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 271
+        lineNumber: 275
       }
     }, partLabel), this.renderHeading(), teacherInstructions && React$2.createElement('div', {
       className: classes.teacherInstructions,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 276
+        lineNumber: 280
       }
     }, !animationsDisabled ? React$2.createElement(Collapsible, {
       labels: {
@@ -12857,14 +12859,14 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 278
+        lineNumber: 282
       }
     }, teacherInstructionsDiv) : teacherInstructionsDiv), React$2.createElement('fieldset', {
       className: classes.fieldset,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 292
+        lineNumber: 296
       }
     }, React$2.createElement(PreviewPrompt, {
       className: "prompt",
@@ -12875,7 +12877,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 293
+        lineNumber: 297
       }
     }), !alwaysShowCorrect && React$2.createElement(CorrectAnswerToggle, {
       show: showCorrectAnswerToggle,
@@ -12885,7 +12887,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 302
+        lineNumber: 306
       }
     }), React$2.createElement('div', {
       className: classNames({
@@ -12896,7 +12898,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 310
+        lineNumber: 314
       }
     }, choices.map((choice, index) => React$2.createElement(StyledChoice, {
       choicesLayout: this.props.choicesLayout,
@@ -12919,21 +12921,21 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 318
+        lineNumber: 322
       }
     })))), choiceMode === 'checkbox' && selections < minSelections && React$2.createElement('div', {
       className: classes.errorText,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 342
+        lineNumber: 346
       }
     }, getMultipleChoiceMinSelectionErrorMessage()), choiceMode === 'checkbox' && maxSelectionsErrorState && React$2.createElement('div', {
       className: classes.errorText,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 347
+        lineNumber: 351
       }
     }, translator$1.t(`translation:multipleChoice:maxSelections_${maxSelections === 1 ? 'one' : 'other'}`, {
       lng: language,
@@ -13120,8 +13122,6 @@ 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, {
@@ -13137,7 +13137,7 @@ class MultipleChoice extends HTMLElement {
           log$1('render complete - render math');
           renderMath(this);
         });
-        if (this._model.keyboardEventsEnabled === true && !this._keyboardEventsEnabled) {
+        if (this._model.keyboardEventsEnabled === true) {
           this.enableKeyboardEvents();
         }
       } else {
@@ -13264,16 +13264,10 @@ class MultipleChoice extends HTMLElement {
     });
   }
   enableKeyboardEvents() {
-    if (!this._keyboardEventsEnabled) {
-      window.addEventListener('keydown', this._boundHandleKeyDown);
-      this._keyboardEventsEnabled = true;
-    }
+    window.addEventListener('keydown', this.handleKeyDown.bind(this));
   }
   disconnectedCallback() {
-    if (this._keyboardEventsEnabled) {
-      window.removeEventListener('keydown', this._boundHandleKeyDown);
-      this._keyboardEventsEnabled = false;
-    }
+    window.removeEventListener('keydown', this.handleKeyDown.bind(this));
   }
   handleKeyDown(event) {
     if (!this._model || !this._session) {
@@ -13292,8 +13286,7 @@ class MultipleChoice extends HTMLElement {
     const choiceId = this._model.choices[choiceIndex].value;
     const newValue = {
       value: choiceId,
-      selected: !currentValue.includes(choiceId),
-      selector: 'Keyboard'
+      selected: !currentValue.includes(choiceId)
     };
     this._onChange(newValue);
   }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@pie-element/ebsr",
-  "version": "10.3.5-next.38+fc40873ed",
+  "version": "10.3.5-next.6+5c374061c",
   "description": "",
   "repository": "pie-framework/pie-elements",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@pie-element/multiple-choice": "^9.11.1-next.38+fc40873ed",
+    "@pie-element/multiple-choice": "^9.11.1-next.6+5c374061c",
     "@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": "fc40873edb985e6509b57f2e733ea3582551b19e",
+  "gitHead": "5c374061c150a5937762cee20d5dd656778e8b2e",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
   },