@seafile/sdoc-editor 3.0.234 → 3.0.235

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.normalizePastedHtml = exports.deserializeHtml = void 0;
+exports.deserializePastedHtml = exports.deserializeHtml = void 0;
 var _slugid = _interopRequireDefault(require("slugid"));
 var _typeOf = _interopRequireDefault(require("type-of"));
 var _constants = require("../../constants");
@@ -122,13 +122,7 @@ 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 deserializeFragment = function deserializeFragment(fragment) {
   var children = Array.from(fragment.childNodes);
   var nodes = [];
   nodes = deserializeElements(children, true);
@@ -144,4 +138,13 @@ var deserializeHtml = exports.deserializeHtml = function deserializeHtml(html) {
     }];
   }
   return nodes;
+};
+var deserializeHtml = exports.deserializeHtml = function deserializeHtml(html) {
+  return deserializeFragment(parseHtml(html));
+};
+var deserializePastedHtml = exports.deserializePastedHtml = function deserializePastedHtml(html) {
+  var fragment = parseHtml(html);
+  // Normalize WeChat-specific DOM before applying the generic HTML-to-Slate rules.
+  (0, _wechatPasteNormalizer.normalizeWechatPastedFragment)(fragment);
+  return deserializeFragment(fragment);
 };

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

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

package/dist/extension/plugins/html/rules/code-block.js

@@ -16,7 +16,7 @@ var normalizeCodeText = function normalizeCodeText() {
 };
 var isFormattingWhitespace = function isFormattingWhitespace() {
   var text = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-  return text !== '' && text.trim() === '';
+  return text !== '' && !text.includes("\xA0") && text.trim() === '';
 };
 var appendTextToLines = function appendTextToLines(lines) {
   var text = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
@@ -90,11 +90,20 @@ var buildCodeLines = function buildCodeLines(element) {
     };
   });
 };
