@pie-element/ebsr 10.3.4-next.0 → 10.3.4-next.13

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
@@ -12729,7 +12731,8 @@ class MultipleChoice$1 extends React$2.Component {
       }
       onChoiceChanged({
         value,
-        selected: checked
+        selected: checked,
+        selector
       });
     };
   }
@@ -12813,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");
   }
@@ -12833,6 +12836,7 @@ class MultipleChoice$1 extends React$2.Component {
       gridTemplateColumns: `repeat(${gridColumns}, 1fr)`
     } : undefined;
     const selections = session.value && session.value.length || 0;
+    const addAutoplayAudio = autoplayAudioEnabled && !((/Safari|Firefox|Edg/).test(navigator.userAgent) && !(/Chrome/).test(navigator.userAgent));
     const teacherInstructionsDiv = React$2.createElement(PreviewPrompt, {
       tagName: "div",
       className: "prompt",
@@ -12841,7 +12845,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 245
+        lineNumber: 251
       }
     });
     const getMultipleChoiceMinSelectionErrorMessage = () => {
@@ -12868,21 +12872,21 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 268
+        lineNumber: 274
       }
     }, partLabel && React$2.createElement('h3', {
       className: classes.partLabel,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 269
+        lineNumber: 275
       }
     }, partLabel), this.renderHeading(), teacherInstructions && React$2.createElement('div', {
       className: classes.teacherInstructions,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 274
+        lineNumber: 280
       }
     }, !animationsDisabled ? React$2.createElement(Collapsible, {
       labels: {
@@ -12892,25 +12896,25 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 276
+        lineNumber: 282
       }
     }, teacherInstructionsDiv) : teacherInstructionsDiv), React$2.createElement('fieldset', {
       className: classes.fieldset,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 290
+        lineNumber: 296
       }
     }, React$2.createElement(PreviewPrompt, {
       className: "prompt",
       defaultClassName: "prompt",
       prompt: prompt,
       tagName: 'legend',
-      autoplayAudioEnabled: autoplayAudioEnabled,
+      autoplayAudioEnabled: addAutoplayAudio,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 291
+        lineNumber: 297
       }
     }), !alwaysShowCorrect && React$2.createElement(CorrectAnswerToggle, {
       show: showCorrectAnswerToggle,
@@ -12920,7 +12924,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 300
+        lineNumber: 306
       }
     }), React$2.createElement('div', {
       className: classNames({
@@ -12931,7 +12935,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 308
+        lineNumber: 314
       }
     }, choices.map((choice, index) => React$2.createElement(StyledChoice, {
       choicesLayout: this.props.choicesLayout,
@@ -12954,21 +12958,21 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 316
+        lineNumber: 322
       }
     })))), choiceMode === 'checkbox' && selections < minSelections && React$2.createElement('div', {
       className: classes.errorText,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 340
+        lineNumber: 346
       }
     }, getMultipleChoiceMinSelectionErrorMessage()), choiceMode === 'checkbox' && maxSelectionsErrorState && React$2.createElement('div', {
       className: classes.errorText,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 345
+        lineNumber: 351
       }
     }, translator.t(`translation:multipleChoice:maxSelections_${maxSelections === 1 ? 'one' : 'other'}`, {
       lng: language,
@@ -13079,6 +13083,7 @@ function updateSessionValue(session, choiceMode, data) {
       session.value = [];
     }
   }
+  session.selector = data.selector;
 }
 const React = _dll_react;
 const ReactDOM = _dll_react_dom;
@@ -13125,6 +13130,9 @@ class MultipleChoice extends HTMLElement {
           log$1('render complete - render math');
           renderMath(this);
         });
+        if (this._model.keyboardEventsEnabled === true) {
+          this.enableKeyboardEvents();
+        }
       } else {
         log$1('skip');
       }
