@seafile/sdoc-editor 0.2.10 → 0.2.11

package/dist/basic-sdk/comment/comment/global-comment-header.js

@@ -1,7 +1,8 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { useState } from 'react';
+import React, { useCallback, useState } from 'react';
 import { withTranslation } from 'react-i18next';
 import { Dropdown, DropdownItem, DropdownMenu, DropdownToggle } from 'reactstrap';
+import { eventStopPropagation } from '../../utils/mouse-event';
 export var COMMENT_TYPES = {
   all: 'All_comments',
   resolved: 'Resolved_comments',
@@ -24,6 +25,12 @@ function GlobalCommentHeader(_ref) {
       count: commentList.length
     });
   }
+  var handleCommentTypeChanged = useCallback(function (event, type) {
+    eventStopPropagation(event);
+    onCommentTypeChanged(type);
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
   var id = 'comment-type-controller';
   return /*#__PURE__*/React.createElement("div", {
     className: "comments-panel-body__header"
@@ -47,20 +54,20 @@ function GlobalCommentHeader(_ref) {
   }, /*#__PURE__*/React.createElement(DropdownItem, {
     className: "sdoc-dropdown-menu-item",
     tag: 'div',
-    onClick: function onClick() {
-      return onCommentTypeChanged(COMMENT_TYPES.all);
+    onClick: function onClick(event) {
+      return handleCommentTypeChanged(event, COMMENT_TYPES.all);
     }
   }, t(COMMENT_TYPES.all)), /*#__PURE__*/React.createElement(DropdownItem, {
     className: "sdoc-dropdown-menu-item",
     tag: 'div',
-    onClick: function onClick() {
-      return onCommentTypeChanged(COMMENT_TYPES.resolved);
+    onClick: function onClick(event) {
+      return handleCommentTypeChanged(event, COMMENT_TYPES.resolved);
     }
   }, t(COMMENT_TYPES.resolved)), /*#__PURE__*/React.createElement(DropdownItem, {
     className: "sdoc-dropdown-menu-item",
     tag: 'div',
-    onClick: function onClick() {
-      return onCommentTypeChanged(COMMENT_TYPES.unresolved);
+    onClick: function onClick(event) {
+      return handleCommentTypeChanged(event, COMMENT_TYPES.unresolved);
     }
   }, t(COMMENT_TYPES.unresolved))))), /*#__PURE__*/React.createElement("div", {
     className: "comment-count-tip"

package/dist/basic-sdk/comment/comment/global-comment.js

@@ -8,7 +8,7 @@ import { withTranslation } from 'react-i18next';
 import GlobalCommentHeader from './global-comment-header';
 var GlobalComment = function GlobalComment(_ref) {
   var t = _ref.t;
-  var _useState = useState(false),
+  var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     activeComment = _useState2[0],
     setActiveComment = _useState2[1];
@@ -26,6 +26,7 @@ var GlobalComment = function GlobalComment(_ref) {
     isShowCommentList = _useState4[0],
     setShowCommentList = _useState4[1];
   useEffect(function () {
+    if (!isShowCommentList) return;
     var toggleOuterSide = function toggleOuterSide(e) {
       var commentWrapper = commentRef.current;
       var clickIsInComment = commentWrapper && commentWrapper.contains(e.target) && commentWrapper !== e.target;
@@ -33,14 +34,18 @@ var GlobalComment = function GlobalComment(_ref) {
       setActiveComment(null);
       setShowCommentList(false);
     };
+    document.addEventListener('click', toggleOuterSide);
+    return function () {
+      document.removeEventListener('click', toggleOuterSide);
+    };
+  }, [isShowCommentList]);
+  useEffect(function () {
     var eventBus = EventBus.getInstance();
     var unsubscribe = eventBus.subscribe('COMMENT_LIST_CLICK', function () {
       return setShowCommentList(!isShowCommentList);
     });
-    document.addEventListener('click', toggleOuterSide, true);
     return function () {
       unsubscribe();
-      document.removeEventListener('click', toggleOuterSide, true);
     };
   }, [isShowCommentList]);
   var contentRef = useRef(null);
@@ -51,6 +56,9 @@ var GlobalComment = function GlobalComment(_ref) {
       behavior: 'smooth'
     });
   }, []);
+  var hiddenComment = useCallback(function () {
+    setActiveComment(null);
+  }, []);
   if (!isShowCommentList) return null;
   return /*#__PURE__*/React.createElement(ElementPopover, {
     className: 'global-comments-popover'
@@ -88,6 +96,7 @@ var GlobalComment = function GlobalComment(_ref) {
       comment: comment,
       isActive: isActive,
       onCommentClick: onCommentClick,
+      hiddenComment: hiddenComment,
       updateScrollPosition: updateScrollPosition
     });
   }))))));

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

