@pie-element/complex-rubric 2.11.0 → 2.11.1-next.14

package/controller/package.json

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

package/module/configure.js

@@ -1,4 +1,4 @@
-import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.12.1/module/index.js";
+import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.13.0/module/index.js";
 import RubricConfigure from '@pie-element/rubric/configure/lib';
 import {_dll_pie_lib__pie_toolbox_editable_html, _dll_pie_lib__pie_toolbox_render_ui, _dll_pie_lib__pie_toolbox_config_ui} from "../../../@pie-lib/pie-toolbox-module@4.12.0/module/index.js";
 function _mergeNamespaces(n, m) {
@@ -145090,50 +145090,41 @@ const require$$8$e = _dll_prop_types;
       node: _propTypes["default"].object
     };
     core.normalizeNode = function (node) {
-      if (node.object !== 'document') {
-        return;
-      }
-      var tableAdded = node.findDescendant(function (d) {
-        return d.data && d.data.get('newTable');
-      });
-      if (!tableAdded) {
-        return;
-      }
-      var nodeToSearch = node.getParent(tableAdded.key) || node;
-      var shouldAddTextAfterNode = false;
-      var indexToNotHaveTableOn = nodeToSearch.nodes.size - 1;
-      var indexOfLastTable = nodeToSearch.nodes.findLastIndex(function (d) {
-        return d.type === 'table';
+      var addNodeBeforeArray = [];
+      if (node.object !== 'document') return;
+      node.findDescendant(function (d) {
+        if (d.type === 'table') {
+          var tablePath = node.getPath(d.key);
+          var prevNode = node.getPreviousNode(tablePath);
+          var nextNode = node.getNextNode(tablePath);
+          if (!prevNode || !nextNode) {
+            addNodeBeforeArray.push({
+              node: d,
+              prevNode: prevNode,
+              nextNode: nextNode
+            });
+          }
+        }
       });
-      if (indexOfLastTable === indexToNotHaveTableOn) {
-        shouldAddTextAfterNode = true;
-      }
-      if (!shouldAddTextAfterNode) {
+      if (!addNodeBeforeArray.length) {
         return;
       }
       return function (change) {
-        if (shouldAddTextAfterNode) {
-          var tableJSON = tableAdded.toJSON();
-          change.removeNodeByKey(tableAdded.key);
-          var newBlock = _slate.Block.create({
-            object: 'block',
-            type: 'div'
-          });
-          change.insertBlock(newBlock);
-          change.withoutNormalization(function () {
-            var prevText = change.value.document.getPreviousText(newBlock.key);
-            if (prevText) {
-              var _prevText$text, _prevText$text2;
-              change.moveFocusTo(prevText.key, (_prevText$text = prevText.text) === null || _prevText$text === void 0 ? void 0 : _prevText$text.length).moveAnchorTo(prevText.key, (_prevText$text2 = prevText.text) === null || _prevText$text2 === void 0 ? void 0 : _prevText$text2.length);
-            }
-            change.insertBlock(_objectSpread(_objectSpread({}, tableJSON), {}, {
-              data: _objectSpread(_objectSpread({}, tableJSON.data), {}, {
-                newTable: true
-              })
-            }));
-            moveFocusToBeginningOfTable(change);
-          });
-        }
+        var newBlock = {
+          object: 'block',
+          type: 'div'
+        };
+        addNodeBeforeArray.forEach(function (n) {
+          var tablePath = change.value.document.getPath(n.node.key).toJSON();
+          var indexToAdd = tablePath.splice(-1)[0];
+          if (!n.prevNode) {
+            change.insertNodeByPath(tablePath, indexToAdd, newBlock);
+            return;
+          }
+          if (!n.nextNode) {
+            change.insertNodeByPath(tablePath, indexToAdd + 1, newBlock);
+          }
+        });
       };
     };
     core.renderNode = Node;

package/module/element.js

@@ -1,4 +1,4 @@
-import {_dll_react, _dll_prop_types, _dll_react_dom, _dll_classnames, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.12.1/module/index.js";
+import {_dll_react, _dll_prop_types, _dll_react_dom, _dll_classnames, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.13.0/module/index.js";
 import {_dll_pie_lib__pie_toolbox_render_ui} from "../../../@pie-lib/pie-toolbox-module@4.12.0/module/index.js";
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {
@@ -135281,50 +135281,41 @@ const require$$8$f = _dll_prop_types;
       node: _propTypes["default"].object
     };
     core.normalizeNode = function (node) {
-      if (node.object !== 'document') {
-        return;
-      }
-      var tableAdded = node.findDescendant(function (d) {
-        return d.data && d.data.get('newTable');
-      });
-      if (!tableAdded) {
-        return;
-      }
-      var nodeToSearch = node.getParent(tableAdded.key) || node;
-      var shouldAddTextAfterNode = false;
-      var indexToNotHaveTableOn = nodeToSearch.nodes.size - 1;
-      var indexOfLastTable = nodeToSearch.nodes.findLastIndex(function (d) {
-        return d.type === 'table';
+      var addNodeBeforeArray = [];
+      if (node.object !== 'document') return;
+      node.findDescendant(function (d) {
+        if (d.type === 'table') {
+          var tablePath = node.getPath(d.key);
+          var prevNode = node.getPreviousNode(tablePath);
+          var nextNode = node.getNextNode(tablePath);
+          if (!prevNode || !nextNode) {
+            addNodeBeforeArray.push({
+              node: d,
+              prevNode: prevNode,
+              nextNode: nextNode
+            });
+          }
+        }
       });
-      if (indexOfLastTable === indexToNotHaveTableOn) {
-        shouldAddTextAfterNode = true;
-      }
-      if (!shouldAddTextAfterNode) {
+      if (!addNodeBeforeArray.length) {
         return;
       }
       return function (change) {
-        if (shouldAddTextAfterNode) {
-          var tableJSON = tableAdded.toJSON();
-          change.removeNodeByKey(tableAdded.key);
-          var newBlock = _slate.Block.create({
-            object: 'block',
-            type: 'div'
-          });
-          change.insertBlock(newBlock);
-          change.withoutNormalization(function () {
-            var prevText = change.value.document.getPreviousText(newBlock.key);
-            if (prevText) {
-              var _prevText$text, _prevText$text2;
-              change.moveFocusTo(prevText.key, (_prevText$text = prevText.text) === null || _prevText$text === void 0 ? void 0 : _prevText$text.length).moveAnchorTo(prevText.key, (_prevText$text2 = prevText.text) === null || _prevText$text2 === void 0 ? void 0 : _prevText$text2.length);
-            }
-            change.insertBlock(_objectSpread(_objectSpread({}, tableJSON), {}, {
-              data: _objectSpread(_objectSpread({}, tableJSON.data), {}, {
-                newTable: true
-              })
-            }));
-            moveFocusToBeginningOfTable(change);
-          });
-        }
+        var newBlock = {
+          object: 'block',
+          type: 'div'
+        };
+        addNodeBeforeArray.forEach(function (n) {
+          var tablePath = change.value.document.getPath(n.node.key).toJSON();
+          var indexToAdd = tablePath.splice(-1)[0];
+          if (!n.prevNode) {
+            change.insertNodeByPath(tablePath, indexToAdd, newBlock);
+            return;
+          }
+          if (!n.nextNode) {
+            change.insertNodeByPath(tablePath, indexToAdd + 1, newBlock);
+          }
+        });
       };
     };
     core.renderNode = Node;

package/module/index.html

@@ -2,7 +2,7 @@
   <!doctype html>
   <html>
     <head>
-      <title>@pie-element/complex-rubric@2.10.6</title>
+      <title>@pie-element/complex-rubric@2.11.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/complex-rubric",
-  "version": "2.10.6",
+  "version": "2.11.0",
   "modules": [
     {
       "name": "@pie-lib/pie-toolbox-math-rendering-module",
-      "version": "1.12.1"
+      "version": "1.13.0"
     },
     {
       "name": "@pie-lib/pie-toolbox-module",

package/module/print.html

@@ -2,7 +2,7 @@
   <!doctype html>
   <html>
     <head>
-      <title>@pie-element/complex-rubric@2.10.6</title>
+      <title>@pie-element/complex-rubric@2.11.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_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.12.1/module/index.js";
+import {_dll_react, _dll_prop_types, _dll_react_dom, _dll_classnames, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.13.0/module/index.js";
 import {_dll_pie_lib__pie_toolbox_render_ui} from "../../../@pie-lib/pie-toolbox-module@4.12.0/module/index.js";
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {
@@ -135281,50 +135281,41 @@ const require$$8$f = _dll_prop_types;
       node: _propTypes["default"].object
     };
     core.normalizeNode = function (node) {
-      if (node.object !== 'document') {
-        return;
-      }
-      var tableAdded = node.findDescendant(function (d) {
-        return d.data && d.data.get('newTable');
-      });
-      if (!tableAdded) {
-        return;
-      }
-      var nodeToSearch = node.getParent(tableAdded.key) || node;
-      var shouldAddTextAfterNode = false;
-      var indexToNotHaveTableOn = nodeToSearch.nodes.size - 1;
-      var indexOfLastTable = nodeToSearch.nodes.findLastIndex(function (d) {
-        return d.type === 'table';
+      var addNodeBeforeArray = [];
+      if (node.object !== 'document') return;
+      node.findDescendant(function (d) {
+        if (d.type === 'table') {
+          var tablePath = node.getPath(d.key);
+          var prevNode = node.getPreviousNode(tablePath);
+          var nextNode = node.getNextNode(tablePath);
+          if (!prevNode || !nextNode) {
+            addNodeBeforeArray.push({
+              node: d,
+              prevNode: prevNode,
+              nextNode: nextNode
+            });
+          }
+        }
       });
-      if (indexOfLastTable === indexToNotHaveTableOn) {
-        shouldAddTextAfterNode = true;
-      }
-      if (!shouldAddTextAfterNode) {
+      if (!addNodeBeforeArray.length) {
         return;
       }
       return function (change) {
-        if (shouldAddTextAfterNode) {
-          var tableJSON = tableAdded.toJSON();
-          change.removeNodeByKey(tableAdded.key);
-          var newBlock = _slate.Block.create({
-            object: 'block',
-            type: 'div'
-          });
-          change.insertBlock(newBlock);
-          change.withoutNormalization(function () {
-            var prevText = change.value.document.getPreviousText(newBlock.key);
-            if (prevText) {
-              var _prevText$text, _prevText$text2;
-              change.moveFocusTo(prevText.key, (_prevText$text = prevText.text) === null || _prevText$text === void 0 ? void 0 : _prevText$text.length).moveAnchorTo(prevText.key, (_prevText$text2 = prevText.text) === null || _prevText$text2 === void 0 ? void 0 : _prevText$text2.length);
-            }
-            change.insertBlock(_objectSpread(_objectSpread({}, tableJSON), {}, {
-              data: _objectSpread(_objectSpread({}, tableJSON.data), {}, {
-                newTable: true
-              })
-            }));
-            moveFocusToBeginningOfTable(change);
-          });
-        }
+        var newBlock = {
+          object: 'block',
+          type: 'div'
+        };
+        addNodeBeforeArray.forEach(function (n) {
+          var tablePath = change.value.document.getPath(n.node.key).toJSON();
+          var indexToAdd = tablePath.splice(-1)[0];
+          if (!n.prevNode) {
+            change.insertNodeByPath(tablePath, indexToAdd, newBlock);
+            return;
+          }
+          if (!n.nextNode) {
+            change.insertNodeByPath(tablePath, indexToAdd + 1, newBlock);
+          }
+        });
       };
     };
     core.renderNode = Node;

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@pie-element/complex-rubric",
   "repository": "pie-framework/pie-elements",
-  "version": "2.11.0",
+  "version": "2.11.1-next.14+5684f4f62",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
     "@material-ui/core": "^3.9.2",
-    "@pie-element/multi-trait-rubric": "^3.11.0",
-    "@pie-element/rubric": "^3.11.0",
+    "@pie-element/multi-trait-rubric": "^3.11.1-next.14+5684f4f62",
+    "@pie-element/rubric": "^3.11.1-next.14+5684f4f62",
     "@pie-framework/pie-player-events": "^0.1.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.11",
     "prop-types": "^15.7.2"
   },
-  "gitHead": "f5691f1d898d9b51f79a269bce973b35cfe99ced",
+  "gitHead": "5684f4f62514a113e675718a8ae76613004883bf",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
   },