@seafile/seafile-editor 3.0.18 → 3.0.20

package/dist/extension/plugins/link/helper.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.isMenuDisabled = exports.isLinkType = exports.insertSeafileLink = exports.insertLink = exports.getLinkInfo = exports.generateLinkNode = void 0;
+exports.upsertLinkText = exports.updateLink = exports.unWrapLinkNode = exports.isMenuDisabled = exports.isLinkType = exports.insertSeafileLink = exports.insertLink = exports.getLinkInfo = exports.getElementHref = exports.generateLinkNode = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _slate = require("slate");
 var _slugid = _interopRequireDefault(require("slugid"));
@@ -172,6 +172,11 @@ const insertSeafileLink = _ref => {
   }
 };
 exports.insertSeafileLink = insertSeafileLink;
+const getElementHref = element => {
+  if (!element) return '';
+  return element.href || element.url;
+};
+exports.getElementHref = getElementHref;
 const getLinkInfo = editor => {
   const isLinkNode = isLinkType(editor);
   if (!isLinkNode) return null;
@@ -183,7 +188,7 @@ const getLinkInfo = editor => {
   const [node, path] = match;
   const showedText = (0, _queries.getEditorString)(editor, path);
   return {
-    linkUrl: node.url,
+    linkUrl: getElementHref(node),
     linkTitle: showedText || node.title,
     path: path
   };

package/dist/extension/plugins/link/render-elem/index.js

@@ -1,11 +1,12 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _slateReact = require("slate-react");
@@ -75,8 +76,11 @@ const renderLink = (_ref, editor) => {
   const onHrefClick = (0, _react.useCallback)(e => {
     e.preventDefault();
   }, []);
+  const url = (0, _helper.getElementHref)(element);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/(0, _react.isValidElement)(render) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/(0, _react.cloneElement)(render, {
-    element,
+    element: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, element), {}, {
+      url
+    }),
     isShowPopover,
     onLinkClick,
     onHrefClick,
@@ -85,16 +89,16 @@ const renderLink = (_ref, editor) => {
     editor
   })) : /*#__PURE__*/_react.default.createElement("span", Object.assign({
     onClick: onLinkClick,
-    "data-url": element.url,
+    "data-url": url,
     className: (0, _classnames.default)('sf-virtual-link', {
       selected: isShowPopover
     })
   }, attributes), /*#__PURE__*/_react.default.createElement("a", {
-    href: element.url,
+    href: url,
     onClick: onHrefClick
   }, children)), isLinkActive && isShowPopover && /*#__PURE__*/_react.default.createElement(_linkPopover.default, {
     popoverPosition: popoverPosition,
-    linkUrl: element.url,
+    linkUrl: url,
     editor: editor,
     onClosePopover: onClosePopover
   }));

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

@@ -30,22 +30,49 @@ const listRule = (element, parseChild) => {
       children: parseChild(childNodes)
     };
   }
-  if (nodeName === 'LI' && firstChild && PARAGRAPH_TAGS.includes(firstChild.nodeName)) {
-    return {
-      id: _slugid.default.nice(),
-      type: _constants.LIST_ITEM,
-      children: parseChild(childNodes)
+  if (nodeName === 'LI') {
+    const parsedChildren = parseChild(childNodes);
+    const normalizedChildren = Array.isArray(parsedChildren) ? parsedChildren : parsedChildren ? [parsedChildren] : [];
+    const listItemChildren = [];
+    let inlineChildren = [];
+    const appendInlineParagraph = () => {
+      if (inlineChildren.length === 0) return;
+      listItemChildren.push({
+        id: _slugid.default.nice(),
+        type: _constants.PARAGRAPH,
+        children: inlineChildren
+      });
+      inlineChildren = [];
     };
-  }
-  if (nodeName === 'LI' && firstChild && !PARAGRAPH_TAGS.includes(firstChild.nodeName)) {
+    normalizedChildren.forEach(child => {
+      if (!child) return;
+      const isInlineNode = !child.type || _constants.INLINE_LEVEL_TYPES.includes(child.type);
+      if (isInlineNode) {
+        inlineChildren.push(child);
+        return;
+      }
+      appendInlineParagraph();
+      listItemChildren.push(child);
+    });
+    appendInlineParagraph();
+    if (listItemChildren.length === 0) {
+      listItemChildren.push({
+        id: _slugid.default.nice(),
+        type: _constants.PARAGRAPH,
+        children: [(0, _core.generateDefaultText)()]
+      });
+    } else if ([_constants.UNORDERED_LIST, _constants.ORDERED_LIST].includes(listItemChildren[0].type)) {
+      // Ensure nested list item content starts with a paragraph.
+      listItemChildren.unshift({
+        id: _slugid.default.nice(),
+        type: _constants.PARAGRAPH,
+        children: [(0, _core.generateDefaultText)()]
+      });
+    }
     return {
       id: _slugid.default.nice(),
       type: _constants.LIST_ITEM,
-      children: [{
-        id: _slugid.default.nice(),
-        type: _constants.PARAGRAPH,
-        children: parseChild(childNodes)
-      }]
+      children: listItemChildren
     };
   }
   if (PARAGRAPH_TAGS.includes(nodeName) && parentElement && parentElement.nodeName === 'LI') {

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

@@ -8,6 +8,7 @@ exports.formatSlateToMd = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _slate = require("slate");
 var _isPunctuationMark = _interopRequireDefault(require("../../utils/is-punctuation-mark"));
+var _helper = require("../../extension/plugins/link/helper");
 const formatInlineChildren = children => {
   return children.reduce((ret, item, index) => {
     if (index === 0) return [item];
@@ -123,7 +124,7 @@ const transformInlineChildren = (result, item) => {
   if (item.type && item.type === 'link') {
     const link = {
       type: 'link',
-      url: item.url,
+      url: (0, _helper.getElementHref)(item),
       title: item.title || null,
       children: [transformTextNode(item.children[0])]
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/seafile-editor",
-  "version": "3.0.18",
+  "version": "3.0.20",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -94,7 +94,7 @@
     "prismjs": "1.30.0",
     "reactstrap": "9.2.3",
     "rehype-format": "5.0.0",
-    "rehype-mathjax": "5.0.0",
+    "rehype-mathjax": "7.1.0",
     "rehype-raw": "7.0.0",
     "rehype-sanitize": "6.0.0",
     "rehype-slug": "6.0.0",