@pie-element/ebsr 9.18.4-next.3 → 9.18.4-next.33

package/configure/package.json

@@ -10,7 +10,7 @@
     "@material-ui/core": "^3.9.2",
     "@pie-element/multiple-choice": "^8.21.3",
     "@pie-framework/pie-configure-events": "^1.2.0",
-    "@pie-lib/pie-toolbox": "1.25.3",
+    "@pie-lib/pie-toolbox": "1.26.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
     "react": "^16.8.1",

package/controller/package.json

@@ -7,7 +7,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "1.25.3",
+    "@pie-lib/pie-toolbox": "1.26.0",
     "lodash": "^4.17.15"
   },
   "author": "",

package/module/configure.js

@@ -1,4 +1,4 @@
-import {_dll_react, _dll_prop_types, _dll_lodash, _dll_react_dom} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.18.2/module/index.js";
+import {_dll_react, _dll_prop_types, _dll_lodash, _dll_react_dom} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.18.3/module/index.js";
 import MultipleChoiceConfigure from '@pie-element/multiple-choice/configure/lib';
 import {_dll_pie_lib__pie_toolbox_config_ui} from "../../../@pie-lib/pie-toolbox-module@4.12.0/module/index.js";
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};

package/module/element.js

@@ -1,4 +1,4 @@
-import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_lodash, _dll_debug, _dll_pie_lib__pie_toolbox_math_rendering_accessible} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.18.2/module/index.js";
+import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_lodash, _dll_debug, _dll_pie_lib__pie_toolbox_math_rendering_accessible} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.18.3/module/index.js";
 import {_dll_pie_lib__pie_toolbox_render_ui, _dll_pie_lib__pie_toolbox_correct_answer_toggle} from "../../../@pie-lib/pie-toolbox-module@4.12.0/module/index.js";
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 function getDefaultExportFromCjs(x) {
@@ -9376,7 +9376,8 @@ class MultipleChoice$1 extends React$2.Component {
       gridColumns: PropTypes$1.string,
       alwaysShowCorrect: PropTypes$1.bool,
       animationsDisabled: PropTypes$1.bool,
-      language: PropTypes$1.string
+      language: PropTypes$1.string,
+      onShowCorrectToggle: PropTypes$1.func
     };
   }
   constructor(props) {
@@ -9384,6 +9385,7 @@ class MultipleChoice$1 extends React$2.Component {
     MultipleChoice$1.prototype.__init.call(this);
     MultipleChoice$1.prototype.__init2.call(this);
     MultipleChoice$1.prototype.__init3.call(this);
+    MultipleChoice$1.prototype.__init4.call(this);
     this.state = {
       selectedValue: null,
       selectedValues: [],
@@ -9419,22 +9421,30 @@ class MultipleChoice$1 extends React$2.Component {
       });
     };
   }
-  onToggle() {
-    if (this.props.mode === 'evaluate') {
-      this.setState({
-        showCorrect: !this.state.showCorrect
-      });
-    }
+  __init3() {
+    this.onToggle = () => {
+      if (this.props.mode === 'evaluate') {
+        this.setState({
+          showCorrect: !this.state.showCorrect
+        }, () => {
+          this.props.onShowCorrectToggle();
+        });
+      }
+    };
   }
   UNSAFE_componentWillReceiveProps(nextProps) {
-    if (!nextProps.correctResponse) {
+    if (!nextProps.correctResponse && this.state.showCorrect !== false) {
       this.setState({
         showCorrect: false
+      }, () => {
+        this.props.onShowCorrectToggle();
       });
     }
-    if (nextProps.alwaysShowCorrect) {
+    if (nextProps.alwaysShowCorrect && this.state.showCorrect !== true) {
       this.setState({
         showCorrect: true
+      }, () => {
+        this.props.onShowCorrectToggle();
       });
     }
   }
@@ -9447,7 +9457,7 @@ class MultipleChoice$1 extends React$2.Component {
     }
     return '';
   }
-  __init3() {
+  __init4() {
     this.getCorrectness = (choice = {}) => {
       const isCorrect = choice.correct;
       const isChecked = this.isSelected(choice.value);
@@ -9488,14 +9498,14 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 195
+        lineNumber: 202
       }
     }, "Multiple Choice Question") : React$2.createElement('h2', {
       className: classes.srOnly,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 197
+        lineNumber: 204
       }
     }, "Multiple Select Question");
   }