@@ -13194,7 +13202,9 @@ class MultipleChoice extends HTMLElement {
     const observer = new MutationObserver((mutationsList, observer) => {
       mutationsList.forEach(mutation => {
         if (mutation.type === 'childList') {
-          const audio = this.querySelector('audio[autoplay]');
+          const audio = this.querySelector('audio');
+          const isInsidePrompt = audio && audio.closest('#preview-prompt');
+          if (audio && !isInsidePrompt) return;
           if (!audio) return;
           const info = this._createAudioInfoToast();
           const enableAudio = () => {
@@ -13208,6 +13218,8 @@ class MultipleChoice extends HTMLElement {
             if (audio.paused && !this.querySelector('#play-audio-info')) {
               this.appendChild(info);
               document.addEventListener('click', enableAudio);
+            } else {
+              document.removeEventListener('click', enableAudio);
             }
           }, 500);
           const handlePlaying = () => {
@@ -13233,6 +13245,33 @@ class MultipleChoice extends HTMLElement {
       subtree: true
     });
   }
+  enableKeyboardEvents() {
+    window.addEventListener('keydown', this.handleKeyDown.bind(this));
+  }
+  disconnectedCallback() {
+    window.removeEventListener('keydown', this.handleKeyDown.bind(this));
+  }
+  handleKeyDown(event) {
+    if (!this._model || !this._session) {
+      return;
+    }
+    const keyToIndex = key => {
+      const numOffset = key >= '1' && key <= '9' ? key - '1' : key === '0' ? 9 : -1;
+      const letterOffset = (/^[a-jA-J]$/).test(key) ? key.toLowerCase().charCodeAt(0) - ('a').charCodeAt(0) : -1;
+      return numOffset >= 0 ? numOffset : letterOffset;
+    };
+    const choiceIndex = keyToIndex(event.key);
+    if (choiceIndex === undefined || choiceIndex >= this._model.choices.length) {
+      return;
+    }
+    const currentValue = this._session.value || [];
+    const choiceId = this._model.choices[choiceIndex].value;
+    const newValue = {
+      value: choiceId,
+      selected: !currentValue.includes(choiceId)
+    };
+    this._onChange(newValue);
+  }
 }
 const {get: get} = _dll_lodash;
 const debug = _dll_debug;

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
@@ -12692,7 +12694,8 @@ class MultipleChoice$1 extends React$2.Component {
       }
       onChoiceChanged({
         value,
-        selected: checked
+        selected: checked,
+        selector
       });
     };
   }
@@ -12776,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");
   }
@@ -12796,6 +12799,7 @@ class MultipleChoice$1 extends React$2.Component {
       gridTemplateColumns: `repeat(${gridColumns}, 1fr)`
     } : undefined;
     const selections = session.value && session.value.length || 0;
+    const addAutoplayAudio = autoplayAudioEnabled && !((/Safari|Firefox|Edg/).test(navigator.userAgent) && !(/Chrome/).test(navigator.userAgent));
     const teacherInstructionsDiv = React$2.createElement(PreviewPrompt, {
       tagName: "div",
       className: "prompt",
@@ -12804,7 +12808,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 245
+        lineNumber: 251
       }
     });
     const getMultipleChoiceMinSelectionErrorMessage = () => {
@@ -12831,21 +12835,21 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 268
+        lineNumber: 274
       }
     }, partLabel && React$2.createElement('h3', {
       className: classes.partLabel,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 269
+        lineNumber: 275
       }
     }, partLabel), this.renderHeading(), teacherInstructions && React$2.createElement('div', {
       className: classes.teacherInstructions,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 274
+        lineNumber: 280
       }
     }, !animationsDisabled ? React$2.createElement(Collapsible, {
       labels: {
@@ -12855,25 +12859,25 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 276
+        lineNumber: 282
       }
     }, teacherInstructionsDiv) : teacherInstructionsDiv), React$2.createElement('fieldset', {
       className: classes.fieldset,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 290
+        lineNumber: 296
       }
     }, React$2.createElement(PreviewPrompt, {
       className: "prompt",
       defaultClassName: "prompt",
       prompt: prompt,
       tagName: 'legend',
-      autoplayAudioEnabled: autoplayAudioEnabled,
+      autoplayAudioEnabled: addAutoplayAudio,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 291
+        lineNumber: 297
       }
     }), !alwaysShowCorrect && React$2.createElement(CorrectAnswerToggle, {
       show: showCorrectAnswerToggle,
@@ -12883,7 +12887,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 300
+        lineNumber: 306
       }
     }), React$2.createElement('div', {
       className: classNames({
@@ -12894,7 +12898,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 308
+        lineNumber: 314
       }
     }, choices.map((choice, index) => React$2.createElement(StyledChoice, {
       choicesLayout: this.props.choicesLayout,
@@ -12917,21 +12921,21 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 316
+        lineNumber: 322
       }
     })))), choiceMode === 'checkbox' && selections < minSelections && React$2.createElement('div', {
       className: classes.errorText,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 340
+        lineNumber: 346
       }
     }, getMultipleChoiceMinSelectionErrorMessage()), choiceMode === 'checkbox' && maxSelectionsErrorState && React$2.createElement('div', {
       className: classes.errorText,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 345
+        lineNumber: 351
       }
     }, translator$1.t(`translation:multipleChoice:maxSelections_${maxSelections === 1 ? 'one' : 'other'}`, {
       lng: language,
@@ -13079,6 +13083,7 @@ function updateSessionValue(session, choiceMode, data) {
       session.value = [];
     }
   }
+  session.selector = data.selector;
 }
 const React = _dll_react;
 const ReactDOM = _dll_react_dom;
