@pie-element/complex-rubric 3.4.4-next.11 → 3.4.4-next.9

package/controller/package.json

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

package/module/configure.js

@@ -1,6 +1,6 @@
 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@3.3.2/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@5.10.2/module/index.js";
+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@5.10.1/module/index.js";
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {
     e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) {
@@ -126864,7 +126864,7 @@ const require$$11$G = _dll_prop_types;
       },
       label: {
         color: ("").concat(color.text(), " !important"),
-        display: 'flex',
+        display: 'inline-block',
         verticalAlign: 'middle',
         cursor: 'pointer',
         '& > p': {
@@ -177874,74 +177874,36 @@ var reduceRedundantNewLineCharacters = function reduceRedundantNewLineCharacters
   }
   return markup;
 };
-var fixHtmlCode = function fixHtmlCode(markup) {
-  var wrapperEl = document.createElement('div');
-  wrapperEl.innerHTML = markup;
-  var fixParagraphs = function fixParagraphs(child) {
-    var p = document.createElement('p');
-    p.innerHTML = child.innerHTML;
-    Array.from(child.attributes).forEach(function (attr) {
-      p.setAttribute(attr.name, attr.value);
-    });
-    child.replaceWith(p);
-  };
-  var fixTables = function fixTables(tableArray) {
-    tableArray.forEach(function (el) {
-      var index = el.index, child = el.child, parent = el.parent;
-      var nodesBefore = [];
-      var nodesAfter = [];
-      var allNodes = Array.from(parent.childNodes);
-      var i;
-      for (i = 0; i < allNodes.length; i++) {
-        var node = allNodes[i];
-        if (i < index) {
-          nodesBefore.push(node);
-        } else if (i > index) {
-          nodesAfter.push(node);
-        }
-      }
-      var beforeEl = document.createElement(parent.nodeName);
-      beforeEl.append.apply(beforeEl, nodesBefore);
-      parent.replaceWith(beforeEl);
-      beforeEl.after(child);
-      var afterEl = document.createElement(parent.nodeName);
-      afterEl.append.apply(afterEl, nodesAfter);
-      child.after(afterEl);
-    });
-  };
+var wrapHtmlProperly = function wrapHtmlProperly(markup) {
+  var el = document.createElement('div');
+  el.innerHTML = markup;
   var parseNode = function parseNode(el) {
-    var childArray = Array.from(el.childNodes);
+    var childArray = Array.from(el.children);
     var hasParagraphs = childArray.find(function (child) {
       return child.nodeName === 'P';
     });
-    var tables = [];
-    childArray.forEach(function (child, index) {
+    childArray.forEach(function (child) {
       if ((child.nodeName === 'DIV' || child.nodeName === 'P') && child.childNodes.length === 0) {
         child.remove();
         return;
       }
       if (hasParagraphs && child.nodeName === 'DIV') {
-        fixParagraphs(child);
-      }
-      if (wrapperEl !== el && child.nodeName === 'TABLE') {
-        tables.push({
-          index: index,
-          child: child,
-          parent: el
+        var p = document.createElement('p');
+        p.innerHTML = child.innerHTML;
+        Array.from(child.attributes).forEach(function (attr) {
+          p.setAttribute(attr.name, attr.value);
         });
+        child.replaceWith(p);
       }
       parseNode(child);
     });
-    if (tables.length) {
-      fixTables(tables);
-    }
   };
-  parseNode(wrapperEl);
-  return wrapperEl.innerHTML;
+  parseNode(el);
+  return el.innerHTML;
 };
 var htmlToValue = function htmlToValue(html) {
   try {
-    return serializer.deserialize(fixHtmlCode(reduceRedundantNewLineCharacters(reduceMultipleBrs(html))));
+    return serializer.deserialize(wrapHtmlProperly(reduceRedundantNewLineCharacters(reduceMultipleBrs(html))));
   } catch (e) {
     console.log("Couldn't parse html: ", e);
     return {};

package/module/element.js

@@ -1,5 +1,5 @@
 import {_dll_react, _dll_prop_types, _dll_react_dom, _dll_classnames, _dll_debug, _dll_pie_lib__pie_toolbox_math_rendering, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@3.3.2/module/index.js";
-import {_dll_pie_lib__pie_toolbox_render_ui} from "../../../@pie-lib/pie-toolbox-module@5.10.2/module/index.js";
+import {_dll_pie_lib__pie_toolbox_render_ui} from "../../../@pie-lib/pie-toolbox-module@5.10.1/module/index.js";
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {
     e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) {
@@ -142827,7 +142827,7 @@ const require$$11$B = _dll_prop_types;
       },
       label: {
         color: ("").concat(color$1.text(), " !important"),
-        display: 'flex',
+        display: 'inline-block',
         verticalAlign: 'middle',
         cursor: 'pointer',
         '& > p': {
@@ -175948,74 +175948,36 @@ var reduceRedundantNewLineCharacters = function reduceRedundantNewLineCharacters
   }
   return markup;
 };
-var fixHtmlCode = function fixHtmlCode(markup) {
-  var wrapperEl = document.createElement('div');
-  wrapperEl.innerHTML = markup;
-  var fixParagraphs = function fixParagraphs(child) {
-    var p = document.createElement('p');
-    p.innerHTML = child.innerHTML;
-    Array.from(child.attributes).forEach(function (attr) {
-      p.setAttribute(attr.name, attr.value);
-    });
-    child.replaceWith(p);
-  };
-  var fixTables = function fixTables(tableArray) {
-    tableArray.forEach(function (el) {
-      var index = el.index, child = el.child, parent = el.parent;
-      var nodesBefore = [];
-      var nodesAfter = [];
-      var allNodes = Array.from(parent.childNodes);
-      var i;
-      for (i = 0; i < allNodes.length; i++) {
-        var node = allNodes[i];
-        if (i < index) {
-          nodesBefore.push(node);
-        } else if (i > index) {
-          nodesAfter.push(node);
-        }
-      }
-      var beforeEl = document.createElement(parent.nodeName);
-      beforeEl.append.apply(beforeEl, nodesBefore);
-      parent.replaceWith(beforeEl);
-      beforeEl.after(child);
-      var afterEl = document.createElement(parent.nodeName);
-      afterEl.append.apply(afterEl, nodesAfter);
-      child.after(afterEl);
-    });
-  };
+var wrapHtmlProperly = function wrapHtmlProperly(markup) {
+  var el = document.createElement('div');
+  el.innerHTML = markup;
   var parseNode = function parseNode(el) {
-    var childArray = Array.from(el.childNodes);
+    var childArray = Array.from(el.children);
     var hasParagraphs = childArray.find(function (child) {
       return child.nodeName === 'P';
     });
-    var tables = [];
-    childArray.forEach(function (child, index) {
+    childArray.forEach(function (child) {
       if ((child.nodeName === 'DIV' || child.nodeName === 'P') && child.childNodes.length === 0) {
         child.remove();
         return;
       }
       if (hasParagraphs && child.nodeName === 'DIV') {
-        fixParagraphs(child);
-      }
-      if (wrapperEl !== el && child.nodeName === 'TABLE') {
-        tables.push({
-          index: index,
-          child: child,
-          parent: el
+        var p = document.createElement('p');
+        p.innerHTML = child.innerHTML;
+        Array.from(child.attributes).forEach(function (attr) {
+          p.setAttribute(attr.name, attr.value);
         });
+        child.replaceWith(p);
       }
       parseNode(child);
     });
-    if (tables.length) {
-      fixTables(tables);
-    }
   };
-  parseNode(wrapperEl);
-  return wrapperEl.innerHTML;
+  parseNode(el);
+  return el.innerHTML;
 };
 var htmlToValue = function htmlToValue(html) {
   try {
-    return serializer.deserialize(fixHtmlCode(reduceRedundantNewLineCharacters(reduceMultipleBrs(html))));
+    return serializer.deserialize(wrapHtmlProperly(reduceRedundantNewLineCharacters(reduceMultipleBrs(html))));
   } catch (e) {
     console.log("Couldn't parse html: ", e);
     return {};

package/module/manifest.json

@@ -8,7 +8,7 @@
     },
     {
       "name": "@pie-lib/pie-toolbox-module",
-      "version": "5.10.2"
+      "version": "5.10.1"
     }
   ]
 }

package/module/print.js

@@ -1,5 +1,5 @@
 import {_dll_react, _dll_prop_types, _dll_react_dom, _dll_classnames, _dll_debug, _dll_pie_lib__pie_toolbox_math_rendering, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@3.3.2/module/index.js";
-import {_dll_pie_lib__pie_toolbox_render_ui} from "../../../@pie-lib/pie-toolbox-module@5.10.2/module/index.js";
+import {_dll_pie_lib__pie_toolbox_render_ui} from "../../../@pie-lib/pie-toolbox-module@5.10.1/module/index.js";
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {
     e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) {
@@ -142827,7 +142827,7 @@ const require$$11$B = _dll_prop_types;
       },
       label: {
         color: ("").concat(color$1.text(), " !important"),
-        display: 'flex',
+        display: 'inline-block',
         verticalAlign: 'middle',
         cursor: 'pointer',
         '& > p': {
@@ -175948,74 +175948,36 @@ var reduceRedundantNewLineCharacters = function reduceRedundantNewLineCharacters
   }
   return markup;
 };
-var fixHtmlCode = function fixHtmlCode(markup) {
-  var wrapperEl = document.createElement('div');
-  wrapperEl.innerHTML = markup;
-  var fixParagraphs = function fixParagraphs(child) {
-    var p = document.createElement('p');
-    p.innerHTML = child.innerHTML;
-    Array.from(child.attributes).forEach(function (attr) {
-      p.setAttribute(attr.name, attr.value);
-    });
-    child.replaceWith(p);
-  };
-  var fixTables = function fixTables(tableArray) {
-    tableArray.forEach(function (el) {
-      var index = el.index, child = el.child, parent = el.parent;
-      var nodesBefore = [];
-      var nodesAfter = [];
-      var allNodes = Array.from(parent.childNodes);
-      var i;
-      for (i = 0; i < allNodes.length; i++) {
-        var node = allNodes[i];
-        if (i < index) {
-          nodesBefore.push(node);
-        } else if (i > index) {
-          nodesAfter.push(node);
-        }
-      }
-      var beforeEl = document.createElement(parent.nodeName);
-      beforeEl.append.apply(beforeEl, nodesBefore);
-      parent.replaceWith(beforeEl);
-      beforeEl.after(child);
-      var afterEl = document.createElement(parent.nodeName);
-      afterEl.append.apply(afterEl, nodesAfter);
-      child.after(afterEl);
-    });
-  };
+var wrapHtmlProperly = function wrapHtmlProperly(markup) {
+  var el = document.createElement('div');
+  el.innerHTML = markup;
   var parseNode = function parseNode(el) {
-    var childArray = Array.from(el.childNodes);
+    var childArray = Array.from(el.children);
     var hasParagraphs = childArray.find(function (child) {
       return child.nodeName === 'P';
     });
-    var tables = [];
-    childArray.forEach(function (child, index) {
+    childArray.forEach(function (child) {
       if ((child.nodeName === 'DIV' || child.nodeName === 'P') && child.childNodes.length === 0) {
         child.remove();
         return;
       }
       if (hasParagraphs && child.nodeName === 'DIV') {
-        fixParagraphs(child);
-      }
-      if (wrapperEl !== el && child.nodeName === 'TABLE') {
-        tables.push({
-          index: index,
-          child: child,
-          parent: el
+        var p = document.createElement('p');
+        p.innerHTML = child.innerHTML;
+        Array.from(child.attributes).forEach(function (attr) {
+          p.setAttribute(attr.name, attr.value);
         });
+        child.replaceWith(p);
       }
       parseNode(child);
     });
-    if (tables.length) {
-      fixTables(tables);
-    }
   };
-  parseNode(wrapperEl);
-  return wrapperEl.innerHTML;
+  parseNode(el);
+  return el.innerHTML;
 };
 var htmlToValue = function htmlToValue(html) {
   try {
-    return serializer.deserialize(fixHtmlCode(reduceRedundantNewLineCharacters(reduceMultipleBrs(html))));
+    return serializer.deserialize(wrapHtmlProperly(reduceRedundantNewLineCharacters(reduceMultipleBrs(html))));
   } catch (e) {
     console.log("Couldn't parse html: ", e);
     return {};

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@pie-element/complex-rubric",
   "repository": "pie-framework/pie-elements",
-  "version": "3.4.4-next.11+9ab7c3e03",
+  "version": "3.4.4-next.9+0d9ce0b3b",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
     "@material-ui/core": "^3.9.2",
-    "@pie-element/multi-trait-rubric": "^4.3.4-next.11+9ab7c3e03",
-    "@pie-element/rubric": "^4.4.4-next.11+9ab7c3e03",
+    "@pie-element/multi-trait-rubric": "^4.3.4-next.9+0d9ce0b3b",
+    "@pie-element/rubric": "^4.4.4-next.9+0d9ce0b3b",
     "@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": "9ab7c3e03dc26a84de7a5df5e0dd0a8d3d5a5e7b",
+  "gitHead": "0d9ce0b3ba004625b63eec1704ad22da1c14bcad",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
   },