@@ -9515,7 +9525,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 225
+        lineNumber: 232
       }
     });
     return React$2.createElement('div', {
@@ -9523,21 +9533,21 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 234
+        lineNumber: 241
       }
     }, partLabel && React$2.createElement('h3', {
       className: classes.partLabel,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 235
+        lineNumber: 242
       }
     }, partLabel), this.renderHeading(), teacherInstructions && React$2.createElement('div', {
       className: classes.teacherInstructions,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 240
+        lineNumber: 247
       }
     }, !animationsDisabled ? React$2.createElement(Collapsible, {
       labels: {
@@ -9547,14 +9557,14 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 242
+        lineNumber: 249
       }
     }, teacherInstructionsDiv) : teacherInstructionsDiv), React$2.createElement('fieldset', {
       className: classes.fieldset,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 256
+        lineNumber: 263
       }
     }, React$2.createElement(PreviewPrompt, {
       className: "prompt",
@@ -9564,7 +9574,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 257
+        lineNumber: 264
       }
     }), !alwaysShowCorrect && React$2.createElement(CorrectAnswerToggle, {
       show: showCorrectAnswerToggle,
@@ -9574,7 +9584,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 260
+        lineNumber: 267
       }
     }), React$2.createElement('div', {
       className: classNames({
@@ -9585,7 +9595,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 268
+        lineNumber: 275
       }
     }, choices.map((choice, index) => React$2.createElement(StyledChoice, {
       choicesLayout: this.props.choicesLayout,
@@ -9607,7 +9617,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 276
+        lineNumber: 283
       }
     })))));
   }
@@ -9630,7 +9640,8 @@ class Main extends React$1.Component {
       model: PropTypes.object,
       session: PropTypes.object,
       onChoiceChanged: PropTypes.func,
-      classes: PropTypes.object.isRequired
+      classes: PropTypes.object.isRequired,
+      onShowCorrectToggle: PropTypes.func
     };
   }
   static __initStatic2() {
@@ -9643,21 +9654,22 @@ class Main extends React$1.Component {
     super(props);
   }
   render() {
-    const {model, onChoiceChanged, session} = this.props;
+    const {model, onChoiceChanged, session, onShowCorrectToggle} = this.props;
     return React$1.createElement(PreviewLayout, {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 31
+        lineNumber: 32
       }
     }, React$1.createElement(MultipleChoice$2, {
       ...model,
       session: session,
       onChoiceChanged: onChoiceChanged,
+      onShowCorrectToggle: onShowCorrectToggle,
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 32
+        lineNumber: 33
       }
     }));
   }
@@ -9677,14 +9689,14 @@ const Root = props => React$1.createElement(styles$b.MuiThemeProvider, {
   __self: undefined,
   __source: {
     fileName: _jsxFileName,
-    lineNumber: 47
+    lineNumber: 53
   }
 }, React$1.createElement(Styled, {
   ...props,
   __self: undefined,
   __source: {
     fileName: _jsxFileName,
-    lineNumber: 48
+    lineNumber: 54
   }
 }));
 const {concat: concat} = _dll_lodash;
@@ -9724,7 +9736,8 @@ class MultipleChoice extends HTMLElement {
         var element = React.createElement(Root, {
           model: this._model,
           session: this._session,
-          onChoiceChanged: this._onChange.bind(this)
+          onChoiceChanged: this._onChange.bind(this),
+          onShowCorrectToggle: this.onShowCorrectToggle.bind(this)
         });
         this.setAttribute('aria-label', this._model.choiceMode === 'radio' ? 'Multiple Choice Question' : 'Multiple Correct Answer Question');
         this.setAttribute('role', 'region');
@@ -9766,6 +9779,9 @@ class MultipleChoice extends HTMLElement {
       trailing: true
     });
   }
