@seafile/sdoc-editor 0.5.62 → 0.5.64

package/dist/basic-sdk/comment/components/comment-item-wrapper.js

@@ -3,6 +3,7 @@ import React, { useCallback, useEffect, useRef, useState } from 'react';
 import dayjs from 'dayjs';
 import classNames from 'classnames';
 import { Node } from '@seafile/slate';
+import { ReactEditor } from '@seafile/slate-react';
 import context from '../../../context';
 import { useCommentContext } from '../hooks/comment-hooks/use-comment-context';
 import CommentItemContent from './comment-item-content';
@@ -19,12 +20,14 @@ const CommentItemWrapper = _ref => {
     comment,
     onCommentClick,
     updateScrollPosition,
-    hiddenComment
+    hiddenComment,
+    editor
   } = _ref;
   const listRef = useRef(null);
   const {
     dispatch
   } = useCommentContext();
+  const scrollRef = useRef(document.querySelector('.sdoc-scroll-container'));
   const commentOpToolsId = "commentOpTools_".concat(comment.id);
   const deleteComment = useCallback(async commentId => {
     await context.deleteComment(commentId);
@@ -234,12 +237,22 @@ const CommentItemWrapper = _ref => {
     'd-flex flex-column pt-0': element
   });
   const tip = comment.resolved ? 'Reopen_discussion' : 'Enter_reply_Enter_for_new_line_Shift_Enter_to_send';
+  const handleScrollToArticle = useCallback(e => {
+    e.stopPropagation();
+    const dom = ReactEditor.toDOMNode(editor, element);
+    const headerHeight = 56 + 37;
+    scrollRef.current.scrollTo({
+      top: dom.offsetTop - headerHeight,
+      behavior: 'smooth'
+    });
+  }, [editor, element, scrollRef]);
   return /*#__PURE__*/React.createElement("div", {
     id: "comment-item-wrapper_".concat(comment.id),
     className: className,
     onClick: onItemClick
   }, element && /*#__PURE__*/React.createElement("div", {
-    className: "comment-item-selected-text-container"
+    className: "comment-item-selected-text-container",
+    onClick: handleScrollToArticle
   }, /*#__PURE__*/React.createElement("i", {
     className: "sdocfont sdoc-comment-quote mr-2"
   }), /*#__PURE__*/React.createElement("div", {

package/dist/basic-sdk/comment/components/elements-comment-count/element-comment-count.js

@@ -19,12 +19,24 @@ const ElementCommentCount = _ref => {
     eventStopPropagation(event);
     focusToCommentElement(editor, element);
   }, [editor, element]);
-  useEffect(() => {
+  const updatePosition = useCallback(() => {
     if (!element) return;
     const scrollTop = scrollRef.current.scrollTop || 0;
     const newTop = getElementCommentCountTop(editor, element, scrollTop);
     setTop(newTop);
-  }, [editor, elementId, element, isElementSelected, scrollRef]);
+  }, [editor, element, scrollRef]);
+  useEffect(() => {
+    updatePosition();
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  useEffect(() => {
+    const scrollDom = scrollRef.current;
+    scrollDom.addEventListener('scroll', updatePosition);
+    return () => {
+      scrollDom.removeEventListener('scroll', updatePosition);
+    };
+  }, [editor, elementId, element, scrollRef, isElementSelected, updatePosition]);
   if (!element) return null;
   let style = {
     top

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

@@ -231,7 +231,8 @@ const GlobalComment = _ref => {
       onCommentClick: comment => onCommentClick(comment, element),
       hiddenComment: hiddenComment,
       updateScrollPosition: updateScrollPosition,
-      isClickCommentPanelBody: isClickCommentPanelBody
+      isClickCommentPanelBody: isClickCommentPanelBody,
+      editor: editor
     });
   }))), showEditor && /*#__PURE__*/React.createElement(GlobalCommentEditor, {
     isScrollDisplayed: isScrollDisplayed,

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

@@ -49,7 +49,7 @@ export const getCursorPosition = function () {
 
 /**
  * Get the height of the header of the editor
- * @param {Editor} editor 
+ * @param {Editor} editor
  * @returns {Number} height of the header
  */
 export const getHeaderHeight = editor => {

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

@@ -5,7 +5,7 @@ import { generateDefaultDocContent } from '../../utils';
 import { EditorContainer, EditorContent } from '../layout';
 import ReadOnlyArticle from './readonly-article';
 import { ColorProvider } from '../hooks/use-color-context';
-import '../assets/css/simple-viewer.css';
+import '../assets/css/sdoc-viewer.css';
 const SDocViewer = _ref => {
   let {
     editor,

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

@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import React, { useEffect, useMemo } from 'react';
 import { withTranslation } from 'react-i18next';
 import context from '../context';
 import ErrorBoundary from './error-boundary';
@@ -35,7 +35,13 @@ const SdocWikiViewer = _ref => {
     return newEditor;
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [docUuid]);
+  useEffect(() => {
+    validEditor.openConnection();
+    return () => {
+      validEditor.closeConnection();
+    };
+  }, [validEditor]);
   return /*#__PURE__*/React.createElement(ErrorBoundary, null, /*#__PURE__*/React.createElement(SDocEditor, {
     showComment: false,
     document: document,

package/dist/slate-convert/md-to-slate/transform.js

@@ -40,7 +40,7 @@ const applyMarkForInlineItem = function (result, item) {
     }
     const linkChildren = [{
       id: slugid.nice(),
-      text: child.value
+      text: child.value || ''
     }];
     const link = {
       id: slugid.nice(),
@@ -84,7 +84,9 @@ const applyMarkForInlineItem = function (result, item) {
     textNode['id'] = slugid.nice();
   }
   if (type === 'text') {
-    textNode['text'] = value || '';
+    // https://symbl.cc/en/200B/
+    const formatValue = value && value !== '​' ? value : '';
+    textNode['text'] = formatValue;
     result.push(textNode);
     return;
   }
@@ -181,6 +183,8 @@ export const transformListItem = node => {
         return transformBlockquote(child);
       } else if (child.type === 'list') {
         return transformList(child);
+      } else if (child.type === 'heading') {
+        return transformParagraph(child);
       } else if (child.type === 'html') {
         // patch
         return transformBlockHtml(child);
@@ -244,18 +248,17 @@ export const transformTableCell = (cell, align) => {
   return {
     id: slugid.nice(),
     type: TABLE_CELL,
-    align: align || null,
     children: transformNodeWithInlineChildren(cell)
   };
 };
-export const transformTableRow = (row, align) => {
+export const transformTableRow = row => {
   const {
     children: cells
   } = row;
   return {
     id: slugid.nice(),
     type: TABLE_ROW,
-    children: cells.map(cell => transformTableCell(cell, align))
+    children: cells.map(cell => transformTableCell(cell))
   };
 };
 export const transformTable = node => {
@@ -266,7 +269,8 @@ export const transformTable = node => {
   return {
     id: slugid.nice(),
     type: TABLE,
-    children: rows.map((row, index) => transformTableRow(row, align[index]))
+    align: align,
+    children: rows.map((row, index) => transformTableRow(row))
   };
 };
 export const transformCodeLine = text => {

package/dist/slate-convert/slate-to-md/transform.js

@@ -1,9 +1,10 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import { Node } from '@seafile/slate';
 import isLastCharPunctuation from '../../utils/is-punctuation-mark';
-const generateDefaultText = () => {
+const generateDefaultText = value => {
   return {
     type: 'text',
-    value: ''
+    value: value || ''
   };
 };
 const transformTextNode = textNode => {
@@ -23,24 +24,13 @@ const transformTextNode = textNode => {
   if (textNode['bold']) {
     mdNode['value'] = mdNode.value ? mdNode.value.trim() : '';
     if (isLastCharPunctuation(mdNode.value)) {
-      const value = mdNode.value;
-      const mdNode1 = _objectSpread(_objectSpread({}, mdNode), {}, {
-        value: value.substring(0, value.length - 1)
-      });
-      const mdNode2 = {
-        type: 'text',
-        value: value.substring(value.length - 1)
-      };
-      mdNode = [{
-        type: 'strong',
-        children: [mdNode1]
-      }, mdNode2];
-    } else {
-      mdNode = {
-        type: 'strong',
-        children: [mdNode]
-      };
+      // https://symbl.cc/en/200B/
+      mdNode['value'] = mdNode.value + '​';
     }
+    mdNode = {
+      type: 'strong',
+      children: [mdNode]
+    };
   }
 
   // italic = true, add emphasis parent
@@ -52,24 +42,13 @@ const transformTextNode = textNode => {
   } else if (textNode['italic']) {
     mdNode['value'] = mdNode.value ? mdNode.value.trim() : '';
     if (isLastCharPunctuation(mdNode.value)) {
-      const value = mdNode.value;
-      const mdNode1 = _objectSpread(_objectSpread({}, mdNode), {}, {
-        value: value.substring(0, value.length - 1)
-      });
-      const mdNode2 = {
-        type: 'text',
-        value: value.substring(value.length - 1)
-      };
-      mdNode = [{
-        type: 'emphasis',
-        children: [mdNode1]
-      }, mdNode2];
-    } else {
-      mdNode = {
-        type: 'emphasis',
-        children: [mdNode]
-      };
+      // https://symbl.cc/en/200B/
+      mdNode['value'] = mdNode.value + '​';
     }
+    mdNode = {
+      type: 'emphasis',
+      children: [mdNode]
+    };
   }
   return mdNode;
 };
@@ -160,6 +139,25 @@ const transformHeader = node => {
   };
 };
 const transformParagraph = node => {
+  const {
+    children
+  } = node;
+  if (!Array.isArray(children) || children.length === 0) {
+    return {
+      type: 'paragraph',
+      children: transformNodeWithInlineChildren(node)
+    };
+  }
+  const voidNodeTypes = ['image', 'column', 'formula'];
+  const hasBlock = children.some(item => voidNodeTypes.includes(item.type));
+  if (!hasBlock && Node.string(node).length === 0) {
+    return {
+      type: 'paragraph',
+      children: [
+      // https://symbl.cc/en/200B/
+      generateDefaultText('​')]
+    };
+  }
   return {
     type: 'paragraph',
     children: transformNodeWithInlineChildren(node)
@@ -187,7 +185,7 @@ const transformCheckList = node => {
     children: [{
       type: 'listItem',
       spread: false,
-      checked: node.checked,
+      checked: node.checked ? true : false,
       children: [transformParagraph(node)]
     }]
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "0.5.62",
+  "version": "0.5.64",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",
@@ -141,7 +141,7 @@
     "react-hot-loader": "4.13.1",
     "react-i18next": "12.1.4",
     "react-mentions": "4.4.7",
-    "release-it": "16.2.1",
+    "release-it": "17.3.0",
     "resolve": "1.12.0",
     "resolve-url-loader": "5.0.0",
     "sass-loader": "13.3.2",