@seafile/sdoc-editor 0.2.3 → 0.2.4

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

@@ -1,8 +1,11 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import classNames from 'classnames';
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Button } from 'reactstrap';
+import classNames from 'classnames';
+import { useScrollContext } from '../../hooks/use-scroll-context';
+import context from '../../../context';
+import EventBus from '../../utils/event-bus';
+import { INTERNAL_EVENT } from '../../constants';
 var getSubmitTip = function getSubmitTip(type, content) {
   if (content) return 'Save';
   return type === 'comment' ? 'Comment' : 'Reply';
@@ -17,18 +20,44 @@ var CommentEditor = function CommentEditor(_ref) {
     setIsEditing = _ref.setIsEditing,
     hiddenComment = _ref.hiddenComment;
   var commentRef = useRef();
+  var commentWrapperRef = useRef();
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    isFocus = _useState2[0],
-    setIsFocus = _useState2[1];
+  var scrollRef = useScrollContext();
 
-  // onMount
+  // onMount: comment content
   useEffect(function () {
-    if (content) {
-      commentRef.current.textContent = content;
-    }
+    if (!content) return;
+    commentRef.current.textContent = content;
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  // onMount: set input focus
+  useEffect(function () {
+    if (type !== 'comment') return;
+    commentRef.current && commentRef.current.focus();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  // onMount: set scrollLeft
+  useEffect(function () {
+    if (!commentWrapperRef.current) return;
+    var _commentWrapperRef$cu = commentWrapperRef.current.getBoundingClientRect(),
+      right = _commentWrapperRef$cu.right,
+      width = _commentWrapperRef$cu.width;
+    if (right <= window.innerWidth) return;
+    if (!scrollRef.current) return;
+    scrollRef.current.scrollLeft = scrollRef.current.scrollLeft + width;
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  // onMount: hidden comment
+  useEffect(function () {
+    var eventBus = EventBus.getInstance();
+    var unsubscribe = eventBus.subscribe(INTERNAL_EVENT.ARTICLE_CLICK, hiddenComment);
+    return function () {
+      unsubscribe();
+    };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   var updateValue = useCallback(function (value) {
@@ -47,7 +76,6 @@ var CommentEditor = function CommentEditor(_ref) {
   }, [updateValue]);
   var onCancel = useCallback(function (event) {
     event.stopPropagation();
-    setIsFocus(false);
     commentRef.current.textContent = '';
     setIsEditing && setIsEditing(false);
     hiddenComment && hiddenComment(false);
@@ -65,23 +93,32 @@ var CommentEditor = function CommentEditor(_ref) {
       onCancel();
     }
   }, [onCancel, onSubmit]);
-  placeholder = t(placeholder);
   var submitTip = useMemo(function () {
     return getSubmitTip(type, content);
   }, [content, type]);
+  var userInfo = context.getUserInfo();
   return /*#__PURE__*/React.createElement("div", {
-    className: classNames('comment-editor-wrapper', className)
+    className: classNames('comment-editor-wrapper', className),
+    ref: commentWrapperRef
+  }, type === 'comment' && /*#__PURE__*/React.createElement("div", {
+    className: "comment-editor-user-info"
   }, /*#__PURE__*/React.createElement("div", {
+    className: "comment-editor-user-img"
+  }, /*#__PURE__*/React.createElement("img", {
+    src: userInfo.avatar_url,
+    alt: "",
+    height: "100%",
+    width: "100%"
+  })), /*#__PURE__*/React.createElement("div", {
+    className: "comment-editor-user-name"
+  }, userInfo.name)), /*#__PURE__*/React.createElement("div", {
     ref: commentRef,
     contentEditable: "true",
     className: "comment-editor",
-    placeholder: placeholder,
-    onKeyDown: onKeyDown,
-    onFocus: function onFocus() {
-      return setIsFocus(true);
-    }
-  }), isFocus && /*#__PURE__*/React.createElement("div", {
-    className: "editor-operations"
+    placeholder: t(placeholder),
+    onKeyDown: onKeyDown
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "comment-operations"
   }, /*#__PURE__*/React.createElement(Button, {
     className: "mr-2",
     onClick: onCancel

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

@@ -191,3 +191,30 @@
 .sdoc-comment-list-container .comment-editor-wrapper .comment-editor:focus {
   border: 1px solid rgba(0, 0, 0, .12);
 }
+
+.sdoc-comment-list-container .comment-editor-wrapper .comment-editor-user-info {
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.sdoc-comment-list-container .comment-editor-wrapper .comment-editor-user-info .comment-editor-user-img {
+  height: 30px;
+  width: 30px;
+  border-radius: 50%;
+  overflow: hidden;
+  margin-right: 8px;
+}
+
+.sdoc-comment-list-container .comment-editor-wrapper .comment-editor-user-info .comment-editor-user-name {
+  flex: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  user-select: none;
+}
+
+.sdoc-comment-list-container .comment-editor-wrapper .comment-operations {
+  display: flex;
+  justify-content: flex-end;
+}

package/dist/basic-sdk/comment/comment/comment-list.js

@@ -9,6 +9,8 @@ import { useCommentListPosition } from '../../hooks/use-selection-position';
 import { useCommentContext } from '../hooks/use-comment-context';
 import CommentEditor from './comment-editor';
 import CommentItemWrapper from './comment-item-wrapper';
+import EventBus from '../../utils/event-bus';
+import { INTERNAL_EVENT } from '../../constants';
 import './comment-list.css';
 var CommentList = function CommentList(_ref) {
   var comments = _ref.comments,
@@ -20,6 +22,20 @@ var CommentList = function CommentList(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     activeComment = _useState2[0],
     setActiveComment = _useState2[1];
+  var handelArticleClick = useCallback(function (event) {
+    if (event.target.className !== 'article') return;
+    hiddenComment();
+  }, [hiddenComment]);
+
+  // onMount: hidden comment
+  useEffect(function () {
+    var eventBus = EventBus.getInstance();
+    var unsubscribe = eventBus.subscribe(INTERNAL_EVENT.ARTICLE_CLICK, handelArticleClick);
+    return function () {
+      unsubscribe();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
   var onCommentClick = useCallback(function (comment) {
     if (activeComment && activeComment.id === comment.id) return;
     setActiveComment(comment);

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

@@ -19,18 +19,6 @@ var EditorComment = function EditorComment() {
   var onAddCommentToggle = useCallback(function () {
     setIsShowComments(true);
   }, []);
-  var cursor = useCursorPosition();
-  var style = useMemo(function () {
-    var _Node$string;
-    if (selectionElement && ((_Node$string = Node.string(selectionElement)) === null || _Node$string === void 0 ? void 0 : _Node$string.length) === 0) {
-      return {
-        top: '-99999px'
-      };
-    }
-    return {
-      top: cursor.y === 0 || isShowComments ? '-99999px' : cursor.y
-    };
-  }, [cursor, isShowComments, selectionElement]);
 
   // When selectionElement update, recalculate comment's panel state
   var _useState3 = useState([]),
@@ -52,24 +40,31 @@ var EditorComment = function EditorComment() {
     setComments([]);
     setIsShowComments(false);
   }, [element_comments_map, selectionElement, editor.selection]);
+  var cursor = useCursorPosition();
+  var style = useMemo(function () {
+    var _Node$string;
+    if (selectionElement && ((_Node$string = Node.string(selectionElement)) === null || _Node$string === void 0 ? void 0 : _Node$string.length) === 0) return {
+      top: '-99999px'
+    };
+    var comments = element_comments_map[selectionElement === null || selectionElement === void 0 ? void 0 : selectionElement.id];
+    var unresolvedComments = comments && comments.filter(function (item) {
+      return !item.resolved;
+    });
+    var hasComments = unresolvedComments && unresolvedComments.length > 0;
+    if (hasComments) return {
+      top: '-99999px'
+    };
+    if (cursor.y === 0 || isShowComments) return {
+      top: '-99999px'
+    };
+    return {
+      top: cursor.y
+    };
+  }, [cursor, isShowComments, selectionElement, element_comments_map]);
   var hiddenComment = useCallback(function () {
     setComments([]);
     setIsShowComments(false);
   }, []);
-  var onHiddenComment = useCallback(function (e) {
-    if (e.target.className === 'article') {
-      hiddenComment();
-    }
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  useEffect(function () {
-    window.addEventListener('click', onHiddenComment);
-    return function () {
-      window.removeEventListener('click', onHiddenComment);
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: "sdoc-comment-container"
   }, /*#__PURE__*/React.createElement("div", {

package/dist/basic-sdk/constants/index.js

@@ -5,7 +5,8 @@ export var INTERNAL_EVENT = {
   ON_MOUSE_ENTER_BLOCK: 'on_mouse_enter_block',
   INSERT_ELEMENT: 'insert_element',
   OUTLINE_STATE_CHANGED: 'outline_state_changed',
-  RELOAD_IMAGE: 'reload_image'
+  RELOAD_IMAGE: 'reload_image',
+  ARTICLE_CLICK: 'hidden_comment'
 };
 export var PAGE_EDIT_AREA_WIDTH = 672; // 672 = 794 - 2[borderLeft + borderRight] - 120[paddingLeft + paddingRight]
 

package/dist/basic-sdk/extension/commons/tooltip/index.js

@@ -6,12 +6,14 @@ var Tooltip = function Tooltip(_ref) {
   var target = _ref.target,
     children = _ref.children,
     className = _ref.className,
-    placement = _ref.placement;
+    placement = _ref.placement,
+    _ref$fade = _ref.fade,
+    fade = _ref$fade === void 0 ? false : _ref$fade;
   var popperClassName = classnames('sdoc-tooltip', className);
   return /*#__PURE__*/React.createElement(UncontrolledTooltip, {
     popperClassName: popperClassName,
     target: target,
-    fade: false,
+    fade: fade,
     placement: placement || 'bottom',
     delay: 0
   }, children);

package/dist/basic-sdk/extension/plugins/image/hover-menu/index.css

@@ -49,24 +49,6 @@
   background: #f1f1f1;
 }
 
-.sdoc-image-hover-menu-container .hover-menu-container .op-tooltip:hover::after {
-  position: absolute;
-  color: #212529;
-  content: attr(op-item-tooltip);
-  top: -40px;
-  left: -20px;
-  width: 100px;
-  height: 30px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background-color: #fff;
-  border-radius: 3px;
-  border: 1px solid #e8e8e8;
-  font-size: 12px;
-  box-shadow: 0 0 5px #ccc;
-}
-
 .sdoc-image-hover-menu-container .hover-menu-container .icon-font {
   font-size: 12px;
   color: #999999;

package/dist/basic-sdk/extension/plugins/image/hover-menu/index.js

@@ -1,11 +1,12 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { Transforms } from '@seafile/slate';
 import { ReactEditor } from '@seafile/slate-react';
 import { withTranslation } from 'react-i18next';
 import classnames from 'classnames';
 import { ElementPopover } from '../../../commons';
+import Tooltip from '../../../commons/tooltip';
 import ImagePreviewer from '../dialogs/image-previewer';
 import { getImageURL } from '../helpers';
 import { IMAGE_DISPLAY_TYPE, IMAGE_BORDER_TYPE } from '../constants';
@@ -35,6 +36,13 @@ var ImageHoverMenu = function ImageHoverMenu(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     isShowImagePreview = _useState4[0],
     setIsShowImagePreview = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    isShowTooltip = _useState6[0],
+    setIsShowTooltip = _useState6[1];
+  useEffect(function () {
+    setIsShowTooltip(true);
+  }, []);
   var onShowProver = useCallback(function (event, showProverKey) {
     event.stopPropagation();
     var newPopoverState = popoverState;
@@ -92,9 +100,9 @@ var ImageHoverMenu = function ImageHoverMenu(_ref) {
   }), /*#__PURE__*/React.createElement("i", {
     className: "sdocfont sdoc-drop-down icon-font"
   })), /*#__PURE__*/React.createElement("span", {
+    id: "sdoc_image_border",
     role: "button",
-    "op-item-tooltip": t('Image_border'),
-    className: classnames('op-item', 'op-tooltip', 'ml-1', {
+    className: classnames('op-item', 'ml-1', {
       'active': popoverState.borderPopover
     }),
     onClick: function onClick(e) {
@@ -104,19 +112,27 @@ var ImageHoverMenu = function ImageHoverMenu(_ref) {
     className: "sdocfont sdoc-image icon-font mr-1"
   }), /*#__PURE__*/React.createElement("i", {
     className: "sdocfont sdoc-drop-down icon-font"
-  }))), /*#__PURE__*/React.createElement("span", {
+  }), isShowTooltip && /*#__PURE__*/React.createElement(Tooltip, {
+    target: "sdoc_image_border",
+    placement: "top",
+    fade: true
+  }, t('Image_border')))), /*#__PURE__*/React.createElement("span", {
     className: "op-group-item"
   }, /*#__PURE__*/React.createElement("span", {
+    id: "sdoc_image_full_screen_mode",
     role: "button",
-    "op-item-tooltip": t('Full_screen_mode'),
-    className: "op-item op-tooltip",
+    className: "op-item",
     onClick: function onClick(e) {
       e.stopPropagation();
       setIsShowImagePreview(!isShowImagePreview);
     }
   }, /*#__PURE__*/React.createElement("i", {
     className: "sdocfont sdoc-fullscreen icon-font"
-  })))), popoverState.displayPopover && /*#__PURE__*/React.createElement("div", {
+  }), isShowTooltip && /*#__PURE__*/React.createElement(Tooltip, {
+    target: "sdoc_image_full_screen_mode",
+    placement: "top",
+    fade: true
+  }, t('Full_screen_mode'))))), popoverState.displayPopover && /*#__PURE__*/React.createElement("div", {
     className: "sdoc-image-popover sdoc-dropdown-menu"
   }, IMAGE_DISPLAY_TYPE.map(function (item) {
     return /*#__PURE__*/React.createElement("div", {

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

@@ -40,8 +40,8 @@ var Image = function Image(_ref) {
   var scrollRef = useScrollContext();
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
-    width = _useState2[0],
-    setWidth = _useState2[1];
+    movingWidth = _useState2[0],
+    setMovingWidth = _useState2[1];
   var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
     isResizing = _useState4[0],
@@ -75,7 +75,8 @@ var Image = function Image(_ref) {
     var changeX = event.clientX - ((_resizerRef$current = resizerRef.current) === null || _resizerRef$current === void 0 ? void 0 : _resizerRef$current.getBoundingClientRect().left) - 5;
     var imageWidth = imageRef.current.width + changeX;
     if (imageWidth < 20) return;
-    setWidth(imageWidth);
+    imageRef.current.width = imageWidth;
+    setMovingWidth(imageWidth);
   }, []);
   var onResizeEnd = useCallback(function (event) {
     event.preventDefault();
@@ -88,12 +89,12 @@ var Image = function Image(_ref) {
       'event': onResizeEnd
     }]);
     var newData = _objectSpread(_objectSpread({}, element.data), {}, {
-      width: width
+      width: imageRef.current.width
     });
     updateImage(editor, newData);
     setIsResizing(false);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [editor, element.data, width]);
+  }, [editor, element.data]);
   var onResizeStart = useCallback(function (event) {
     event.preventDefault();
     event.stopPropagation();
@@ -108,18 +109,19 @@ var Image = function Image(_ref) {
   }, [onMouseMove, onResizeEnd, registerEvent]);
   var getImageStyle = useCallback(function () {
     var imageWidth = element.data.width || '';
-    if (width) imageWidth = width;
+    if (movingWidth) imageWidth = movingWidth;
     return {
       width: imageWidth
     };
-  }, [element.data, width]);
+  }, [element.data, movingWidth]);
   var onScroll = useCallback(function () {
     setPosition(imageRef.current);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   var onHideImageHoverMenu = useCallback(function (e) {
+    var _imagePreviewer$;
     var imagePreviewer = document.getElementsByClassName('sf-editor-image-previewer');
-    if (e.target === imageRef.current || imagePreviewer[0].contains(e.target)) return;
+    if (e.target === imageRef.current || ((_imagePreviewer$ = imagePreviewer[0]) === null || _imagePreviewer$ === void 0 ? void 0 : _imagePreviewer$.contains(e.target))) return;
     setIsShowImageHoverMenu(false);
   }, []);
   useEffect(function () {
@@ -154,9 +156,9 @@ var Image = function Image(_ref) {
       var _elem$getBoundingClie = elem.getBoundingClientRect(),
         top = _elem$getBoundingClie.top,
         left = _elem$getBoundingClie.left,
-        _width = _elem$getBoundingClie.width;
+        width = _elem$getBoundingClie.width;
       var menuTop = top - 42;
-      var menuLeft = left - 222 / 2 + _width / 2; // left = left distance - (menu width / 2) + (image with / 2)
+      var menuLeft = left - 222 / 2 + width / 2; // left = left distance - (menu width / 2) + (image with / 2)
       setMenuPosition({
         top: menuTop,
         left: menuLeft
@@ -215,7 +217,7 @@ var Image = function Image(_ref) {
   }), isResizing && /*#__PURE__*/React.createElement("span", {
     className: "image-size",
     contentEditable: false
-  }, /*#__PURE__*/React.createElement("span", null, t('Width'), ':', parseInt(width || imageRef.current.clientWidth)), /*#__PURE__*/React.createElement("span", null, "\xA0\xA0"), /*#__PURE__*/React.createElement("span", null, t('Height'), ':', imageRef.current.clientHeight))), children), isShowImageHoverMenu && !readOnly && /*#__PURE__*/React.createElement(ImageHoverMenu, {
+  }, /*#__PURE__*/React.createElement("span", null, t('Width'), ':', parseInt(movingWidth || imageRef.current.clientWidth)), /*#__PURE__*/React.createElement("span", null, "\xA0\xA0"), /*#__PURE__*/React.createElement("span", null, t('Height'), ':', imageRef.current.clientHeight))), children), isShowImageHoverMenu && !readOnly && /*#__PURE__*/React.createElement(ImageHoverMenu, {
     editor: editor,
     menuPosition: menuPosition,
     element: element,

package/dist/basic-sdk/layout/article-container.js

@@ -31,6 +31,11 @@ export default function ArticleContainer(_ref) {
       setContainerStyle({});
     }
   }, [scrollRef]);
+  var handelArticleClick = useCallback(function (event) {
+    if (!articleRef.current.contains(event.target)) return;
+    var eventBus = EventBus.getInstance();
+    eventBus.dispatch(INTERNAL_EVENT.ARTICLE_CLICK, event);
+  }, []);
   useEffect(function () {
     var eventBus = EventBus.getInstance();
     var unsubscribeOutline = eventBus.subscribe(INTERNAL_EVENT.OUTLINE_STATE_CHANGED, handleWindowResize);
@@ -49,9 +54,11 @@ export default function ArticleContainer(_ref) {
     style: containerStyle
   }, React.Children.count(children) === 1 && /*#__PURE__*/React.createElement("div", {
     className: "article",
-    ref: articleRef
+    ref: articleRef,
+    onClick: handelArticleClick
   }, children), React.Children.count(children) > 1 && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "article",
-    ref: articleRef
+    ref: articleRef,
+    onClick: handelArticleClick
   }, children[0]), _toConsumableArray(children.slice(1))));
 }

package/package.json

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