@seafile/sdoc-editor 0.1.45 → 0.1.46

package/dist/assets/css/simple-editor.css

@@ -19,6 +19,6 @@
   color: #333;
 }
 
-.sdoc-editor-page-header .doc-info .sdocfont {
-  font-size: 18px;
+.sdoc-editor-page-header .doc-info .sdoc-link {
+  font-size: 14px;
 }

package/dist/basic-sdk/editor.js

@@ -13,7 +13,6 @@ import withNodeId from './node-id';
 import SDocOutline from './outline';
 import EventProxy from './utils/event-handler';
 import { focusEditor } from './extension/core';
-import { getDecorate } from './cursor/decorate';
 import './assets/css/layout.css';
 import './assets/css/sdoc-editor-plugins.css';
 var SDocEditor = /*#__PURE__*/function (_React$Component) {
@@ -85,7 +84,6 @@ var SDocEditor = /*#__PURE__*/function (_React$Component) {
       var slateValue = this.state.slateValue;
       var config = this.props.config;
       var docUuid = config.docUuid;
-      var decorate = getDecorate(editor);
       return /*#__PURE__*/React.createElement("div", {
         className: "sdoc-editor-container"
       }, /*#__PURE__*/React.createElement(Toolbar, {
@@ -111,8 +109,7 @@ var SDocEditor = /*#__PURE__*/function (_React$Component) {
           return _renderLeaf(props, _this2.editor);
         },
         onKeyDown: this.eventProxy.onKeyDown,
-        onDOMBeforeInput: this.onDOMBeforeInput,
-        decorate: decorate
+        onDOMBeforeInput: this.onDOMBeforeInput
       }))))));
     }
   }]);

package/dist/basic-sdk/extension/constants/element-type.js

@@ -1,6 +1,8 @@
 export var BLOCKQUOTE = 'blockquote';
 export var BOLD = 'bold';
 export var ITALIC = 'italic';
+export var UNDERLINE = 'underline';
+export var STRIKETHROUGH = 'strikethrough';
 export var HEADER = 'header';
 export var HEADER1 = 'header1';
 export var HEADER2 = 'header2';

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

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 var _MENUS_CONFIG_MAP, _HEADER_TITLE_MAP;
 // extension plugin
 import * as ELEMENT_TYPE from './element-type';
-import { BLOCKQUOTE, BOLD, ITALIC, HEADER, HEADER1, HEADER2, HEADER3, HEADER4, HEADER5, HEADER6, ORDERED_LIST, UNORDERED_LIST, LIST_ITEM, LIST_LIC, CHECK_LIST, CHECK_LIST_ITEM, PARAGRAPH, LINK, HTML, CODE_BLOCK, CODE_LINE, IMAGE, TABLE, TABLE_CELL, TABLE_ROW, FORMULA, COLUMN, TEXT_STYLE, BOLD_ITALIC } from './element-type';
+import { BLOCKQUOTE, HEADER, HEADER1, HEADER2, HEADER3, HEADER4, HEADER5, HEADER6, PARAGRAPH, BOLD, ITALIC, UNDERLINE, STRIKETHROUGH, 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, BOLD_ITALIC } from './element-type';
 import KEYBOARD from './keyboard';
 
 // history
