@seafile/sdoc-editor 0.1.1 → 0.1.2

package/dist/editor.js

@@ -1,3 +1,4 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
@@ -15,6 +16,12 @@ var SDocEditor = /*#__PURE__*/function (_React$Component) {
     var _this;
     _classCallCheck(this, SDocEditor);
     _this = _super.call(this, props);
+    _this.updateWithRemoteOperation = function (params) {
+      var operation = params.operation;
+      _this.editor.apply(_objectSpread(_objectSpread({}, operation), {}, {
+        is_remote: true
+      }));
+    };
     _this.onChange = function (slateValue) {
       var onValueChanged = _this.props.onValueChanged;
       _this.setState({
@@ -22,12 +29,13 @@ var SDocEditor = /*#__PURE__*/function (_React$Component) {
       });
       onValueChanged && onValueChanged(slateValue);
     };
-    var content = props.document.content;
+    var children = props.document.children;
     _this.state = {
-      slateValue: content,
+      slateValue: children,
       isLoading: true
     };
     _this.editor = editor;
+    _this.socketManager = null;
     return _this;
   }
   _createClass(SDocEditor, [{
@@ -38,9 +46,16 @@ var SDocEditor = /*#__PURE__*/function (_React$Component) {
         document = _this$props.document,
         config = _this$props.config;
       if (isOpenSocket) {
-        SocketManager.getInstance(document, config);
+        this.socketManager = SocketManager.getInstance(document, config);
+        var eventBus = this.socketManager.eventBus;
+        this.unsubscribeReceiveOption = eventBus.subscribe('receive-operation', this.updateWithRemoteOperation);
       }
     }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      this.unsubscribeReceiveOption();
+    }
   }, {
     key: "render",
     value: function render() {

package/dist/slate-extension/core/transforms/move-children.js

@@ -10,7 +10,7 @@ export var moveChildren = function moveChildren(editor, _ref) {
   var moved = 0;
   var parentPath = Path.isPath(at) ? at : at[1];
   var parentNode = Path.isPath(at) ? getNode(editor, parentPath) : at[0];
-
+  if (!parentNode) return moved;
   // There have none children in a not block element
   if (!Editor.isBlock(editor, parentNode)) return moved;
   for (var i = parentNode.children.length - 1; i >= fromStartIndex; i--) {

package/dist/slate-extension/plugins/blockquote/helpers.js

@@ -1,7 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { Editor, Transforms } from "slate";
-import { BLOCKQUOTE } from "../../constants";
-import { getNodeType } from "../../core";
+import { Editor, Transforms } from 'slate';
+import { BLOCKQUOTE } from '../../constants';
+import { getNodeType } from '../../core';
 export var isMenuDisabled = function isMenuDisabled(editor) {
   if (editor.selection == null) return true;
   var _Editor$nodes = Editor.nodes(editor, {

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

@@ -1,7 +1,7 @@
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import { Transforms, Editor, Path } from 'slate';
+import { Transforms, Editor, Path, Element } from 'slate';
 import { LIST_LIC } from '../../../constants';
 import { getChildren, getDeepInlineChildren, match } from '../../../core';
 import { getListTypes } from '../queries';
@@ -79,7 +79,7 @@ export var normalizeListItem = function normalizeListItem(editor, _ref) {
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var licChild = _step.value;
-        if (!Editor.isBlock(editor, licChild[0])) {
+        if (!(Element.isElement(licChild[0]) && Editor.isBlock(editor, licChild[0]))) {
           break;
         }
         blockPathRefs.push(Editor.pathRef(editor, licChild[1]));

package/dist/slate-extension/plugins/list/transforms/toggle-list.js

@@ -6,15 +6,19 @@ import { findNode, getNodeEntries, getNodeType, getSelectedNodeEntryByType, isRa
 import { getListItemEntry, getListTypes } from '../queries';
 import { unwrapList } from './unwrap-list';
 var wrapLineList = function wrapLineList(editor, type) {
+  Transforms.wrapNodes(editor, {
+    type: type,
+    children: []
+  });
   var nodeEntry = getSelectedNodeEntryByType(editor, PARAGRAPH);
+  if (!nodeEntry) return;
   var _nodeEntry = _slicedToArray(nodeEntry, 2),
     node = _nodeEntry[0],
     path = _nodeEntry[1];
   if (node.type !== LIST_LIC) {
+    // paragraph to list-lic
     Transforms.setNodes(editor, {
       type: LIST_LIC
-    }, {
-      at: path
     });
   }
   Transforms.wrapNodes(editor, {
@@ -23,12 +27,6 @@ var wrapLineList = function wrapLineList(editor, type) {
   }, {
     at: path
   });
-  Transforms.wrapNodes(editor, {
-    type: type,
-    children: []
-  }, {
-    at: path
-  });
   return;
 };
 var wrapRangeList = function wrapRangeList(editor, type) {

package/dist/slate-extension/plugins/socket/plugin.js

@@ -3,6 +3,12 @@ var withSocket = function withSocket(editor) {
   var apply = editor.apply;
   var newEditor = editor;
   newEditor.apply = function (operation) {
+    var isRemote = operation.is_remote;
+    if (isRemote) {
+      apply(operation);
+      return;
+    }
+
     // 合并 op
     try {
       var socketManager = SocketManager.getInstance();

package/dist/slate-extension/socket/socket-client.js

@@ -14,8 +14,18 @@ var SocketClient = /*#__PURE__*/_createClass(function SocketClient(config) {
   };
   this.onConnected = function () {
     var socketManager = SocketManager.getInstance();
-    // todo
-    _this.socket.emit('join-room', _this.getParams(_this.config), function (result) {
+    var _this$config = _this.config,
+      fileUuid = _this$config.fileUuid,
+      filePath = _this$config.filePath,
+      fileName = _this$config.fileName,
+      accessToken = _this$config.accessToken;
+    var params = {
+      file_uuid: fileUuid,
+      file_path: filePath,
+      file_name: fileName,
+      access_token: accessToken
+    };
+    _this.socket.emit('join-room', params, function (result) {
       if (result.status) {
         socketManager.dispatchConnectState('connect', result);
         return;

package/dist/slate-extension/socket/socket-manager.js

@@ -1,5 +1,6 @@
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import EventBus from '../../utils/event-bus';
 import SocketClient from './socket-client';
 var SocketManager = /*#__PURE__*/_createClass(function SocketManager(document, config) {
   var _this = this;
@@ -36,8 +37,8 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(document, c
     _this.sendingOperation = null;
     _this.sendNextOperation();
   };
-  this.receiveOperation = function (operation, last_version) {
-    console.log(operation);
+  this.receiveOperation = function (params, last_version) {
+    _this.eventBus.dispatch('receive-operation', params);
   };
   this.dispatchConnectState = function (type, message) {
     console.log(type);
@@ -47,6 +48,7 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(document, c
   this.sendingOperation = null;
   this.pendingOperations = [];
   this.isSendingOperation = false;
+  this.eventBus = new EventBus();
 });
 SocketManager.getInstance = function (document, socketConfig) {
   if (SocketManager.instance) {

package/dist/utils/event-bus.js

@@ -0,0 +1,39 @@
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
+var EventBus = /*#__PURE__*/function () {
+  function EventBus() {
+    _classCallCheck(this, EventBus);
+    this.subscribers = {};
+  }
+  _createClass(EventBus, [{
+    key: "subscribe",
+    value: function subscribe(type, handler) {
+      if (!this.subscribers[type]) {
+        this.subscribers[type] = [];
+      }
+      var handlers = this.subscribers[type];
+      handlers.push(handler);
+      return function () {
+        var index = handlers.indexOf(handler);
+        if (index > -1) {
+          handlers.splice(index, 1);
+        }
+      };
+    }
+  }, {
+    key: "dispatch",
+    value: function dispatch(type) {
+      for (var _len = arguments.length, data = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+        data[_key - 1] = arguments[_key];
+      }
+      var handlers = this.subscribers[type];
+      if (Array.isArray(handlers)) {
+        handlers.forEach(function (handler) {
+          return handler.apply(void 0, data);
+        });
+      }
+    }
+  }]);
+  return EventBus;
+}();
+export default EventBus;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",
@@ -9,10 +9,10 @@
     "is-hotkey": "0.2.0",
     "react-cookies": "0.1.1",
     "reactstrap": "8.9.0",
-    "slate": "0.88.1",
+    "slate": "0.91.4",
     "slate-history": "0.86.0",
     "slate-hyperscript": "0.77.0",
-    "slate-react": "0.88.2",
+    "slate-react": "0.92.0",
     "socket.io-client": "4.6.1"
   },
   "scripts": {