@@ -7,6 +7,7 @@ import React from 'react';
 import { CHECK_LIST_ITEM, MENUS_CONFIG_MAP, PARAGRAPH } from '../../../constants';
 import { MenuItem } from '../../../commons';
 import { isMenuDisabled, setCheckListItemType, getCheckListItemType } from '../helpers';
+import { focusEditor } from '../../../core';
 var CheckListMenu = /*#__PURE__*/function (_React$Component) {
   _inherits(CheckListMenu, _React$Component);
   var _super = _createSuper(CheckListMenu);
@@ -32,6 +33,7 @@ var CheckListMenu = /*#__PURE__*/function (_React$Component) {
       var active = _this.isActive(editor);
       var newType = active ? PARAGRAPH : CHECK_LIST_ITEM;
       setCheckListItemType(editor, newType);
+      focusEditor(editor, editor.selection);
     };
     return _this;
   }

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

@@ -1,6 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { Editor, Transforms } from '@seafile/slate';
-import { getNodeType, isTextNode, getParentNode } from '../../core';
+import { getNodeType } from '../../core';
 import { ELEMENT_TYPE, HEADER, PARAGRAPH, SUBTITLE, TITLE } from '../../constants';
 export var isMenuDisabled = function isMenuDisabled(editor) {
   var readonly = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -9,10 +9,7 @@ export var isMenuDisabled = function isMenuDisabled(editor) {
   var _Editor$nodes = Editor.nodes(editor, {
       match: function match(n) {
         var type = getNodeType(n);
-        if (!type && isTextNode(n) && n.id) {
-          var parentNode = getParentNode(editor.children, n.id);
-          type = getNodeType(parentNode);
-        }
+        if (!type) return false;
         if (type === ELEMENT_TYPE.CODE_LINE) return true;
         if (type === ELEMENT_TYPE.CODE_BLOCK) return true;
         if (type === ELEMENT_TYPE.PARAGRAPH) return true;
@@ -32,6 +29,7 @@ export var getHeaderType = function getHeaderType(editor) {
   var _Editor$nodes3 = Editor.nodes(editor, {
       match: function match(n) {
         var nodeType = getNodeType(n);
+        if (!nodeType) return false;
         if (nodeType.includes(HEADER)) return true;
         if (nodeType === TITLE) return true;
         if (nodeType === SUBTITLE) return true;

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

@@ -9,6 +9,7 @@ import classnames from 'classnames';
 import { getHeaderType, isMenuDisabled, setHeaderType } from '../helpers';
 import { HEADERS, HEADER_TITLE_MAP, MAC_HOTKEYS, PARAGRAPH, SDOC_FONT_SIZE, SUBTITLE, TITLE, WIN_HOTKEYS } from '../../../constants';
 import Tooltip from '../../../commons/tooltip';
+import { focusEditor } from '../../../core';
 import './style.css';
 var HeaderMenu = /*#__PURE__*/function (_React$Component) {
   _inherits(HeaderMenu, _React$Component);
@@ -70,6 +71,7 @@ var HeaderMenu = /*#__PURE__*/function (_React$Component) {
         var active = _this.isActive(type);
         var newType = active ? PARAGRAPH : type;
         setHeaderType(editor, newType);
+        focusEditor(editor, editor.selection);
         _this.setState({
           isShowHeaderPopover: false
         }, function () {

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

@@ -23,6 +23,7 @@ var withHeader = function withHeader(editor) {
     var _Editor$nodes = Editor.nodes(newEditor, {
         match: function match(n) {
           if (!Element.isElement(n)) return false;
+          if (!n.type) return false;
           if (n.type.startsWith(HEADER)) return true;
           if (n.type === TITLE) return true;
           if (n.type === SUBTITLE) return true;

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

@@ -72,9 +72,9 @@ var withMarkDown = function withMarkDown(editor) {
 
     // Based on the keyword, find the type of element you want to convert
     var type = KEY_TO_TYPE_FOR_SPACE[beforeText.trim()];
+    var italicAndBoldType = KEY_TO_INLINE_TYPE_FOR_SPACE[beforeText.slice(-3)];
     var boldType = KEY_TO_INLINE_TYPE_FOR_SPACE[beforeText.slice(-2)];
     var italicType = KEY_TO_INLINE_TYPE_FOR_SPACE[beforeText.slice(-1)];
-    var italicAndBoldType = KEY_TO_INLINE_TYPE_FOR_SPACE[beforeText.slice(-3)];
     if (!type && !boldType && !italicType && !italicAndBoldType) return insertText(text);
     if (italicAndBoldType === TEXT_STYLE_MAP.BOLD_ITALIC) {
       var restStr = beforeText === null || beforeText === void 0 ? void 0 : beforeText.slice(0, beforeText.length - 3);
@@ -119,10 +119,17 @@ var withMarkDown = function withMarkDown(editor) {
       Editor.addMark(editor, newType, true);
       return insertText(_newText);
     }
+
+    // demos
+    // 1 '*'
+    // 2 'acd * add *'
     if (italicType === TEXT_STYLE_MAP.ITALIC) {
       var _restStr2 = beforeText === null || beforeText === void 0 ? void 0 : beforeText.slice(0, beforeText.length - 1);
       var _startOffset2 = _restStr2 === null || _restStr2 === void 0 ? void 0 : _restStr2.lastIndexOf('*');
       var _endOffset2 = (beforeText === null || beforeText === void 0 ? void 0 : beforeText.lastIndexOf('*')) + 1;
+      if (_startOffset2 === -1 && _restStr2.length > 0) {
+        return insertText(text);
+      }
       if (_startOffset2 !== -1) {
         Transforms.delete(editor, {
           at: {

package/dist/basic-sdk/views/sdoc-diff-viewer.js

@@ -1,6 +1,7 @@
 import React, { useEffect } from 'react';
 import { getDiff } from '../utils/diff';
 import SDocViewer from './sdoc-viewer';
+import context from '../../context';
 import '../../assets/css/diff-viewer.css';
 var DiffViewer = function DiffViewer(_ref) {
   var currentContent = _ref.currentContent,
@@ -8,6 +9,7 @@ var DiffViewer = function DiffViewer(_ref) {
     didMountCallback = _ref.didMountCallback;
   var diff = getDiff(currentContent, lastContent);
   useEffect(function () {
+    context.initApi();
     didMountCallback && didMountCallback(diff);
 
     // eslint-disable-next-line react-hooks/exhaustive-deps

package/dist/components/doc-operations/comments-operation/index.js

@@ -1,7 +1,9 @@
 import React, { useCallback } from 'react';
 import { EventBus } from '../../../basic-sdk';
+import { eventStopPropagation } from '../../../basic-sdk/utils/mouse-event';
 export default function CommentsOperation() {
-  var onCommentsToggle = useCallback(function () {
+  var onCommentsToggle = useCallback(function (event) {
+    eventStopPropagation(event);
     var eventBus = EventBus.getInstance();
     eventBus.dispatch('COMMENT_LIST_CLICK');
   }, []);

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

@@ -30,7 +30,7 @@ var MoreOperations = function MoreOperations(_ref) {
     className: "op-item",
     tag: "span"
   }, /*#__PURE__*/React.createElement("i", {
-    className: "sdocfont sdoc-menu"
+    className: "sdocfont sdoc-more"
   })), /*#__PURE__*/React.createElement(DropdownMenu, {
     className: "sdoc-dropdown-menu",
     right: true

package/dist/pages/simple-editor.js

@@ -1,3 +1,4 @@
+import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { withTranslation } from 'react-i18next';
@@ -55,7 +56,23 @@ var SimpleEditor = function SimpleEditor(_ref) {
         toaster.success(t('Revision_created', {
           id: revisionId
         }));
+        searchParams.delete(REVISION_FIRST_LOAD_KEY);
       }
+      var newParamsString = '';
+      var _iterator = _createForOfIteratorHelper(searchParams.entries()),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var item = _step.value;
+          newParamsString = newParamsString + "&".concat(item[0], "=").concat(item[1]);
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      var newURL = "".concat(url.origin).concat(url.pathname).concat(newParamsString ? '/?' + newParamsString : '');
+      window.history.replaceState(null, null, newURL);
     }
 
     // eslint-disable-next-line react-hooks/exhaustive-deps

package/package.json

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