@seafile/sdoc-editor 0.3.17 → 0.3.18

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

@@ -8,6 +8,7 @@ import { useSelectionElement } from '../../hooks/use-selection-element';
 import { useCommentContext } from '../hooks/comment-hooks/use-comment-context';
 import ElementsCommentCount from './elements-comment-count';
 import { ELEMENT_TYPE } from '../../extension/constants';
+import { Z_INDEX } from '../../constants';
 const EditorComment = _ref => {
   let {
     deleteUnseenNotifications
@@ -55,7 +56,8 @@ const EditorComment = _ref => {
       top: '-99999px'
     };
     return {
-      top: cursor.y
+      top: cursor.y,
+      zIndex: Z_INDEX.COMMENT_ADD
     };
   }, [cursor, isShowComments, selectionElement, element_comments_map]);
   const hiddenComment = useCallback(() => {
@@ -77,7 +79,8 @@ const EditorComment = _ref => {
   }, /*#__PURE__*/React.createElement("i", {
     className: "sdocfont sdoc-add-comment mr-1"
   }))), /*#__PURE__*/React.createElement(ElementsCommentCount, {
-    elementCommentsMap: element_comments_map
+    elementCommentsMap: element_comments_map,
+    selectionElement: selectionElement
   }), /*#__PURE__*/React.createElement("div", {
     className: "comment-list-wrapper",
     style: isShowComments ? {

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

@@ -5,9 +5,11 @@ import { useScrollContext } from '../../../hooks/use-scroll-context';
 import { getElementCommentCountTop } from '../../helper';
 import { eventStopPropagation } from '../../../utils/mouse-event';
 import { focusToCommentElement } from '../../utils';
+import { Z_INDEX } from '../../../constants';
 const ElementCommentCount = _ref => {
   let {
     elementId,
+    isElementSelected,
     commentsCount
   } = _ref;
   const editor = useSlateStatic();
@@ -24,13 +26,17 @@ const ElementCommentCount = _ref => {
     const scrollTop = (scrollRef === null || scrollRef === void 0 ? void 0 : (_scrollRef$current = scrollRef.current) === null || _scrollRef$current === void 0 ? void 0 : _scrollRef$current.scrollTop) || 0;
     const newTop = getElementCommentCountTop(editor, element, scrollTop);
     setTop(newTop);
-  }, [editor, elementId, element, scrollRef]);
+  }, [editor, elementId, element, scrollRef, isElementSelected]);
   if (!element) return null;
+  let style = {
+    top
+  };
+  if (isElementSelected) {
+    style['zIndex'] = Z_INDEX.ACTIVE_COMMENT_COUNT;
+  }
   return /*#__PURE__*/React.createElement("div", {
     className: "element-comments-count",
-    style: {
-      top
-    },
+    style: style,
     onClick: onClick
   }, /*#__PURE__*/React.createElement("i", {
     className: "sdocfont sdoc-comment-count"

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

@@ -3,7 +3,8 @@ import ElementCommentCount from './element-comment-count';
 import './index.css';
 const ElementsCommentCount = _ref => {
   let {
-    elementCommentsMap
+    elementCommentsMap,
+    selectionElement
   } = _ref;
   if (!elementCommentsMap) return null;
   return /*#__PURE__*/React.createElement("div", {
@@ -14,9 +15,11 @@ const ElementsCommentCount = _ref => {
     const unresolvedComment = comments.filter(item => !item.resolved);
     const unresolvedCommentCount = unresolvedComment.length;
     if (unresolvedCommentCount === 0) return null;
+    const isSelected = selectionElement.id === elementId;
     return /*#__PURE__*/React.createElement(ElementCommentCount, {
       key: elementId,
       elementId: elementId,
+      isElementSelected: isSelected,
       commentsCount: unresolvedCommentCount
     });
   }));

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

@@ -25,6 +25,7 @@
 
 .sdoc-comment-container .comment-container-right .comment-add-wrapper .sdocfont {
   color: #999;
+  background-color: #FFF;
 }
 
 .sdoc-comment-container .comment-container-right .comment-add-wrapper .sdocfont:hover {

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

@@ -1,3 +1,4 @@
+import * as Z_INDEX from './z-index';
 export const INTERNAL_EVENT = {
   CANCEL_TABLE_SELECT_RANGE: 'cancel_table_select_range',
   SET_TABLE_SELECT_RANGE: 'set_table_select_range',
@@ -41,4 +42,5 @@ export const REBASE_ORIGIN = {
   OTHER: 'other',
   MY: 'my'
 };
-export const REBASE_MARKS = [REBASE_MARK_KEY.ORIGIN, REBASE_MARK_KEY.REBASE_TYPE, REBASE_MARK_KEY.MODIFY_TYPE, REBASE_MARK_KEY.OLD_ELEMENT];
+export const REBASE_MARKS = [REBASE_MARK_KEY.ORIGIN, REBASE_MARK_KEY.REBASE_TYPE, REBASE_MARK_KEY.MODIFY_TYPE, REBASE_MARK_KEY.OLD_ELEMENT];
+export { Z_INDEX };

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

@@ -0,0 +1,2 @@
+export const ACTIVE_COMMENT_COUNT = 1;
+export const COMMENT_ADD = 2;

package/dist/basic-sdk/extension/plugins/table/helpers.js

@@ -2,7 +2,8 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import slugid from 'slugid';
 import { Editor, Range, Transforms, Point, Node } from '@seafile/slate';
 import { ReactEditor } from '@seafile/slate-react';
-import { getNodeType, getParentNode, getSelectedNodeByType, isTextNode, getSelectedElems, focusEditor, getNode, findPath, replaceNodeChildren } from '../../core';
+import deepCopy from 'deep-copy';
+import { getNodeType, getParentNode, getSelectedNodeByType, isTextNode, getSelectedElems, focusEditor, getNode, findPath, replaceNodeChildren, replaceNode } from '../../core';
 import { ELEMENT_TYPE, KEYBOARD, CLIPBOARD_FORMAT_KEY, INSERT_POSITION } from '../../constants';
 import { TABLE_MAX_ROWS, TABLE_MAX_COLUMNS, EMPTY_SELECTED_RANGE, TABLE_ROW_MIN_HEIGHT, TABLE_CELL_MIN_WIDTH, TABLE_ELEMENT, TABLE_ELEMENT_POSITION, TABLE_ROW_STYLE } from './constants';
 import EventBus from '../../../utils/event-bus';
@@ -868,6 +869,7 @@ export const insertMultipleRowsAndColumns = (editor, rows, columns) => {
     rowIndex,
     cellIndex
   } = getSelectedInfo(editor);
+  let newTable = deepCopy(table);
   const eventBus = EventBus.getInstance();
   eventBus.dispatch(INTERNAL_EVENT.CANCEL_TABLE_SELECT_RANGE);
   const insertRows = rows.slice(tableSize[0] - rowIndex);
@@ -878,20 +880,15 @@ export const insertMultipleRowsAndColumns = (editor, rows, columns) => {
     const insertRow = validInsertRows[i];
     const row = generateTableRow(tableSize[1]);
     row.style = insertRow.style;
-    Transforms.insertNodes(editor, row, {
-      at: [...tablePath, tableSize[0] + i]
-    });
+    newTable.children.push(row);
   }
   if (validInsertColumns.length > 0) {
-    updateColumnWidth(editor, table, [...table.columns, ...validInsertColumns]);
+    newTable.columns = [...table.columns, ...validInsertColumns];
   }
   for (let j = 0; j < validInsertColumns.length; j++) {
     for (let i = 0; i < tableSize[0] + validInsertRows.length; i++) {
-      const newCellPath = [...tablePath, i, tableSize[1] - 1];
       const newCell = generateTableCell();
-      Transforms.insertNodes(editor, newCell, {
-        at: newCellPath
-      });
+      newTable.children[i].children.push(newCell);
     }
   }
   for (let i = rowIndex; i < Math.min(TABLE_MAX_ROWS, rowIndex + rows.length); i++) {
@@ -900,12 +897,13 @@ export const insertMultipleRowsAndColumns = (editor, rows, columns) => {
     for (let j = cellIndex; j < Math.min(TABLE_MAX_COLUMNS, cellIndex + columns.length); j++) {
       const replaceCellIndex = j - cellIndex;
       const replaceCell = cells[replaceCellIndex];
-      replaceNodeChildren(editor, {
-        at: [...tablePath, i, j],
-        nodes: replacePastedDataId(replaceCell.children)
-      });
+      newTable.children[i].children[j].children = replacePastedDataId(replaceCell.children);
     }
   }
+  replaceNode(editor, {
+    at: tablePath,
+    nodes: newTable
+  });
   focusEditor(editor, [...tablePath, rowIndex, cellIndex, 0]);
   const {
     focus: newFocus

package/package.json

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