@seafile/sdoc-editor 3.0.232 → 3.0.234

package/dist/extension/plugins/html/helper.js

@@ -4,11 +4,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.deserializeHtml = void 0;
+exports.normalizePastedHtml = exports.deserializeHtml = void 0;
 var _slugid = _interopRequireDefault(require("slugid"));
 var _typeOf = _interopRequireDefault(require("type-of"));
 var _constants = require("../../constants");
 var _rules = _interopRequireDefault(require("./rules"));
+var _wechatPasteNormalizer = require("./wechat-paste-normalizer");
 var cruftNewline = function cruftNewline(element) {
   return !(element.nodeName === '#text' && element.nodeValue === '\n');
 };
@@ -121,6 +122,11 @@ var parseHtml = function parseHtml(html) {
   var body = parsed.body;
   return body;
 };
+var normalizePastedHtml = exports.normalizePastedHtml = function normalizePastedHtml(html) {
+  var fragment = parseHtml(html);
+  (0, _wechatPasteNormalizer.normalizeWechatPastedFragment)(fragment);
+  return fragment.innerHTML;
+};
 var deserializeHtml = exports.deserializeHtml = function deserializeHtml(html) {
   var fragment = parseHtml(html);
   var children = Array.from(fragment.childNodes);

package/dist/extension/plugins/html/plugin.js

@@ -37,7 +37,8 @@ var withHtml = function withHtml(editor) {
       }
       var htmlContent = data.getData('text/html') || '';
       if (htmlContent) {
-        var content = (0, _helper.deserializeHtml)(htmlContent);
+        var normalizedHtmlContent = (0, _helper.normalizePastedHtml)(htmlContent);
+        var content = (0, _helper.deserializeHtml)(normalizedHtmlContent);
         _localStorageUtils["default"].setItem(_constants.RECENT_COPY_CONTENT, htmlContent);
         editor.insertFragment(content);
         return;

package/dist/extension/plugins/html/rules/header.js

@@ -19,10 +19,14 @@ var headerRule = function headerRule(element, parseChild) {
   var nodeName = element.nodeName,
     childNodes = element.childNodes;
   if (nodeName && HEADER_LIST.includes(nodeName)) {
+    var children = parseChild(childNodes);
     return {
       id: _slugid["default"].nice(),
       type: HEADER_TYPE_MAP[nodeName],
-      children: parseChild(childNodes)
+      children: children.length > 0 ? children : [{
+        id: _slugid["default"].nice(),
+        text: ''
+      }]
     };
   }
   return;

package/dist/extension/plugins/html/rules/image.js

@@ -10,11 +10,16 @@ var _constants = require("../../../constants");
 var imageRule = function imageRule(element, parseChild) {
   var nodeName = element.nodeName;
   if (nodeName === 'IMG') {
+    var src = element.getAttribute('src');
+    if (!src || !src.trim()) return {
+      id: _slugid["default"].nice(),
+      text: ''
+    };
     return {
       id: _slugid["default"].nice(),
       type: _constants.IMAGE,
       data: {
-        src: element.getAttribute('src')
+        src: src
       },
       children: [{
         text: '',

package/dist/extension/plugins/html/rules/link.js

@@ -11,16 +11,23 @@ var _constants = require("../../../constants");
 var _linkHelpers = require("../../image/link-helpers");
 var linkRule = function linkRule(element, parseChild) {
   var nodeName = element.nodeName;
-  var content = element.textContent || element.getAttribute('title') || element.getAttribute('href');
   if (nodeName === 'A') {
+    var content = [element.textContent, element.getAttribute('title'), element.getAttribute('href')].find(function (value) {
+      return value === null || value === void 0 ? void 0 : value.trim();
+    });
     var image = (0, _linkHelpers.getOnlyImageChild)(element);
     if (image) {
+      var src = image.getAttribute('src');
+      if (!src || !src.trim()) return {
+        id: _slugid["default"].nice(),
+        text: ''
+      };
       var href = (0, _linkHelpers.normalizeWebUrl)(element.getAttribute('href'));
       return {
         id: _slugid["default"].nice(),
         type: _constants.IMAGE,
         data: (0, _objectSpread2["default"])({
-          src: image.getAttribute('src')
+          src: src
         }, href && {
           href: href
         }),
@@ -40,6 +47,7 @@ var linkRule = function linkRule(element, parseChild) {
           })
         });
         if (typeof child.text === 'string') {
+          if (!child.text) return child;
           return {
             id: _slugid["default"].nice(),
             type: _constants.LINK,
@@ -51,6 +59,10 @@ var linkRule = function linkRule(element, parseChild) {
         return child;
       });
     }
+    if (!content) return {
+      id: _slugid["default"].nice(),
+      text: ''
+    };
     return {
       id: _slugid["default"].nice(),
       type: _constants.LINK,

package/dist/extension/plugins/html/rules/paragraph.js

@@ -11,10 +11,14 @@ var paragraphRule = function paragraphRule(element, parseChild) {
   var nodeName = element.nodeName,
     childNodes = element.childNodes;
   if (nodeName === 'P' && element.parentElement.nodeName !== 'LI') {
+    var children = parseChild(childNodes);
     return {
       id: _slugid["default"].nice(),
       type: _constants.PARAGRAPH,
-      children: parseChild(childNodes)
+      children: children.length > 0 ? children : [{
+        id: _slugid["default"].nice(),
+        text: ''
+      }]
     };
   }
   return;

package/dist/extension/plugins/html/wechat-paste-normalizer.js

@@ -0,0 +1,32 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.normalizeWechatPastedFragment = void 0;
+var WECHAT_REPLY_BREAK_ATTRIBUTE = 'data-sdoc-wechat-reply-break';
+var WECHAT_REPLY_SELECTOR = 'div.discuss_media.js_reply_item[data-reply-id][data-content-id]';
+var addWechatCommentReplyBreaks = function addWechatCommentReplyBreaks(fragment) {
+  var replies = fragment.querySelectorAll(WECHAT_REPLY_SELECTOR);
+  replies.forEach(function (reply) {
+    var replyId = reply.getAttribute('data-reply-id');
+    var contentId = reply.getAttribute('data-content-id');
+    var commentItem = reply.closest('li.js_comment_item.discuss_item');
+    if (!replyId || !contentId || !commentItem || commentItem.getAttribute('data-content-id') !== contentId) {
+      return;
+    }
+    var commentParts = Array.from(commentItem.querySelectorAll('.discuss_media[data-content-id]')).filter(function (item) {
+      return item.getAttribute('data-content-id') === contentId;
+    });
+    if (commentParts.indexOf(reply) <= 0) return;
+    var previousElement = reply.previousElementSibling;
+    if ((previousElement === null || previousElement === void 0 ? void 0 : previousElement.getAttribute(WECHAT_REPLY_BREAK_ATTRIBUTE)) === 'true') return;
+    var breakElement = fragment.ownerDocument.createElement('span');
+    breakElement.setAttribute(WECHAT_REPLY_BREAK_ATTRIBUTE, 'true');
+    breakElement.textContent = '\n';
+    reply.before(breakElement);
+  });
+};
+var normalizeWechatPastedFragment = exports.normalizeWechatPastedFragment = function normalizeWechatPastedFragment(fragment) {
+  addWechatCommentReplyBreaks(fragment);
+};

package/dist/extension/plugins/image/helpers.js

@@ -197,6 +197,7 @@ var getImageURL = exports.getImageURL = function getImageURL(data, editor) {
       return _imgUrl;
     }
   }
+  if (url === null) return '';
 
   // upload image | drag drop image | cut image
   if (isImageUrlIsFromUpload(url)) return url;

package/dist/extension/plugins/link/helpers.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.upsertLinkText = exports.updateLink = exports.unWrapLinkNode = exports.parseHtmlString = exports.isWeChat = exports.isSdocFile = exports.isNodeInCurrentView = exports.isMenuDisabled = exports.isLinkToolBarActive = exports.isExdrawFile = exports.isEmptyNode = exports.isCommonFile = exports.insertLink = exports.getMenuPosition = exports.getLinkType = exports.getElementHref = exports.genLinkNode = exports.checkLink = void 0;
+exports.upsertLinkText = exports.updateLink = exports.unWrapLinkNode = exports.parseHtmlString = exports.isWeChat = exports.isSdocFile = exports.isNodeInCurrentView = exports.isMenuDisabled = exports.isLinkToolBarActive = exports.isExdrawFile = exports.isEmptyNode = exports.isCommonFile = exports.insertLink = exports.getMenuPosition = exports.getLinkType = exports.getLinkFileInfo = exports.getElementHref = exports.genLinkNode = exports.decodeLinkUrl = exports.checkLink = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
@@ -248,25 +248,32 @@ var unWrapLinkNode = exports.unWrapLinkNode = function unWrapLinkNode(editor) {
     }
   });
 };
-var isSdocFile = exports.isSdocFile = function isSdocFile(res, url) {
-  var files_info = res.data.files_info;
-  var fileInfo = files_info[url];
+var decodeLinkUrl = exports.decodeLinkUrl = function decodeLinkUrl(url) {
+  try {
+    return decodeURIComponent(url);
+  } catch (e) {
+    return url;
+  }
+};
+var getLinkFileInfo = exports.getLinkFileInfo = function getLinkFileInfo(res, url) {
+  var _res$data;
+  var filesInfo = (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.files_info) || {};
+  var decodedUrl = decodeLinkUrl(url);
+  return filesInfo[decodedUrl] || filesInfo[url];
+};
+var isSdocFile = exports.isSdocFile = function isSdocFile(fileInfo) {
   var _ref3 = fileInfo || {},
     is_dir = _ref3.is_dir,
     file_ext = _ref3.file_ext;
   return !is_dir && file_ext === 'sdoc';
 };
-var isExdrawFile = exports.isExdrawFile = function isExdrawFile(res, url) {
-  var files_info = res.data.files_info;
-  var fileInfo = files_info[url];
+var isExdrawFile = exports.isExdrawFile = function isExdrawFile(fileInfo) {
   var _ref4 = fileInfo || {},
     is_dir = _ref4.is_dir,
     file_ext = _ref4.file_ext;
   return !is_dir && file_ext === 'exdraw';
 };
-var isCommonFile = exports.isCommonFile = function isCommonFile(res, url) {
-  var files_info = res.data.files_info;
-  var fileInfo = files_info[url];
+var isCommonFile = exports.isCommonFile = function isCommonFile(fileInfo) {
   var _ref5 = fileInfo || {},
     is_dir = _ref5.is_dir,
     file_ext = _ref5.file_ext;

package/dist/extension/plugins/link/plugin.js

@@ -44,7 +44,7 @@ var withLink = function withLink(editor) {
   };
   newEditor.insertData = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee(data) {
-      var text, selectedElems, isCodeContext, res, fileName, fileUuid, _fileName, fileParentPath, filePath, repoId, _fileName2, _fileUuid, url, pathname, _context$getSetting, parts, wikiPageId, title, wikiPageList, page, linkedNodeId, _title, params, link, _link, embedLinkType, _link2, _Editor$next, _Editor$next2, focusPath, focusPoint, _t;
+      var text, selectedElems, isCodeContext, res, fileInfo, fileName, fileUuid, _fileName, fileParentPath, filePath, repoId, _fileName2, _fileUuid, url, pathname, _context$getSetting, parts, wikiPageId, title, wikiPageList, page, linkedNodeId, _title, params, link, _link, embedLinkType, _link2, _Editor$next, _Editor$next2, focusPath, focusPoint, _t;
       return (0, _regenerator2["default"])().w(function (_context) {
         while (1) switch (_context.p = _context.n) {
           case 0:
@@ -73,34 +73,36 @@ var withLink = function withLink(editor) {
             return _context2["default"].getLinkFilesInfo([text]);
           case 3:
             res = _context.v;
-            if (!(0, _helpers4.isSdocFile)(res, text)) {
+            fileInfo = (0, _helpers4.getLinkFileInfo)(res, text);
+            if (!(fileInfo && (0, _helpers4.isSdocFile)(fileInfo))) {
               _context.n = 4;
               break;
             }
-            fileName = res.data.files_info[text].name;
-            fileUuid = res.data.files_info[text].file_uuid;
+            fileName = fileInfo.name;
+            fileUuid = fileInfo.file_uuid;
             (0, _helpers2.insertSdocFileLink)(editor, fileName, fileUuid);
             _context.n = 10;
             break;
           case 4:
-            if (!(0, _helpers4.isExdrawFile)(res, text)) {
+            if (!(fileInfo && (0, _helpers4.isExdrawFile)(fileInfo))) {
               _context.n = 5;
               break;
             }
-            _fileName = res.data.files_info[text].name;
-            fileParentPath = res.data.files_info[text].parent_path;
+            _fileName = fileInfo.name;
+            fileParentPath = fileInfo.parent_path;
             filePath = fileParentPath + '/' + _fileName;
-            repoId = res.data.files_info[text].repo_id;
+            repoId = fileInfo.repo_id;
+            console.log('insertWhiteboard', _fileName, filePath, repoId);
             (0, _helper2.insertWhiteboard)(editor, _fileName, filePath, repoId);
             _context.n = 10;
             break;
           case 5:
-            if (!(0, _helpers4.isCommonFile)(res, text)) {
+            if (!(fileInfo && (0, _helpers4.isCommonFile)(fileInfo))) {
               _context.n = 6;
               break;
             }
-            _fileName2 = res.data.files_info[text].name;
-            _fileUuid = res.data.files_info[text].file_uuid;
+            _fileName2 = fileInfo.name;
+            _fileUuid = fileInfo.file_uuid;
             (0, _helpers.insertFileLink)(editor, _fileName2, _fileUuid);
             _context.n = 10;
             break;

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

@@ -11,10 +11,14 @@ var headerRule = function headerRule(element, parseChild) {
   var nodeName = element.nodeName,
     childNodes = element.childNodes;
   if (nodeName && _constants.HEADER_LIST.includes(nodeName)) {
+    var children = parseChild(childNodes);
     return {
       id: _slugid["default"].nice(),
       type: _constants.HEADER_TYPE_MAP[nodeName],
-      children: parseChild(childNodes)
+      children: children.length > 0 ? children : [{
+        id: _slugid["default"].nice(),
+        text: ''
+      }]
     };
   }
   return;

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

@@ -10,11 +10,16 @@ var _constants = require("../constants");
 var imageRule = function imageRule(element, parseChild) {
   var nodeName = element.nodeName;
   if (nodeName === 'IMG') {
+    var src = element.getAttribute('src');
+    if (!src || !src.trim()) return {
+      id: _slugid["default"].nice(),
+      text: ''
+    };
     return {
       id: _slugid["default"].nice(),
       type: _constants.IMAGE,
       data: {
-        src: element.getAttribute('src')
+        src: src
       },
       children: [{
         text: '',

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

@@ -11,16 +11,23 @@ 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 content = [element.textContent, element.getAttribute('title'), element.getAttribute('href')].find(function (value) {
+      return value === null || value === void 0 ? void 0 : value.trim();
+    });
     var image = (0, _linkHelpers.getOnlyImageChild)(element);
     if (image) {
+      var src = image.getAttribute('src');
+      if (!src || !src.trim()) return {
+        id: _slugid["default"].nice(),
+        text: ''
+      };
       var href = (0, _linkHelpers.normalizeWebUrl)(element.getAttribute('href'));
       return {
         id: _slugid["default"].nice(),
         type: _constants.IMAGE,
         data: (0, _objectSpread2["default"])({
-          src: image.getAttribute('src')
+          src: src
         }, href && {
           href: href
         }),
@@ -40,6 +47,7 @@ var linkRule = function linkRule(element, parseChild) {
           })
         });
         if (typeof child.text === 'string') {
+          if (!child.text) return child;
           return {
             id: _slugid["default"].nice(),
             type: _constants.LINK,
@@ -51,6 +59,10 @@ var linkRule = function linkRule(element, parseChild) {
         return child;
       });
     }
+    if (!content) return {
+      id: _slugid["default"].nice(),
+      text: ''
+    };
     return {
       id: _slugid["default"].nice(),
       type: _constants.LINK,

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

@@ -11,7 +11,8 @@ var paragraphRule = function paragraphRule(element, parseChild) {
   var nodeName = element.nodeName,
     childNodes = element.childNodes;
   if (nodeName === 'P' && element.parentElement.nodeName !== 'LI') {
-    if (childNodes.length === 0) {
+    var children = parseChild(childNodes);
+    if (children.length === 0) {
       return {
         id: _slugid["default"].nice(),
         type: _constants.PARAGRAPH,
@@ -24,7 +25,7 @@ var paragraphRule = function paragraphRule(element, parseChild) {
     return {
       id: _slugid["default"].nice(),
       type: _constants.PARAGRAPH,
-      children: parseChild(childNodes)
+      children: children
     };
   }
   return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "3.0.232",
+  "version": "3.0.234",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -71,5 +71,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8cf7a004d8b3d37e3e0f0c841a405122d5449477"
+  "gitHead": "3e872bda72ab8b41609dd2d7facbd5dc4b21508e"
 }