@pie-element/ebsr 10.5.3-hotfix.0 → 10.5.3-hotfix.1

package/module/element.js

@@ -12713,7 +12713,7 @@ class MultipleChoice$1 extends React$2.Component {
     MultipleChoice$1.prototype.__init2.call(this);
     MultipleChoice$1.prototype.__init3.call(this);
     this.state = {
-      showCorrect: this.props.alwaysShowCorrect || false,
+      showCorrect: this.props.options && this.props.alwaysShowCorrect || false,
       maxSelectionsErrorState: false
     };
     this.onToggle = this.onToggle.bind(this);
@@ -12764,7 +12764,7 @@ class MultipleChoice$1 extends React$2.Component {
         }
       });
     }
-    if (nextProps.alwaysShowCorrect && this.state.showCorrect !== true) {
+    if (nextProps.options && nextProps.alwaysShowCorrect && this.state.showCorrect !== true) {
       this.setState({
         showCorrect: true
       }, () => {
@@ -12838,7 +12838,7 @@ class MultipleChoice$1 extends React$2.Component {
     }, "Multiple Select Question");
   }
   render() {
-    const {mode, disabled, className, choices = [], choiceMode, gridColumns, partLabel, prompt, responseCorrect, teacherInstructions, classes, alwaysShowCorrect, animationsDisabled, language, isSelectionButtonBelow, minSelections, maxSelections, autoplayAudioEnabled, session, customAudioButton} = this.props;
+    const {mode, disabled, className, choices = [], choiceMode, gridColumns, partLabel, prompt, responseCorrect, teacherInstructions, classes, alwaysShowCorrect, animationsDisabled, language, isSelectionButtonBelow, minSelections, maxSelections, autoplayAudioEnabled, session, customAudioButton, options} = this.props;
     const {showCorrect, maxSelectionsErrorState} = this.state;
     const isEvaluateMode = mode === 'evaluate';
     const showCorrectAnswerToggle = isEvaluateMode && !responseCorrect;
@@ -12854,7 +12854,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 263
+        lineNumber: 264
       }
     });
     const getMultipleChoiceMinSelectionErrorMessage = () => {
@@ -12882,21 +12882,21 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 286
+        lineNumber: 287
       }
     }, partLabel && React$2.createElement('h3', {
       className: classes.partLabel,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 287
+        lineNumber: 288
       }
     }, partLabel), this.renderHeading(), teacherInstructions && React$2.createElement('div', {
       className: classes.teacherInstructions,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 292
+        lineNumber: 293
       }
     }, !animationsDisabled ? React$2.createElement(Collapsible, {
       labels: {
@@ -12906,14 +12906,14 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 294
+        lineNumber: 295
       }
     }, teacherInstructionsDiv) : teacherInstructionsDiv), React$2.createElement('fieldset', {
       className: classes.fieldset,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 308
+        lineNumber: 309
       }
     }, React$2.createElement(PreviewPrompt, {
       className: "prompt",
@@ -12925,9 +12925,9 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 309
+        lineNumber: 310
       }
-    }), !alwaysShowCorrect && React$2.createElement(CorrectAnswerToggle, {
+    }), !(options && alwaysShowCorrect) && React$2.createElement(CorrectAnswerToggle, {
       show: showCorrectAnswerToggle,
       toggled: showCorrect,
       onToggle: this.onToggle.bind(this),
@@ -12935,7 +12935,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 319
+        lineNumber: 320
       }
     }), React$2.createElement('div', {
       className: classNames({
@@ -12946,7 +12946,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 327
+        lineNumber: 328
       }
     }, choices.map((choice, index) => React$2.createElement(StyledChoice, {
       choicesLayout: this.props.choicesLayout,
@@ -12969,21 +12969,21 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 335
+        lineNumber: 336
       }
     })))), choiceMode === 'checkbox' && selections < minSelections && React$2.createElement('div', {
       className: classes.errorText,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 359
+        lineNumber: 360
       }
     }, getMultipleChoiceMinSelectionErrorMessage()), choiceMode === 'checkbox' && maxSelectionsErrorState && React$2.createElement('div', {
       className: classes.errorText,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 364
+        lineNumber: 365
       }
     }, translator.t(`translation:multipleChoice:maxSelections_${maxSelections === 1 ? 'one' : 'other'}`, {
       lng: language,
@@ -13008,6 +13008,7 @@ class Main extends React$1.Component {
     this.propTypes = {
       model: PropTypes.object,
       session: PropTypes.object,
+      options: PropTypes.object,
       onChoiceChanged: PropTypes.func,
       classes: PropTypes.object.isRequired,
       onShowCorrectToggle: PropTypes.func,
@@ -13027,7 +13028,7 @@ class Main extends React$1.Component {
     super(props);
   }
   render() {
-    const {model, onChoiceChanged, session, onShowCorrectToggle} = this.props;
+    const {model, onChoiceChanged, session, onShowCorrectToggle, options} = this.props;
     const {extraCSSRules, fontSizeFactor} = model;
     return React$1.createElement(PreviewLayout, {
       extraCSSRules: extraCSSRules,
@@ -13035,17 +13036,18 @@ class Main extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 37
+        lineNumber: 38
       }
     }, React$1.createElement(MultipleChoice$2, {
       ...model,
+      options: options,
       session: session,
       onChoiceChanged: onChoiceChanged,
       onShowCorrectToggle: onShowCorrectToggle,
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 38
+        lineNumber: 39
       }
     }));
   }
@@ -13065,14 +13067,14 @@ const Root = props => React$1.createElement(styles$b.MuiThemeProvider, {
   __self: undefined,
   __source: {
     fileName: _jsxFileName,
-    lineNumber: 58
+    lineNumber: 60
   }
 }, React$1.createElement(Styled, {
   ...props,
   __self: undefined,
   __source: {
     fileName: _jsxFileName,
-    lineNumber: 59
+    lineNumber: 61
   }
 }));
 const {concat: concat} = _dll_lodash;
@@ -13154,6 +13156,7 @@ class MultipleChoice extends HTMLElement {
     super();
     this._model = null;
     this._session = null;
+    this._options = null;
     this.audioComplete = false;
     this._boundHandleKeyDown = this.handleKeyDown.bind(this);
     this._keyboardEventsEnabled = false;
@@ -13162,6 +13165,7 @@ class MultipleChoice extends HTMLElement {
         var element = React.createElement(Root, {
           model: this._model,
           session: this._session,
+          options: this._options,
           onChoiceChanged: this._onChange.bind(this),
           onShowCorrectToggle: this.onShowCorrectToggle.bind(this)
         });
@@ -13208,6 +13212,13 @@ class MultipleChoice extends HTMLElement {
   get session() {
     return this._session;
   }
+  get options() {
+    return this._options;
+  }
+  set options(o) {
+    this._options = o;
+    this._rerender();
+  }
   set session(s) {
     this._session = s;
     this._rerender();

package/module/print.js

@@ -12676,7 +12676,7 @@ class MultipleChoice$1 extends React$2.Component {
     MultipleChoice$1.prototype.__init2.call(this);
     MultipleChoice$1.prototype.__init3.call(this);
     this.state = {
-      showCorrect: this.props.alwaysShowCorrect || false,
+      showCorrect: this.props.options && this.props.alwaysShowCorrect || false,
       maxSelectionsErrorState: false
     };
     this.onToggle = this.onToggle.bind(this);
@@ -12727,7 +12727,7 @@ class MultipleChoice$1 extends React$2.Component {
         }
       });
     }
-    if (nextProps.alwaysShowCorrect && this.state.showCorrect !== true) {
+    if (nextProps.options && nextProps.alwaysShowCorrect && this.state.showCorrect !== true) {
       this.setState({
         showCorrect: true
       }, () => {
@@ -12801,7 +12801,7 @@ class MultipleChoice$1 extends React$2.Component {
     }, "Multiple Select Question");
   }
   render() {
-    const {mode, disabled, className, choices = [], choiceMode, gridColumns, partLabel, prompt, responseCorrect, teacherInstructions, classes, alwaysShowCorrect, animationsDisabled, language, isSelectionButtonBelow, minSelections, maxSelections, autoplayAudioEnabled, session, customAudioButton} = this.props;
+    const {mode, disabled, className, choices = [], choiceMode, gridColumns, partLabel, prompt, responseCorrect, teacherInstructions, classes, alwaysShowCorrect, animationsDisabled, language, isSelectionButtonBelow, minSelections, maxSelections, autoplayAudioEnabled, session, customAudioButton, options} = this.props;
     const {showCorrect, maxSelectionsErrorState} = this.state;
     const isEvaluateMode = mode === 'evaluate';
     const showCorrectAnswerToggle = isEvaluateMode && !responseCorrect;
@@ -12817,7 +12817,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 263
+        lineNumber: 264
       }
     });
     const getMultipleChoiceMinSelectionErrorMessage = () => {
@@ -12845,21 +12845,21 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 286
+        lineNumber: 287
       }
     }, partLabel && React$2.createElement('h3', {
       className: classes.partLabel,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 287
+        lineNumber: 288
       }
     }, partLabel), this.renderHeading(), teacherInstructions && React$2.createElement('div', {
       className: classes.teacherInstructions,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 292
+        lineNumber: 293
       }
     }, !animationsDisabled ? React$2.createElement(Collapsible, {
       labels: {
@@ -12869,14 +12869,14 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 294
+        lineNumber: 295
       }
     }, teacherInstructionsDiv) : teacherInstructionsDiv), React$2.createElement('fieldset', {
       className: classes.fieldset,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 308
+        lineNumber: 309
       }
     }, React$2.createElement(PreviewPrompt, {
       className: "prompt",
@@ -12888,9 +12888,9 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 309
+        lineNumber: 310
       }
-    }), !alwaysShowCorrect && React$2.createElement(CorrectAnswerToggle, {
+    }), !(options && alwaysShowCorrect) && React$2.createElement(CorrectAnswerToggle, {
       show: showCorrectAnswerToggle,
       toggled: showCorrect,
       onToggle: this.onToggle.bind(this),
@@ -12898,7 +12898,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 319
+        lineNumber: 320
       }
     }), React$2.createElement('div', {
       className: classNames({
@@ -12909,7 +12909,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 327
+        lineNumber: 328
       }
     }, choices.map((choice, index) => React$2.createElement(StyledChoice, {
       choicesLayout: this.props.choicesLayout,
@@ -12932,21 +12932,21 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 335
+        lineNumber: 336
       }
     })))), choiceMode === 'checkbox' && selections < minSelections && React$2.createElement('div', {
       className: classes.errorText,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 359
+        lineNumber: 360
       }
     }, getMultipleChoiceMinSelectionErrorMessage()), choiceMode === 'checkbox' && maxSelectionsErrorState && React$2.createElement('div', {
       className: classes.errorText,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 364
+        lineNumber: 365
       }
     }, translator$1.t(`translation:multipleChoice:maxSelections_${maxSelections === 1 ? 'one' : 'other'}`, {
       lng: language,
@@ -12971,6 +12971,7 @@ class Main extends React$1.Component {
     this.propTypes = {
       model: PropTypes.object,
       session: PropTypes.object,
+      options: PropTypes.object,
       onChoiceChanged: PropTypes.func,
       classes: PropTypes.object.isRequired,
       onShowCorrectToggle: PropTypes.func,
@@ -12990,7 +12991,7 @@ class Main extends React$1.Component {
     super(props);
   }
   render() {
-    const {model, onChoiceChanged, session, onShowCorrectToggle} = this.props;
+    const {model, onChoiceChanged, session, onShowCorrectToggle, options} = this.props;
     const {extraCSSRules, fontSizeFactor} = model;
     return React$1.createElement(PreviewLayout, {
       extraCSSRules: extraCSSRules,
@@ -12998,17 +12999,18 @@ class Main extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 37
+        lineNumber: 38
       }
     }, React$1.createElement(MultipleChoice$2, {
       ...model,
+      options: options,
       session: session,
       onChoiceChanged: onChoiceChanged,
       onShowCorrectToggle: onShowCorrectToggle,
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 38
+        lineNumber: 39
       }
     }));
   }
@@ -13028,14 +13030,14 @@ const Root = props => React$1.createElement(styles$b.MuiThemeProvider, {
   __self: undefined,
   __source: {
     fileName: _jsxFileName,
-    lineNumber: 58
+    lineNumber: 60
   }
 }, React$1.createElement(Styled, {
   ...props,
   __self: undefined,
   __source: {
     fileName: _jsxFileName,
-    lineNumber: 59
+    lineNumber: 61
   }
 }));
 var lib = {};
@@ -13154,6 +13156,7 @@ class MultipleChoice extends HTMLElement {
     super();
     this._model = null;
     this._session = null;
+    this._options = null;
     this.audioComplete = false;
     this._boundHandleKeyDown = this.handleKeyDown.bind(this);
     this._keyboardEventsEnabled = false;
@@ -13162,6 +13165,7 @@ class MultipleChoice extends HTMLElement {
         var element = React.createElement(Root, {
           model: this._model,
           session: this._session,
+          options: this._options,
           onChoiceChanged: this._onChange.bind(this),
           onShowCorrectToggle: this.onShowCorrectToggle.bind(this)
         });
@@ -13208,6 +13212,13 @@ class MultipleChoice extends HTMLElement {
   get session() {
     return this._session;
   }
+  get options() {
+    return this._options;
+  }
+  set options(o) {
+    this._options = o;
+    this._rerender();
+  }
   set session(s) {
     this._session = s;
     this._rerender();

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@pie-element/ebsr",
-  "version": "10.5.3-hotfix.0",
+  "version": "10.5.3-hotfix.1",
   "description": "",
   "repository": "pie-framework/pie-elements",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@pie-element/multiple-choice": "9.15.3-hotfix.0",
+    "@pie-element/multiple-choice": "^9.15.3-hotfix.1",
     "@pie-framework/pie-player-events": "^0.1.0",
     "@pie-lib/pie-toolbox": "2.14.3",
     "classnames": "^2.2.5",