@seafile/sdoc-editor 0.5.37 → 0.5.39

package/dist/basic-sdk/comment/components/global-comment/index.css

@@ -4,6 +4,8 @@
   min-width: 360px;
   max-width: 620px;
   border-left: 1px solid #e2e3e6;
+  /* Prevent the image menu from still appearing above the comment drawer when scrolled hidden. */
+  z-index: 103;
 }
 
 .sdoc-comment-drawer .comments-panel-wrapper {

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

@@ -15,6 +15,7 @@ import { EventBus } from '../../basic-sdk';
 import { EXTERNAL_EVENT } from '../../constants';
 import CommentEditorToolbar from '../extension/toolbar/comment-editor-toolbar';
 import CommentArticle from './comment-article';
+import { ScrollContext } from '../hooks/use-scroll-context';
 const SdocCommentEditor = forwardRef((_ref, ref) => {
   let {
     editor: propsEditor,
@@ -110,12 +111,16 @@ const SdocCommentEditor = forwardRef((_ref, ref) => {
     ref: commentEditorContainerRef,
     className: "article sdoc-comment-editor",
     onClick: handleFocusEditor
+  }, /*#__PURE__*/React.createElement(ScrollContext.Provider, {
+    value: {
+      scrollRef: commentEditorContainerRef
+    }
   }, /*#__PURE__*/React.createElement(CommentArticle, {
     type: type,
     editor: validEditor,
     slateValue: slateValue,
     updateSlateValue: setSlateValue
-  })), /*#__PURE__*/React.createElement(CommentEditorToolbar, {
+  }))), /*#__PURE__*/React.createElement(CommentEditorToolbar, {
     editor: validEditor,
     onSubmit: onSubmit,
     submitBtnText: submitBtnText,

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

@@ -115,6 +115,11 @@ const SdocEditor = forwardRef((_ref, ref) => {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }), [document, validEditor, slateValue]);
+  const onValueChange = value => {
+    const eventBus = EventBus.getInstance();
+    eventBus.dispatch(INTERNAL_EVENT.UPDATE_SEARCH_REPLACE_HIGHLIGHT, value);
+    setSlateValue(value);
+  };
   const isFreezed = context.getSetting('isFreezed');
   if (isReloading) {
     return /*#__PURE__*/React.createElement("div", {
@@ -129,7 +134,8 @@ const SdocEditor = forwardRef((_ref, ref) => {
       docValue: slateValue,
       readonly: true,
       showOutline: false,
-      editor: validEditor
+      editor: validEditor,
+      showComment: false
     }, /*#__PURE__*/React.createElement(ReadOnlyArticle, {
       editor: validEditor,
       slateValue: slateValue
@@ -146,18 +152,14 @@ const SdocEditor = forwardRef((_ref, ref) => {
       docValue: slateValue,
       showOutline: true,
       readonly: isFreezed,
-      editor: validEditor
+      editor: validEditor,
+      showComment: true
     }, /*#__PURE__*/React.createElement(ReadOnlyArticle, {
       editor: validEditor,
       slateValue: slateValue,
       isShowComment: true
     })))));
   }
-  const onValueChange = value => {
-    const eventBus = EventBus.getInstance();
-    eventBus.dispatch(INTERNAL_EVENT.UPDATE_SEARCH_REPLACE_HIGHLIGHT, value);
-    setSlateValue(value);
-  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(EditorContainer, {
     editor: validEditor
   }, /*#__PURE__*/React.createElement(CollaboratorsProvider, null, /*#__PURE__*/React.createElement(ColorProvider, null, /*#__PURE__*/React.createElement(HeaderToolbar, {
@@ -165,7 +167,8 @@ const SdocEditor = forwardRef((_ref, ref) => {
   }), /*#__PURE__*/React.createElement(EditorContent, {
     docValue: slateValue,
     showOutline: true,
-    editor: validEditor
+    editor: validEditor,
+    showComment: true
   }, /*#__PURE__*/React.createElement(EditableArticle, {
     editor: validEditor,
     slateValue: slateValue,

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

@@ -46,7 +46,8 @@ const InsertElementDialog = _ref => {
       slateNode,
       insertFileLinkCallback,
       insertSdocFileLinkCallback,
-      isShowHistoryFiles
+      isShowHistoryFiles,
+      editor: paramEditor
     } = _ref2;
     setInsertPosition(insertPosition);
     setSlateNode(slateNode);
@@ -58,7 +59,7 @@ const InsertElementDialog = _ref => {
     });
     setIsShowHistoryFiles(isShowHistoryFiles);
     // Apply for comment editor, as it has a different editor instance
-    setValidEditor(editor);
+    setValidEditor(paramEditor || editor);
     if (type === LOCAL_IMAGE) {
       setTimeout(() => {
         uploadLocalImageInputRef.current && uploadLocalImageInputRef.current.click();

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

@@ -22,16 +22,18 @@ export const isMenuDisabled = (editor, readonly) => {
   return false; // enable
 };
 
-export const generateSdocFileNode = (uuid, text) => {
+export const generateSdocFileNode = function (uuid) {
+  let text = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  const sdocFileName = text.replace(/\.sdoc$/, '');
   const sdocFileNode = {
     id: slugid.nice(),
     type: SDOC_LINK,
     doc_uuid: uuid,
-    title: text,
+    title: sdocFileName,
     display_type: INSERT_FILE_DISPLAY_TYPE[1],
     children: [{
       id: slugid.nice(),
-      text: text || ''
+      text: sdocFileName
     }]
   };
   return sdocFileNode;

package/dist/basic-sdk/extension/plugins/table/render/resize-mask/index.js

@@ -87,18 +87,13 @@ const ResizeMask = _ref => {
     }
     return resizeHandlerInfo;
   }, [cellInfo, editor, maskStyle, table]);
-  const handleMouseOver = useCallback((event, mode) => {
+  const handleMouseDown = useCallback((event, mode) => {
     event.stopPropagation();
     event.preventDefault();
-    if (isDraggingResizeHandler) return;
+    handlerStartDragging();
     const handlerInfo = getHandlerDisplayInfo(mode);
     handleShowResizeHandler(handlerInfo);
-  }, [getHandlerDisplayInfo, handleShowResizeHandler, isDraggingResizeHandler]);
-  const handleMouseDown = useCallback(event => {
-    event.stopPropagation();
-    event.preventDefault();
-    handlerStartDragging();
-  }, [handlerStartDragging]);
+  }, [getHandlerDisplayInfo, handleShowResizeHandler, handlerStartDragging]);
   const handleMouseOut = useCallback(event => {
     event.stopPropagation();
     event.preventDefault();
@@ -110,23 +105,19 @@ const ResizeMask = _ref => {
     style: maskStyle
   }, cellInfo.rowIndex !== 0 && /*#__PURE__*/React.createElement("div", {
     onMouseOut: handleMouseOut,
-    onMouseDown: handleMouseDown,
-    onMouseOver: e => handleMouseOver(e, RESIZE_MASK_TOP),
+    onMouseDown: e => handleMouseDown(e, RESIZE_MASK_TOP),
     className: "sdoc-table-resize-top"
   }), /*#__PURE__*/React.createElement("div", {
     onMouseOut: handleMouseOut,
-    onMouseDown: handleMouseDown,
-    onMouseOver: e => handleMouseOver(e, RESIZE_MASK_RIGHT),
+    onMouseDown: e => handleMouseDown(e, RESIZE_MASK_RIGHT),
     className: "sdoc-table-resize-right"
   }), /*#__PURE__*/React.createElement("div", {
     onMouseOut: handleMouseOut,
-    onMouseDown: handleMouseDown,
-    onMouseOver: e => handleMouseOver(e, RESIZE_MASK_BOTTOM),
+    onMouseDown: e => handleMouseDown(e, RESIZE_MASK_BOTTOM),
     className: "sdoc-table-resize-bottom"
   }), /*#__PURE__*/React.createElement("div", {
     onMouseOut: handleMouseOut,
-    onMouseDown: handleMouseDown,
-    onMouseOver: e => handleMouseOver(e, RESIZE_MASK_LEFT),
+    onMouseDown: e => handleMouseDown(e, RESIZE_MASK_LEFT),
     className: "sdoc-table-resize-left"
   }));
 };

package/dist/basic-sdk/extension/toolbar/side-toolbar/helpers.js

@@ -88,11 +88,11 @@ export const getDomTopHeight = (dom, slateNode) => {
   const rect = dom.getBoundingClientRect();
   let offsetY = 0;
   const paddingTop = parseFloat(window.getComputedStyle(dom).getPropertyValue('padding-top'));
-  const lightHight = parseFloat(window.getComputedStyle(dom).getPropertyValue('line-height'));
+  const lineHeight = parseFloat(window.getComputedStyle(dom).getPropertyValue('line-height'));
+  const disToolBarHeight = 12; // side toolbar icon is 12 px
   if (ADD_POSITION_OFFSET_TYPE.includes(slateNode.type)) {
-    offsetY = lightHight / 2 + paddingTop - 12; // side toolbar icon is 12 px
+    offsetY = lineHeight / 2 + paddingTop - disToolBarHeight / 2;
   }
-
   const HEADER_HEIGHT = 56 + 44;
   return rect.y - HEADER_HEIGHT + offsetY;
 };

package/dist/basic-sdk/layout/editor-content.js

@@ -11,7 +11,8 @@ const EditorContent = _ref => {
     showOutline,
     children,
     docValue,
-    editor
+    editor,
+    showComment
   } = _ref;
   const scrollRef = useRef(null);
   const [scrollLeft, setScrollLeft] = useState(0);
@@ -25,7 +26,7 @@ const EditorContent = _ref => {
     'readonly': readonly,
     'no-outline': !showOutline
   });
-  if (readonly) {
+  if (!showComment) {
     return /*#__PURE__*/React.createElement("div", {
       className: "sdoc-content-wrapper"
     }, /*#__PURE__*/React.createElement("div", {
@@ -69,6 +70,7 @@ const EditorContent = _ref => {
 };
 EditorContent.defaultProps = {
   readonly: false,
-  showOutline: true
+  showOutline: true,
+  showComment: false
 };
 export default EditorContent;

package/dist/basic-sdk/views/published-revision-diff-viewer.js

@@ -48,9 +48,10 @@ const PublishedRevisionDiffViewer = _ref => {
     children: isShowChanges && (diff === null || diff === void 0 ? void 0 : diff.value) || revisionContent.children
   };
   return /*#__PURE__*/React.createElement(SDocViewer, {
+    document: document,
     showToolbar: true,
     showOutline: true,
-    document: document
+    showComment: false
   });
 };
 export default PublishedRevisionDiffViewer;

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

@@ -3,6 +3,7 @@ import context from '../../context';
 import { getDiff } from '../utils/diff';
 import SDocViewer from './sdoc-viewer';
 import Loading from '../../components/loading';
+import { CollaboratorsProvider } from '../../hooks';
 import '../../assets/css/diff-viewer.css';
 const RevisionDiffViewer = _ref => {
   let {
@@ -39,13 +40,14 @@ const RevisionDiffViewer = _ref => {
   if (isLoading) {
     return /*#__PURE__*/React.createElement(Loading, null);
   }
-  return /*#__PURE__*/React.createElement(SDocViewer, {
-    showToolbar: true,
-    showOutline: true,
+  return /*#__PURE__*/React.createElement(CollaboratorsProvider, null, /*#__PURE__*/React.createElement(SDocViewer, {
     editor: editor,
     document: {
       children: diff.value
-    }
-  });
+    },
+    showToolbar: true,
+    showOutline: true,
+    showComment: true
+  }));
 };
 export default RevisionDiffViewer;

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

@@ -17,11 +17,12 @@ const DiffViewer = _ref => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   return /*#__PURE__*/React.createElement(SDocViewer, {
-    showToolbar: false,
-    showOutline: false,
     document: {
       children: diff.value
-    }
+    },
+    showToolbar: false,
+    showOutline: false,
+    showComment: false
   });
 };
 export default DiffViewer;

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

@@ -11,7 +11,8 @@ const SDocViewer = _ref => {
     editor,
     document,
     showToolbar,
-    showOutline
+    showOutline,
+    showComment
   } = _ref;
   const validEditor = editor || withNodeId(createDefaultEditor());
   const slateValue = (document || generateDefaultDocContent()).children;
@@ -25,7 +26,8 @@ const SDocViewer = _ref => {
     docValue: slateValue,
     readonly: true,
     showOutline: showOutline,
-    editor: validEditor
+    editor: validEditor,
+    showComment: showComment
   }, /*#__PURE__*/React.createElement(ReadOnlyArticle, {
     editor: validEditor,
     slateValue: slateValue

package/package.json

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