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

package/module/element.js

@@ -12703,9 +12703,8 @@ class MultipleChoice$1 extends React$2.Component {
     MultipleChoice$1.prototype.__init2.call(this);
     MultipleChoice$1.prototype.__init3.call(this);
     this.state = {
-      selectedValue: null,
-      selectedValues: [],
-      showCorrect: this.props.alwaysShowCorrect || false
+      showCorrect: this.props.alwaysShowCorrect || false,
+      maxSelectionsErrorState: false
     };
     this.onToggle = this.onToggle.bind(this);
   }
@@ -12716,22 +12715,14 @@ class MultipleChoice$1 extends React$2.Component {
   __init() {
     this.handleChange = event => {
       const {value, checked} = event.target;
-      const {choiceMode, maxSelections, onChoiceChanged} = this.props;
-      if (choiceMode === 'radio') {
+      const {maxSelections, onChoiceChanged, session} = this.props;
+      if (session.value && session.value.length >= maxSelections) {
         this.setState({
-          selectedValue: value
+          maxSelectionsErrorState: checked
         });
-      } else {
-        const {selectedValues} = this.state;
-        if (checked && selectedValues.length >= maxSelections) {
+        if (checked) {
           return;
         }
-        this.setState(prevState => {
-          const selectedValues = checked ? [...prevState.selectedValues, value] : prevState.selectedValues.filter(currentValue => currentValue !== value);
-          return {
-            selectedValues
-          };
-        });
       }
       onChoiceChanged({
         value,
@@ -12807,10 +12798,7 @@ class MultipleChoice$1 extends React$2.Component {
     if (this.state.showCorrect) {
       return choice.correct || false;
     }
-    if (this.isSelected(choice.value)) {
-      return true;
-    }
-    return this.props.choiceMode === 'radio' ? this.state.selectedValue === choice.value : this.state.selectedValues.includes(choice.value);
+    return this.isSelected(choice.value);
   }
   renderHeading() {
     const {mode, choiceMode, classes} = this.props;
@@ -12822,20 +12810,20 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 225
+        lineNumber: 209
       }
     }, "Multiple Choice Question") : React$2.createElement('h2', {
       className: classes.srOnly,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 227
+        lineNumber: 211
       }
     }, "Multiple Select Question");
   }
   render() {
     const {mode, disabled, className, choices = [], choiceMode, gridColumns, partLabel, prompt, responseCorrect, teacherInstructions, classes, alwaysShowCorrect, animationsDisabled, language, isSelectionButtonBelow, minSelections, maxSelections, session} = this.props;
-    const {showCorrect} = this.state;
+    const {showCorrect, maxSelectionsErrorState} = this.state;
     const isEvaluateMode = mode === 'evaluate';
     const showCorrectAnswerToggle = isEvaluateMode && !responseCorrect;
     const columnsStyle = gridColumns > 1 ? {
@@ -12850,7 +12838,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 259
+        lineNumber: 243
       }
     });
     return React$2.createElement('div', {
@@ -12858,21 +12846,21 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 268
+        lineNumber: 252
       }
     }, partLabel && React$2.createElement('h3', {
       className: classes.partLabel,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 269
+        lineNumber: 253
       }
     }, partLabel), this.renderHeading(), teacherInstructions && React$2.createElement('div', {
       className: classes.teacherInstructions,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 274
+        lineNumber: 258
       }
     }, !animationsDisabled ? React$2.createElement(Collapsible, {
       labels: {
@@ -12882,14 +12870,14 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 276
+        lineNumber: 260
       }
     }, teacherInstructionsDiv) : teacherInstructionsDiv), React$2.createElement('fieldset', {
       className: classes.fieldset,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 290
+        lineNumber: 274
       }
     }, React$2.createElement(PreviewPrompt, {
       className: "prompt",
@@ -12899,7 +12887,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 291
+        lineNumber: 275
       }
     }), !alwaysShowCorrect && React$2.createElement(CorrectAnswerToggle, {
       show: showCorrectAnswerToggle,
@@ -12909,7 +12897,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 294
+        lineNumber: 278
       }
     }), React$2.createElement('div', {
       className: classNames({
@@ -12920,7 +12908,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 302
+        lineNumber: 286
       }
     }, choices.map((choice, index) => React$2.createElement(StyledChoice, {
       choicesLayout: this.props.choicesLayout,
@@ -12943,24 +12931,24 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 310
+        lineNumber: 294
       }
     })))), choiceMode === 'checkbox' && selections < minSelections && React$2.createElement('div', {
       className: classes.errorText,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 334
+        lineNumber: 318
       }
     }, translator.t(`translation:multipleChoice:minSelections_${minSelections === 1 ? 'one' : 'other'}`, {
       lng: language,
       minSelections
-    })), choiceMode === 'checkbox' && selections >= maxSelections && React$2.createElement('div', {
+    })), choiceMode === 'checkbox' && maxSelectionsErrorState && React$2.createElement('div', {
       className: classes.errorText,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 342
+        lineNumber: 326
       }
     }, translator.t(`translation:multipleChoice:maxSelections_${maxSelections === 1 ? 'one' : 'other'}`, {
       lng: language,
@@ -13120,7 +13108,6 @@ class MultipleChoice extends HTMLElement {
       trailing: true
     });
     this._dispatchResponseChanged = debounce(() => {
-      console.log('>> dispatch event');
       var event = new CustomEvent('session-changed', {
         bubbles: true,
         composed: true,

package/module/print.js

@@ -12666,9 +12666,8 @@ class MultipleChoice$1 extends React$2.Component {
     MultipleChoice$1.prototype.__init2.call(this);
     MultipleChoice$1.prototype.__init3.call(this);
     this.state = {
-      selectedValue: null,
-      selectedValues: [],
-      showCorrect: this.props.alwaysShowCorrect || false
+      showCorrect: this.props.alwaysShowCorrect || false,
+      maxSelectionsErrorState: false
     };
     this.onToggle = this.onToggle.bind(this);
   }
@@ -12679,22 +12678,14 @@ class MultipleChoice$1 extends React$2.Component {
   __init() {
     this.handleChange = event => {
       const {value, checked} = event.target;
-      const {choiceMode, maxSelections, onChoiceChanged} = this.props;
-      if (choiceMode === 'radio') {
+      const {maxSelections, onChoiceChanged, session} = this.props;
+      if (session.value && session.value.length >= maxSelections) {
         this.setState({
-          selectedValue: value
+          maxSelectionsErrorState: checked
         });
-      } else {
-        const {selectedValues} = this.state;
-        if (checked && selectedValues.length >= maxSelections) {
+        if (checked) {
           return;
         }
-        this.setState(prevState => {
-          const selectedValues = checked ? [...prevState.selectedValues, value] : prevState.selectedValues.filter(currentValue => currentValue !== value);
-          return {
-            selectedValues
-          };
-        });
       }
       onChoiceChanged({
         value,
@@ -12770,10 +12761,7 @@ class MultipleChoice$1 extends React$2.Component {
     if (this.state.showCorrect) {
       return choice.correct || false;
     }
-    if (this.isSelected(choice.value)) {
-      return true;
-    }
-    return this.props.choiceMode === 'radio' ? this.state.selectedValue === choice.value : this.state.selectedValues.includes(choice.value);
+    return this.isSelected(choice.value);
   }
   renderHeading() {
     const {mode, choiceMode, classes} = this.props;
@@ -12785,20 +12773,20 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 225
+        lineNumber: 209
       }
     }, "Multiple Choice Question") : React$2.createElement('h2', {
       className: classes.srOnly,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 227
+        lineNumber: 211
       }
     }, "Multiple Select Question");
   }
   render() {
     const {mode, disabled, className, choices = [], choiceMode, gridColumns, partLabel, prompt, responseCorrect, teacherInstructions, classes, alwaysShowCorrect, animationsDisabled, language, isSelectionButtonBelow, minSelections, maxSelections, session} = this.props;
-    const {showCorrect} = this.state;
+    const {showCorrect, maxSelectionsErrorState} = this.state;
     const isEvaluateMode = mode === 'evaluate';
     const showCorrectAnswerToggle = isEvaluateMode && !responseCorrect;
     const columnsStyle = gridColumns > 1 ? {
@@ -12813,7 +12801,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 259
+        lineNumber: 243
       }
     });
     return React$2.createElement('div', {
@@ -12821,21 +12809,21 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 268
+        lineNumber: 252
       }
     }, partLabel && React$2.createElement('h3', {
       className: classes.partLabel,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 269
+        lineNumber: 253
       }
     }, partLabel), this.renderHeading(), teacherInstructions && React$2.createElement('div', {
       className: classes.teacherInstructions,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 274
+        lineNumber: 258
       }
     }, !animationsDisabled ? React$2.createElement(Collapsible, {
       labels: {
@@ -12845,14 +12833,14 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 276
+        lineNumber: 260
       }
     }, teacherInstructionsDiv) : teacherInstructionsDiv), React$2.createElement('fieldset', {
       className: classes.fieldset,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 290
+        lineNumber: 274
       }
     }, React$2.createElement(PreviewPrompt, {
       className: "prompt",
@@ -12862,7 +12850,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 291
+        lineNumber: 275
       }
     }), !alwaysShowCorrect && React$2.createElement(CorrectAnswerToggle, {
       show: showCorrectAnswerToggle,
@@ -12872,7 +12860,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 294
+        lineNumber: 278
       }
     }), React$2.createElement('div', {
       className: classNames({
@@ -12883,7 +12871,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 302
+        lineNumber: 286
       }
     }, choices.map((choice, index) => React$2.createElement(StyledChoice, {
       choicesLayout: this.props.choicesLayout,
@@ -12906,24 +12894,24 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 310
+        lineNumber: 294
       }
     })))), choiceMode === 'checkbox' && selections < minSelections && React$2.createElement('div', {
       className: classes.errorText,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 334
+        lineNumber: 318
       }
     }, translator$1.t(`translation:multipleChoice:minSelections_${minSelections === 1 ? 'one' : 'other'}`, {
       lng: language,
       minSelections
-    })), choiceMode === 'checkbox' && selections >= maxSelections && React$2.createElement('div', {
+    })), choiceMode === 'checkbox' && maxSelectionsErrorState && React$2.createElement('div', {
       className: classes.errorText,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 342
+        lineNumber: 326
       }
     }, translator$1.t(`translation:multipleChoice:maxSelections_${maxSelections === 1 ? 'one' : 'other'}`, {
       lng: language,
@@ -13083,7 +13071,6 @@ class MultipleChoice extends HTMLElement {
       trailing: true
     });
     this._dispatchResponseChanged = debounce(() => {
-      console.log('>> dispatch event');
       var event = new CustomEvent('session-changed', {
         bubbles: true,
         composed: true,

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@pie-element/ebsr",
-  "version": "10.2.9-next.0+84d34449a",
+  "version": "10.2.9-next.13+95b17d26e",
   "description": "",
   "repository": "pie-framework/pie-elements",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@pie-element/multiple-choice": "^9.7.2-next.0+84d34449a",
+    "@pie-element/multiple-choice": "^9.7.2-next.13+95b17d26e",
     "@pie-framework/pie-player-events": "^0.1.0",
     "@pie-lib/pie-toolbox": "2.6.1",
     "classnames": "^2.2.5",
@@ -16,7 +16,7 @@
   },
   "author": "pie framework developers",
   "license": "ISC",
-  "gitHead": "84d34449ad5a426c607c88b2b43cae7468944413",
+  "gitHead": "95b17d26ecb7649371c9399138d5bd7ba2a10b74",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
   },