@pie-element/extended-text-entry 6.7.7 → 6.8.2

package/module/print.js

@@ -1,7 +1,7 @@
-import {_dll_debug, _dll_lodash, _dll_react_dom, _dll_prop_types, _dll_react, _dll_react_dom_server, _dll_material_ui__core, _dll_classnames, _dll_material_ui__core_styles, _dll_material_ui__icons, _dll_pie_lib__render_ui} from "../../../@pie-lib/shared-module@^1.2.15/module/index.js";
-import {_dll_pie_lib__math_rendering} from "../../../@pie-lib/math-rendering-module@^1.0.18/module/index.js";
-import {_dll_pie_lib__math_toolbar} from "../../../@pie-lib/math-edit-module@^1.1.14/module/index.js";
-import {_dll_pie_lib__drag} from "../../../@pie-lib/drag-module@^1.0.16/module/index.js";
+import {_dll_debug, _dll_lodash, _dll_react_dom, _dll_prop_types, _dll_react, _dll_react_dom_server, _dll_material_ui__core, _dll_classnames, _dll_material_ui__core_styles, _dll_material_ui__icons, _dll_pie_lib__render_ui} from "../../../@pie-lib/shared-module@^1.3.1/module/index.js";
+import {_dll_pie_lib__math_rendering} from "../../../@pie-lib/math-rendering-module@^1.0.24/module/index.js";
+import {_dll_pie_lib__math_toolbar} from "../../../@pie-lib/math-edit-module@^1.1.20/module/index.js";
+import {_dll_pie_lib__drag} from "../../../@pie-lib/drag-module@^1.0.22/module/index.js";
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 function getDefaultExportFromCjs(x) {
   return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -21936,34 +21936,6 @@ function MathPlugin() {
           }
         });
       }
-    },
-    normalizeNode: node => {
-      if (node.object !== 'document') {
-        return;
-      }
-      const addSpacesArray = [];
-      const allElements = node.filterDescendants(d => d.type === 'math');
-      allElements.forEach(el => {
-        const prevText = node.getPreviousText(el.key);
-        const lastCharIsNewLine = prevText.text[prevText.text.length - 1] === '\n';
-        if (prevText.text.length === 0 || lastCharIsNewLine) {
-          addSpacesArray.push({
-            nr: lastCharIsNewLine ? 1 : 2,
-            key: prevText.key
-          });
-        }
-      });
-      if (!addSpacesArray.length) {
-        return;
-      }
-      return change => {
-        change.withoutNormalization(() => {
-          addSpacesArray.forEach(({key, nr}) => {
-            const node = change.value.document.getNode(key);
-            change.insertTextByKey(key, node.text.length, ('\u00A0').repeat(nr));
-          });
-        });
-      };
     }
   };
 }
