@pie-element/select-text 8.5.0 → 8.5.1-next.48

package/module/configure.js

@@ -1,4 +1,4 @@
-import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_lodash, _dll_debug, _dll_react_dom_server} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.1.6/module/index.js";
+import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_lodash, _dll_debug, _dll_react_dom_server} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.4.0/module/index.js";
 import {_dll_pie_lib__pie_toolbox_config_ui, _dll_pie_lib__pie_toolbox_editable_html} 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) {
@@ -111118,7 +111118,7 @@ class Design extends React$1.Component {
     const {classes, configuration, imageSupport, model, onConfigurationChanged, onModelChanged, uploadSoundSupport} = this.props;
     const {baseInputConfiguration = {}, correctAnswer = {}, contentDimensions = {}, feedback = {}, highlightChoices = {}, mode = {}, partialScoring = {}, prompt = {}, rationale = {}, selectionCount = {}, selections = {}, settingsPanelDisabled, scoringType = {}, spellCheck = {}, studentInstructions = {}, teacherInstructions = {}, text = {}, tokens = {}, maxImageWidth = {}, maxImageHeight = {}, withRubric = {}, mathMlOptions = {}, language = {}, languageChoices = {}} = configuration || ({});
     const {errors, feedbackEnabled, promptEnabled, rationaleEnabled, spellCheckEnabled, teacherInstructionsEnabled, toolbarEditorPosition} = model || ({});
-    const {tokensError, selectionsError} = errors || ({});
+    const {prompt: promptError, rationale: rationaleError, selectionsError, teacherInstructions: teacherInstructionsError, tokensError} = errors || ({});
     const validationMessage = generateValidationMessage(configuration);
     const defaultImageMaxWidth = maxImageWidth && maxImageWidth.prompt;
     const defaultImageMaxHeight = maxImageHeight && maxImageHeight.prompt;
@@ -111144,11 +111144,10 @@ class Design extends React$1.Component {
       scoringType: scoringType.settings && radio(scoringType.label, ['auto', 'rubric']),
       rubricEnabled: _optionalChain$1([withRubric, 'optionalAccess', _ => _.settings]) && toggle(_optionalChain$1([withRubric, 'optionalAccess', _2 => _2.label]))
     };
-    const getPluginProps = props => {
-      return Object.assign({
-        ...baseInputConfiguration
-      }, props || ({}));
-    };
+    const getPluginProps = (props = {}) => ({
+      ...baseInputConfiguration,
+      ...props
+    });
     return React$1.createElement(layout.ConfigLayout, {
       dimensions: contentDimensions,
       hideSettings: settingsPanelDisabled,
@@ -111164,13 +111163,13 @@ class Design extends React$1.Component {
         __self: this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 210
+          lineNumber: 212
         }
       }),
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 206
+        lineNumber: 208
       }
     }, teacherInstructionsEnabled && React$1.createElement(InputContainer, {
       label: teacherInstructions.label,
@@ -111178,7 +111177,7 @@ class Design extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 223
+        lineNumber: 225
       }
     }, React$1.createElement(EditableHtml, {
       className: classes.prompt,
@@ -111186,6 +111185,7 @@ class Design extends React$1.Component {
       onChange: this.onTeacherInstructionsChanged,
       imageSupport: imageSupport,
       nonEmpty: false,
+      error: teacherInstructionsError,
       toolbarOpts: toolbarOpts,
       pluginProps: getPluginProps(_optionalChain$1([configuration, 'optionalAccess', _3 => _3.teacherInstructions, 'optionalAccess', _4 => _4.inputConfiguration])),
       spellCheck: spellCheckEnabled,
@@ -111201,21 +111201,29 @@ class Design extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 224
+        lineNumber: 226
+      }
+    }), teacherInstructionsError && React$1.createElement('div', {
+      className: classes.errorText,
+      __self: this,
+      __source: {
+        fileName: _jsxFileName,
+        lineNumber: 242
       }
-    })), promptEnabled && React$1.createElement(InputContainer, {
+    }, teacherInstructionsError)), promptEnabled && React$1.createElement(InputContainer, {
       label: prompt.label || '',
       className: classes.promptHolder,
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 243
+        lineNumber: 247
       }
     }, React$1.createElement(EditableHtml, {
       className: classes.prompt,
       markup: model.prompt,
       onChange: this.onPromptChanged,
       imageSupport: imageSupport,
+      error: promptError,
       toolbarOpts: toolbarOpts,
       pluginProps: getPluginProps(_optionalChain$1([configuration, 'optionalAccess', _5 => _5.prompt, 'optionalAccess', _6 => _6.inputConfiguration])),
       spellCheck: spellCheckEnabled,
@@ -111231,15 +111239,22 @@ class Design extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 244
+        lineNumber: 248
       }
-    })), text.settings && React$1.createElement(InputContainer, {
+    }), promptError && React$1.createElement('div', {
+      className: classes.errorText,
+      __self: this,
+      __source: {
+        fileName: _jsxFileName,
+        lineNumber: 263
+      }
+    }, promptError)), text.settings && React$1.createElement(InputContainer, {
       label: text.label || '',
       className: classes.promptHolder,
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 262
+        lineNumber: 268
       }
     }, React$1.createElement(TextField, {
       className: classes.input,
@@ -111250,7 +111265,7 @@ class Design extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 263
+        lineNumber: 269
       }
     })), tokens.settings && React$1.createElement(InputContainer, {
       label: tokens.label || '',
@@ -111258,7 +111273,7 @@ class Design extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 274
+        lineNumber: 280
       }
     }, React$1.createElement(Tooltip, {
       classes: {
@@ -111271,7 +111286,7 @@ class Design extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 275
+        lineNumber: 281
       }
     }, React$1.createElement(default_1, {
       fontSize: 'small',
@@ -111284,7 +111299,7 @@ class Design extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 282
+        lineNumber: 288
       }
     })), React$1.createElement(textSelect$2.Tokenizer, {
       className: classes.tokenizer,
@@ -111294,28 +111309,28 @@ class Design extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 285
+        lineNumber: 291
       }
     })), tokensError && React$1.createElement('div', {
       className: classes.errorText,
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 293
+        lineNumber: 299
       }
     }, tokensError), selectionsError && React$1.createElement('div', {
       className: classes.errorText,
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 294
+        lineNumber: 300
       }
     }, selectionsError), React$1.createElement('div', {
       className: classes.tokensDetails,
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 296
+        lineNumber: 302
       }
     }, mode.settings && React$1.createElement(Chip, {
       label: `${mode.label}: ${model.mode ? model.mode : 'None'}`,
@@ -111323,7 +111338,7 @@ class Design extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 298
+        lineNumber: 304
       }
     }), selections.settings && React$1.createElement(Chip, {
       label: `${selections.label}: ${tokensModel.length}`,
@@ -111331,7 +111346,7 @@ class Design extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 302
+        lineNumber: 308
       }
     }), correctAnswer.settings && React$1.createElement(Chip, {
       label: `${correctAnswer.label}: ${tokensModel.filter(t => t.correct).length}`,
@@ -111339,7 +111354,7 @@ class Design extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 306
+        lineNumber: 312
       }
     }), selectionCount.settings && React$1.createElement(NumberTextField, {
       min: tokensModel.filter(t => t.correct).length || 0,
@@ -111351,7 +111366,7 @@ class Design extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 313
+        lineNumber: 319
       }
     })), rationaleEnabled && React$1.createElement(InputContainer, {
       label: rationale.label || '',
@@ -111359,13 +111374,14 @@ class Design extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 325
+        lineNumber: 331
       }
     }, React$1.createElement(EditableHtml, {
       className: classes.prompt,
       markup: model.rationale || '',
       onChange: this.onRationaleChanged,
       imageSupport: imageSupport,
+      error: rationaleError,
       toolbarOpts: toolbarOpts,
       pluginProps: getPluginProps(_optionalChain$1([configuration, 'optionalAccess', _7 => _7.rationale, 'optionalAccess', _8 => _8.inputConfiguration])),
       spellCheck: spellCheckEnabled,
@@ -111381,16 +111397,23 @@ class Design extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 326
+        lineNumber: 332
+      }
+    }), rationaleError && React$1.createElement('div', {
+      className: classes.errorText,
+      __self: this,
+      __source: {
+        fileName: _jsxFileName,
+        lineNumber: 347
       }
-    })), feedbackEnabled && React$1.createElement(FeedbackConfig, {
+    }, rationaleError)), feedbackEnabled && React$1.createElement(FeedbackConfig, {
       feedback: model.feedback,
       onChange: this.changeFeedback,
       toolbarOpts: toolbarOpts,
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 344
+        lineNumber: 352
       }
     }));
   }
