@seafile/sdoc-editor 0.1.142-beta → 0.1.143-beta1

package/dist/api/sdoc-server-api.js

@@ -58,21 +58,16 @@ var SDocServerApi = /*#__PURE__*/function () {
         }
       });
     }
-  }, {
-    key: "saveDocContentByRebase",
-    value: function saveDocContentByRebase(content) {
-      var server = this.server,
-        docUuid = this.docUuid,
-        accessToken = this.accessToken;
-      var url = "".concat(server, "/api/v1/docs/").concat(docUuid, "/rebase/");
-      var formData = new FormData();
-      formData.append('doc_content', JSON.stringify(content));
-      return axios.post(url, formData, {
-        headers: {
-          Authorization: "Token ".concat(accessToken)
-        }
-      });
-    }
+
+    // saveDocContentByRebase(content) {
+    //   const { server, docUuid, accessToken } = this;
+    //   const url = `${server}/api/v1/docs/${docUuid}/rebase/`;
+
+    //   const formData = new FormData();
+    //   formData.append('doc_content', JSON.stringify(content));
+
+    //   return axios.post(url, formData, {headers: {Authorization: `Token ${accessToken}`}});
+    // }
   }, {
     key: "getCollaborators",
     value: function getCollaborators() {

package/dist/basic-sdk/editor/rebase-editor/index.js

@@ -38,23 +38,22 @@ var SDocRebaseEditor = function SDocRebaseEditor(_ref) {
     if (slateValue.filter(function (item) {
       return item.rebaseType;
     }).length === 0) {
-      var user = context.getUserInfo();
       context.rebaseSdocRevision().then(function (res) {
-        return context.saveDocContentByRebase({
-          children: slateValue,
-          version: version + 1,
-          last_modify_user: user.username
+        editor.rebaseContent({
+          children: slateValue
         });
+
+        // return context.saveDocContentByRebase();
       }).then(function (res) {
-        toaster.success(t('Successfully_rebase_'));
-        toggleViewChanges(false, true);
+        // toaster.success(t('Successfully_rebase_'));
+        // toggleViewChanges(false, true);
       }).catch(function (error) {
         toaster.danger(t('Error'));
       });
     }
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [version, toggleViewChanges]);
+  }, [version]);
   var updateParentNodeByPath = useCallback(function (path) {
     var parentPath = path.slice(0, -1);
     var parentNode = getNode(editor, parentPath);

package/dist/basic-sdk/extension/commons/insert-element-dialog/index.js

@@ -23,16 +23,21 @@ var InsertElementDialog = function InsertElementDialog(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     insertPosition = _useState6[0],
     setInsertPosition = _useState6[1];
+  var _useState7 = useState(null),
+    _useState8 = _slicedToArray(_useState7, 2),
+    slateNode = _useState8[0],
+    setSlateNode = _useState8[1];
   var uploadLocalImageInputRef = useRef();
   var onFileChanged = useCallback(function (event) {
     var file = event.target.files[0];
     context.uploadLocalImage(file).then(function (fileUrl) {
-      insertImage(editor, fileUrl, editor.selection, insertPosition);
+      insertImage(editor, fileUrl, editor.selection, insertPosition, slateNode);
       if (uploadLocalImageInputRef.current) {
         uploadLocalImageInputRef.current.value = '';
       }
     });
-  }, [editor, uploadLocalImageInputRef, insertPosition]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [editor, uploadLocalImageInputRef, insertPosition, slateNode]);
   useEffect(function () {
     var eventBus = EventBus.getInstance();
     var toggleDialogSubscribe = eventBus.subscribe(INTERNAL_EVENT.INSERT_ELEMENT, toggleDialog);
@@ -46,8 +51,10 @@ var InsertElementDialog = function InsertElementDialog(_ref) {
     var type = _ref2.type,
       element = _ref2.element,
       _ref2$insertPosition = _ref2.insertPosition,
-      insertPosition = _ref2$insertPosition === void 0 ? INSERT_POSITION.CURRENT : _ref2$insertPosition;
+      insertPosition = _ref2$insertPosition === void 0 ? INSERT_POSITION.CURRENT : _ref2$insertPosition,
+      slateNode = _ref2.slateNode;
     setInsertPosition(insertPosition);
+    setSlateNode(slateNode);
     setElement(element);
     setDialogType(type);
     if (type === INSERT_IMAGE_TYPE.LOCAL_IMAGE) {
@@ -58,11 +65,13 @@ var InsertElementDialog = function InsertElementDialog(_ref) {
   }, [uploadLocalImageInputRef]);
   var closeDialog = useCallback(function () {
     setInsertPosition(INSERT_POSITION.CURRENT);
+    setSlateNode(null);
     setElement('');
     setDialogType('');
   }, []);
   var props = {
     insertPosition: insertPosition,
+    slateNode: slateNode,
     editor: editor,
     element: element,
     closeDialog: closeDialog

package/dist/basic-sdk/extension/constants/index.js

@@ -240,4 +240,6 @@ export var INSERT_IMAGE_TYPE = {
   LOCAL_IMAGE: 'local-image',
   WEB_IMAGE: 'web-image'
 };
+export var LIST_ITEM_CORRELATION_TYPE = ['unordered_list', 'ordered_list', 'list-item'];
+export var LIST_ITEM_SUPPORTED_TRANSFORMATION = ['unordered_list', 'ordered_list', 'left', 'center', 'right', 'blockquote'];
 export { BLOCKQUOTE, HEADER, TITLE, SUBTITLE, HEADER1, HEADER2, HEADER3, HEADER4, HEADER5, HEADER6, PARAGRAPH, BOLD, ITALIC, UNDERLINE, STRIKETHROUGH, SUPERSCRIPT, SUBSCRIPT, ORDERED_LIST, UNORDERED_LIST, LIST_ITEM, LIST_LIC, CHECK_LIST, CHECK_LIST_ITEM, LINK, HTML, CODE_BLOCK, CODE_LINE, IMAGE, TABLE, TABLE_CELL, TABLE_ROW, FORMULA, COLUMN, TEXT_STYLE, TEXT_STYLE_MORE, BOLD_ITALIC, TEXT_ALIGN, ALIGN_LEFT, ALIGN_RIGHT, ALIGN_CENTER, ELEMENT_TYPE, KEYBOARD, MAC_HOTKEYS, WIN_HOTKEYS, DEFAULT_COLORS, STANDARD_COLORS, DEFAULT_RECENT_USED_LIST, CLEAR_FORMAT, DEFAULT_FONT_COLOR, RECENT_USED_HIGHLIGHT_COLORS_KEY, RECENT_USED_FONT_COLORS_KEY, RECENT_USED_TABLE_CELL_BG_COLORS_KEY, DEFAULT_LAST_USED_FONT_COLOR, DEFAULT_LAST_USED_HIGHLIGHT_COLOR, DEFAULT_LAST_USED_TABLE_CELL_BG_COLOR, FONT_SIZE, DEFAULT_FONT, FONT, GOOGLE_FONT_CLASS, RECENT_USED_FONTS_KEY, SDOC_FONT_SIZE, SDOC_LINK };

package/dist/basic-sdk/extension/plugins/code-block/plugin.js

@@ -4,7 +4,7 @@ import _toArray from "@babel/runtime/helpers/esm/toArray";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import slugid from 'slugid';
 import isHotkey from 'is-hotkey';
-import { Transforms, Node, Range, Editor, Path } from '@seafile/slate';
+import { Transforms, Node, Range, Editor } from '@seafile/slate';
 import { getNodeType, isLastNode, getSelectedNodeByType, generateEmptyElement } from '../../core';
 import { deleteBackwardByLength } from './helpers';
 import { CODE_BLOCK, PARAGRAPH, CODE_LINE } from '../../constants';
@@ -25,29 +25,11 @@ var withCodeBlock = function withCodeBlock(editor) {
     return insertText(data);
   };
   newEditor.insertData = function (data) {
-    if (!newEditor.insertFragmentData(data) && !data.types.includes('text/code-block')) {
-      var plaintext = data.getData('text/plain') || '';
-      if (plaintext) {
-        var fragmentData = [];
-        plaintext.split('\n').forEach(function (item) {
-          var codeLine = {
-            id: slugid.nice(),
-            type: CODE_LINE,
-            children: [{
-              text: item,
-              id: slugid.nice()
-            }]
-          };
-          fragmentData.push(codeLine);
-        });
-        newEditor.insertFragment(fragmentData);
-        return;
-      }
-    }
     if (data.types.includes('text/code-block') && !getSelectedNodeByType(editor, CODE_BLOCK)) {
       var codeBlockNode = JSON.parse(data.getData('text/code-block'));
       return insertNode(codeBlockNode);
     }
+    insertData(data);
   };
   newEditor.insertFragment = function (data) {
     // only selected code block content

package/dist/basic-sdk/extension/plugins/code-block/render-elem.js

@@ -124,16 +124,17 @@ var CodeBlock = function CodeBlock(_ref) {
     eventBus.subscribe(INTERNAL_EVENT.HIDDEN_CODE_BLOCK_HOVER_MENU, onHiddenHoverMenu);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-  return /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", Object.assign({
     "data-id": element.id,
-    "data-root": "true",
-    ref: codeBlockRef,
+    "data-root": "true"
+  }, attributes, {
     className: 'sdoc-code-block-container',
     onClick: onFocusCodeBlock,
     onMouseLeave: onMouseLeave
-  }, /*#__PURE__*/React.createElement("pre", Object.assign({
-    className: 'sdoc-code-block-pre'
-  }, attributes), /*#__PURE__*/React.createElement("code", {
+  }), /*#__PURE__*/React.createElement("pre", {
+    className: 'sdoc-code-block-pre',
+    ref: codeBlockRef
+  }, /*#__PURE__*/React.createElement("code", {
     className: "sdoc-code-block-code ".concat(white_space === 'nowrap' ? 'sdoc-code-no-wrap' : '')
   }, children)), showHoverMenu && /*#__PURE__*/React.createElement(CodeBlockHoverMenu, {
     menuPosition: menuPosition,

package/dist/basic-sdk/extension/plugins/html/plugin.js

@@ -1,11 +1,32 @@
+import slugid from 'slugid';
 import { deserializeHtml } from './helper';
 import { getSelectedNodeByType } from '../../core';
-import { CODE_BLOCK } from '../../constants';
+import { CODE_BLOCK, CODE_LINE } from '../../constants';
 var withHtml = function withHtml(editor) {
   var insertData = editor.insertData;
   var newEditor = editor;
   newEditor.insertData = function (data) {
-    if (!newEditor.insertFragmentData(data) && !getSelectedNodeByType(editor, CODE_BLOCK)) {
+    if (!newEditor.insertFragmentData(data)) {
+      // Other document paste content into code block
+      if (!data.types.includes('text/code-block') && getSelectedNodeByType(editor, CODE_BLOCK)) {
+        var plaintext = data.getData('text/plain') || '';
+        if (plaintext) {
+          var fragmentData = [];
+          plaintext.split('\n').forEach(function (item) {
+            var codeLine = {
+              id: slugid.nice(),
+              type: CODE_LINE,
+              children: [{
+                text: item,
+                id: slugid.nice()
+              }]
+            };
+            fragmentData.push(codeLine);
+          });
+          newEditor.insertFragment(fragmentData);
+        }
+        return;
+      }
       var htmlContent = data.getData('text/html') || '';
       if (htmlContent) {
         var content = deserializeHtml(htmlContent);

package/dist/basic-sdk/extension/plugins/image/helpers.js

@@ -1,8 +1,9 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import urlJoin from 'url-join';
-import { Editor, Range, Transforms } from '@seafile/slate';
-import { CODE_BLOCK, ELEMENT_TYPE, IMAGE, INSERT_POSITION } from '../../constants';
+import { Editor, Range, Transforms, Path } from '@seafile/slate';
+import { ReactEditor } from '@seafile/slate-react';
+import { CODE_BLOCK, ELEMENT_TYPE, IMAGE, INSERT_POSITION, LIST_ITEM } from '../../constants';
 import { generateEmptyElement, getNodeType, isTextNode, getParentNode } from '../../core';
 import context from '../../../../context';
 export var isInsertImageMenuDisabled = function isInsertImageMenuDisabled(editor, readonly) {
@@ -39,14 +40,23 @@ export var generateImageNode = function generateImageNode(src) {
 };
 export var insertImage = function insertImage(editor, src, selection) {
   var position = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : INSERT_POSITION.CURRENT;
+  var slateNode = arguments.length > 4 ? arguments[4] : undefined;
   if (!src) return;
   if (position !== INSERT_POSITION.AFTER) {
     if (isInsertImageMenuDisabled(editor)) return;
   }
   var imageNode = generateImageNode(src);
   var validSelection = selection || editor.selection;
-  if (position = INSERT_POSITION.AFTER) {
+  if (position === INSERT_POSITION.AFTER) {
     var path = Editor.path(editor, validSelection);
+    if (slateNode && (slateNode === null || slateNode === void 0 ? void 0 : slateNode.type) === LIST_ITEM) {
+      path = ReactEditor.findPath(editor, slateNode);
+      var nextPath = Path.next(path);
+      Transforms.insertNodes(editor, imageNode, {
+        at: nextPath
+      });
+      return;
+    }
     var p = generateEmptyElement(ELEMENT_TYPE.PARAGRAPH);
     p.children[0] = imageNode;
     Transforms.insertNodes(editor, p, {

package/dist/basic-sdk/extension/plugins/link/dialog/add-link-dialog/index.js

@@ -8,6 +8,7 @@ var AddLinkDialog = function AddLinkDialog(_ref) {
     className = _ref.className,
     element = _ref.element,
     insertPosition = _ref.insertPosition,
+    slateNode = _ref.slateNode,
     closeDialog = _ref.closeDialog;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
@@ -52,7 +53,7 @@ var AddLinkDialog = function AddLinkDialog(_ref) {
     if (isEdit) {
       updateLink(editor, title, url);
     } else {
-      insertLink(editor, title, url, insertPosition);
+      insertLink(editor, title, url, insertPosition, slateNode);
     }
     closeDialog();
 

package/dist/basic-sdk/extension/plugins/link/helpers.js

@@ -2,9 +2,10 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == typeof h && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(typeof e + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
-import { Editor, Transforms, Range } from '@seafile/slate';
+import { Editor, Transforms, Range, Path } from '@seafile/slate';
+import { ReactEditor } from '@seafile/slate-react';
 import slugid from 'slugid';
-import { ELEMENT_TYPE, INSERT_POSITION, LINK } from '../../constants';
+import { ELEMENT_TYPE, INSERT_POSITION, LINK, LIST_ITEM } from '../../constants';
 import { getNodeType, getSelectedElems, getAboveNode, getEditorString, replaceNodeChildren, generateEmptyElement } from '../../core';
 export var isMenuDisabled = function isMenuDisabled(editor, readonly) {
   if (readonly) return true;
@@ -55,11 +56,21 @@ export var getLinkType = function getLinkType(editor) {
 };
 export var insertLink = function insertLink(editor, title, url) {
   var position = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : INSERT_POSITION.CURRENT;
+  var slateNode = arguments.length > 4 ? arguments[4] : undefined;
   if (position === INSERT_POSITION.CURRENT && isMenuDisabled(editor)) return;
   if (!title || !url) return;
   if (position === INSERT_POSITION.AFTER) {
-    var p = generateEmptyElement(ELEMENT_TYPE.PARAGRAPH);
     var linkNode = genLinkNode(url, title);
+    var path = Editor.path(editor, editor.selection);
+    if (slateNode && (slateNode === null || slateNode === void 0 ? void 0 : slateNode.type) === LIST_ITEM) {
+      path = ReactEditor.findPath(editor, slateNode);
+      var nextPath = Path.next(path);
+      Transforms.insertNodes(editor, linkNode, {
+        at: nextPath
+      });
+      return;
+    }
+    var p = generateEmptyElement(ELEMENT_TYPE.PARAGRAPH);
     p.children[0] = {
       id: slugid.nice(),
       text: ' '
@@ -69,7 +80,6 @@ export var insertLink = function insertLink(editor, title, url) {
       id: slugid.nice(),
       text: ' '
     };
-    var path = Editor.path(editor, editor.selection);
     Transforms.insertNodes(editor, p, {
       at: [path[0] + 1]
     });

package/dist/basic-sdk/extension/plugins/link/plugin.js

@@ -32,22 +32,17 @@ var withLink = function withLink(editor) {
     return insertText(text);
   };
   newEditor.insertData = function (data) {
-    // Paste content from sdoc document
-    if (newEditor.insertFragmentData(data)) return;
-
-    // Paste content from other document
+    // Paste link content
     var text = data.getData('text/plain');
-    if (!isUrl(text) && !isImage(text)) {
-      // not a link content
-      insertData(data);
+    if (isUrl(text) && !isImage(text)) {
+      var link = genLinkNode(text, text);
+      Transforms.insertNodes(newEditor, [link, {
+        id: slugid.nice(),
+        text: ' '
+      }]);
       return;
     }
-    var link = genLinkNode(text, text);
-    Transforms.insertNodes(newEditor, [link, {
-      id: slugid.nice(),
-      text: ' '
-    }]);
-    return;
+    insertData(data);
   };
 
   // Rewrite normalizeNode

package/dist/basic-sdk/extension/toolbar/side-toolbar/helpers.js

@@ -1,8 +1,9 @@
-import { Transforms } from '@seafile/slate';
+import { Transforms, Node, Editor, Element } from '@seafile/slate';
+import slugid from 'slugid';
 import { ReactEditor } from '@seafile/slate-react';
 import copy from 'copy-to-clipboard';
 import { toggleList } from '../../plugins/list/transforms';
-import { ORDERED_LIST, UNORDERED_LIST, PARAGRAPH, CHECK_LIST_ITEM } from '../../constants';
+import { ORDERED_LIST, UNORDERED_LIST, PARAGRAPH, CHECK_LIST_ITEM, IMAGE, TABLE, CODE_BLOCK, LIST_ITEM, BLOCKQUOTE, LIST_ITEM_CORRELATION_TYPE } from '../../constants';
 export var onSetNodeType = function onSetNodeType(editor, element, type) {
   if (!type) return;
   if ([ORDERED_LIST, UNORDERED_LIST].includes(type)) {
@@ -22,6 +23,18 @@ export var onSetNodeType = function onSetNodeType(editor, element, type) {
     });
     return;
   }
+  if (type === BLOCKQUOTE && LIST_ITEM_CORRELATION_TYPE.includes(element.type)) {
+    Transforms.wrapNodes(editor, {
+      id: slugid.nice(),
+      type: BLOCKQUOTE
+    }, {
+      mode: 'highest',
+      match: function match(n) {
+        return Element.isElement(n) && Editor.isBlock(editor, n);
+      }
+    });
+    return;
+  }
   Transforms.setNodes(editor, {
     type: type
   });
@@ -53,4 +66,19 @@ export var getDomTopHeight = function getDomTopHeight(dom) {
   var HEADER_HEIGHT = 56 + 44;
   var rect = dom.getBoundingClientRect();
   return rect.y - HEADER_HEIGHT;
+};
+export var isVoidNode = function isVoidNode(node) {
+  if (!node) return true;
+  var hasImage = node.children.find(function (n) {
+    return n.type === IMAGE;
+  });
+  var isTable = node.type === TABLE;
+  var isCodeBlock = node.type === CODE_BLOCK;
+  return Node.string(node) === '' && !hasImage && !isTable && !isCodeBlock;
+};
+export var isNotSupportTransform = function isNotSupportTransform(node) {
+  if (node.type && [CODE_BLOCK, TABLE].includes(node.type)) {
+    return true;
+  }
+  return false;
 };

package/dist/basic-sdk/extension/toolbar/side-toolbar/index.js

@@ -1,12 +1,11 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import classnames from 'classnames';
-import { Node } from '@seafile/slate';
 import { ReactEditor, useSlateStatic } from '@seafile/slate-react';
 import EventBus from '../../../utils/event-bus';
 import { useScrollContext } from '../../../hooks/use-scroll-context';
 import { INTERNAL_EVENT } from '../../../constants';
-import { getDomTopHeight, setSelection } from './helpers';
+import { getDomTopHeight, setSelection, isVoidNode } from './helpers';
 import SideMenu from './side-menu';
 import './index.css';
 var SideToolbar = function SideToolbar() {
@@ -72,7 +71,7 @@ var SideToolbar = function SideToolbar() {
       }
       var top = getDomTopHeight(dom);
       var node = ReactEditor.toSlateNode(editor, dom);
-      var isEmpty = Node.string(node) === '';
+      var isEmpty = isVoidNode(node);
       setSidePosition({
         top: top + scrollRef.current.scrollTop,
         left: 20

package/dist/basic-sdk/extension/toolbar/side-toolbar/insert-below-menu.js

@@ -3,8 +3,10 @@ import { UncontrolledPopover } from 'reactstrap';
 import InsertBlockMenu from './insert-block-menu';
 import { INSERT_POSITION } from '../../constants';
 var InsertBelowMenu = function InsertBelowMenu(_ref) {
-  var target = _ref.target;
+  var target = _ref.target,
+    slateNode = _ref.slateNode;
   return /*#__PURE__*/React.createElement(UncontrolledPopover, {
+    boundariesElement: "viewport",
     target: target,
     className: "sdoc-side-menu-insert-below-popover sdoc-sub-dropdown-menu sdoc-dropdown-menu",
     trigger: "hover",
@@ -14,7 +16,8 @@ var InsertBelowMenu = function InsertBelowMenu(_ref) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "sdoc-dropdown-menu-container"
   }, /*#__PURE__*/React.createElement(InsertBlockMenu, {
-    insertPosition: INSERT_POSITION.AFTER
+    insertPosition: INSERT_POSITION.AFTER,
+    slateNode: slateNode
   })));
 };
 export default InsertBelowMenu;

package/dist/basic-sdk/extension/toolbar/side-toolbar/insert-block-menu.js

@@ -5,12 +5,13 @@ import { Transforms } from '@seafile/slate';
 import { insertTable } from '../../plugins/table/helpers';
 import TableSizePopover from '../../plugins/table/popover/table-size-popover';
 import { changeToCodeBlock } from '../../plugins/code-block/helpers';
-import { ELEMENT_TYPE, INSERT_POSITION, INSERT_IMAGE_TYPE, MENUS_CONFIG_MAP } from '../../constants';
+import { ELEMENT_TYPE, INSERT_POSITION, INSERT_IMAGE_TYPE, MENUS_CONFIG_MAP, LIST_ITEM } from '../../constants';
 import EventBus from '../../../utils/event-bus';
 import { INTERNAL_EVENT } from '../../../constants';
 import DropdownMenuItem from '../../commons/dropdown-menu-item';
 var InsertBlockMenu = function InsertBlockMenu(_ref) {
-  var insertPosition = _ref.insertPosition;
+  var insertPosition = _ref.insertPosition,
+    slateNode = _ref.slateNode;
   var editor = useSlateStatic();
   var onInsertImageToggle = useCallback(function () {
     var eventBus = EventBus.getInstance();
@@ -19,30 +20,34 @@ var InsertBlockMenu = function InsertBlockMenu(_ref) {
     }
     eventBus.dispatch(INTERNAL_EVENT.INSERT_ELEMENT, {
       type: INSERT_IMAGE_TYPE.LOCAL_IMAGE,
-      insertPosition: insertPosition
+      insertPosition: insertPosition,
+      slateNode: slateNode
     });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [editor, insertPosition]);
   var createTable = useCallback(function (size) {
-    insertTable(editor, size, editor.selection, insertPosition);
+    var newInsertPosition = slateNode.type === LIST_ITEM ? INSERT_POSITION.AFTER : insertPosition;
+    insertTable(editor, size, editor.selection, newInsertPosition);
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [editor, insertPosition]);
+  }, [editor, insertPosition, slateNode]);
   var openLinkDialog = useCallback(function () {
     var eventBus = EventBus.getInstance();
     eventBus.dispatch(INTERNAL_EVENT.INSERT_ELEMENT, {
       type: ELEMENT_TYPE.LINK,
-      insertPosition: insertPosition
+      insertPosition: insertPosition,
+      slateNode: slateNode
     });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [insertPosition]);
   var onInsertCodeBlock = useCallback(function () {
-    changeToCodeBlock(editor, 'plaintext', insertPosition);
+    var newInsertPosition = slateNode.type === LIST_ITEM ? INSERT_POSITION.AFTER : insertPosition;
+    changeToCodeBlock(editor, 'plaintext', newInsertPosition);
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [editor, insertPosition]);
+  }, [editor, insertPosition, slateNode]);
   var openTableDialog = useCallback(function () {
     var eventBus = EventBus.getInstance();
     eventBus.dispatch(INTERNAL_EVENT.INSERT_ELEMENT, {

package/dist/basic-sdk/extension/toolbar/side-toolbar/side-menu.js

@@ -6,7 +6,7 @@ import EventBus from '../../../utils/event-bus';
 import { ElementPopover } from '../../commons';
 import InsertBelowMenu from './insert-below-menu';
 import InsertBlockMenu from './insert-block-menu';
-import { onCopyNode, onDeleteNode } from './helpers';
+import { onCopyNode, onDeleteNode, isNotSupportTransform } from './helpers';
 import TransformMenus from './transform-menus';
 import DropdownMenuItem from '../../commons/dropdown-menu-item';
 import './side-menu.css';
@@ -58,7 +58,7 @@ var SideMenu = function SideMenu(_ref) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "sdoc-side-menu sdoc-dropdown-menu",
     ref: sideMenuRef
-  }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DropdownMenuItem, {
+  }, /*#__PURE__*/React.createElement(React.Fragment, null, !isNotSupportTransform(slateNode) && /*#__PURE__*/React.createElement(DropdownMenuItem, {
     menuConfig: {
       id: 'sdoc-side-menu-item-transform',
       text: 'Transform_to',
@@ -71,7 +71,9 @@ var SideMenu = function SideMenu(_ref) {
     target: "sdoc-side-menu-item-transform",
     slateNode: slateNode,
     onReset: onReset
-  }))), isNodeEmpty && /*#__PURE__*/React.createElement(InsertBlockMenu, null), !isNodeEmpty && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DropdownMenuItem, {
+  }))), isNodeEmpty && /*#__PURE__*/React.createElement(InsertBlockMenu, {
+    slateNode: slateNode
+  }), !isNodeEmpty && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DropdownMenuItem, {
     menuConfig: {
       id: 'sdoc-side-menu-item-insert-below',
       text: 'Insert_below',
@@ -81,7 +83,8 @@ var SideMenu = function SideMenu(_ref) {
   }, /*#__PURE__*/React.createElement("i", {
     className: "sdocfont sdoc-right-slide sdoc-dropdown-item-right-icon"
   }), /*#__PURE__*/React.createElement(InsertBelowMenu, {
-    target: "sdoc-side-menu-item-insert-below"
+    target: "sdoc-side-menu-item-insert-below",
+    slateNode: slateNode
   })), /*#__PURE__*/React.createElement("div", {
     className: "sdoc-dropdown-menu-divider"
   }), /*#__PURE__*/React.createElement(DropdownMenuItem, {

package/dist/basic-sdk/extension/toolbar/side-toolbar/transform-menus.js

@@ -3,7 +3,7 @@ import { UncontrolledPopover } from 'reactstrap';
 import { withTranslation } from 'react-i18next';
 import { useSlateStatic } from '@seafile/slate-react';
 import { onSetNodeType } from './helpers';
-import { SIDE_MENUS_CONFIG } from '../../constants';
+import { SIDE_MENUS_CONFIG, LIST_ITEM_SUPPORTED_TRANSFORMATION, LIST_ITEM_CORRELATION_TYPE } from '../../constants';
 import DropdownMenuItem from '../../commons/dropdown-menu-item';
 var TransformMenus = function TransformMenus(_ref) {
   var target = _ref.target,
@@ -16,7 +16,18 @@ var TransformMenus = function TransformMenus(_ref) {
     onReset();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
+  var getSideMenusConfig = useCallback(function (SIDE_MENUS_CONFIG) {
+    var newSideMenusConfig = SIDE_MENUS_CONFIG;
+    if (LIST_ITEM_CORRELATION_TYPE.includes(slateNode.type)) {
+      newSideMenusConfig = SIDE_MENUS_CONFIG.filter(function (item) {
+        return LIST_ITEM_SUPPORTED_TRANSFORMATION.includes(item.type);
+      });
+    }
+    return newSideMenusConfig;
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [slateNode]);
   return /*#__PURE__*/React.createElement(UncontrolledPopover, {
+    boundariesElement: "viewport",
     target: target,
     className: "sdoc-side-operation-translate-popover sdoc-sub-dropdown-menu sdoc-dropdown-menu",
     trigger: "hover",
@@ -25,7 +36,7 @@ var TransformMenus = function TransformMenus(_ref) {
     fade: false
   }, /*#__PURE__*/React.createElement("div", {
     className: "sdoc-dropdown-menu-container"
-  }, SIDE_MENUS_CONFIG.map(function (item) {
+  }, getSideMenusConfig(SIDE_MENUS_CONFIG).map(function (item) {
     return /*#__PURE__*/React.createElement(DropdownMenuItem, {
       key: item.id,
       menuConfig: item,

package/dist/basic-sdk/socket/socket-client.js

@@ -123,9 +123,19 @@ var SocketClient = /*#__PURE__*/_createClass(function SocketClient(config) {
   this.disconnectWithServer = function () {
     _this.socket.disconnect();
   };
-  this.onRebaseDocument = function (document) {
+  this.receiveRebaseDocument = function (document) {
     var socketManager = SocketManager.getInstance();
-    socketManager.rebaseContent(document);
+    socketManager.receiveRebaseContent(document);
+  };
+  this.sendRebaseDocument = function (document, callback) {
+    debug('=========== send operations ==========');
+    debug('%O', document);
+    debug('======================================');
+    _this.socket.emit('rebase-document', _this.getParams({
+      document: document
+    }), function (result) {
+      callback && callback(result);
+    });
   };
   this.config = config;
   this.isReconnect = false;
@@ -141,7 +151,7 @@ var SocketClient = /*#__PURE__*/_createClass(function SocketClient(config) {
   this.socket.on('join-room', this.onJoinRoom);
   this.socket.on('leave-room', this.onLeaveRoom);
   this.socket.on('update-document', this.onReceiveRemoteOperations);
-  this.socket.on('rebase-document', this.onRebaseDocument);
+  this.socket.on('rebase-document', this.receiveRebaseDocument);
   this.socket.on('update-cursor', this.receiveCursorLocation);
   this.socket.io.on('reconnect', this.onReconnect);
   this.socket.io.on('reconnect_attempt', this.onReconnectAttempt);

package/dist/basic-sdk/socket/socket-manager.js

@@ -27,7 +27,10 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, _do
     var version = _this.document.version;
     return version;
   };
-  this.rebaseContent = function (document) {
+  this.sendRebaseContent = function (document) {
+    _this.socketClient.sendRebaseDocument(document);
+  };
+  this.receiveRebaseContent = function (document) {
     _this.document = document;
     _this.eventBus.dispatch(EXTERNAL_EVENT.REBASE_DOCUMENT, document);
   };

package/dist/basic-sdk/socket/with-socket-io.js

@@ -49,6 +49,12 @@ var withSocketIO = function withSocketIO(editor, options) {
     }
     onChange();
   };
+  newEditor.rebaseContent = function (document) {
+    console.log('send rebase document: ', document);
+    var config = options.config;
+    var socketManager = SocketManager.getInstance(newEditor, document, config);
+    socketManager.sendRebaseContent(document);
+  };
   return newEditor;
 };
 export default withSocketIO;

package/dist/context.js

@@ -10,6 +10,9 @@ var Context = /*#__PURE__*/function () {
     this.initSettings = function () {
       _this.settings = window.seafile ? window.seafile : window.seafileConfig;
     };
+    // saveDocContentByRebase(content) {
+    //   return this.sdocServerApi.saveDocContentByRebase(content);
+    // }
     this.uploadLocalImage = function (imageFile) {
       var docUuid = _this.getSetting('docUuid');
       return _this.api.uploadSdocImage(docUuid, imageFile).then(function (res) {
@@ -89,11 +92,6 @@ var Context = /*#__PURE__*/function () {
     value: function saveContent(content) {
       return this.sdocServerApi.saveDocContent(content);
     }
-  }, {
-    key: "saveDocContentByRebase",
-    value: function saveDocContentByRebase(content) {
-      return this.sdocServerApi.saveDocContentByRebase(content);
-    }
   }, {
     key: "getCollaborators",
     value: function getCollaborators() {

package/dist/pages/simple-editor.js

@@ -311,7 +311,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
   }))), showTip && /*#__PURE__*/React.createElement(TipDialog, {
     toggle: closeTipDialog,
     submit: deleteRevision,
-    title: t('Rebase_tip')
+    title: t('Tip')
   }, t('Rebase_delete_no_change_revision_tip')));
 };
 export default withTranslation('sdoc-editor')(SimpleEditor);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "0.1.142beta",
+  "version": "0.1.143beta1",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",

package/public/locales/en/sdoc-editor.json

@@ -368,5 +368,6 @@
   "Keep_both_modification": "Keep my modification",
   "Need_rebase": "Need rebase",
   "Abort": "Abort",
+  "Tip": "Tip",
   "Rebase_delete_no_change_revision_tip": "No changes have been made in the revision, should the revision be deleted directly ?"
 }

package/public/locales/zh_CN/sdoc-editor.json

@@ -368,5 +368,5 @@
   "Keep_both_modification": "保留两个更改",
   "Need_rebase": "需要变基",
   "Abort": "中止",
-  "Rebase_delete_no_change_revision_tip": "No changes have been made in the revision, should the revision be deleted directly ?"
+  "Rebase_delete_no_change_revision_tip": "修订稿未做任何改动，是否直接删除修订稿？"
 }