@pie-element/complex-rubric 3.3.2-next.13 → 3.3.2-next.16

package/controller/package.json

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

package/module/configure.js

@@ -60200,7 +60200,7 @@ const {omit: require$$13$d} = _dll_lodash;
       key: "render",
       value: function render() {
         var _this$props = this.props, children = _this$props.children, className = _this$props.className, classes = _this$props.classes, fontSizeFactor = _this$props.fontSizeFactor, rest = (0, _objectWithoutProperties2["default"])(_this$props, _excluded);
-        var finalClass = (0, _classnames["default"])(className, classes.extraCSSRules);
+        var finalClass = (0, _classnames["default"])(className, classes.extraCSSRules, classes.uiLayoutContainer);
         var restProps = (0, _omit["default"])(rest, 'extraCSSRules');
         return _react["default"].createElement("div", (0, _extends2["default"])({
           className: finalClass
@@ -60226,7 +60226,12 @@ const {omit: require$$13$d} = _dll_lodash;
     fontSizeFactor: 1
   });
   var styles = {
-    extraCSSRules: {}
+    extraCSSRules: {},
+    uiLayoutContainer: {
+      '& table, th, td': {
+        fontSize: 'inherit'
+      }
+    }
   };
   var Styled = (0, _styles.withStyles)(styles)(UiLayout);
   var _default = Styled;
@@ -102318,6 +102323,41 @@ var INLINE_TAGS = {
   span: 'span'
 };
 serialization.INLINE_TAGS = INLINE_TAGS;
+var inlines = {
+  deserialize: function deserialize(el, next) {
+    log$2('[inlines:deserialize] inline: ', el);
+    var inlineTag = INLINE_TAGS[el.tagName.toLowerCase()];
+    if (!inlineTag) return;
+    log$2('[inlines:deserialize] inline: ', inlineTag);
+    if (el.childNodes.length === 1) {
+      var cn = el.childNodes[0];
+      if (cn && cn.tagName && cn.tagName.toLowerCase() === inlineTag) {
+        log$2('[we have a child node of the same]...');
+        return;
+      }
+    }
+    return {
+      object: 'inline',
+      type: inlineTag,
+      data: {
+        attributes: attributes.reduce(attributesToMap(el), {})
+      },
+      nodes: next(el.childNodes)
+    };
+  },
+  serialize: function serialize(object, children) {
+    if (object.object !== 'inline') return;
+    var jsonData = object.data.toJSON();
+    log$2('[inlines:serialize] object: ', object, children);
+    var key;
+    for (key in INLINE_TAGS) {
+      if (INLINE_TAGS[key] === object.type) {
+        var Tag = key;
+        return _react$1o["default"].createElement(Tag, jsonData.attributes, children);
+      }
+    }
+  }
+};
 var extraCSSRulesOpts = {};
 serialization.extraCSSRulesOpts = extraCSSRulesOpts;
 var STYLES_MAP$1 = {
@@ -102423,7 +102463,7 @@ var TEXT_RULE = {
   }
 };
 serialization.TEXT_RULE = TEXT_RULE;
-var RULES = [_list$1.serialization, _math$1.serialization, _media$1.serialization, _image$1.serialization, _table$1.serialization, _respArea$1.serialization, TEXT_RULE, blocks, marks];
+var RULES = [_list$1.serialization, _math$1.serialization, _media$1.serialization, _image$1.serialization, _table$1.serialization, _respArea$1.serialization, TEXT_RULE, inlines, blocks, marks];
 function allWhitespace(node) {
   return !(/[^\t\n\r ]/).test(node.textContent);
 }
@@ -102436,7 +102476,10 @@ function defaultParseHtml(html) {
   var textNodes = document.createTreeWalker(body, NodeFilter.SHOW_TEXT, null, null);
   var n = textNodes.nextNode();
   while (n) {
-    if (allWhitespace(n) || n.nodeValue === "\u200B") {
+    var _n$nextSibling, _n$nextSibling$tagNam, _n$previousSibling, _n$previousSibling$ta;
+    var isWhiteSpace = allWhitespace(n);
+    var isNotNearMarkup = !MARK_TAGS[(_n$nextSibling = n.nextSibling) === null || _n$nextSibling === void 0 ? void 0 : (_n$nextSibling$tagNam = _n$nextSibling.tagName) === null || _n$nextSibling$tagNam === void 0 ? void 0 : _n$nextSibling$tagNam.toLowerCase()] && !MARK_TAGS[(_n$previousSibling = n.previousSibling) === null || _n$previousSibling === void 0 ? void 0 : (_n$previousSibling$ta = _n$previousSibling.tagName) === null || _n$previousSibling$ta === void 0 ? void 0 : _n$previousSibling$ta.toLowerCase()];
+    if (isWhiteSpace && isNotNearMarkup || n.nodeValue === "\u200B") {
       n.parentNode.removeChild(n);
     }
     n = textNodes.nextNode();

package/module/element.js

@@ -82076,7 +82076,7 @@ const {omit: require$$13$8} = _dll_lodash;
       key: "render",
       value: function render() {
         var _this$props = this.props, children = _this$props.children, className = _this$props.className, classes = _this$props.classes, fontSizeFactor = _this$props.fontSizeFactor, rest = (0, _objectWithoutProperties2["default"])(_this$props, _excluded);
-        var finalClass = (0, _classnames["default"])(className, classes.extraCSSRules);
+        var finalClass = (0, _classnames["default"])(className, classes.extraCSSRules, classes.uiLayoutContainer);
         var restProps = (0, _omit["default"])(rest, 'extraCSSRules');
         return _react["default"].createElement("div", (0, _extends2["default"])({
           className: finalClass
@@ -82102,7 +82102,12 @@ const {omit: require$$13$8} = _dll_lodash;
     fontSizeFactor: 1
   });
   var styles = {
-    extraCSSRules: {}
+    extraCSSRules: {},
+    uiLayoutContainer: {
+      '& table, th, td': {
+        fontSize: 'inherit'
+      }
+    }
   };
   var Styled = (0, _styles.withStyles)(styles)(UiLayout);
   var _default = Styled;
@@ -100590,6 +100595,41 @@ var INLINE_TAGS = {
   span: 'span'
 };
 serialization.INLINE_TAGS = INLINE_TAGS;
+var inlines = {
+  deserialize: function deserialize(el, next) {
+    log$2('[inlines:deserialize] inline: ', el);
+    var inlineTag = INLINE_TAGS[el.tagName.toLowerCase()];
+    if (!inlineTag) return;
+    log$2('[inlines:deserialize] inline: ', inlineTag);
+    if (el.childNodes.length === 1) {
+      var cn = el.childNodes[0];
+      if (cn && cn.tagName && cn.tagName.toLowerCase() === inlineTag) {
+        log$2('[we have a child node of the same]...');
+        return;
+      }
+    }
+    return {
+      object: 'inline',
+      type: inlineTag,
+      data: {
+        attributes: attributes.reduce(attributesToMap(el), {})
+      },
+      nodes: next(el.childNodes)
+    };
+  },
+  serialize: function serialize(object, children) {
+    if (object.object !== 'inline') return;
+    var jsonData = object.data.toJSON();
+    log$2('[inlines:serialize] object: ', object, children);
+    var key;
+    for (key in INLINE_TAGS) {
+      if (INLINE_TAGS[key] === object.type) {
+        var Tag = key;
+        return _react$1m["default"].createElement(Tag, jsonData.attributes, children);
+      }
+    }
+  }
+};
 var extraCSSRulesOpts = {};
 serialization.extraCSSRulesOpts = extraCSSRulesOpts;
 var STYLES_MAP$1 = {
@@ -100695,7 +100735,7 @@ var TEXT_RULE = {
   }
 };
 serialization.TEXT_RULE = TEXT_RULE;
-var RULES = [_list$1.serialization, _math$1.serialization, _media$1.serialization, _image$1.serialization, _table$1.serialization, _respArea$1.serialization, TEXT_RULE, blocks, marks];
+var RULES = [_list$1.serialization, _math$1.serialization, _media$1.serialization, _image$1.serialization, _table$1.serialization, _respArea$1.serialization, TEXT_RULE, inlines, blocks, marks];
 function allWhitespace(node) {
   return !(/[^\t\n\r ]/).test(node.textContent);
 }
@@ -100708,7 +100748,10 @@ function defaultParseHtml(html) {
   var textNodes = document.createTreeWalker(body, NodeFilter.SHOW_TEXT, null, null);
   var n = textNodes.nextNode();
   while (n) {
-    if (allWhitespace(n) || n.nodeValue === "\u200B") {
+    var _n$nextSibling, _n$nextSibling$tagNam, _n$previousSibling, _n$previousSibling$ta;
+    var isWhiteSpace = allWhitespace(n);
+    var isNotNearMarkup = !MARK_TAGS[(_n$nextSibling = n.nextSibling) === null || _n$nextSibling === void 0 ? void 0 : (_n$nextSibling$tagNam = _n$nextSibling.tagName) === null || _n$nextSibling$tagNam === void 0 ? void 0 : _n$nextSibling$tagNam.toLowerCase()] && !MARK_TAGS[(_n$previousSibling = n.previousSibling) === null || _n$previousSibling === void 0 ? void 0 : (_n$previousSibling$ta = _n$previousSibling.tagName) === null || _n$previousSibling$ta === void 0 ? void 0 : _n$previousSibling$ta.toLowerCase()];
+    if (isWhiteSpace && isNotNearMarkup || n.nodeValue === "\u200B") {
       n.parentNode.removeChild(n);
     }
     n = textNodes.nextNode();

package/module/print.js

@@ -82076,7 +82076,7 @@ const {omit: require$$13$8} = _dll_lodash;
       key: "render",
       value: function render() {
         var _this$props = this.props, children = _this$props.children, className = _this$props.className, classes = _this$props.classes, fontSizeFactor = _this$props.fontSizeFactor, rest = (0, _objectWithoutProperties2["default"])(_this$props, _excluded);
-        var finalClass = (0, _classnames["default"])(className, classes.extraCSSRules);
+        var finalClass = (0, _classnames["default"])(className, classes.extraCSSRules, classes.uiLayoutContainer);
         var restProps = (0, _omit["default"])(rest, 'extraCSSRules');
         return _react["default"].createElement("div", (0, _extends2["default"])({
           className: finalClass
@@ -82102,7 +82102,12 @@ const {omit: require$$13$8} = _dll_lodash;
     fontSizeFactor: 1
   });
   var styles = {
-    extraCSSRules: {}
+    extraCSSRules: {},
+    uiLayoutContainer: {
+      '& table, th, td': {
+        fontSize: 'inherit'
+      }
+    }
   };
   var Styled = (0, _styles.withStyles)(styles)(UiLayout);
   var _default = Styled;
@@ -100590,6 +100595,41 @@ var INLINE_TAGS = {
   span: 'span'
 };
 serialization.INLINE_TAGS = INLINE_TAGS;
+var inlines = {
+  deserialize: function deserialize(el, next) {
+    log$2('[inlines:deserialize] inline: ', el);
+    var inlineTag = INLINE_TAGS[el.tagName.toLowerCase()];
+    if (!inlineTag) return;
+    log$2('[inlines:deserialize] inline: ', inlineTag);
+    if (el.childNodes.length === 1) {
+      var cn = el.childNodes[0];
+      if (cn && cn.tagName && cn.tagName.toLowerCase() === inlineTag) {
+        log$2('[we have a child node of the same]...');
+        return;
+      }
+    }
+    return {
+      object: 'inline',
+      type: inlineTag,
+      data: {
+        attributes: attributes.reduce(attributesToMap(el), {})
+      },
+      nodes: next(el.childNodes)
+    };
+  },
+  serialize: function serialize(object, children) {
+    if (object.object !== 'inline') return;
+    var jsonData = object.data.toJSON();
+    log$2('[inlines:serialize] object: ', object, children);
+    var key;
+    for (key in INLINE_TAGS) {
+      if (INLINE_TAGS[key] === object.type) {
+        var Tag = key;
+        return _react$1m["default"].createElement(Tag, jsonData.attributes, children);
+      }
+    }
+  }
+};
 var extraCSSRulesOpts = {};
 serialization.extraCSSRulesOpts = extraCSSRulesOpts;
 var STYLES_MAP$1 = {
@@ -100695,7 +100735,7 @@ var TEXT_RULE = {
   }
 };
 serialization.TEXT_RULE = TEXT_RULE;
-var RULES = [_list$1.serialization, _math$1.serialization, _media$1.serialization, _image$1.serialization, _table$1.serialization, _respArea$1.serialization, TEXT_RULE, blocks, marks];
+var RULES = [_list$1.serialization, _math$1.serialization, _media$1.serialization, _image$1.serialization, _table$1.serialization, _respArea$1.serialization, TEXT_RULE, inlines, blocks, marks];
 function allWhitespace(node) {
   return !(/[^\t\n\r ]/).test(node.textContent);
 }
@@ -100708,7 +100748,10 @@ function defaultParseHtml(html) {
   var textNodes = document.createTreeWalker(body, NodeFilter.SHOW_TEXT, null, null);
   var n = textNodes.nextNode();
   while (n) {
-    if (allWhitespace(n) || n.nodeValue === "\u200B") {
+    var _n$nextSibling, _n$nextSibling$tagNam, _n$previousSibling, _n$previousSibling$ta;
+    var isWhiteSpace = allWhitespace(n);
+    var isNotNearMarkup = !MARK_TAGS[(_n$nextSibling = n.nextSibling) === null || _n$nextSibling === void 0 ? void 0 : (_n$nextSibling$tagNam = _n$nextSibling.tagName) === null || _n$nextSibling$tagNam === void 0 ? void 0 : _n$nextSibling$tagNam.toLowerCase()] && !MARK_TAGS[(_n$previousSibling = n.previousSibling) === null || _n$previousSibling === void 0 ? void 0 : (_n$previousSibling$ta = _n$previousSibling.tagName) === null || _n$previousSibling$ta === void 0 ? void 0 : _n$previousSibling$ta.toLowerCase()];
+    if (isWhiteSpace && isNotNearMarkup || n.nodeValue === "\u200B") {
       n.parentNode.removeChild(n);
     }
     n = textNodes.nextNode();

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@pie-element/complex-rubric",
   "repository": "pie-framework/pie-elements",
-  "version": "3.3.2-next.13+b0b7ceb83",
+  "version": "3.3.2-next.16+afafda4a5",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
     "@material-ui/core": "^3.9.2",
-    "@pie-element/multi-trait-rubric": "^4.2.4-next.13+b0b7ceb83",
-    "@pie-element/rubric": "^4.3.2-next.13+b0b7ceb83",
+    "@pie-element/multi-trait-rubric": "^4.2.4-next.16+afafda4a5",
+    "@pie-element/rubric": "^4.3.2-next.16+afafda4a5",
     "@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": "b0b7ceb839d774f70e1c9a9e9f6a46d537a2405d",
+  "gitHead": "afafda4a504ecae6e4c85a45817b7f73a4b81244",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
   },