@pie-element/multiple-choice 8.9.1-next.2 → 8.9.1-next.39

package/module/controller.js

@@ -20776,21 +20776,33 @@ const createCorrectResponseSession = (question, env) => {
   });
 };
 
+// remove all html tags except img and iframe
+const getContent = (html) => (html || '').replace(/(<(?!img|iframe)([^>]+)>)/gi, '');
+
 const validate = (model = {}, config = {}) => {
   const { choices } = model;
   const { minAnswerChoices = 2, maxAnswerChoices } = config;
   const reversedChoices = [...(choices || [])].reverse();
   const choicesErrors = {};
+  const rationaleErrors = {};
+  const errors = {};
+
+  ['teacherInstructions', 'prompt'].forEach((field) => {
+    if (config[field]?.required && !getContent(model[field])) {
+      errors[field] = 'This field is required.';
+    }
+  });
+
   let hasCorrectResponse = false;
 
   reversedChoices.forEach((choice, index) => {
-    const { correct, value, label } = choice;
+    const { correct, value, label, rationale } = choice;
 
     if (correct) {
       hasCorrectResponse = true;
     }
 
-    if (label === '' || label === '<div></div>') {
+    if (!getContent(label)) {
       choicesErrors[value] = 'Content should not be empty.';
     } else {
       const identicalAnswer = reversedChoices.slice(index + 1).some((c) => c.label === label);
@@ -20799,23 +20811,30 @@ const validate = (model = {}, config = {}) => {
         choicesErrors[value] = 'Content should be unique.';
       }
     }
+
+    if (config.rationale?.required && !getContent(rationale)) {
+      rationaleErrors[value] = 'This field is required.';
+    }
   });
 
-  const errors = {};
   const nbOfChoices = (choices || []).length;
 
   if (nbOfChoices < minAnswerChoices) {
-    errors.answerChoicesError = `There should be at least ${minAnswerChoices} choices defined.`;
+    errors.answerChoices = `There should be at least ${minAnswerChoices} choices defined.`;
   } else if (nbOfChoices > maxAnswerChoices) {
-    errors.answerChoicesError = `No more than ${maxAnswerChoices} choices should be defined.`;
+    errors.answerChoices = `No more than ${maxAnswerChoices} choices should be defined.`;
   }
 
   if (!hasCorrectResponse) {
-    errors.correctResponseError = 'No correct response defined.';
+    errors.correctResponse = 'No correct response defined.';
   }
 
   if (!isEmpty_1(choicesErrors)) {
-    errors.choicesErrors = choicesErrors;
+    errors.choices = choicesErrors;
+  }
+
+  if (!isEmpty_1(rationaleErrors)) {
+    errors.rationale = rationaleErrors;
   }
 
   return errors;

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.5.0/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.5.1/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.0.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) {

package/module/manifest.json

@@ -4,7 +4,7 @@
   "modules": [
     {
       "name": "@pie-lib/pie-toolbox-math-rendering-module",
-      "version": "1.5.0"
+      "version": "1.5.1"
     },
     {
       "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_pie_lib__pie_toolbox_math_rendering_accessible, _dll_debug} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.5.0/module/index.js";
+import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_lodash, _dll_pie_lib__pie_toolbox_math_rendering_accessible, _dll_debug} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.5.1/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.0.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) {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@pie-element/multiple-choice",
   "repository": "pie-framework/pie-elements",
-  "version": "8.9.1-next.2+c90543115",
+  "version": "8.9.1-next.39+072ef11f3",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
     "@material-ui/core": "^3.9.2",
-    "@pie-lib/pie-toolbox": "1.12.1",
+    "@pie-lib/pie-toolbox": "1.12.2",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "enzyme-to-json": "^3.3.3",
@@ -18,7 +18,7 @@
     "react-test-renderer": "^16.3.2",
     "react-transition-group": "^2.3.1"
   },
-  "gitHead": "c90543115d39f285d97ea39308d32ca27d4e1489",
+  "gitHead": "072ef11f320de229433e4373b83fe2828ea7cf06",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
   },