@@ -21986,6 +21958,18 @@ const htmlDecode = input => {
 const getTagName = el => {
   return (el && el.tagName || '').toLowerCase();
 };
+const lessThanHandling = input => {
+  const arrowSplit = input.split('<');
+  if (input.length > 2) {
+    return arrowSplit.reduce((st, part) => {
+      if (part.match(/<[a-zA-Z/][\s\S]*>/ig)) {
+        return `${st}${st ? '<' : ''}${part}`;
+      }
+      return `${st}${st ? '&lt;' : ''}${part}`;
+    }, '');
+  }
+  return input;
+};
 const serialization$4 = {
   deserialize(el) {
     const tagName = getTagName(el);
@@ -22030,14 +22014,14 @@ const serialization$4 = {
       const l = object.data.get('latex');
       const wrapper = object.data.get('wrapper');
       log$f('[serialize] latex: ', l);
-      const decoded = htmlDecode(l);
+      const decoded = htmlDecode(lessThanHandling(l));
       return React$p.createElement('span', {
         'data-latex': "",
         'data-raw': decoded,
         __self: this,
         __source: {
           fileName: _jsxFileName$o,
-          lineNumber: 274
+          lineNumber: 268
         }
       }, wrapMath(decoded, wrapper));
     }
@@ -22051,7 +22035,7 @@ const serialization$4 = {
         __self: this,
         __source: {
           fileName: _jsxFileName$o,
-          lineNumber: 286
+          lineNumber: 280
         }
       });
     }
@@ -22438,7 +22422,7 @@ class MediaDialog extends React$o.Component {
         lineNumber: 347
       }
     }, "Cancel"), React$o.createElement(Button, {
-      disabled: invalid || url === null,
+      disabled: invalid || url === null || url === undefined,
       onClick: () => this.handleDone(true),
       color: "primary",
       __self: this,
@@ -30493,6 +30477,17 @@ TableCell.propTypes = {
   onBlur: PropTypes$a.func,
   children: PropTypes$a.oneOfType([PropTypes$a.arrayOf(PropTypes$a.node), PropTypes$a.node]).isRequired
 };
+const moveFocusToBeginningOfTable = change => {
+  const addedTable = change.value.document.findDescendant(d => !!d.data && !!d.data.get('newTable'));
+  if (!addedTable) {
+    return;
+  }
+  change.collapseToStartOf(addedTable);
+  const update = addedTable.data.remove('newTable');
+  change.setNodeByKey(addedTable.key, {
+    data: update
+  });
+};
 var TablePlugin = (opts, toolbarPlugins) => {
   const core = _default({
     typeContent: 'div'
@@ -30539,7 +30534,7 @@ var TablePlugin = (opts, toolbarPlugins) => {
       __self: undefined,
       __source: {
         fileName: _jsxFileName$e,
-        lineNumber: 131
+        lineNumber: 145
       }
     }),
     onClick: (value, onChange) => {
@@ -30547,10 +30542,12 @@ var TablePlugin = (opts, toolbarPlugins) => {
       const change = value.change();
       const newTable = core.utils.createTableWithOptions(2, 2, {
         data: {
-          border: '1'
+          border: '1',
+          newTable: true
         }
       });
       change.insertBlock(newTable);
+      moveFocusToBeginningOfTable(change);
       onChange(change);
     },
     supports: (node, value) => node && node.object === 'block' && core.utils.isSelectionInTable(value),
@@ -30607,7 +30604,7 @@ var TablePlugin = (opts, toolbarPlugins) => {
         __self: undefined,
         __source: {
           fileName: _jsxFileName$e,
-          lineNumber: 197
+          lineNumber: 213
         }
       });
       return Tb;
@@ -30623,7 +30620,7 @@ var TablePlugin = (opts, toolbarPlugins) => {
           __self: undefined,
           __source: {
             fileName: _jsxFileName$e,
-            lineNumber: 218
+            lineNumber: 234
           }
         });
       case 'table_row':
@@ -30632,7 +30629,7 @@ var TablePlugin = (opts, toolbarPlugins) => {
           __self: undefined,
           __source: {
             fileName: _jsxFileName$e,
-            lineNumber: 220
+            lineNumber: 236
           }
         });
       case 'table_cell':
@@ -30643,7 +30640,7 @@ var TablePlugin = (opts, toolbarPlugins) => {
           __self: undefined,
           __source: {
             fileName: _jsxFileName$e,
-            lineNumber: 222
+            lineNumber: 238
           }
         });
       default:
@@ -30657,20 +30654,24 @@ var TablePlugin = (opts, toolbarPlugins) => {
     if (node.object !== 'document') {
       return;
     }
+    const tableAdded = node.findDescendant(d => d.data && d.data.get('newTable'));
+    if (!tableAdded) {
+      return;
+    }
+    const nodeToSearch = node.getParent(tableAdded.key) || node;
     let shouldAddTextAfterNode = false;
-    const indexToNotHaveTableOn = node.nodes.size - 1;
-    const indexOfLastTable = node.nodes.findLastIndex(d => d.type === 'table');
+    const indexToNotHaveTableOn = nodeToSearch.nodes.size - 1;
+    const indexOfLastTable = nodeToSearch.nodes.findLastIndex(d => d.type === 'table');
     if (indexOfLastTable === indexToNotHaveTableOn) {
       shouldAddTextAfterNode = true;
     }
     if (!shouldAddTextAfterNode) {
       return;
     }
-    const tableNode = node.nodes.get(indexOfLastTable);
     return change => {
       if (shouldAddTextAfterNode) {
-        const tableJSON = tableNode.toJSON();
-        change.removeNodeByKey(tableNode.key);
+        const tableJSON = tableAdded.toJSON();
+        change.removeNodeByKey(tableAdded.key);
         const newBlock = Block.create({
           object: 'block',
           type: 'div'
@@ -30681,7 +30682,14 @@ var TablePlugin = (opts, toolbarPlugins) => {
           if (prevText) {
             change.moveFocusTo(prevText.key, prevText.text.length).moveAnchorTo(prevText.key, prevText.text.length);
           }
-          change.insertBlock(tableJSON);
+          change.insertBlock({
+            ...tableJSON,
+            data: {
+              ...tableJSON.data,
+              newTable: true
+            }
+          });
+          moveFocusToBeginningOfTable(change);
         });
       }
     };
@@ -30788,13 +30796,13 @@ const serialization$1 = {
             __self: this,
             __source: {
               fileName: _jsxFileName$e,
-              lineNumber: 389
+              lineNumber: 418
             }
           }, React$f.createElement('tbody', {
             __self: this,
             __source: {
               fileName: _jsxFileName$e,
-              lineNumber: 390
+              lineNumber: 419
             }
           }, children));
         }
@@ -30804,7 +30812,7 @@ const serialization$1 = {
             __self: this,
             __source: {
               fileName: _jsxFileName$e,
-              lineNumber: 395
+              lineNumber: 424
             }
           }, children);
         }
