@seafile/sdoc-editor 0.1.69-beta3 → 0.1.70

package/dist/basic-sdk/extension/core/queries/index.js

@@ -190,14 +190,6 @@ export var getSelectedElems = function getSelectedElems(editor) {
   }
   return elems;
 };
-export var genEmptyParagraph = function genEmptyParagraph() {
-  return {
-    type: 'paragraph',
-    children: [{
-      text: ''
-    }]
-  };
-};
 
 // siblings
 export var getNextSiblingNodes = function getNextSiblingNodes(ancestorEntry, path) {

package/dist/basic-sdk/extension/core/utils/index.js

@@ -26,6 +26,7 @@ export var generateDefaultText = function generateDefaultText() {
 };
 export var generateEmptyElement = function generateEmptyElement(type) {
   return {
+    id: slugid.nice(),
     type: type,
     children: [generateDefaultText()]
   };

package/dist/basic-sdk/extension/plugins/check-list/plugin.js

@@ -32,7 +32,7 @@ var withCheckList = function withCheckList(editor) {
     if (selection && Range.isCollapsed(selection)) {
       var selectedTodo = getSelectedNodeByType(editor, CHECK_LIST_ITEM);
       if (selectedTodo) {
-        // 当前 todo 已经没有文字，则转换为 paragraph
+        // If the current todo has no text, it will be converted to a paragraph
         if (Node.string(selectedTodo).length === 0) {
           Transforms.setNodes(editor, {
             type: PARAGRAPH

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

@@ -58,6 +58,7 @@ export var changeToCodeBlock = function changeToCodeBlock(editor, language) {
 
   // Insert the codeBlockNode node
   var newCodeBlockNode = {
+    id: slugid.nice(),
     type: CODE_BLOCK,
     language: language,
     style: {
@@ -94,12 +95,12 @@ export var changeToPlainText = function changeToPlainText(editor) {
   // Insert p node
   var pList = str.split('\n').map(function (s) {
     return {
+      id: elem.id,
       type: 'paragraph',
       children: [{
         text: s,
         id: slugid.nice()
-      }],
-      id: elem.id
+      }]
     };
   });
   Transforms.insertNodes(editor, pList, {

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

@@ -3,7 +3,7 @@ import _toArray from "@babel/runtime/helpers/esm/toArray";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import slugid from 'slugid';
 import { Transforms, Node, Range, Editor } from '@seafile/slate';
-import { getNodeType, isLastNode, genEmptyParagraph, getSelectedNodeByType, generateEmptyElement } from '../../core';
+import { getNodeType, isLastNode, getSelectedNodeByType, generateEmptyElement } from '../../core';
 import { CODE_BLOCK, PARAGRAPH, CODE_LINE } from '../../constants';
 var withCodeBlock = function withCodeBlock(editor) {
   var normalizeNode = editor.normalizeNode,
@@ -84,7 +84,8 @@ var withCodeBlock = function withCodeBlock(editor) {
       // code-block is the last node in the editor and needs to be followed by a p node
       var isLast = isLastNode(newEditor, node);
       if (isLast) {
-        Transforms.insertNodes(newEditor, genEmptyParagraph(), {
+        var paragraph = generateEmptyElement(PARAGRAPH);
+        Transforms.insertNodes(newEditor, paragraph, {
           at: [path[0] + 1]
         });
       }

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

@@ -12,19 +12,17 @@ var withHeader = function withHeader(editor) {
   var insertBreak = editor.insertBreak;
   var newEditor = editor;
 
-  // 重写 insertBreak - header 末尾回车时要插入 paragraph
+  // Rewrite insertBreak - insert paragraph when carriage return at the end of header
   newEditor.insertBreak = function () {
     var _Editor$nodes = Editor.nodes(newEditor, {
         match: function match(n) {
           return Element.isElement(n) && n.type.startsWith('header');
         },
-        // 匹配 node.type 是 header 开头的 node
+        // Matches nodes whose node.type starts with header
         universal: true
       }),
       _Editor$nodes2 = _slicedToArray(_Editor$nodes, 1),
       match = _Editor$nodes2[0];
-
-    // 未匹配到
     if (!match) {
       insertBreak();
       return;
@@ -43,7 +41,7 @@ var withHeader = function withHeader(editor) {
     }
     var isAtLineEnd = isSelectionAtLineEnd(editor, match[1]);
 
-    // 如果在行末插入一个空 p，否则正常换行
+    // If an empty p is inserted at the end of the line, otherwise wrap normally
     if (isAtLineEnd) {
       var p = generateEmptyElement(PARAGRAPH);
       Transforms.insertNodes(newEditor, p, {
@@ -53,8 +51,6 @@ var withHeader = function withHeader(editor) {
       insertBreak();
     }
   };
-
-  // 返回 editor
   return newEditor;
 };
 export default withHeader;

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

@@ -3,6 +3,7 @@ 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 exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == typeof value && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 import { Editor, Transforms, Range } from '@seafile/slate';
+import slugid from 'slugid';
 import { LINK } from '../../constants';
 import { getNodeType, getSelectedElems, getAboveNode, getEditorString, replaceNodeChildren } from '../../core';
 export var isMenuDisabled = function isMenuDisabled(editor) {
@@ -26,12 +27,14 @@ export var checkLink = function checkLink(url) {
 };
 export var genLinkNode = function genLinkNode(url, text) {
   var linkNode = {
+    id: slugid.nice(),
     type: 'link',
     href: url,
     title: text,
-    children: text ? [{
-      text: text
-    }] : []
+    children: [{
+      id: slugid.nice(),
+      text: text || ''
+    }]
   };
   return linkNode;
 };
@@ -64,6 +67,7 @@ export var insertLink = function insertLink(editor, text, url) {
 
     // Not being able to use insertText directly causes the added Spaces to be added to the linked text, as in the issue above, replaced by insertFragment
     editor.insertFragment([{
+      id: slugid.nice(),
       text: ' '
     }]);
   } else {

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

@@ -1,5 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { Transforms, Node } from '@seafile/slate';
+import slugid from 'slugid';
 import isUrl from 'is-url';
 import { genLinkNode } from './helpers';
 import { getNodeType } from '../../core';
@@ -31,6 +32,7 @@ var withLink = function withLink(editor) {
     }
     var link = genLinkNode(text, text);
     Transforms.insertNodes(newEditor, [link, {
+      id: slugid.nice(),
       text: ' '
     }]);
     return;

package/dist/basic-sdk/extension/plugins/list/model.js

@@ -1,6 +1,8 @@
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import { UNORDERED_LIST } from '../../constants';
+import slugid from 'slugid';
+import { LIST_ITEM, LIST_LIC, UNORDERED_LIST } from '../../constants';
+import { generateEmptyElement } from '../../core';
 var List = /*#__PURE__*/_createClass(function List(options) {
   _classCallCheck(this, List);
   this.type = options.type || UNORDERED_LIST;
@@ -8,4 +10,21 @@ var List = /*#__PURE__*/_createClass(function List(options) {
     text: ''
   }];
 });
-export default List;
+export default List;
+export var generateEmptyListItem = function generateEmptyListItem() {
+  return {
+    id: slugid.nice(),
+    type: LIST_ITEM,
+    children: []
+  };
+};
+export var generateEmptyListLic = function generateEmptyListLic() {
+  return generateEmptyElement(LIST_LIC);
+};
+export var generateEmptyList = function generateEmptyList(type) {
+  return {
+    id: slugid.nice(),
+    type: type,
+    children: []
+  };
+};

package/dist/basic-sdk/extension/plugins/list/plugin/insert-fragment-list.js

@@ -2,8 +2,9 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _toArray from "@babel/runtime/helpers/esm/toArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { Element, Path, Transforms, Node, Editor } from '@seafile/slate';
+import slugid from 'slugid';
 import { LIST_ITEM, LIST_LIC } from '../../../constants';
-import { findNode, getCommonNode, getNode, getNodes } from '../../../core';
+import { findNode, generateDefaultText, getCommonNode, getNode, getNodes } from '../../../core';
 import { getListTypes } from '../queries';
 var isListRoot = function isListRoot(node) {
   return Element.isElement(node) && getListTypes().includes(node.type);
@@ -48,6 +49,7 @@ var trimList = function trimList(listRoot) {
 };
 var wrapNodeIntoListItem = function wrapNodeIntoListItem(node) {
   return node.type === LIST_ITEM ? node : {
+    id: slugid.nice(),
     type: LIST_ITEM,
     children: [node]
   };
@@ -114,14 +116,10 @@ export var getTextAndListItemNodes = function getTextAndListItemNodes(editor, fr
           });
         }
       }
-      textNode = {
-        text: ''
-      };
+      textNode = generateDefaultText();
       listItemNodes = rest;
     } else {
-      textNode = {
-        text: ''
-      };
+      textNode = generateDefaultText();
       listItemNodes = [first].concat(_toConsumableArray(rest));
     }
   } else {
@@ -148,14 +146,10 @@ export var insertFragmentList = function insertFragmentList(editor) {
         mode: 'lowest'
       });
       if (!liEntry) {
-        var nodes = isListRoot(fragment) ? [{
-          text: ''
-        }].concat(_toConsumableArray(fragment)) : fragment;
+        var nodes = isListRoot(fragment) ? [generateDefaultText()].concat(_toConsumableArray(fragment)) : fragment;
         return _insertFragment(nodes);
       }
-      Transforms.insertFragment(editor, [{
-        text: ''
-      }]); // need ' '
+      Transforms.insertFragment(editor, [generateDefaultText()]); // need ' '
 
       liEntry = findNode(editor, {
         match: {
@@ -170,9 +164,7 @@ export var insertFragmentList = function insertFragmentList(editor) {
         mode: 'lowest'
       });
       if (!licEntry) {
-        var _nodes = isListRoot(fragment) ? [{
-          text: ''
-        }].concat(_toConsumableArray(fragment)) : fragment;
+        var _nodes = isListRoot(fragment) ? [generateDefaultText()].concat(_toConsumableArray(fragment)) : fragment;
         return _insertFragment(_nodes);
       }
       var _getTextAndListItemNo = getTextAndListItemNodes(editor, fragment, liEntry, licEntry),

package/dist/basic-sdk/extension/plugins/list/plugin/normalize-list.js

@@ -4,6 +4,7 @@ import { LIST_ITEM, LIST_LIC, PARAGRAPH } from '../../../constants';
 import { getChildren, getNode, getPreviousPath, match } from '../../../core';
 import { getListTypes } from '../queries';
 import { moveListItemsToList, normalizeListItem, normalizeNestedList } from '../transforms';
+import { generateEmptyListItem } from '../model';
 export var normalizeList = function normalizeList(editor) {
   var normalizeNode = editor.normalizeNode;
   return function (_ref) {
@@ -24,10 +25,8 @@ export var normalizeList = function normalizeList(editor) {
         return child.type !== LIST_ITEM;
       });
       if (nonLiChild) {
-        Transforms.wrapNodes(editor, {
-          type: LIST_ITEM,
-          children: []
-        }, {
+        var listItem = generateEmptyListItem();
+        Transforms.wrapNodes(editor, listItem, {
           at: nonLiChild[1]
         });
         return;

package/dist/basic-sdk/extension/plugins/list/transforms/insert-list-item.js

@@ -2,7 +2,8 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { Transforms, Editor, Path, Range } from '@seafile/slate';
 import { LIST_ITEM, LIST_LIC } from '../../../constants';
-import { generateEmptyElement, getAboveNode, isBlockTextEmptyAfterSelection, isStartPoint } from '../../../core';
+import { getAboveNode, isBlockTextEmptyAfterSelection, isStartPoint } from '../../../core';
+import { generateEmptyListItem, generateEmptyListLic } from '../model';
 export var insertListItem = function insertListItem(editor) {
   var licEntry = getAboveNode(editor, {
     match: {
@@ -33,14 +34,12 @@ export var insertListItem = function insertListItem(editor) {
     var nextListItemPath = Path.next(listItemPath);
     if (_isStartPoint) {
       // listItem 有内容，光标在开始
-      var licItem = generateEmptyElement(LIST_LIC);
+      var licItem = generateEmptyListLic();
       Transforms.insertNodes(editor, licItem, {
         at: listItemPath
       });
-      Transforms.wrapNodes(editor, {
-        type: LIST_ITEM,
-        children: []
-      }, {
+      var listItem = generateEmptyListItem();
+      Transforms.wrapNodes(editor, listItem, {
         at: listItemPath
       });
       success = true;
@@ -49,10 +48,8 @@ export var insertListItem = function insertListItem(editor) {
     if (!isEndPoint) {
       // listItem 有内容，光标在中间
       Transforms.splitNodes(editor);
-      Transforms.wrapNodes(editor, {
-        type: LIST_ITEM,
-        children: []
-      }, {
+      var _listItem = generateEmptyListItem();
+      Transforms.wrapNodes(editor, _listItem, {
         at: nextParagraphPath
       });
       Transforms.moveNodes(editor, {
@@ -68,14 +65,12 @@ export var insertListItem = function insertListItem(editor) {
       var _Editor$marks;
       // listItem 有内容，光标在结尾
       var marks = (_Editor$marks = Editor.marks(editor)) === null || _Editor$marks === void 0 ? void 0 : _Editor$marks.key;
-      var _licItem = generateEmptyElement(LIST_LIC);
+      var _licItem = generateEmptyListLic();
       Transforms.insertNodes(editor, _objectSpread(_objectSpread({}, _licItem), marks), {
         at: nextListItemPath
       });
-      Transforms.wrapNodes(editor, {
-        type: LIST_ITEM,
-        children: []
-      }, {
+      var _listItem2 = generateEmptyListItem();
+      Transforms.wrapNodes(editor, _listItem2, {
         at: nextListItemPath
       });
       Transforms.select(editor, nextListItemPath);

package/dist/basic-sdk/extension/plugins/list/transforms/move-list-item-down.js

@@ -1,6 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { Transforms, Path, Editor } from '@seafile/slate';
 import { getListTypes } from '../queries';
+import { generateEmptyList } from '../model';
 export var movedListItemDown = function movedListItemDown(editor, _ref) {
   var list = _ref.list,
     listItem = _ref.listItem;
@@ -26,11 +27,8 @@ export var movedListItemDown = function movedListItemDown(editor, _ref) {
     var newPath = previousPath.concat(subList ? [1, subList.children.length] : [1]);
     Editor.withoutNormalizing(editor, function () {
       if (!subList) {
-        var _list2 = {
-          type: listNode.type,
-          children: []
-        };
-        // 插入一个 list 子元素
+        // Insert a list child element
+        var _list2 = generateEmptyList(listNode.type);
         Transforms.wrapNodes(editor, _list2, {
           at: listItemPath
         });

package/dist/basic-sdk/extension/plugins/list/transforms/move-list-item-up.js

@@ -5,6 +5,7 @@ import { getAboveNode, getNode, isLastChild } from '../../../core';
 import { hasListChild } from '../queries';
 import { moveListItemsToList } from './move-list-items-to-list';
 import { unwrapList } from './unwrap-list';
+import { generateEmptyList } from '../model';
 export var movedListItemUp = function movedListItemUp(editor, _ref) {
   var list = _ref.list,
     listItem = _ref.listItem;
@@ -35,11 +36,8 @@ export var movedListItemUp = function movedListItemUp(editor, _ref) {
       var condA = hasListChild(editor, liNode);
       var condB = !isLastChild(list, liPath);
       if (condA || condB) {
-        var _list2 = {
-          type: listNode.type,
-          children: []
-        };
         // 创建一个新的兄弟节点
+        var _list2 = generateEmptyList(listNode.type);
         Transforms.insertNodes(editor, _list2, {
           at: _toListPath
         });
@@ -90,10 +88,7 @@ export var movedListItemUp = function movedListItemUp(editor, _ref) {
       // 第一步：把当前节点的兄弟节点，移动到当前节点 “子节点（ol）” 的孩子节点中
       // 第二步：把当前节点的字节点，移动为当前节点 “父节点” 的 “兄弟” 节点
       if (!hasListChild(liNode)) {
-        var _list3 = {
-          type: listNode.type,
-          children: []
-        };
+        var _list3 = generateEmptyList(listNode.type);
         Transforms.insertNodes(editor, _list3, {
           at: toListPath
         });

package/dist/basic-sdk/extension/plugins/list/transforms/normalize-list-item.js

@@ -6,6 +6,7 @@ import { LIST_LIC } from '../../../constants';
 import { getChildren, getDeepInlineChildren, match } from '../../../core';
 import { getListTypes } from '../queries';
 import { movedListItemUp } from './move-list-item-up';
+import { generateEmptyListLic } from '../model';
 export var normalizeListItem = function normalizeListItem(editor, _ref) {
   var listItem = _ref.listItem;
   var changed = false;
@@ -28,12 +29,7 @@ export var normalizeListItem = function normalizeListItem(editor, _ref) {
     firstLiChildNode = _ref7[0],
     firstLiChildPath = _ref7[1];
   if (!firstLiChild || !Editor.isBlock(editor, firstLiChildNode)) {
-    var emptyLic = {
-      type: LIST_LIC,
-      children: [{
-        text: ''
-      }]
-    };
+    var emptyLic = generateEmptyListLic();
     Transforms.insertNodes(editor, emptyLic, {
       at: liPath.concat([0])
     });

package/dist/basic-sdk/extension/plugins/list/transforms/toggle-list.js

@@ -5,11 +5,10 @@ import { LIST_ITEM, LIST_LIC, PARAGRAPH } from '../../../constants';
 import { findNode, getNodeEntries, getNodeType, getSelectedNodeEntryByType, isRangeAcrossBlocks } from '../../../core';
 import { getListItemEntry, getListTypes } from '../queries';
 import { unwrapList } from './unwrap-list';
+import { generateEmptyList, generateEmptyListItem } from '../model';
 var wrapLineList = function wrapLineList(editor, type) {
-  Transforms.wrapNodes(editor, {
-    type: type,
-    children: []
-  });
+  var list = generateEmptyList(type);
+  Transforms.wrapNodes(editor, list);
   var nodeEntry = getSelectedNodeEntryByType(editor, PARAGRAPH);
   if (!nodeEntry) return;
   var _nodeEntry = _slicedToArray(nodeEntry, 2),
@@ -21,10 +20,8 @@ var wrapLineList = function wrapLineList(editor, type) {
       type: LIST_LIC
     });
   }
-  Transforms.wrapNodes(editor, {
-    type: LIST_ITEM,
-    children: []
-  }, {
+  var listItem = generateEmptyListItem();
+  Transforms.wrapNodes(editor, listItem, {
     at: path
   });
   return;
@@ -101,17 +98,11 @@ var wrapRangeList = function wrapRangeList(editor, type) {
             at: n[1]
           });
         }
-        var listItem = {
-          type: LIST_ITEM,
-          children: []
-        };
+        var listItem = generateEmptyListItem();
         Transforms.wrapNodes(editor, listItem, {
           at: n[1]
         });
-        var list = {
-          type: type,
-          children: []
-        };
+        var list = generateEmptyList(type);
         Transforms.wrapNodes(editor, list, {
           at: n[1]
         });

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

@@ -5,8 +5,8 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import isHotkey from 'is-hotkey';
 import { Editor, Transforms, Point, Path, Node } from '@seafile/slate';
 import { ReactEditor } from '@seafile/slate-react';
-import { getNodeType, getParentNode, getSelectedNodeByType, isTextNode, isLastNode, genEmptyParagraph, replaceNodeChildren, focusEditor, getNode } from '../../core';
-import { ELEMENT_TYPE, TABLE_ELEMENT, TABLE_ELEMENT_POSITION, KEYBOARD } from '../../constants';
+import { getNodeType, getParentNode, getSelectedNodeByType, isTextNode, isLastNode, replaceNodeChildren, focusEditor, getNode, generateEmptyElement } from '../../core';
+import { ELEMENT_TYPE, TABLE_ELEMENT, TABLE_ELEMENT_POSITION, KEYBOARD, PARAGRAPH } from '../../constants';
 import { TABLE_MAX_ROWS, EMPTY_SELECTED_RANGE } from './constants';
 import ObjectUtils from '../../../utils/object-utils';
 import { getSelectedInfo, insertTableElement } from './helpers';
@@ -322,7 +322,7 @@ var withTable = function withTable(editor) {
     // insert empty node，continue editor
     var isLast = isLastNode(newEditor, node);
     if (isLast) {
-      var p = genEmptyParagraph();
+      var p = generateEmptyElement(PARAGRAPH);
       Transforms.insertNodes(newEditor, p, {
         at: [path[0] + 1]
       });

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

@@ -42,10 +42,23 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, doc
     }
 
     // Operations are execute failure
-    var operations = result.operations;
-    // Put the failed operation into the pending list and re-execute it
-    _this.pendingOperationList.unshift(operations);
-    _this.sendNextOperations();
+    var error_type = result.error_type,
+      operations = result.operations;
+    if (error_type === 'version_behind_server') {
+      // Put the failed operation into the pending list and re-execute it
+      _this.pendingOperationList.unshift(operations);
+      _this.sendNextOperations();
+    } else if (error_type === 'operation_exec_error') {
+      _this.editor.isRemote = true;
+      revertOperationList(_this.editor, [operations]);
+
+      // reset control flag
+      Promise.resolve().then(function (_) {
+        _this.editor.isRemote = false;
+        _this.dispatchConnectState(error_type);
+        _this.sendNextOperations();
+      });
+    }
   };
   this.receiveOperations = function (params) {
     _this.remoteOperationsList.push(params);

package/dist/components/doc-operations/revision-operations.js

@@ -31,7 +31,7 @@ var RevisionOperations = function RevisionOperations(_ref) {
   }, []);
   var startRevise = useCallback(function () {
     context.startRevise().then(function (res) {
-      window.location.href = "".concat(siteRoot, "lib/").concat(repoID, "/file/").concat(res.data.file_path);
+      window.location.href = "".concat(siteRoot, "lib/").concat(repoID, "/file").concat(res.data.file_path);
     }).catch(function (error) {
       toaster.danger(t('Error'));
     });

package/dist/components/tip-message/index.js

@@ -14,6 +14,14 @@ var TipMessage = /*#__PURE__*/function (_React$Component) {
     var _this;
     _classCallCheck(this, TipMessage);
     _this = _super.call(this, props);
+    _this.onOperationExecuteError = function () {
+      var t = _this.props.t;
+      var message = t('Failed_to_execute_operation_on_server');
+      toaster.danger(message, {
+        hasCloseButton: true,
+        duration: null
+      });
+    };
     _this.onDisconnect = function () {
       var t = _this.props.t;
       var message = t('Server_is_not_connected_Operation_will_be_sent_to_server_later');
@@ -97,6 +105,9 @@ var TipMessage = /*#__PURE__*/function (_React$Component) {
       this.unsubscribeDisconnectEvent = eventBus.subscribe('disconnect', this.onDisconnect);
       this.unsubscribeReconnectErrorEvent = eventBus.subscribe('reconnect_error', this.onReconnectError);
       this.unsubscribeReconnectEvent = eventBus.subscribe('reconnect', this.onReconnect);
+
+      // op execute error
+      this.unsubscribeOpExecError = eventBus.subscribe('operation_exec_error', this.onOperationExecuteError);
     }
   }, {
     key: "componentWillUnmount",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "0.1.69beta3",
+  "version": "0.1.70",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",

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

@@ -255,5 +255,6 @@
   "View_changes": "View changes",
   "Revision": "Revision",
   "Error": "Error",
-  "Start_revise": "Start revise"
+  "Start_revise": "Start revise",
+  "Failed_to_execute_operation_on_server": "Failed to execute operation on server"
 }

package/public/locales/zh-CN/sdoc-editor.json

@@ -255,5 +255,6 @@
   "View_changes": "查看改动",
   "Revision": "修订",
   "Error": "错误",
-  "Start_revise": "开始修订"
+  "Start_revise": "开始修订",
+  "Failed_to_execute_operation_on_server": "无法在服务器上执行操作"
 }