@seafile/sdoc-editor 0.5.10 → 0.5.11

package/dist/basic-sdk/assets/css/sdoc-comment-editor-plugin.css

@@ -1,7 +1,19 @@
-.sdoc-comment-editor-wrapper .sdoc-comment-editor .list-container {
-  padding-left: 1em !important;
+/* List */
+.sdoc-editor-container .sdoc-comment-editor .list-container {
+  padding-left: 2em !important; 
 }
 
 .sdoc-comment-editor .list-container li p {
   margin: 0 !important;
 }
+
+/* Paragraph */
+.sdoc-comment-editor .sdoc-comment-editor-paragraph {
+  margin: 0.8em 0 !important;
+  padding: 0 !important;
+}
+
+/* Image */
+.sdoc-comment-editor .sdoc-image-wrapper  {
+  padding: 1px !important;
+}

package/dist/basic-sdk/comment/components/comment-list.css

@@ -48,6 +48,8 @@
   overflow-x: hidden;
   overflow-y: auto;
   margin: 0;
+  padding: 0;
+  list-style: none;
 }
 
 .sdoc-comment-list-container .comment-item {
@@ -85,9 +87,22 @@
   word-wrap: break-word;
 }
 
+.comment-item .comment-content {
+  font-size: 11pt;
+}
+
 .comment-item .comment-content ol,
 .comment-item .comment-content ul {
-  padding-left: 1em;
+  padding-left: 2em;
+}
+
+.comment-item .comment-content ol li p,
+.comment-item .comment-content ul li p {
+  margin: 0;
+}
+
+.comment-item .comment-content p {
+  margin: 0.8em 0;
 }
 
 .sdoc-comment-list-container .comment-header .comment-author__avatar {
@@ -216,7 +231,8 @@
 
 .comment-editor-wrapper .sdoc-comment-editor-wrapper .article.sdoc-comment-editor {
   width: 365px;
-  padding: 0 5px;
+  padding: 8px;
+  padding-bottom: 0;
   min-height: 130px;
   max-height: 130px;
   box-shadow: none;
@@ -226,6 +242,10 @@
   background-color: transparent;
 }
 
+.article.sdoc-comment-editor :first-child {
+  padding-top: 0;
+}
+
 .sdoc-comment-list-container .comment-editor-wrapper {
   display: flex;
   flex-direction: column;

package/dist/basic-sdk/editor/sdoc-comment-editor.js

@@ -1,5 +1,5 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import React, { useEffect, useState, useImperativeHandle, forwardRef, useMemo, useCallback } from 'react';
+import React, { useEffect, useState, useImperativeHandle, forwardRef, useMemo, useCallback, useRef } from 'react';
 import { Editor } from '@seafile/slate';
 import deepCopy from 'deep-copy';
 import context from '../../context';
@@ -23,6 +23,7 @@ const SdocCommentEditor = forwardRef((_ref, ref) => {
     type
   } = _ref;
   const [slateValue, setSlateValue] = useState(document.children);
+  const commentEditorContainerRef = useRef(null);
   const validEditor = propsEditor || useMemo(() => {
     const defaultEditor = createCommentEditor();
     const editorConfig = context.getEditorConfig();
@@ -92,12 +93,20 @@ const SdocCommentEditor = forwardRef((_ref, ref) => {
       className: "h-100 w-100 d-flex align-items-center justify-content-center"
     }, /*#__PURE__*/React.createElement(CommonLoading, null));
   }
+  const handleFocusEditor = e => {
+    if (e.target === commentEditorContainerRef.current) {
+      const focusPoint = Editor.end(validEditor, []);
+      focusEditor(validEditor, focusPoint);
+    }
+  };
   return /*#__PURE__*/React.createElement(EditorContainer, {
     editor: validEditor
   }, /*#__PURE__*/React.createElement(CollaboratorsProvider, null, /*#__PURE__*/React.createElement("div", {
     className: "sdoc-comment-editor-wrapper"
   }, /*#__PURE__*/React.createElement("div", {
-    className: "article sdoc-comment-editor"
+    ref: commentEditorContainerRef,
+    className: "article sdoc-comment-editor",
+    onClick: handleFocusEditor
   }, /*#__PURE__*/React.createElement(CommentArticle, {
     type: type,
     editor: validEditor,

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

@@ -46,8 +46,7 @@ const InsertElementDialog = _ref => {
       slateNode,
       insertFileLinkCallback,
       insertSdocFileLinkCallback,
-      isShowHistoryFiles,
-      editor
+      isShowHistoryFiles
     } = _ref2;
     setInsertPosition(insertPosition);
     setSlateNode(slateNode);
@@ -65,7 +64,7 @@ const InsertElementDialog = _ref => {
         uploadLocalImageInputRef.current && uploadLocalImageInputRef.current.click();
       }, 0);
     }
-  }, [uploadLocalImageInputRef]);
+  }, [editor]);
   const closeDialog = useCallback(() => {
     setInsertPosition(INSERT_POSITION.CURRENT);
     setSlateNode(null);
@@ -121,6 +120,7 @@ const InsertElementDialog = _ref => {
     case LOCAL_IMAGE:
       {
         return /*#__PURE__*/React.createElement("input", {
+          onClick: e => e.stopPropagation(),
           ref: uploadLocalImageInputRef,
           type: "file",
           multiple: true,

package/dist/basic-sdk/extension/commons/menu/menu.css

@@ -16,7 +16,7 @@
   margin-right: 8px;
   border: none !important;
   color: #444;
-  background-color: #fff;
+  background-color: transparent;
 }
 
 .menu-group .menu-group-item:disabled {

package/dist/basic-sdk/extension/commons/select-file-dialog/index.js

@@ -61,6 +61,7 @@ const SelectSdocFileDialog = _ref => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [currentSelectedFile]);
   return /*#__PURE__*/React.createElement(Modal, {
+    toggle: closeDialog,
     isOpen: true,
     autoFocus: false,
     zIndex: 1071,

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

@@ -5,7 +5,6 @@ import { useSlateStatic } from '@seafile/slate-react';
 import { Placeholder } from '../../core';
 import { isEmptyNode } from './helper';
 import { COMMENT_EDITOR } from '../../../constants';
-import './index.css';
 const PLACEHOLDER = 'Please_enter_text';
 const Paragraph = _ref => {
   let {

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

@@ -59,6 +59,10 @@
 
 }
 
+.sdoc-cell-container {
+  width: 100%;
+}
+
 .table-cell>span {
   min-width: 1px;
 }

package/dist/basic-sdk/extension/plugins/table/render/render-cell.js

@@ -100,7 +100,9 @@ const TableCell = _ref => {
     "cell-index": cellIndex,
     onContextMenu: onContextMenu,
     onMouseMove: onMouseMove
-  }), children);
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "sdoc-cell-container"
+  }, children));
 };
 function renderTableCell(props) {
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -121,7 +123,7 @@ function renderTableCell(props) {
     const cellIndex = cellPath[pathLength - 1];
 
     // eslint-disable-next-line react-hooks/rules-of-hooks
-    const highlightClass = useMemo(() => getHighlightClass(editor, cellPath), []);
+    const highlightClass = useMemo(() => getHighlightClass(editor, cellPath), [cellPath, editor]);
 
     // const cellValue = element;
     let style = attributes.style || {};
@@ -149,7 +151,9 @@ function renderTableCell(props) {
       style: _objectSpread(_objectSpread({}, element.style), style),
       className: classnames('table-cell', highlightClass, attributes.className),
       "data-id": element.id
-    }), children);
+    }), /*#__PURE__*/React.createElement("div", {
+      className: "sdoc-cell-container"
+    }, children));
   }
   return /*#__PURE__*/React.createElement(TableCell, props);
 }

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

@@ -1,6 +1,6 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import useSelectionUpdate from '../../../hooks/use-selection-update';
-import { ORDERED_LIST, UNORDERED_LIST } from '../../constants';
+import { ORDERED_LIST, TABLE_CELL, UNORDERED_LIST } from '../../constants';
 import { MenuGroup } from '../../commons';
 import QuoteMenu from '../../plugins/blockquote/menu';
 import ListMenu from '../../plugins/list/menu';
@@ -15,12 +15,14 @@ import InsertToolbar from './insert-toolbar';
 import ActiveTableMenu from '../../plugins/table/menu/active-table-menu';
 import CalloutMenu from '../../plugins/callout/menu';
 import SearchReplaceMenu from '../../plugins/search-replace/menu';
+import { getSelectedNodeByType } from '../../core';
 const HeaderToolbar = _ref => {
   let {
     editor,
     readonly
   } = _ref;
   useSelectionUpdate();
+  const isSelectTableCell = useMemo(() => getSelectedNodeByType(editor, TABLE_CELL), [editor]);
   return /*#__PURE__*/React.createElement("div", {
     className: "sdoc-editor-toolbar"
   }, /*#__PURE__*/React.createElement(MenuGroup, null, /*#__PURE__*/React.createElement(HistoryMenu, {
@@ -41,7 +43,7 @@ const HeaderToolbar = _ref => {
   }), /*#__PURE__*/React.createElement(TextStyleMenuList, {
     editor: editor,
     readonly: readonly
-  })), /*#__PURE__*/React.createElement(MenuGroup, null, /*#__PURE__*/React.createElement(QuoteMenu, {
+  })), !isSelectTableCell && /*#__PURE__*/React.createElement(MenuGroup, null, /*#__PURE__*/React.createElement(QuoteMenu, {
     editor: editor,
     readonly: readonly
   }), /*#__PURE__*/React.createElement(ListMenu, {

package/package.json

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

package/dist/basic-sdk/extension/plugins/paragraph/index.css

@@ -1,4 +0,0 @@
-.sdoc-comment-editor-paragraph {
-  margin: 0.8em 0 !important;
-  padding: 0 !important;
-}