@seafile/sdoc-editor 1.0.7 → 1.0.9

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

@@ -2,6 +2,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import React, { useEffect, useState, useImperativeHandle, forwardRef, useMemo, useCallback } from 'react';
 import { Editor } from '@seafile/slate';
 import deepCopy from 'deep-copy';
+import classNames from 'classnames';
 import context from '../../context';
 import CommonLoading from '../../components/common-loading';
 import { INTERNAL_EVENT, PAGE_EDIT_AREA_WIDTH } from '../constants';
@@ -10,20 +11,21 @@ import withNodeId from '../node-id';
 import { withSocketIO } from '../socket';
 import { focusEditor } from '../extension/core';
 import InsertElementDialog from '../extension/commons/insert-element-dialog';
-import { EditorContainer, EditorContent } from '../layout';
+import { EditorContainer } from '../layout';
 import EditableArticle from './editable-article';
 import { ColorProvider } from '../hooks/use-color-context';
 import ReadOnlyArticle from '../views/readonly-article';
 import { isMobile } from '../../utils';
 import { EventBus } from '../../basic-sdk';
 import { EXTERNAL_EVENT } from '../../constants';
+import { ScrollContext } from '../hooks/use-scroll-context';
 const WikiEditor = forwardRef((_ref, ref) => {
   let {
     editor: propsEditor,
     document,
     isReloading,
     isWikiReadOnly,
-    topSlot
+    scrollRef
   } = _ref;
   const validEditor = propsEditor || useMemo(() => {
     const defaultEditor = createDefaultEditor();
@@ -87,6 +89,11 @@ const WikiEditor = forwardRef((_ref, ref) => {
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
+  useEffect(() => {
+    if (scrollRef) {
+      scrollRef.current.id = 'sdoc-scroll-container';
+    }
+  }, [scrollRef]);
   const onRefreshDocument = useCallback(() => {
     window.location.reload();
   }, []);
@@ -130,31 +137,38 @@ const WikiEditor = forwardRef((_ref, ref) => {
     return /*#__PURE__*/React.createElement(EditorContainer, {
       editor: validEditor,
       readonly: true
-    }, /*#__PURE__*/React.createElement(ColorProvider, null, /*#__PURE__*/React.createElement(EditorContent, {
-      docValue: slateValue,
-      readonly: true,
-      showOutline: false,
-      editor: validEditor,
-      showComment: false
-    }, topSlot, /*#__PURE__*/React.createElement(ReadOnlyArticle, {
+    }, /*#__PURE__*/React.createElement(ColorProvider, null, /*#__PURE__*/React.createElement("div", {
+      className: "sdoc-content-wrapper"
+    }, /*#__PURE__*/React.createElement(ScrollContext.Provider, {
+      value: {
+        scrollRef
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "sdoc-editor-content readonly"
+    }, /*#__PURE__*/React.createElement(ReadOnlyArticle, {
       editor: validEditor,
       slateValue: slateValue,
       showComment: false
-    }))));
+    }))))));
   }
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(EditorContainer, {
     editor: validEditor
-  }, /*#__PURE__*/React.createElement(ColorProvider, null, /*#__PURE__*/React.createElement(EditorContent, {
-    docValue: slateValue,
-    showOutline: false,
-    editor: validEditor,
-    showComment: false
-  }, topSlot, /*#__PURE__*/React.createElement(EditableArticle, {
+  }, /*#__PURE__*/React.createElement(ColorProvider, null, /*#__PURE__*/React.createElement("div", {
+    className: "sdoc-content-wrapper"
+  }, /*#__PURE__*/React.createElement(ScrollContext.Provider, {
+    value: {
+      scrollRef
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    className: classNames('sdoc-editor-content', {
+      'readonly': isWikiReadOnly
+    })
+  }, /*#__PURE__*/React.createElement(EditableArticle, {
     editor: validEditor,
     slateValue: slateValue,
     updateSlateValue: onValueChange,
     showComment: false
-  })))), /*#__PURE__*/React.createElement(InsertElementDialog, {
+  })))))), /*#__PURE__*/React.createElement(InsertElementDialog, {
     editor: validEditor
   }));
 });

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

@@ -112,10 +112,13 @@ const withBlockquote = editor => {
             const parentNodeEntry = Editor.parent(editor, paragraphEntry[1]);
             if (parentNodeEntry && parentNodeEntry[0].type === BLOCKQUOTE) {
               if (!Node.string(paragraphEntry[0]).length) {
-                insertFragment(data);
-                return Transforms.removeNodes(newEditor, {
-                  at: paragraphEntry[1]
+                data.forEach(node => {
+                  if (node.type === BLOCKQUOTE) {
+                    node.type = PARAGRAPH;
+                  }
                 });
+                insertFragment(data);
+                return;
               }
             }
           }

package/dist/basic-sdk/extension/plugins/callout/render-elem/callout-hover-menu/index.js

@@ -1,8 +1,10 @@
 import React, { useCallback, useState } from 'react';
 import classNames from 'classnames';
+import { useTranslation } from 'react-i18next';
 import { ElementPopover } from '../../../../commons';
 import ColorSelector from '../callout-color-selector';
 import IconSelector from '../callout-icon';
+import { setCalloutIcon } from '../../helper';
 import './style.css';
 export default function CalloutHoverMenu(_ref) {
   let {
@@ -12,6 +14,9 @@ export default function CalloutHoverMenu(_ref) {
   } = _ref;
   const [isShowColorSelector, setIsShowColorSelector] = useState(false);
   const [isShowIcon, setIsShowIcon] = useState(false);
+  const {
+    t
+  } = useTranslation();
   const onColorSelectorToggle = useCallback(event => {
     event.stopPropagation();
     if (!isShowColorSelector) {
@@ -38,6 +43,9 @@ export default function CalloutHoverMenu(_ref) {
     'callout-menu-item': true,
     'icon-active': isShowIcon
   });
+  const handleRemoveIcon = () => {
+    setCalloutIcon(editor, '');
+  };
   return /*#__PURE__*/React.createElement(ElementPopover, null, /*#__PURE__*/React.createElement("div", {
     className: "sdoc-callout-hover-menu",
     style: popoverPosition
@@ -65,5 +73,10 @@ export default function CalloutHoverMenu(_ref) {
     editor: editor,
     element: element,
     onCloseSelector: onCloseSelector
-  })));
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "callout-menu-divider"
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "callout-menu-item",
+    onClick: handleRemoveIcon
+  }, t('Remove_icon'))));
 }

package/dist/basic-sdk/extension/plugins/callout/render-elem/callout-hover-menu/style.css

@@ -14,12 +14,14 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  color: #aaa;
+  font-size: 12px;
+  color: #212529;
   cursor: pointer;
+  border-radius: 3px;
 }
 
 .sdoc-callout-hover-menu .callout-menu-item:hover {
-  color: #444;
+  background-color: #f2f2f2;
 }
 
 .sdoc-callout-hover-menu .callout-menu-item .sdocfont {

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

@@ -29,33 +29,29 @@ const withLink = editor => {
     }
     return isInline(elem);
   };
-  newEditor.insertData = data => {
+  newEditor.insertData = async data => {
     // Paste link content
     const text = data.getData('text/plain');
+    // Internal link, insert sdoc file link
     if (isUrl(text) && !isImage(text)) {
-      const link = genLinkNode(text, text);
-      Transforms.insertNodes(newEditor, link);
-      // Void merging text fron link
+      if (isSameDomain(text, context.getSetting('serviceUrl'))) {
+        const res = await context.getLinkFilesInfo([text]);
+        if (isSdocFile(res, text)) {
+          const fileName = res.data.files_info[text].name;
+          const fileUuid = res.data.files_info[text].file_uuid;
+          insertSdocFileLink(editor, fileName, fileUuid);
+        } else {
+          const link = genLinkNode(text, text);
+          Transforms.insertNodes(newEditor, link);
+        }
+      } else {
+        const link = genLinkNode(text, text);
+        Transforms.insertNodes(newEditor, link);
+      }
+      // Void merging text from link
       const [, focusPath] = Editor.next(newEditor);
       const focusPoint = Editor.start(newEditor, focusPath);
       Transforms.select(newEditor, focusPoint);
-      if (isSameDomain(text, context.getSetting('serviceUrl'))) {
-        context.getLinkFilesInfo([text]).then(res => {
-          if (isSdocFile(res, text)) {
-            const [nodeEntry] = Editor.nodes(editor, {
-              match: n => n.type === LINK,
-              universal: true
-            });
-            const fileName = res.data.files_info[text].name;
-            const fileUuid = res.data.files_info[text].file_uuid;
-            Transforms.removeNodes(editor, {
-              at: nodeEntry[1]
-            });
-            insertSdocFileLink(editor, fileName, fileUuid);
-            return;
-          }
-        });
-      }
       return;
     }
     insertData(data);

package/dist/basic-sdk/extension/plugins/table/menu/color-selector-popover/index.js

@@ -87,7 +87,7 @@ const ColorSelectorPopover = _ref => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [readonly]);
   return /*#__PURE__*/React.createElement(UncontrolledPopover, {
-    target: target,
+    target: target.current,
     trigger: "hover",
     placement: "right-start",
     hideArrow: true,

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

@@ -190,7 +190,7 @@ class TableContextMenu extends React.Component {
       onClick: e => console.log('123')
     }, /*#__PURE__*/React.createElement("span", null, t('Horizontal_align')), /*#__PURE__*/React.createElement("i", {
       className: "sdocfont sdoc-right-slide"
-    })), /*#__PURE__*/React.createElement(HorizontalAlignPopover, {
+    })), this.horizontalAlignRef.current && /*#__PURE__*/React.createElement(HorizontalAlignPopover, {
       target: this.horizontalAlignRef,
       editor: editor,
       readonly: readonly,
@@ -200,7 +200,7 @@ class TableContextMenu extends React.Component {
       className: "dropdown-item side-extendable"
     }, /*#__PURE__*/React.createElement("span", null, t('Vertical_align')), /*#__PURE__*/React.createElement("i", {
       className: "sdocfont sdoc-right-slide"
-    })), /*#__PURE__*/React.createElement(VerticalAlignPopover, {
+    })), this.verticalAlignRef.current && /*#__PURE__*/React.createElement(VerticalAlignPopover, {
       target: this.verticalAlignRef,
       editor: editor,
       readonly: readonly,
@@ -210,7 +210,7 @@ class TableContextMenu extends React.Component {
       className: "dropdown-item side-extendable"
     }, /*#__PURE__*/React.createElement("span", null, t('Background_color')), /*#__PURE__*/React.createElement("i", {
       className: "sdocfont sdoc-right-slide"
-    })), /*#__PURE__*/React.createElement(ColorSelectorPopover, {
+    })), this.colorSelectorRef.current && /*#__PURE__*/React.createElement(ColorSelectorPopover, {
       target: this.colorSelectorRef,
       editor: editor,
       readonly: readonly

package/dist/basic-sdk/extension/plugins/table/menu/vertical-align-popover/index.js

@@ -32,7 +32,7 @@ const VerticalAlignPopover = _ref => {
     }, 0);
   }, [editor, readonly]);
   return /*#__PURE__*/React.createElement(UncontrolledPopover, {
-    target: target,
+    target: target.current,
     trigger: "hover",
     placement: "right-start",
     hideArrow: true,

package/dist/basic-sdk/utils/dom-utils.js

@@ -1,4 +1,4 @@
-import { WIKI_EDITOR, DOCUMENT_PLUGIN_EDITOR } from '../constants';
+import { DOCUMENT_PLUGIN_EDITOR, WIKI_EDITOR } from '../constants';
 export const getDomHeight = dom => {
   const styles = window.getComputedStyle(dom);
   const rect = dom.getBoundingClientRect();
@@ -58,7 +58,9 @@ export const getHeaderHeight = editor => {
   } = editor;
   switch (editorType) {
     case WIKI_EDITOR:
-      return 113.2;
+      const headerHeight = document.querySelector('.sdoc-editor-container').offsetTop; // async height in wiki
+      const headerBarHeight = 44;
+      return headerHeight + headerBarHeight;
     case DOCUMENT_PLUGIN_EDITOR:
       return 67 + 48 + 49 + 37;
     default:

package/dist/pages/sdoc-wiki-viewer.js

@@ -14,7 +14,7 @@ const SdocWikiViewer = _ref => {
     document,
     docUuid,
     isWikiReadOnly,
-    topSlot
+    scrollRef
   } = _ref;
   context.initApi();
 
@@ -51,7 +51,7 @@ const SdocWikiViewer = _ref => {
     docUuid: docUuid,
     editor: validEditor,
     isWikiReadOnly: isWikiReadOnly,
-    topSlot: topSlot
+    scrollRef: scrollRef
   }));
 };
 export default withTranslation('sdoc-editor')(SdocWikiViewer);

package/package.json

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

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

@@ -468,5 +468,6 @@
   "Show_record_numbers": "Show record numbers",
   "Alternate_color": "Alternate color",
   "Select_column_display_option_color_tip": "Single-select and multi-select columns display option colors",
-  "Header": "Header"
+  "Header": "Header",
+  "Remove_icon": "Remove icon"
 }

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

@@ -468,5 +468,6 @@
   "Show_record_numbers": "Show record numbers",
   "Alternate_color": "Alternate color",
   "Select_column_display_option_color_tip": "Single-select and multi-select columns display option colors",
-  "Header": "Überschrift"
+  "Header": "Überschrift",
+  "Remove_icon": "Remove icon"
 }

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

@@ -468,5 +468,6 @@
   "Show_record_numbers": "Show record numbers",
   "Alternate_color": "Alternate color",
   "Select_column_display_option_color_tip": "Single-select and multi-select columns display option colors",
-  "Header": "Header"
+  "Header": "Header",
+  "Remove_icon": "Remove icon"
 }

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

