@pie-element/explicit-constructed-response 7.3.3 → 7.3.4-next.11

package/configure/package.json

@@ -8,7 +8,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.9.2",
+    "@pie-lib/pie-toolbox": "2.9.3",
     "classnames": "^2.2.6",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",

package/controller/package.json

@@ -8,7 +8,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.9.2",
+    "@pie-lib/pie-toolbox": "2.9.3",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "type-of": "^2.0.1"

package/module/configure.js

@@ -1,5 +1,5 @@
-import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_lodash, _dll_debug} from "../../../@pie-lib/pie-toolbox-math-rendering-module@3.3.1/module/index.js";
-import {_dll_pie_lib__pie_toolbox_editable_html, _dll_pie_lib__pie_toolbox_config_ui} from "../../../@pie-lib/pie-toolbox-module@5.10.1/module/index.js";
+import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_lodash, _dll_debug} from "../../../@pie-lib/pie-toolbox-math-rendering-module@3.3.2/module/index.js";
+import {_dll_pie_lib__pie_toolbox_editable_html, _dll_pie_lib__pie_toolbox_config_ui} from "../../../@pie-lib/pie-toolbox-module@5.10.2/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;

package/module/element.js

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

package/module/index.html

@@ -2,7 +2,7 @@
   <!doctype html>
   <html>
     <head>
-      <title>@pie-element/explicit-constructed-response@7.3.2</title>
+      <title>@pie-element/explicit-constructed-response@7.3.3</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,14 +1,14 @@
 {
   "name": "@pie-element/explicit-constructed-response",
-  "version": "7.3.2",
+  "version": "7.3.3",
   "modules": [
     {
       "name": "@pie-lib/pie-toolbox-math-rendering-module",
-      "version": "3.3.1"
+      "version": "3.3.2"
     },
     {
       "name": "@pie-lib/pie-toolbox-module",
-      "version": "5.10.1"
+      "version": "5.10.2"
     }
   ]
 }

package/module/print.html

@@ -2,7 +2,7 @@
   <!doctype html>
   <html>
     <head>
-      <title>@pie-element/explicit-constructed-response@7.3.2</title>
+      <title>@pie-element/explicit-constructed-response@7.3.3</title>
       <link
         href="https://fonts.googleapis.com/css?family=Roboto&display=swap"
         rel="stylesheet"

package/module/print.js

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

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "repository": "pie-framework/pie-elements",
-  "version": "7.3.3",
+  "version": "7.3.4-next.11+9ab7c3e03",
   "description": "",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
@@ -12,7 +12,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.9.2",
+    "@pie-lib/pie-toolbox": "2.9.3",
     "classnames": "^2.2.5",
     "lodash": "^4.17.10",
     "prop-types": "^15.6.1",
@@ -21,7 +21,7 @@
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "dd230a81ab952d4b4ab9f10138e8e76c11a1a4fa",
+  "gitHead": "9ab7c3e03dc26a84de7a5df5e0dd0a8d3d5a5e7b",
   "main": "lib/index.js",
   "module": "src/index.js",
   "exports": {