@@ -13125,6 +13130,9 @@ class MultipleChoice extends HTMLElement {
           log$1('render complete - render math');
           renderMath(this);
         });
+        if (this._model.keyboardEventsEnabled === true) {
+          this.enableKeyboardEvents();
+        }
       } else {
         log$1('skip');
       }
@@ -13194,7 +13202,9 @@ class MultipleChoice extends HTMLElement {
     const observer = new MutationObserver((mutationsList, observer) => {
       mutationsList.forEach(mutation => {
         if (mutation.type === 'childList') {
-          const audio = this.querySelector('audio[autoplay]');
+          const audio = this.querySelector('audio');
+          const isInsidePrompt = audio && audio.closest('#preview-prompt');
+          if (audio && !isInsidePrompt) return;
           if (!audio) return;
           const info = this._createAudioInfoToast();
           const enableAudio = () => {
@@ -13208,6 +13218,8 @@ class MultipleChoice extends HTMLElement {
             if (audio.paused && !this.querySelector('#play-audio-info')) {
               this.appendChild(info);
               document.addEventListener('click', enableAudio);
+            } else {
+              document.removeEventListener('click', enableAudio);
             }
           }, 500);
           const handlePlaying = () => {
@@ -13233,6 +13245,33 @@ class MultipleChoice extends HTMLElement {
       subtree: true
     });
   }
+  enableKeyboardEvents() {
+    window.addEventListener('keydown', this.handleKeyDown.bind(this));
+  }
+  disconnectedCallback() {
+    window.removeEventListener('keydown', this.handleKeyDown.bind(this));
+  }
+  handleKeyDown(event) {
+    if (!this._model || !this._session) {
+      return;
+    }
+    const keyToIndex = key => {
+      const numOffset = key >= '1' && key <= '9' ? key - '1' : key === '0' ? 9 : -1;
+      const letterOffset = (/^[a-jA-J]$/).test(key) ? key.toLowerCase().charCodeAt(0) - ('a').charCodeAt(0) : -1;
+      return numOffset >= 0 ? numOffset : letterOffset;
+    };
+    const choiceIndex = keyToIndex(event.key);
+    if (choiceIndex === undefined || choiceIndex >= this._model.choices.length) {
+      return;
+    }
+    const currentValue = this._session.value || [];
+    const choiceId = this._model.choices[choiceIndex].value;
+    const newValue = {
+      value: choiceId,
+      selected: !currentValue.includes(choiceId)
+    };
+    this._onChange(newValue);
+  }
 }
 const {cloneDeep: cloneDeep} = _dll_lodash;
 const {get: get} = _dll_lodash;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@pie-element/ebsr",
-  "version": "10.3.4-next.0+222649200",
+  "version": "10.3.4-next.13+8f1cd9aed",
   "description": "",
   "repository": "pie-framework/pie-elements",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@pie-element/multiple-choice": "^9.10.1-next.0+222649200",
+    "@pie-element/multiple-choice": "^9.10.1-next.13+8f1cd9aed",
     "@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": "22264920035c004ecee9a90c99eb2863e3ce6c60",
+  "gitHead": "8f1cd9aed27ed09ad7726699012ce3060cf3416a",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
   },