+  onShowCorrectToggle() {
+    renderMath(this);
+  }
   setLangAttribute() {
     const language = this._model && typeof this._model.language ? this._model.language : '';
     const lang = language ? language.slice(0, 2) : 'en';

package/module/manifest.json

@@ -4,7 +4,7 @@
   "modules": [
     {
       "name": "@pie-lib/pie-toolbox-math-rendering-module",
-      "version": "1.18.2"
+      "version": "1.18.3"
     },
     {
       "name": "@pie-lib/pie-toolbox-module",

package/module/print.js

@@ -1,4 +1,4 @@
-import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_lodash, _dll_debug, _dll_pie_lib__pie_toolbox_math_rendering_accessible} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.18.2/module/index.js";
+import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_lodash, _dll_debug, _dll_pie_lib__pie_toolbox_math_rendering_accessible} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.18.3/module/index.js";
 import {_dll_pie_lib__pie_toolbox_render_ui, _dll_pie_lib__pie_toolbox_correct_answer_toggle} from "../../../@pie-lib/pie-toolbox-module@4.12.0/module/index.js";
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 function getDefaultExportFromCjs(x) {
@@ -9339,7 +9339,8 @@ class MultipleChoice$1 extends React$2.Component {
       gridColumns: PropTypes$1.string,
       alwaysShowCorrect: PropTypes$1.bool,
       animationsDisabled: PropTypes$1.bool,
-      language: PropTypes$1.string
+      language: PropTypes$1.string,
+      onShowCorrectToggle: PropTypes$1.func
     };
   }
   constructor(props) {
@@ -9347,6 +9348,7 @@ class MultipleChoice$1 extends React$2.Component {
     MultipleChoice$1.prototype.__init.call(this);
     MultipleChoice$1.prototype.__init2.call(this);
     MultipleChoice$1.prototype.__init3.call(this);
+    MultipleChoice$1.prototype.__init4.call(this);
     this.state = {
       selectedValue: null,
       selectedValues: [],
@@ -9382,22 +9384,30 @@ class MultipleChoice$1 extends React$2.Component {
       });
     };
   }
-  onToggle() {
-    if (this.props.mode === 'evaluate') {
-      this.setState({
-        showCorrect: !this.state.showCorrect
-      });
-    }
+  __init3() {
+    this.onToggle = () => {
+      if (this.props.mode === 'evaluate') {
+        this.setState({
+          showCorrect: !this.state.showCorrect
+        }, () => {
+          this.props.onShowCorrectToggle();
+        });
+      }
+    };
   }
   UNSAFE_componentWillReceiveProps(nextProps) {
-    if (!nextProps.correctResponse) {
+    if (!nextProps.correctResponse && this.state.showCorrect !== false) {
       this.setState({
         showCorrect: false
+      }, () => {
+        this.props.onShowCorrectToggle();
       });
     }
-    if (nextProps.alwaysShowCorrect) {
+    if (nextProps.alwaysShowCorrect && this.state.showCorrect !== true) {
       this.setState({
         showCorrect: true
+      }, () => {
+        this.props.onShowCorrectToggle();
       });
     }
   }
@@ -9410,7 +9420,7 @@ class MultipleChoice$1 extends React$2.Component {
     }
     return '';
   }
-  __init3() {
+  __init4() {
     this.getCorrectness = (choice = {}) => {
       const isCorrect = choice.correct;
       const isChecked = this.isSelected(choice.value);
@@ -9451,14 +9461,14 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 195
+        lineNumber: 202
       }
     }, "Multiple Choice Question") : React$2.createElement('h2', {
       className: classes.srOnly,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 197
+        lineNumber: 204
       }
     }, "Multiple Select Question");
   }
@@ -9478,7 +9488,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 225
+        lineNumber: 232
       }
     });
     return React$2.createElement('div', {
@@ -9486,21 +9496,21 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 234
+        lineNumber: 241
       }
     }, partLabel && React$2.createElement('h3', {
       className: classes.partLabel,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 235
+        lineNumber: 242
       }
     }, partLabel), this.renderHeading(), teacherInstructions && React$2.createElement('div', {
       className: classes.teacherInstructions,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 240
+        lineNumber: 247
       }
     }, !animationsDisabled ? React$2.createElement(Collapsible, {
       labels: {
@@ -9510,14 +9520,14 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 242
+        lineNumber: 249
       }
     }, teacherInstructionsDiv) : teacherInstructionsDiv), React$2.createElement('fieldset', {
       className: classes.fieldset,
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 256
+        lineNumber: 263
       }
     }, React$2.createElement(PreviewPrompt, {
       className: "prompt",
@@ -9527,7 +9537,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 257
+        lineNumber: 264
       }
     }), !alwaysShowCorrect && React$2.createElement(CorrectAnswerToggle, {
       show: showCorrectAnswerToggle,
@@ -9537,7 +9547,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 260
+        lineNumber: 267
       }
     }), React$2.createElement('div', {
       className: classNames({
@@ -9548,7 +9558,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 268
+        lineNumber: 275
       }
     }, choices.map((choice, index) => React$2.createElement(StyledChoice, {
       choicesLayout: this.props.choicesLayout,
@@ -9570,7 +9580,7 @@ class MultipleChoice$1 extends React$2.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$1,
-        lineNumber: 276
+        lineNumber: 283
       }
     })))));
   }
