@seafile/sdoc-editor 3.0.219 → 3.0.221

package/dist/slate-convert/html-to-slate/rules/link.js

@@ -5,12 +5,52 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _slugid = _interopRequireDefault(require("slugid"));
+var _linkHelpers = require("../../../extension/plugins/image/link-helpers");
 var _constants = require("../constants");
 var linkRule = function linkRule(element, parseChild) {
   var nodeName = element.nodeName;
   var content = element.textContent || element.getAttribute('title') || element.getAttribute('href');
   if (nodeName === 'A') {
+    var image = (0, _linkHelpers.getOnlyImageChild)(element);
+    if (image) {
+      var href = (0, _linkHelpers.normalizeWebUrl)(element.getAttribute('href'));
+      return {
+        id: _slugid["default"].nice(),
+        type: _constants.IMAGE,
+        data: (0, _objectSpread2["default"])({
+          src: image.getAttribute('src')
+        }, href && {
+          href: href
+        }),
+        children: [{
+          text: '',
+          id: _slugid["default"].nice()
+        }]
+      };
+    }
+    if (element.querySelector('img')) {
+      var _href = (0, _linkHelpers.normalizeWebUrl)(element.getAttribute('href'));
+      return parseChild(element.childNodes).map(function (child) {
+        if (!_href) return child;
+        if (child.type === _constants.IMAGE) return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, child), {}, {
+          data: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, child.data), {}, {
+            href: _href
+          })
+        });
+        if (typeof child.text === 'string') {
+          return {
+            id: _slugid["default"].nice(),
+            type: _constants.LINK,
+            href: _href,
+            title: element.getAttribute('title'),
+            children: [child]
+          };
+        }
+        return child;
+      });
+    }
     return {
       id: _slugid["default"].nice(),
       type: _constants.LINK,

package/dist/slate-convert/md-to-slate/transform.js

@@ -9,6 +9,7 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/
 var _slugid = _interopRequireDefault(require("slugid"));
 var _elementType = require("../../extension/constants/element-type");
 var _core = require("../../extension/core");
+var _linkHelpers = require("../../extension/plugins/image/link-helpers");
 var _htmlToSlate = _interopRequireDefault(require("../html-to-slate"));
 var INLINE_KEY_MAP = {
   strong: 'bold',
@@ -27,6 +28,25 @@ var _applyMarkForInlineItem = function applyMarkForInlineItem(result, item) {
       type: 'text',
       value: ''
     } : children[0];
+    if (child.type === _elementType.IMAGE) {
+      var href = (0, _linkHelpers.normalizeWebUrl)(item.url);
+      var image = {
+        id: _slugid["default"].nice(),
+        type: _elementType.IMAGE,
+        data: (0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({
+          src: child.url
+        }, child.title && {
+          title: child.title
+        }), child.alt && {
+          alt: child.alt
+        }), href && {
+          href: href
+        }),
+        children: [(0, _core.generateDefaultText)()]
+      };
+      result.push([(0, _core.generateDefaultText)(), image, (0, _core.generateDefaultText)()]);
+      return result;
+    }
 
     // Mention node
     if ((_item$title = item.title) !== null && _item$title !== void 0 && (_item$title$startsWit = _item$title.startsWith) !== null && _item$title$startsWit !== void 0 && _item$title$startsWit.call(_item$title, '__sdoc_mention__username')) {
@@ -69,13 +89,13 @@ var _applyMarkForInlineItem = function applyMarkForInlineItem(result, item) {
     }), item.height && {
       height: item.height
     });
-    var image = {
+    var _image = {
       id: _slugid["default"].nice(),
       data: data,
       type: _elementType.IMAGE,
       children: [(0, _core.generateDefaultText)()]
     };
-    result.push([(0, _core.generateDefaultText)(), image, (0, _core.generateDefaultText)()]);
+    result.push([(0, _core.generateDefaultText)(), _image, (0, _core.generateDefaultText)()]);
     return result;
   }
 

package/dist/slate-convert/slate-to-md/transform.js

@@ -8,7 +8,11 @@ exports.formatSlateToMd = void 0;
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createForOfIteratorHelper"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _slate = require("@seafile/slate");
+var _linkHelpers = require("../../extension/plugins/image/link-helpers");
 var _isPunctuationMark = _interopRequireDefault(require("../../utils/is-punctuation-mark"));
+var escapeHtmlAttribute = function escapeHtmlAttribute(value) {
+  return String(value).replace(/&/g, '&amp;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+};
 var generateDefaultText = function generateDefaultText(value) {
   return {
     type: 'text',
@@ -73,7 +77,19 @@ var transformInlineChildren = function transformInlineChildren(result, item) {
     if (data.height || data.width) {
       image = {
         type: 'html',
-        value: "<img src=\"".concat(data.src, "\" alt=\"").concat(data.alt, "\" title=\"").concat(data.title, "\" width=\"").concat(data.width, "\" height=\"").concat(data.height, "\" />")
+        value: "<img src=\"".concat(escapeHtmlAttribute(data.src), "\" alt=\"").concat(escapeHtmlAttribute(data.alt), "\" title=\"").concat(escapeHtmlAttribute(data.title), "\" width=\"").concat(escapeHtmlAttribute(data.width), "\" height=\"").concat(escapeHtmlAttribute(data.height), "\" />")
+      };
+    }
+    var imageLinkUrl = (0, _linkHelpers.normalizeWebUrl)(data.href);
+    if (imageLinkUrl) {
+      image = image.type === 'html' ? {
+        type: 'html',
+        value: "<a href=\"".concat(escapeHtmlAttribute(imageLinkUrl), "\">").concat(image.value, "</a>")
+      } : {
+        type: 'link',
+        url: imageLinkUrl,
+        title: null,
+        children: [image]
       };
     }
     result.push(image);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "3.0.219",
+  "version": "3.0.221",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -72,5 +72,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "49d50732b9174eda87f4cdb3647927beda0e6669"
+  "gitHead": "30ff08d00b06b38e8d9f4e005ac5b2f8bfcccae6"
 }