+var buildWechatMultiLineCodeLines = function buildWechatMultiLineCodeLines(element) {
+  var codeChildren = Array.from(element.children);
+  var isWechatMultiLineCodeBlock = element.classList.contains('code-snippet__js') && codeChildren.length > 1 && codeChildren.every(function (child) {
+    return child.nodeName === 'CODE';
+  });
+  return isWechatMultiLineCodeBlock ? codeChildren.flatMap(buildCodeLines) : null;
+};
 var codeBlockRule = function codeBlockRule(element, parseChild) {
   var nodeName = element.nodeName,
     childNodes = element.childNodes;
   if (nodeName === 'PRE') {
     var codeChild = element.querySelector('code');
+    // Process WeChat multi-line code blocks based on their multiple direct <code> children.
+    var wechatMultiLineCodeLines = buildWechatMultiLineCodeLines(element);
     var lang = codeChild === null || codeChild === void 0 ? void 0 : codeChild.getAttribute('lang');
     lang = (0, _prismjs.genCodeLangs)().find(function (item) {
       return item.value === lang;
@@ -103,7 +112,7 @@ var codeBlockRule = function codeBlockRule(element, parseChild) {
       id: _slugid["default"].nice(),
       language: lang,
       type: _constants.CODE_BLOCK,
-      children: buildCodeLines(codeChild || element)
+      children: wechatMultiLineCodeLines !== null && wechatMultiLineCodeLines !== void 0 ? wechatMultiLineCodeLines : buildCodeLines(codeChild || element)
     };
   }
   if (nodeName === 'CODE' && element.parentElement.nodeName === 'PRE') {

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

@@ -59,9 +59,30 @@ var normalizeListItemChildren = function normalizeListItemChildren() {
   }
   return nextChildren;
 };
+var isWechatCodeLineIndex = function isWechatCodeLineIndex(element) {
+  if (element.nodeName !== 'UL' || !element.classList.contains('code-snippet__line-index') || !element.classList.contains('code-snippet__js')) {
+    return false;
+  }
+  var snippet = element.parentElement;
+  var codeBlock = element.nextElementSibling;
+
+  // Match a complete WeChat code snippet when the clipboard preserves its outer <section> wrapper.
+  var isCompleteWechatSnippet = (snippet === null || snippet === void 0 ? void 0 : snippet.nodeName) === 'SECTION' && snippet.classList.contains('code-snippet__fix') && snippet.classList.contains('code-snippet__js');
+
+  // Match a standalone WeChat code snippet when the clipboard omits the outer wrapper.
+  var lineItems = Array.from(element.children);
+  var isStandaloneWechatSnippet = (snippet === null || snippet === void 0 ? void 0 : snippet.nodeName) === 'BODY' && lineItems.length > 0 && lineItems.every(function (item) {
+    return item.nodeName === 'LI' && item.children.length === 0 && item.textContent.trim() === '';
+  });
+  return (isCompleteWechatSnippet || isStandaloneWechatSnippet) && (codeBlock === null || codeBlock === void 0 ? void 0 : codeBlock.nodeName) === 'PRE' && codeBlock.classList.contains('code-snippet__js') && codeBlock.parentElement === snippet;
+};
 var listRule = function listRule(element, parseChild) {
   var nodeName = element.nodeName,
     childNodes = element.childNodes;
+  // Discard the line-index list from a recognized WeChat code snippet to avoid generating extra list items.
+  if (isWechatCodeLineIndex(element)) {
+    return null;
+  }
   if (nodeName === 'UL') {
     var validChildNodes = Array.from(childNodes).filter(function (item) {
       return item.nodeName === 'LI';

package/dist/slate-convert/html-to-slate/rules/code-block.js

@@ -16,7 +16,7 @@ var normalizeCodeText = function normalizeCodeText() {
 };
 var isFormattingWhitespace = function isFormattingWhitespace() {
   var text = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-  return text !== '' && text.trim() === '';
+  return text !== '' && !text.includes("\xA0") && text.trim() === '';
 };
 var appendTextToLines = function appendTextToLines(lines) {
   var text = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
@@ -90,11 +90,20 @@ var buildCodeLines = function buildCodeLines(element) {
     };
   });
 };
+var buildWechatMultiLineCodeLines = function buildWechatMultiLineCodeLines(element) {
+  var codeChildren = Array.from(element.children);
+  var isWechatMultiLineCodeBlock = element.classList.contains('code-snippet__js') && codeChildren.length > 1 && codeChildren.every(function (child) {
+    return child.nodeName === 'CODE';
+  });
+  return isWechatMultiLineCodeBlock ? codeChildren.flatMap(buildCodeLines) : null;
+};
 var codeBlockRule = function codeBlockRule(element, parseChild) {
   var nodeName = element.nodeName,
     childNodes = element.childNodes;
   if (nodeName === 'PRE') {
     var codeChild = element.querySelector('code');
+    // Process WeChat multi-line code blocks based on their multiple direct <code> children.
+    var wechatMultiLineCodeLines = buildWechatMultiLineCodeLines(element);
     var lang = codeChild === null || codeChild === void 0 ? void 0 : codeChild.getAttribute('lang');
     lang = (0, _helper.genCodeLangs)().find(function (item) {
       return item.value === lang;
@@ -103,7 +112,7 @@ var codeBlockRule = function codeBlockRule(element, parseChild) {
       id: _slugid["default"].nice(),
       language: lang,
       type: _constants.CODE_BLOCK,
-      children: buildCodeLines(codeChild || element)
+      children: wechatMultiLineCodeLines !== null && wechatMultiLineCodeLines !== void 0 ? wechatMultiLineCodeLines : buildCodeLines(codeChild || element)
     };
   }
   if (nodeName === 'CODE' && element.parentElement.nodeName === 'PRE') {

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

@@ -59,9 +59,30 @@ var normalizeListItemChildren = function normalizeListItemChildren() {
   }
   return nextChildren;
 };
+var isWechatCodeLineIndex = function isWechatCodeLineIndex(element) {
+  if (element.nodeName !== 'UL' || !element.classList.contains('code-snippet__line-index') || !element.classList.contains('code-snippet__js')) {
+    return false;
+  }
+  var snippet = element.parentElement;
+  var codeBlock = element.nextElementSibling;
+
+  // Match a complete WeChat code snippet when the clipboard preserves its outer <section> wrapper.
+  var isCompleteWechatSnippet = (snippet === null || snippet === void 0 ? void 0 : snippet.nodeName) === 'SECTION' && snippet.classList.contains('code-snippet__fix') && snippet.classList.contains('code-snippet__js');
+
+  // Match a standalone WeChat code snippet when the clipboard omits the outer wrapper.
+  var lineItems = Array.from(element.children);
+  var isStandaloneWechatSnippet = (snippet === null || snippet === void 0 ? void 0 : snippet.nodeName) === 'BODY' && lineItems.length > 0 && lineItems.every(function (item) {
+    return item.nodeName === 'LI' && item.children.length === 0 && item.textContent.trim() === '';
+  });
+  return (isCompleteWechatSnippet || isStandaloneWechatSnippet) && (codeBlock === null || codeBlock === void 0 ? void 0 : codeBlock.nodeName) === 'PRE' && codeBlock.classList.contains('code-snippet__js') && codeBlock.parentElement === snippet;
+};
 var listRule = function listRule(element, parseChild) {
   var nodeName = element.nodeName,
     childNodes = element.childNodes;
+  // Discard the line-index list from a recognized WeChat code snippet to avoid generating extra list items.
+  if (isWechatCodeLineIndex(element)) {
+    return null;
+  }
   if (nodeName === 'UL') {
     var validChildNodes = Array.from(childNodes).filter(function (item) {
       return item.nodeName === 'LI';

package/package.json

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