@@ -9593,7 +9603,8 @@ class Main extends React$1.Component {
       model: PropTypes.object,
       session: PropTypes.object,
       onChoiceChanged: PropTypes.func,
-      classes: PropTypes.object.isRequired
+      classes: PropTypes.object.isRequired,
+      onShowCorrectToggle: PropTypes.func
     };
   }
   static __initStatic2() {
@@ -9606,21 +9617,22 @@ class Main extends React$1.Component {
     super(props);
   }
   render() {
-    const {model, onChoiceChanged, session} = this.props;
+    const {model, onChoiceChanged, session, onShowCorrectToggle} = this.props;
     return React$1.createElement(PreviewLayout, {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 31
+        lineNumber: 32
       }
     }, React$1.createElement(MultipleChoice$2, {
       ...model,
       session: session,
       onChoiceChanged: onChoiceChanged,
+      onShowCorrectToggle: onShowCorrectToggle,
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 32
+        lineNumber: 33
       }
     }));
   }
@@ -9640,14 +9652,14 @@ const Root = props => React$1.createElement(styles$b.MuiThemeProvider, {
   __self: undefined,
   __source: {
     fileName: _jsxFileName,
-    lineNumber: 47
+    lineNumber: 53
   }
 }, React$1.createElement(Styled, {
   ...props,
   __self: undefined,
   __source: {
     fileName: _jsxFileName,
-    lineNumber: 48
+    lineNumber: 54
   }
 }));
 const {concat: concat} = _dll_lodash;
@@ -9687,7 +9699,8 @@ class MultipleChoice extends HTMLElement {
         var element = React.createElement(Root, {
           model: this._model,
           session: this._session,
-          onChoiceChanged: this._onChange.bind(this)
+          onChoiceChanged: this._onChange.bind(this),
+          onShowCorrectToggle: this.onShowCorrectToggle.bind(this)
         });
         this.setAttribute('aria-label', this._model.choiceMode === 'radio' ? 'Multiple Choice Question' : 'Multiple Correct Answer Question');
         this.setAttribute('role', 'region');
@@ -9729,6 +9742,9 @@ class MultipleChoice extends HTMLElement {
       trailing: true
     });
   }
+  onShowCorrectToggle() {
+    renderMath(this);
+  }
   setLangAttribute() {
     const language = this._model && typeof this._model.language ? this._model.language : '';
     const lang = language ? language.slice(0, 2) : 'en';

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@pie-element/ebsr",
-  "version": "9.18.4-next.3+4d5e9b38a",
+  "version": "9.18.4-next.33+30ae254b0",
   "description": "",
   "repository": "pie-framework/pie-elements",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@pie-element/multiple-choice": "^8.21.4-next.3+4d5e9b38a",
+    "@pie-element/multiple-choice": "^8.21.4-next.33+30ae254b0",
     "@pie-framework/pie-player-events": "^0.1.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
@@ -15,7 +15,7 @@
   },
   "author": "pie framework developers",
   "license": "ISC",
-  "gitHead": "4d5e9b38aae9ae001bc22c0a91da4d97eddd71dd",
+  "gitHead": "30ae254b0e3021389a52c7ab6cbf78a9868be728",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
   },