@seafile/sdoc-editor 0.5.38 → 0.5.40

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

@@ -1,12 +1,12 @@
-.sdoc-article-container .sdoc-comment-list-container {
-  width: 312px;
-}
-
 .sdoc-comment-list-container {
   position: absolute;
   margin-top: 5px;
 }
 
+.sdoc-comment-list-container  .article.sdoc-comment-editor {
+  font-size: 14px;
+}
+
 .sdoc-comment-list-container .comment-ui-container {
   background-color: #edf2fa;
   border-radius: 3px;
@@ -18,7 +18,7 @@
 
 .sdoc-comment-list-container .comment-ui-container.active {
   position: relative;
-  left: -24px;
+  left: -5px;
   background: rgba(255, 255, 255, .92);
   box-shadow: 0 1px 3px rgba(0, 0, 0, .15), 0 4px 8px 3px rgba(0, 0, 0, .15);
 }
@@ -315,3 +315,57 @@
   padding-left: 10px;
   padding-right: 10px;
 }
+
+/* editor Side comment preview */
+.sdoc-article-container .sdoc-comment-list-container {
+  width: 312px;
+  /* font-size: 14px !important; */
+}
+
+.sdoc-article-container .comment-ui-container {
+  padding: 0;
+  margin: 0;
+}
+
+.sdoc-article-container .sdoc-comment-list-container .comment-item {
+  padding: 16px;
+}
+
+.sdoc-article-container .sdoc-comment-list-container .comment-item .comment-editor-wrapper.pb-3 {
+  padding-bottom: 0 !important;
+}
+
+.sdoc-article-container .sdoc-comment-list-container .comment-item .comment-author {
+  align-items: flex-start;
+}
+
+.sdoc-article-container .sdoc-comment-list-container .comment-item .comment-content {
+  margin-left: 33px;
+}
+
+.sdoc-article-container .sdoc-comment-list-container .comment-item .comment-author__avatar img {
+  margin-top: 3px;
+  width: 24px;
+  height: 24px;
+}
+
+.sdoc-article-container .sdoc-comment-list-container .comment-item .comment-author__info {
+  padding-left: 8px;
+}
+
+.sdoc-article-container .sdoc-comment-list-container .sdoc-reply-wrapper {
+  padding: 0 16px 16px;
+}
+
+.sdoc-article-container .sdoc-comment-list-container .comment-content div:last-child p {
+  margin-bottom: 0;
+}
+
+/* editor side comment editor */
+.sdoc-article-container .sdoc-comment-list-container .comment-list .comment-ui-container.active {
+  padding: 0;
+}
+
+.sdoc-article-container .sdoc-comment-list-container .comment-ui-container.active {
+  padding: 16px;
+}

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/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/commons/menu-shortcut-indicator/index.js

@@ -0,0 +1,15 @@
+import React from 'react';
+import classNames from 'classnames';
+import './style.css';
+const MenuShortcutPrompt = _ref => {
+  let {
+    shortcuts,
+    containerClassName = ''
+  } = _ref;
+  return /*#__PURE__*/React.createElement("div", {
+    className: classNames('sdoc-shortcut-prompt-container', containerClassName)
+  }, shortcuts.map((shortcut, index) => /*#__PURE__*/React.createElement("kbd", {
+    key: "sdoc-shortcut-".concat(shortcut, "-").concat(index)
+  }, shortcut)));
+};
+export default MenuShortcutPrompt;

package/dist/basic-sdk/extension/commons/menu-shortcut-indicator/style.css

@@ -0,0 +1,20 @@
+.sdoc-shortcut-prompt-container kbd {
+  display: inline-block;
+  margin-bottom: 0px;
+  margin-left: 1px;
+  margin-right: 1px;
+  padding: 1px 3px;
+  min-width: 12px;
+  border-style: solid;
+  border-color: rgba(0, 0, 0, 0.1);
+  border-radius: 3px;
+  border-width: 1px 1px 2px;
+  font: inherit;
+  text-align: center;
+  color: rgb(51, 51, 51);
+  background-color: rgba(255, 255, 255, 0.25);
+}
+
+.sdoc-shortcut-prompt-container:last-child {
+  margin-right: 0px;
+}

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/components/doc-operations/more-operations.js

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { withTranslation } from 'react-i18next';
 import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap';
 import printJS from '@seafile/print-js';
@@ -6,6 +6,7 @@ import { EventBus } from '../../basic-sdk';
 import { EXTERNAL_EVENT } from '../../constants';
 import context from '../../context';
 import { INTERNAL_EVENT } from '../../basic-sdk/constants';
+import MenuShortcutPrompt from '../../basic-sdk/extension/commons/menu-shortcut-indicator';
 const MoreOperations = _ref => {
   let {
     t
@@ -54,6 +55,12 @@ const MoreOperations = _ref => {
     event.nativeEvent.stopImmediatePropagation();
     window.location.href = historyURL;
   }, [docPerm, historyURL, isSdocRevision]);
+  const printShortCutTexts = useMemo(() => {
+    // chrome in Mac: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36"
+    const isMac = window.navigator.userAgent.indexOf('Macintosh') !== -1;
+    const printTexts = isMac ? ['⌘', 'P'] : ['Ctrl', 'P'];
+    return printTexts;
+  }, []);
   return /*#__PURE__*/React.createElement(Dropdown, {
     isOpen: isDropdownOpen,
     toggle: () => toggleDropdown(isDropdownOpen)
@@ -75,7 +82,11 @@ const MoreOperations = _ref => {
   }, t('Unfreeze')), /*#__PURE__*/React.createElement(DropdownItem, {
     className: "sdoc-dropdown-menu-item",
     onClick: handlePrint
-  }, t('Print')), isPro && !isFreezed && /*#__PURE__*/React.createElement(DropdownItem, {
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "sdoc-dropdown-print-container"
+  }, /*#__PURE__*/React.createElement("div", null, t('Print')), /*#__PURE__*/React.createElement(MenuShortcutPrompt, {
+    shortcuts: printShortCutTexts
+  }))), isPro && !isFreezed && /*#__PURE__*/React.createElement(DropdownItem, {
     className: "sdoc-dropdown-menu-item",
     onClick: onFreezeDocument
   }, t('Freeze_document')), /*#__PURE__*/React.createElement(DropdownItem, {

package/dist/components/doc-operations/style.css

@@ -25,3 +25,10 @@
 .doc-ops .popover-wrapper {
   width: 300px;
 }
+
+.sdoc-dropdown-print-container {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+}

package/package.json

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