@readme/markdown 6.36.2 → 6.38.0

package/components/Image/index.jsx

@@ -63,9 +63,11 @@ class Image extends React.Component {
   }
 
   render() {
-    const { alt } = this.props;
+    const { props } = this;
+    const { alt } = props;
+
     if (this.isEmoji) {
-      return <img {...this.props} alt={alt} loading="lazy" />;
+      return <img {...props} alt={alt} loading="lazy" />;
     }
     return (
       <span
@@ -76,13 +78,8 @@ class Image extends React.Component {
         role={'button'}
         tabIndex={0}
       >
-        <img {...this.props} alt={alt} />
-        <Lightbox
-          ref={this.lightbox}
-          {...this.props}
-          onScroll={() => this.toggle(false)}
-          opened={this.state.lightbox}
-        />
+        <img {...props} alt={alt} loading="lazy" />
+        <Lightbox ref={this.lightbox} {...props} onScroll={() => this.toggle(false)} opened={this.state.lightbox} />
       </span>
     );
   }

package/dist/main.js

@@ -10026,10 +10026,11 @@ var Image = /*#__PURE__*/function (_React$Component) {
     value: function render() {
       var _this2 = this;
 
-      var alt = this.props.alt;
+      var props = this.props;
+      var alt = props.alt;
 
       if (this.isEmoji) {
-        return /*#__PURE__*/React.createElement("img", _extends({}, this.props, {
+        return /*#__PURE__*/React.createElement("img", _extends({}, props, {
           alt: alt,
           loading: "lazy"
         }));
@@ -10044,11 +10045,12 @@ var Image = /*#__PURE__*/function (_React$Component) {
         onKeyDown: this.handleKey,
         role: 'button',
         tabIndex: 0
-      }, /*#__PURE__*/React.createElement("img", _extends({}, this.props, {
-        alt: alt
+      }, /*#__PURE__*/React.createElement("img", _extends({}, props, {
+        alt: alt,
+        loading: "lazy"
       })), /*#__PURE__*/React.createElement(Lightbox, _extends({
         ref: this.lightbox
-      }, this.props, {
+      }, props, {
         onScroll: function onScroll() {
           return _this2.toggle(false);
         },
@@ -27968,13 +27970,13 @@ module.exports = function CodeTabsCompiler() {
 /***/ 58:
 /***/ ((module) => {
 
-/* div blocks directly alias the paragraph container; use for display only! */
 module.exports = function DivCompiler() {
   var Compiler = this.Compiler;
   var visitors = Compiler.prototype.visitors;
 
   visitors.div = function compile(node) {
-    return visitors.paragraph.call(this, node);
+    var data = node.data.hProperties;
+    return "\n[block:".concat(node.data.hName, "]\n").concat(JSON.stringify(data, null, 2), "\n[/block]\n");
   };
 };
 
@@ -28012,24 +28014,46 @@ module.exports = function () {
 
 var _slicedToArray = __webpack_require__(3038);
 
+var _defineProperty = __webpack_require__(9713);
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
 var _require = __webpack_require__(7589),
     imgSizeByWidth = _require.imgSizeByWidth;
 
+var compileImage = function compileImage(image) {
+  var img = _objectSpread(_objectSpread({
+    image: [image.url, image.title]
+  }, image.data.hProperties.width && {
+    sizing: imgSizeByWidth[image.data.hProperties.width]
+  }), image.border && {
+    border: image.border
+  });
+
+  return img;
+};
+
 module.exports = function FigureCompiler() {
   var Compiler = this.Compiler;
   var visitors = Compiler.prototype.visitors;
 
   visitors.figure = function figureCompiler(node) {
-    var _node$children = _slicedToArray(node.children, 2),
-        image = _node$children[0],
-        caption = _node$children[1];
-
-    var img = {
-      image: [image.url, image.title],
-      caption: this.block(caption),
-      sizing: imgSizeByWidth[image.data.hProperties.width]
-    };
-    if (image.border) img.border = image.border;
+    var image;
+    var caption;
+
+    if (node.children) {
+      var _node$children = _slicedToArray(node.children, 2);
+
+      image = _node$children[0];
+      caption = _node$children[1];
+    } else {
+      image = node;
+    }
+
+    var img = compileImage(image);
+    if (caption) img.caption = this.block(caption);
     var block = {
       images: [img]
     };
@@ -28076,16 +28100,17 @@ module.exports = function () {
 module.exports = function ImageCompiler() {
   var Compiler = this.Compiler;
   var visitors = Compiler.prototype.visitors;
-  var original = visitors.image;
 
   visitors.image = function compile(node) {
-    var _node$data, _node$data$hPropertie;
+    var _node$data, _node$data$hPropertie, _visitors$figure;
+
+    if (((_node$data = node.data) === null || _node$data === void 0 ? void 0 : (_node$data$hPropertie = _node$data.hProperties) === null || _node$data$hPropertie === void 0 ? void 0 : _node$data$hPropertie.className) === 'emoji') return node.title;
 
     for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
       args[_key - 1] = arguments[_key];
     }
 
-    return ((_node$data = node.data) === null || _node$data === void 0 ? void 0 : (_node$data$hPropertie = _node$data.hProperties) === null || _node$data$hPropertie === void 0 ? void 0 : _node$data$hPropertie.className) === 'emoji' ? node.title : original.call.apply(original, [this, node].concat(args));
+    return (_visitors$figure = visitors.figure).call.apply(_visitors$figure, [this, node].concat(args));
   };
 };
 
@@ -28584,10 +28609,10 @@ __webpack_require__.r(__webpack_exports__);
 /***/ 7589:
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
-var _defineProperty = __webpack_require__(9713);
-
 var _toConsumableArray = __webpack_require__(319);
 
+var _defineProperty = __webpack_require__(9713);
+
 var _slicedToArray = __webpack_require__(3038);
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
@@ -28710,10 +28735,11 @@ function tokenize(eat, value) {
             title: title,
             alt: 'caption' in img ? img.caption : '',
             data: {
-              hProperties: {
-                className: img.border ? 'border' : '',
+              hProperties: _objectSpread({
+                className: img.border ? 'border' : ''
+              }, img.sizing && {
                 width: imgWidthBySize[img.sizing]
-              }
+              })
             }
           };
           if (!img.caption) return block;

package/dist/main.node.js

@@ -10026,10 +10026,11 @@ var Image = /*#__PURE__*/function (_React$Component) {
     value: function render() {
       var _this2 = this;
 
-      var alt = this.props.alt;
+      var props = this.props;
+      var alt = props.alt;
 
       if (this.isEmoji) {
-        return /*#__PURE__*/React.createElement("img", _extends({}, this.props, {
+        return /*#__PURE__*/React.createElement("img", _extends({}, props, {
           alt: alt,
           loading: "lazy"
         }));
@@ -10044,11 +10045,12 @@ var Image = /*#__PURE__*/function (_React$Component) {
         onKeyDown: this.handleKey,
         role: 'button',
         tabIndex: 0
-      }, /*#__PURE__*/React.createElement("img", _extends({}, this.props, {
-        alt: alt
+      }, /*#__PURE__*/React.createElement("img", _extends({}, props, {
+        alt: alt,
+        loading: "lazy"
       })), /*#__PURE__*/React.createElement(Lightbox, _extends({
         ref: this.lightbox
-      }, this.props, {
+      }, props, {
         onScroll: function onScroll() {
           return _this2.toggle(false);
         },
@@ -10791,13 +10793,13 @@ module.exports = function CodeTabsCompiler() {
 /***/ 58:
 /***/ ((module) => {
 
-/* div blocks directly alias the paragraph container; use for display only! */
 module.exports = function DivCompiler() {
   var Compiler = this.Compiler;
   var visitors = Compiler.prototype.visitors;
 
   visitors.div = function compile(node) {
-    return visitors.paragraph.call(this, node);
+    var data = node.data.hProperties;
+    return "\n[block:".concat(node.data.hName, "]\n").concat(JSON.stringify(data, null, 2), "\n[/block]\n");
   };
 };
 
@@ -10835,24 +10837,46 @@ module.exports = function () {
 
 var _slicedToArray = __webpack_require__(3038);
 
+var _defineProperty = __webpack_require__(9713);
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
 var _require = __webpack_require__(7589),
     imgSizeByWidth = _require.imgSizeByWidth;
 
+var compileImage = function compileImage(image) {
+  var img = _objectSpread(_objectSpread({
+    image: [image.url, image.title]
+  }, image.data.hProperties.width && {
+    sizing: imgSizeByWidth[image.data.hProperties.width]
+  }), image.border && {
+    border: image.border
+  });
+
+  return img;
+};
+
 module.exports = function FigureCompiler() {
   var Compiler = this.Compiler;
   var visitors = Compiler.prototype.visitors;
 
   visitors.figure = function figureCompiler(node) {
-    var _node$children = _slicedToArray(node.children, 2),
-        image = _node$children[0],
-        caption = _node$children[1];
-
-    var img = {
-      image: [image.url, image.title],
-      caption: this.block(caption),
-      sizing: imgSizeByWidth[image.data.hProperties.width]
-    };
-    if (image.border) img.border = image.border;
+    var image;
+    var caption;
+
+    if (node.children) {
+      var _node$children = _slicedToArray(node.children, 2);
+
+      image = _node$children[0];
+      caption = _node$children[1];
+    } else {
+      image = node;
+    }
+
+    var img = compileImage(image);
+    if (caption) img.caption = this.block(caption);
     var block = {
       images: [img]
     };
@@ -10899,16 +10923,17 @@ module.exports = function () {
 module.exports = function ImageCompiler() {
   var Compiler = this.Compiler;
   var visitors = Compiler.prototype.visitors;
-  var original = visitors.image;
 
   visitors.image = function compile(node) {
-    var _node$data, _node$data$hPropertie;
+    var _node$data, _node$data$hPropertie, _visitors$figure;
+
+    if (((_node$data = node.data) === null || _node$data === void 0 ? void 0 : (_node$data$hPropertie = _node$data.hProperties) === null || _node$data$hPropertie === void 0 ? void 0 : _node$data$hPropertie.className) === 'emoji') return node.title;
 
     for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
       args[_key - 1] = arguments[_key];
     }
 
-    return ((_node$data = node.data) === null || _node$data === void 0 ? void 0 : (_node$data$hPropertie = _node$data.hProperties) === null || _node$data$hPropertie === void 0 ? void 0 : _node$data$hPropertie.className) === 'emoji' ? node.title : original.call.apply(original, [this, node].concat(args));
+    return (_visitors$figure = visitors.figure).call.apply(_visitors$figure, [this, node].concat(args));
   };
 };
 
@@ -11407,10 +11432,10 @@ __webpack_require__.r(__webpack_exports__);
 /***/ 7589:
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
-var _defineProperty = __webpack_require__(9713);
-
 var _toConsumableArray = __webpack_require__(319);
 
+var _defineProperty = __webpack_require__(9713);
+
 var _slicedToArray = __webpack_require__(3038);
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
@@ -11533,10 +11558,11 @@ function tokenize(eat, value) {
             title: title,
             alt: 'caption' in img ? img.caption : '',
             data: {
-              hProperties: {
-                className: img.border ? 'border' : '',
+              hProperties: _objectSpread({
+                className: img.border ? 'border' : ''
+              }, img.sizing && {
                 width: imgWidthBySize[img.sizing]
-              }
+              })
             }
           };
           if (!img.caption) return block;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@readme/markdown",
   "description": "ReadMe's React-based Markdown parser",
   "author": "Rafe Goldberg <rafe@readme.io>",
-  "version": "6.36.2",
+  "version": "6.38.0",
   "main": "dist/main.node.js",
   "browser": "dist/main.js",
   "files": [
@@ -23,7 +23,7 @@
     "start": "webpack serve --config ./webpack.dev.js --open --mode development",
     "sync": "rdme docs ./docs --version=2",
     "test": "jest --coverage --runInBand --testPathIgnorePatterns '__tests__/browser'",
-    "test.watch": "jest --watch --coverage=false",
+    "test.watch": "jest --watch --coverage=false --testPathIgnorePatterns '__tests__/browser'",
     "test.browser": "jest --runInBand --testPathPattern '__tests__/browser'",
     "watch": "webpack -w --progress --mode production"
   },