@@ -30818,7 +30826,7 @@ const serialization$1 = {
               __self: this,
               __source: {
                 fileName: _jsxFileName$e,
-                lineNumber: 401
+                lineNumber: 430
               }
             }, children);
           } else {
@@ -30827,7 +30835,7 @@ const serialization$1 = {
               __self: this,
               __source: {
                 fileName: _jsxFileName$e,
-                lineNumber: 403
+                lineNumber: 432
               }
             }, children);
           }
@@ -31448,34 +31456,6 @@ function ResponseAreaPlugin(opts) {
         });
       }
     },
-    normalizeNode: node => {
-      if (node.object !== 'document') {
-        return;
-      }
-      const addSpacesArray = [];
-      const allElements = node.filterDescendants(d => elTypesArray.indexOf(d.type) >= 0);
-      allElements.forEach(el => {
-        const prevText = node.getPreviousText(el.key);
-        const lastCharIsNewLine = prevText.text[prevText.text.length - 1] === '\n';
-        if (prevText.text.length === 0 || lastCharIsNewLine) {
-          addSpacesArray.push({
-            nr: lastCharIsNewLine ? 1 : 2,
-            key: prevText.key
-          });
-        }
-      });
-      if (!addSpacesArray.length) {
-        return;
-      }
-      return change => {
-        change.withoutNormalization(() => {
-          addSpacesArray.forEach(({key, nr}) => {
-            const node = change.value.document.getNode(key);
-            change.insertTextByKey(key, node.text.length, ('\u00A0').repeat(nr));
-          });
-        });
-      };
-    },
     onDrop(event, change, editor) {
       const closestEl = event.target.closest('[data-key]');
       const inline = editor.value.document.findDescendant(d => d.key === closestEl.dataset.key);
@@ -31538,7 +31518,7 @@ const serialization = {
             __self: this,
             __source: {
               fileName: _jsxFileName$8,
-              lineNumber: 216
+              lineNumber: 181
             }
           });
         }
@@ -31552,7 +31532,7 @@ const serialization = {
             __self: this,
             __source: {
               fileName: _jsxFileName$8,
-              lineNumber: 222
+              lineNumber: 187
             }
           });
         }
@@ -31568,7 +31548,7 @@ const serialization = {
             __self: this,
             __source: {
               fileName: _jsxFileName$8,
-              lineNumber: 233
+              lineNumber: 198
             }
           });
         }
@@ -32425,7 +32405,7 @@ const style$1 = {
       wordBreak: 'break-word',
       overflow: 'visible',
       maxHeight: '500px',
-      padding: '5px 0'
+      padding: '5px'
     }
   },
   children: {
@@ -32710,6 +32690,7 @@ class Editor extends React$3.Component {
       classes: PropTypes$2.object.isRequired,
       highlightShape: PropTypes$2.bool,
       disabled: PropTypes$2.bool,
+      spellCheck: PropTypes$2.bool,
       nonEmpty: PropTypes$2.bool,
       disableUnderline: PropTypes$2.bool,
       autoWidthToolbar: PropTypes$2.bool,
@@ -32861,6 +32842,13 @@ class Editor extends React$3.Component {
       });
     }
   }