@@ -59,6 +59,16 @@ export var MENUS_CONFIG_MAP = (_MENUS_CONFIG_MAP = {}, _defineProperty(_MENUS_CO
   iconClass: 'sdocfont sdoc-bold',
   text: 'bold',
   type: 'BOLD'
+}, {
+  id: UNDERLINE,
+  iconClass: 'sdocfont sdoc-underline',
+  text: 'underline',
+  type: 'UNDERLINE'
+}, {
+  id: STRIKETHROUGH,
+  iconClass: 'sdocfont sdoc-strikethrough',
+  text: 'strikethrough',
+  type: 'STRIKETHROUGH'
 }]), _defineProperty(_MENUS_CONFIG_MAP, UNDO, {
   id: UNDO,
   iconClass: 'sdocfont sdoc-revoke',
@@ -90,4 +100,4 @@ export var TABLE_ELEMENT_POSITION = {
   AFTER: 'after',
   BEFORE: 'before'
 };
-export { BLOCKQUOTE, BOLD, ITALIC, HEADER, HEADER1, HEADER2, HEADER3, HEADER4, HEADER5, HEADER6, ORDERED_LIST, UNORDERED_LIST, LIST_ITEM, LIST_LIC, CHECK_LIST, CHECK_LIST_ITEM, PARAGRAPH, LINK, HTML, CODE_BLOCK, CODE_LINE, IMAGE, TABLE, TABLE_CELL, TABLE_ROW, FORMULA, COLUMN, TEXT_STYLE, BOLD_ITALIC, ELEMENT_TYPE, KEYBOARD };
+export { BLOCKQUOTE, HEADER, HEADER1, HEADER2, HEADER3, HEADER4, HEADER5, HEADER6, PARAGRAPH, BOLD, ITALIC, UNDERLINE, STRIKETHROUGH, 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, BOLD_ITALIC, ELEMENT_TYPE, KEYBOARD };

package/dist/basic-sdk/extension/plugins/table/menu/active-table-menu/index.css

@@ -2,6 +2,7 @@
   padding: 8px 0;
 }
 
-.sdoc-table-menu-group .sdocfont {
+.sdoc-table-menu-group .sdoc-drop-down,
+.sdoc-table-menu-group .sdoc-caret-up {
   transform: scale(.8);
 }

package/dist/basic-sdk/extension/plugins/text-style/menu/index.js

@@ -11,10 +11,13 @@ import { getValue, isMenuDisabled, addMark, removeMark } from '../helpers';
 var TextStyleMenuList = /*#__PURE__*/function (_React$Component) {
   _inherits(TextStyleMenuList, _React$Component);
   var _super = _createSuper(TextStyleMenuList);
-  function TextStyleMenuList(props) {
+  function TextStyleMenuList() {
     var _this;
     _classCallCheck(this, TextStyleMenuList);
-    _this = _super.call(this, props);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _super.call.apply(_super, [this].concat(args));
     _this.isActive = function (editor, type) {
       var isMark = getValue(editor, type);
       return !!isMark;
@@ -36,43 +39,36 @@ var TextStyleMenuList = /*#__PURE__*/function (_React$Component) {
       }
       focusEditor(editor);
     };
-    _this.state = {
-      isShowLinkDialog: false
-    };
     return _this;
   }
   _createClass(TextStyleMenuList, [{
     key: "getTextStyleMenuList",
     value: function getTextStyleMenuList() {
+      var _this2 = this;
       var _this$props = this.props,
         isRichEditor = _this$props.isRichEditor,
         className = _this$props.className,
         editor = _this$props.editor;
-      var textStyleMenuList = [{
-        isRichEditor: isRichEditor,
-        className: className,
-        disabled: this.isDisabled(),
-        isActive: this.isActive(editor, 'ITALIC'),
-        onMouseDown: this.onMouseDown
-      }, {
-        isRichEditor: isRichEditor,
-        className: className,
-        disabled: this.isDisabled(),
-        isActive: this.isActive(editor, 'BOLD'),
-        onMouseDown: this.onMouseDown
-      }];
-      return textStyleMenuList;
+      var list = MENUS_CONFIG_MAP[TEXT_STYLE].map(function (item) {
+        var itemProps = {
+          isRichEditor: isRichEditor,
+          className: className,
+          disabled: _this2.isDisabled(),
+          isActive: _this2.isActive(editor, item.type),
+          onMouseDown: _this2.onMouseDown
+        };
+        return _objectSpread(_objectSpread({}, itemProps), item);
+      });
+      return list;
     }
   }, {
     key: "render",
     value: function render() {
       var textStyleMenuList = this.getTextStyleMenuList();
-      return /*#__PURE__*/React.createElement(React.Fragment, null, textStyleMenuList.map(function (menuItem, index) {
-        var menuItemConfig = MENUS_CONFIG_MAP[TEXT_STYLE][index];
-        var menuItemProps = _objectSpread(_objectSpread({}, menuItem), menuItemConfig);
+      return /*#__PURE__*/React.createElement(React.Fragment, null, textStyleMenuList.map(function (itemProps, index) {
         return /*#__PURE__*/React.createElement(MenuItem, Object.assign({
           key: index
-        }, menuItemProps));
+        }, itemProps));
       }));
     }
   }]);

package/dist/basic-sdk/extension/plugins/text-style/render-elem.js

@@ -1,5 +1,4 @@
 import React from 'react';
-import Caret from './caret';
 var renderText = function renderText(props, editor) {
   var attributes = props.attributes,
     children = props.children,
@@ -8,12 +7,26 @@ var renderText = function renderText(props, editor) {
   if (leaf.BOLD) {
     markedChildren = /*#__PURE__*/React.createElement("strong", null, markedChildren);
   }
-  if (leaf.CODE) {
-    markedChildren = /*#__PURE__*/React.createElement("code", null, markedChildren);
-  }
   if (leaf.ITALIC) {
     markedChildren = /*#__PURE__*/React.createElement("i", null, markedChildren);
   }
+  if (leaf.UNDERLINE) {
+    markedChildren = /*#__PURE__*/React.createElement("span", {
+      style: {
+        textDecoration: 'underline'
+      }
+    }, markedChildren);
+  }
+  if (leaf.STRIKETHROUGH) {
+    markedChildren = /*#__PURE__*/React.createElement("span", {
+      style: {
+        textDecoration: 'line-through'
+      }
+    }, markedChildren);
+  }
+  if (leaf.CODE) {
+    markedChildren = /*#__PURE__*/React.createElement("code", null, markedChildren);
+  }
   if (leaf.DELETE) {
     markedChildren = /*#__PURE__*/React.createElement("del", null, markedChildren);
   }
@@ -27,10 +40,6 @@ var renderText = function renderText(props, editor) {
   }
   return /*#__PURE__*/React.createElement("span", Object.assign({
     "data-id": leaf.id
-  }, attributes, {
-    style: {
-      position: 'relative'
-    }
-  }), leaf.isCaret ? /*#__PURE__*/React.createElement(Caret, leaf) : null, markedChildren);
+  }, attributes), markedChildren);
 };
 export default renderText;

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

@@ -3,7 +3,6 @@ import deepCopy from 'deep-copy';
 import { Editor, Operation } from '@seafile/slate';
 import { getNode } from '../extension/core';
 import * as OPERATION from '../node-id/constants';
-import { setCursor } from '../cursor/helper';
 export var getNodePathById = function getNodePathById(rootNode, nodeId) {
   var path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   if (rootNode.id === nodeId) return path;
@@ -251,16 +250,11 @@ export var reExecRevertOperationList = function reExecRevertOperationList(editor
     _loop2();
   }
 };
-export var syncRemoteOperations = function syncRemoteOperations(editor, remoteOperations, user) {
+export var syncRemoteOperations = function syncRemoteOperations(editor, remoteOperations) {
   if (remoteOperations.length === 0) return;
   Editor.withoutNormalizing(editor, function () {
-    for (var i = 0; i < remoteOperations.length; i++) {
-      var op = remoteOperations[i];
-      if (op.type === 'set_selection') {
-        continue;
-      }
-      editor.apply(op);
-    }
-    setCursor(user.username, editor, remoteOperations);
+    remoteOperations.forEach(function (item) {
+      editor.apply(item);
+    });
   });
 };

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

@@ -11,12 +11,10 @@ var SocketClient = /*#__PURE__*/_createClass(function SocketClient(config) {
     var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var _this$config = _this.config,
       docUuid = _this$config.docUuid,
-      user = _this$config.user,
-      cursorData = _this$config.cursorData;
+      user = _this$config.user;
     return _objectSpread({
       doc_uuid: docUuid,
-      user: user,
-      cursor_data: cursorData
+      user: user
     }, params);
   };
   this.onConnected = function () {

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

@@ -83,11 +83,10 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, doc
         }
 
         // 2. execute operations
-        var operations = params.operations,
-          user = params.user;
+        var operations = params.operations;
         // 2.1 Update content & version
         debug('execute remote operations: %O', operations);
-        syncRemoteOperations(_this.editor, operations, user);
+        syncRemoteOperations(_this.editor, operations);
 
         // 2.2 Update document
         _this.document.version = serverVersion;

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

@@ -1,15 +1,12 @@
 var _this = this;
-import { generateCursorData, setCursor } from '../cursor/helper';
 import SocketManager from './socket-manager';
 var withSocketIO = function withSocketIO(editor, options) {
   var onChange = editor.onChange;
   var newEditor = editor;
-  var cursorData = generateCursorData(options.config);
   var socketManager = null;
   newEditor.openConnection = function () {
     var document = options.document,
       config = options.config;
-    config['cursorData'] = cursorData;
     socketManager = SocketManager.getInstance(newEditor, document, config);
   };
   newEditor.closeConnection = function () {
@@ -17,13 +14,12 @@ var withSocketIO = function withSocketIO(editor, options) {
   };
   newEditor.onChange = function () {
     var operations = newEditor.operations;
-    // operations = operations.filter(item => item.type !== 'set_selection');
+    operations = operations.filter(function (item) {
+      return item.type !== 'set_selection';
+    });
     if (!newEditor.isRemote && operations.length > 0) {
       var _socketManager = SocketManager.getInstance();
       _socketManager.addOperations && _socketManager.addOperations(operations);
-      var config = options.config;
-      var clientId = config.user.username;
-      setCursor(clientId, editor, operations, cursorData);
     }
     onChange();
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "0.1.45",
+  "version": "0.1.46",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",
@@ -14,7 +14,6 @@
     "deep-copy": "1.4.2",
     "is-hotkey": "0.2.0",
     "is-url": "^1.2.4",
-    "randomcolor": "0.6.2",
     "react-cookies": "0.1.1",
     "reactstrap": "8.9.0",
     "slugid": "3.2.0",

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

@@ -1,6 +1,8 @@
 {
   "bold": "Bold",
   "italic": "Italic",
+  "underline": "Underline",
+  "strikethrough": "Strikethrough",
   "inline_code": "Code",
   "header_one": "Heading 1",
   "header_two": "Heading 2",

package/dist/basic-sdk/cursor/decorate.js

@@ -1,35 +0,0 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { Text, Path, Range } from '@seafile/slate';
-export var getDecorate = function getDecorate(editor) {
-  return function (nodeEntry) {
-    var ranges = [];
-    var _nodeEntry = _slicedToArray(nodeEntry, 2),
-      node = _nodeEntry[0],
-      path = _nodeEntry[1];
-    var cursors = Object.values(editor.cursors || {});
-    if (Text.isText(node) && (cursors === null || cursors === void 0 ? void 0 : cursors.length)) {
-      cursors.forEach(function (cursor) {
-        if (Range.includes(cursor, path)) {
-          var focus = cursor.focus,
-            anchor = cursor.anchor,
-            isForward = cursor.isForward;
-          var isFocusNode = Path.equals(focus.path, path);
-          var isAnchorNode = Path.equals(anchor.path, path);
-          ranges.push(_objectSpread(_objectSpread({}, cursor), {}, {
-            isCaret: isFocusNode,
-            anchor: {
-              path: path,
-              offset: isAnchorNode ? anchor.offset : isForward ? 0 : node.text.length
-            },
-            focus: {
-              path: path,
-              offset: isFocusNode ? focus.offset : isForward ? node.text.length : 0
-            }
-          }));
-        }
-      });
-    }
-    return ranges;
-  };
-};

package/dist/basic-sdk/cursor/helper.js

@@ -1,40 +0,0 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { Range } from '@seafile/slate';
-import randomColor from 'randomcolor';
-
-// selection: { anchor, focus }
-// cursor: { anchor, focus }
-
-export var setCursor = function setCursor(id, editor, operations, cursorData) {
-  var cursorOps = operations.filter(function (operation) {
-    return operation.type === 'set_selection';
-  });
-  if (!editor.cursors) editor.cursors = {};
-  var oldCursor = editor.cursors[id] ? editor.cursors[id] : {};
-  var lastCursorOp = cursorOps[cursorOps.length - 1];
-  var selection = editor.selection;
-  if (selection) {
-    var newCursor = lastCursorOp && lastCursorOp.newProperties || {};
-    var newCursorData = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, oldCursor), newCursor), selection), _objectSpread(_objectSpread({}, cursorData), {}, {
-      isForward: Range.isForward(selection)
-    }));
-    editor.cursors[id] = newCursorData;
-  } else {
-    delete editor.cursors[id];
-  }
-  return editor;
-};
-export var generateCursorData = function generateCursorData(config) {
-  var user = config.user;
-  var options = {
-    luminosity: 'dark',
-    format: 'rgba',
-    alpha: 1
-  };
-  var color = randomColor(options);
-  return {
-    name: user.name,
-    color: color,
-    alphaColor: color.slice(0, -2) + '0.2)'
-  };
-};

package/dist/basic-sdk/extension/plugins/text-style/caret.js

@@ -1,47 +0,0 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import React from 'react';
-var cursorStyleBase = {
-  position: 'absolute',
-  top: -2,
-  pointerEvents: 'none',
-  userSelect: 'none',
-  transform: 'translateY(-100%)',
-  fontSize: 10,
-  color: 'white',
-  background: 'palevioletred',
-  whiteSpace: 'nowrap'
-};
-var caretStyleBase = {
-  position: 'absolute',
-  pointerEvents: 'none',
-  userSelect: 'none',
-  height: '1.2em',
-  width: 2,
-  background: 'palevioletred'
-};
-var Caret = function Caret(_ref) {
-  var color = _ref.color,
-    isForward = _ref.isForward,
-    name = _ref.name;
-  var cursorStyles = _objectSpread(_objectSpread({}, cursorStyleBase), {}, {
-    background: color,
-    left: isForward ? '100%' : '0%'
-  });
-  var caretStyles = _objectSpread(_objectSpread({}, caretStyleBase), {}, {
-    background: color,
-    left: isForward ? '100%' : '0%'
-  });
-  caretStyles[isForward ? 'bottom' : 'top'] = 0;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
-    contentEditable: false,
-    style: caretStyles
-  }, /*#__PURE__*/React.createElement("span", {
-    style: {
-      position: 'relative'
-    }
-  }, /*#__PURE__*/React.createElement("span", {
-    contentEditable: false,
-    style: cursorStyles
-  }, name))));
-};
-export default Caret;