@@ -468,5 +468,6 @@
   "Show_record_numbers": "Show record numbers",
   "Alternate_color": "Alternate color",
   "Select_column_display_option_color_tip": "Single-select and multi-select columns display option colors",
-  "Header": "Encabezado"
+  "Header": "Encabezado",
+  "Remove_icon": "Remove icon"
 }

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

@@ -468,5 +468,6 @@
   "Show_record_numbers": "Show record numbers",
   "Alternate_color": "Alternate color",
   "Select_column_display_option_color_tip": "Single-select and multi-select columns display option colors",
-  "Header": "Encabezado"
+  "Header": "Encabezado",
+  "Remove_icon": "Remove icon"
 }

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

@@ -468,5 +468,6 @@
   "Show_record_numbers": "Show record numbers",
   "Alternate_color": "Alternate color",
   "Select_column_display_option_color_tip": "Single-select and multi-select columns display option colors",
-  "Header": "Encabezado"
+  "Header": "Encabezado",
+  "Remove_icon": "Remove icon"
 }

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

@@ -468,5 +468,6 @@
   "Show_record_numbers": "Show record numbers",
   "Alternate_color": "Alternate color",
   "Select_column_display_option_color_tip": "Single-select and multi-select columns display option colors",
-  "Header": "En-tête "
+  "Header": "En-tête ",
+  "Remove_icon": "Remove icon"
 }

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

@@ -468,5 +468,6 @@
   "Show_record_numbers": "Show record numbers",
   "Alternate_color": "Alternate color",
   "Select_column_display_option_color_tip": "Single-select and multi-select columns display option colors",
-  "Header": "Intestazione"
+  "Header": "Intestazione",
+  "Remove_icon": "Remove icon"
 }

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

@@ -468,5 +468,6 @@
   "Show_record_numbers": "Показывать номера записей",
   "Alternate_color": "Альтернативный цвет",
   "Select_column_display_option_color_tip": "Цвета параметров отображения столбцов с одиночным и множественным выбором",
-  "Header": "Заголовок"
+  "Header": "Заголовок",
+  "Remove_icon": "Remove icon"
 }

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

@@ -468,5 +468,6 @@
   "Show_record_numbers": "显示记录编号",
   "Alternate_color": "单双行不同背景色",
   "Select_column_display_option_color_tip": "单选列和多选列显示选项颜色",
-  "Header": "标题"
+  "Header": "标题",
+  "Remove_icon": "移除图标"
 }