@@ -111451,7 +111474,7 @@ var Main = styles$t.withStyles(theme => ({
   errorText: {
     fontSize: theme.typography.fontSize - 2,
     color: theme.palette.error.main,
-    paddingBottom: theme.spacing.unit
+    paddingTop: theme.spacing.unit
   }
 }))(Design);
 var lib = {};
@@ -111588,7 +111611,8 @@ var defaultValues = {
         image: {
           disabled: false
         }
-      }
+      },
+      required: false
     },
     scoringType: {
       settings: false,
@@ -111611,7 +111635,8 @@ var defaultValues = {
         image: {
           disabled: false
         }
-      }
+      },
+      required: false
     },
     prompt: {
       label: 'Prompt',
@@ -111626,7 +111651,8 @@ var defaultValues = {
         image: {
           disabled: false
         }
-      }
+      },
+      required: false
     },
     text: {
       settings: true,

package/module/controller.js

@@ -19899,11 +19899,14 @@ var defaults = {
   tokens: tokens(),
 };
 
-const isAnswerSelected = (token, selectedToken) => token && selectedToken && token.correct === true &&
-    !(
-        (token.start === selectedToken.start && token.end === selectedToken.end) ||
-        (token.start === selectedToken.oldStart && token.end === selectedToken.oldEnd)
-    );
+const isAnswerSelected = (token, selectedToken) =>
+  token &&
+  selectedToken &&
+  token.correct === true &&
+  !(
+    (token.start === selectedToken.start && token.end === selectedToken.end) ||
+    (token.start === selectedToken.oldStart && token.end === selectedToken.oldEnd)
+  );
 
 const buildTokens = (tokens, selectedTokens, evaluateMode) => {
   tokens = tokens || [];
@@ -20079,12 +20082,21 @@ 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 { tokens } = model;
   const { minTokens = 2, maxTokens, maxSelections } = config;
   const errors = {};
   const nbOfTokens = (tokens || []).length;
 
+  ['teacherInstructions', 'prompt', 'rationale'].forEach((field) => {
+    if (config[field]?.required && !getContent(model[field])) {
+      errors[field] = 'This field is required.';
+    }
+  });
+
   const nbOfSelections = (tokens || []).reduce((acc, token) => (token.correct ? acc + 1 : acc), 0);
 
   if (nbOfTokens < minTokens) {

package/module/element.js

@@ -1,4 +1,4 @@
-import {_dll_react, _dll_prop_types, _dll_react_dom, _dll_classnames, _dll_lodash, _dll_debug, _dll_react_dom_server, _dll_pie_lib__pie_toolbox_math_rendering} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.1.6/module/index.js";
+import {_dll_react, _dll_prop_types, _dll_react_dom, _dll_classnames, _dll_lodash, _dll_debug, _dll_react_dom_server, _dll_pie_lib__pie_toolbox_math_rendering} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.4.0/module/index.js";
 import {_dll_pie_lib__pie_toolbox_correct_answer_toggle, _dll_pie_lib__pie_toolbox_render_ui} 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/index.html

@@ -2,7 +2,7 @@
   <!doctype html>
   <html>
     <head>
-      <title>@pie-element/select-text@8.4.2</title>
+      <title>@pie-element/select-text@8.5.0</title>
       <script
         type="module"
         src="https://cdn.jsdelivr.net/npm/@pslb/demo-el@^1.0.0/dist/demo-el/demo-el.esm.js"></script>

package/module/manifest.json

@@ -1,10 +1,10 @@
 {
   "name": "@pie-element/select-text",
-  "version": "8.4.2",
+  "version": "8.5.0",
   "modules": [
     {
       "name": "@pie-lib/pie-toolbox-math-rendering-module",
-      "version": "1.1.6"
+      "version": "1.4.0"
     },
     {
       "name": "@pie-lib/pie-toolbox-module",

package/module/print.html

@@ -2,7 +2,7 @@
   <!doctype html>
   <html>
     <head>
-      <title>@pie-element/select-text@8.4.2</title>
+      <title>@pie-element/select-text@8.5.0</title>
       <link
         href="https://fonts.googleapis.com/css?family=Roboto&display=swap"
         rel="stylesheet"

package/module/print.js

@@ -1,4 +1,4 @@
-import {_dll_react, _dll_prop_types, _dll_react_dom, _dll_classnames, _dll_lodash, _dll_debug, _dll_react_dom_server, _dll_pie_lib__pie_toolbox_math_rendering} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.1.6/module/index.js";
+import {_dll_react, _dll_prop_types, _dll_react_dom, _dll_classnames, _dll_lodash, _dll_debug, _dll_react_dom_server, _dll_pie_lib__pie_toolbox_math_rendering} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.4.0/module/index.js";
 import {_dll_pie_lib__pie_toolbox_correct_answer_toggle, _dll_pie_lib__pie_toolbox_render_ui} 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

@@ -4,19 +4,19 @@
     "access": "public"
   },
   "repository": "pie-framework/pie-elements",
-  "version": "8.5.0",
+  "version": "8.5.1-next.48+a8e4e6ab2",
   "description": "",
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "1.9.0",
+    "@pie-lib/pie-toolbox": "1.11.1",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "3aaaa00aa149439eb0cb72d04d6ff3eecf0ee4b5",
+  "gitHead": "a8e4e6ab27584435ce7ac3e964ccac2747402777",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
   },