+  componentDidUpdate() {
+    const zeroWidthEls = document.querySelectorAll('[data-slate-zero-width="z"]');
+    Array.from(zeroWidthEls).forEach(el => {
+      el.style.minWidth = '2px';
+      el.style.display = 'inline-block';
+    });
+  }
   __init() {
     this.onPluginBlur = e => {
       log$3('[onPluginBlur]', e && e.relatedTarget);
@@ -33117,7 +33105,7 @@ class Editor extends React$3.Component {
     };
   }
   render() {
-    const {disabled, highlightShape, classes, className, placeholder, pluginProps, onKeyDown} = this.props;
+    const {disabled, spellCheck, highlightShape, classes, className, placeholder, pluginProps, onKeyDown} = this.props;
     const {value, focusedNode, toolbarOpts} = this.state;
     log$3('[render] value: ', value);
     const sizeStyle = this.buildSizeStyle();
@@ -33134,7 +33122,7 @@ class Editor extends React$3.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$2,
-        lineNumber: 531
+        lineNumber: 545
       }
     }, React$3.createElement(Editor$2, {
       plugins: this.plugins,
@@ -33159,6 +33147,7 @@ class Editor extends React$3.Component {
       focusedNode: focusedNode,
       normalize: this.normalize,
       readOnly: disabled,
+      spellCheck: spellCheck,
       className: classes.slateEditor,
       style: {
         minHeight: sizeStyle.minHeight,
@@ -33172,7 +33161,7 @@ class Editor extends React$3.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$2,
-        lineNumber: 536
+        lineNumber: 550
       }
     }));
   }
@@ -33368,10 +33357,11 @@ class Main extends React$1.Component {
   }
   render() {
     const {model, classes, session} = this.props;
-    const {dimensions, disabled, feedback, teacherInstructions, mathInput, animationsDisabled} = model;
+    const {dimensions, disabled, feedback, teacherInstructions, mathInput, animationsDisabled, playersToolbarPosition} = model;
     const {value} = session;
     const {width, height} = dimensions || ({});
     const maxHeight = '40vh';
+    const toolbarOpts = {};
     log$1('[render] disabled? ', disabled);
     const teacherInstructionsDiv = React$1.createElement(PreviewPrompt, {
       defaultClassName: "teacher-instructions",
@@ -33379,9 +33369,17 @@ class Main extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 52
+        lineNumber: 54
       }
     });
+    switch (playersToolbarPosition) {
+      case 'top':
+        toolbarOpts.position = 'top';
+        break;
+      default:
+        toolbarOpts.position = 'bottom';
+        break;
+    }
     return React$1.createElement('div', {
       className: classes.main,
       ref: ref => {
@@ -33390,13 +33388,13 @@ class Main extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 55
+        lineNumber: 66
       }
     }, teacherInstructions && React$1.createElement('div', {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 63
+        lineNumber: 74
       }
     }, !animationsDisabled ? React$1.createElement(Collapsible, {
       labels: {
@@ -33407,20 +33405,20 @@ class Main extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 65
+        lineNumber: 76
       }
     }, teacherInstructionsDiv) : teacherInstructionsDiv, React$1.createElement('br', {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 72
+        lineNumber: 83
       }
     })), model.prompt && React$1.createElement(Typography, {
       className: classes.prompt,
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 77
+        lineNumber: 88
       }
     }, React$1.createElement(PreviewPrompt, {
       defaultClassName: "prompt",
@@ -33428,7 +33426,7 @@ class Main extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 80
+        lineNumber: 91
       }
     })), React$1.createElement(EditableHtml, {
       className: "response-area-editor",
@@ -33439,6 +33437,7 @@ class Main extends React$1.Component {
       maxHeight: maxHeight,
       disabled: disabled,
       highlightShape: true,
+      toolbarOpts: toolbarOpts,
       pluginProps: {
         math: {
           disabled: !mathInput,
@@ -33456,19 +33455,19 @@ class Main extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 83
+        lineNumber: 94
       }
     }), feedback && React$1.createElement('div', {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 108
+        lineNumber: 120
       }
     }, React$1.createElement('br', {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 109
+        lineNumber: 121
       }
     }), React$1.createElement(Feedback, {
       correctness: "correct",
@@ -33476,7 +33475,7 @@ class Main extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 110
+        lineNumber: 122
       }
     })));
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pie-element/extended-text-entry",
-  "version": "6.7.7",
+  "version": "6.8.2",
   "description": "",
   "repository": "pie-framework/pie-elements",
   "publishConfig": {
@@ -12,7 +12,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/editable-html": "^7.17.14",
+    "@pie-lib/editable-html": "^7.18.0",
     "@pie-lib/math-rendering": "^2.3.12",
     "@pie-lib/render-ui": "^4.12.4",
     "classnames": "^2.2.5",
@@ -22,7 +22,7 @@
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
   },
-  "gitHead": "aed4c49b18e323dd0fc7fbf2186039723d406751",
+  "gitHead": "cd1a2efd59f915b882937dea95c2675b2d2a3a50",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
   },