@seafile/sdoc-editor 1.0.141 → 1.0.143

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

@@ -108,13 +108,13 @@ const CommentItemCollapseWrapper = _ref => {
     className: "name"
   }, topLevelComment.user_name), /*#__PURE__*/_react.default.createElement("span", {
     className: "time"
-  }, (0, _dayjs.default)(topLevelComment.updated_at).format('MM-DD HH:mm')))), (isUnseen || isReplayUnseen) && /*#__PURE__*/_react.default.createElement("div", {
+  }, (0, _dayjs.default)(topLevelComment.updated_at).format('MM-DD HH:mm'), (topLevelComment === null || topLevelComment === void 0 ? void 0 : topLevelComment.resolved) && /*#__PURE__*/_react.default.createElement("span", {
+    className: "comment-success-resolved sdocfont sdoc-mark-as-resolved"
+  })))), (isUnseen || isReplayUnseen) && /*#__PURE__*/_react.default.createElement("div", {
     className: "sdoc-unread-message-tip"
   })), /*#__PURE__*/_react.default.createElement("div", {
     className: "comment-content"
-  }, (topLevelComment === null || topLevelComment === void 0 ? void 0 : topLevelComment.resolved) && /*#__PURE__*/_react.default.createElement("span", {
-    className: "comment-success-resolved sdocfont sdoc-mark-as-resolved"
-  }), /*#__PURE__*/_react.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement("div", {
     dangerouslySetInnerHTML: {
       __html: commentContent
     }

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

@@ -147,15 +147,6 @@
   align-items: initial;
 }
 
-.comment-item .comment-footer .comment-author__avatar {
-  width: 16px;
-  height: 16px;
-}
-
-.comment-item .comment-footer .comment-author__avatar img {
-  border-radius: 50%;
-}
-
 .comment-item .comment-footer .comment-author__latest-reply {
   margin-left: 8px;
 }
@@ -168,19 +159,6 @@
   width: 220px;
 }
 
-/* header */
-.sdoc-comment-list-container .comment-header .comment-author__avatar {
-  display: flex;
-  align-items: center;
-}
-
-.sdoc-article-container .sdoc-comment-list-container .comment-item .comment-header .comment-author__avatar img {
-  margin-top: 3px;
-  width: 24px;
-  height: 24px;
-  border-radius: 50%;
-}
-
 .sdoc-comment-list-container .comment-header .comment-author__info {
   display: flex;
   flex-direction: column;
@@ -208,6 +186,12 @@
   align-items: center;
 }
 
+.sdoc-comment-list-container .comment-header .comment-author__info .time .comment-success-resolved {
+  color: rgb(71, 184, 129);
+  margin-left: 6px;
+  font-size: 14px;
+}
+
 .sdoc-comment-list-container .comment-header .sdoc-unread-message-tip {
   display: inline-block;
   height: 6px;
@@ -361,7 +345,29 @@
   padding-right: 10px;
 }
 
-/* editor Side comment preview */
+/* Side comment style */
+.sdoc-article-container .sdoc-comment-list-container .comment-item .comment-header .comment-author__avatar {
+  display: flex;
+  align-items: center;
+  margin-top: 3px;
+  width: 24px;
+  height: 24px;
+}
+
+.sdoc-article-container .sdoc-comment-list-container .comment-item .comment-header .comment-author__avatar img {
+  border-radius: 50%;
+}
+
+.sdoc-article-container .sdoc-comment-list-container .comment-item .comment-footer .comment-author__avatar {
+  width: 16px;
+  height: 16px;
+  margin-top: -1px
+}
+
+.sdoc-article-container .sdoc-comment-list-container .comment-item .comment-footer .comment-author__avatar img {
+  border-radius: 50%;
+}
+
 .sdoc-article-container .sdoc-comment-list-container .comment-item .comment-editor-wrapper.pb-3 {
   padding-bottom: 0 !important;
 }

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

@@ -216,23 +216,22 @@
   background-color: unset;
 }
 
-.sdoc-comment-drawer .sdoc-comment-list-container .comment-item .comment-header .comment-author__avatar img {
+.sdoc-comment-drawer .sdoc-comment-list-container .comment-item .comment-header .comment-author__avatar {
   width: 24px;
   height: 24px;
   margin-top: -5px;
 }
 
+.sdoc-comment-drawer .sdoc-comment-list-container .comment-item .comment-header .comment-author__avatar img {
+  border-radius: 50%;
+}
+
 .sdoc-comment-drawer .sdoc-comment-list-container .comment-item .comment-content {
   margin-left: 35px;
   display: flex;
   align-items: center;
 }
 
-.sdoc-comment-drawer .sdoc-comment-list-container .comment-item .comment-content .comment-success-resolved {
-  color: rgb(71, 184, 129);
-  margin-right: 6px;
-}
-
 .sdoc-comment-drawer .sdoc-comment-list-container .comment-item .comment-footer .comments-count {
   display: flex;
   align-items: center;
@@ -257,6 +256,7 @@
 .sdoc-comment-drawer .sdoc-comment-list-container .comment-item .comment-footer .comment-author__avatar {
   width: 16px;
   height: 16px;
+  margin-top: -1px
 }
 
 .sdoc-comment-drawer .sdoc-comment-list-container .comment-item .comment-footer .comment-author__avatar img {

package/dist/basic-sdk/extension/core/queries/index.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.someNode = exports.isTopLevelListItem = exports.isTextNode = exports.isStartPoint = exports.isSelectionAtBlockStart = exports.isSelectionAtBlockEnd = exports.isRangeInSameBlock = exports.isRangeAcrossBlocks = exports.isMultiLevelList = exports.isLastNode = exports.isLastChild = exports.isHasImg = exports.isFirstChild = exports.isEndPoint = exports.isCurrentLineHasText = exports.isCurrentLineEmpty = exports.isBlockTextEmptyAfterSelection = exports.isBlockAboveEmpty = exports.isAncestorEmpty = exports.getTopLevelBlockNode = exports.getStartPoint = exports.getSelectedNodeEntryByType = exports.getSelectedNodeByTypes = exports.getSelectedNodeByType = exports.getSelectedElems = exports.getQueryOptions = exports.getPreviousPath = exports.getPrevNode = exports.getPointBefore = exports.getParentNode = exports.getNodes = exports.getNodeType = exports.getNodeEntries = exports.getNodeById = exports.getNode = exports.getNextSiblingNodes = exports.getNextNode = exports.getLastChildPath = exports.getLastChild = exports.getEndPoint = exports.getEditorString = exports.getDeepInlineChildren = exports.getCurrentNode = exports.getCommonNode = exports.getChildren = exports.getAboveNode = exports.getAboveBlockNode = exports.findPath = exports.findNode = exports.findDescendant = void 0;
+exports.someNode = exports.isTopLevelListItem = exports.isTextNode = exports.isStartPoint = exports.isSelectionAtBlockStart = exports.isSelectionAtBlockEnd = exports.isRangeInSameBlock = exports.isRangeAcrossBlocks = exports.isMultiLevelList = exports.isLastNode = exports.isLastChild = exports.isHasImg = exports.isFirstChild = exports.isEndPoint = exports.isEmptyArticle = exports.isCurrentLineHasText = exports.isCurrentLineEmpty = exports.isBlockTextEmptyAfterSelection = exports.isBlockAboveEmpty = exports.isAncestorEmpty = exports.getTopLevelBlockNode = exports.getStartPoint = exports.getSelectedNodeEntryByType = exports.getSelectedNodeByTypes = exports.getSelectedNodeByType = exports.getSelectedElems = exports.getQueryOptions = exports.getPreviousPath = exports.getPrevNode = exports.getPointBefore = exports.getParentNode = exports.getNodes = exports.getNodeType = exports.getNodeEntries = exports.getNodeById = exports.getNode = exports.getNextSiblingNodes = exports.getNextNode = exports.getLastChildPath = exports.getLastChild = exports.getEndPoint = exports.getEditorString = exports.getDeepInlineChildren = exports.getCurrentNode = exports.getCommonNode = exports.getChildren = exports.getAboveNode = exports.getAboveBlockNode = exports.findPath = exports.findNode = exports.findDescendant = void 0;
 var _slate = require("@seafile/slate");
 var _slateReact = require("@seafile/slate-react");
 var _utils = require("../utils");
@@ -75,11 +75,6 @@ const getNodeById = (nodes, nodeId) => {
   return node;
 };
 exports.getNodeById = getNodeById;
-const isTextNode = node => {
-  if (!node) return false;
-  if (!_objectUtils.default.hasProperty(node, 'children') && _objectUtils.default.hasProperty(node, 'text')) return true;
-};
-exports.isTextNode = isTextNode;
 const getParentNode = (nodes, nodeId) => {
   let parentNode;
   for (let i = 0; i < nodes.length; i++) {
@@ -201,11 +196,6 @@ const getPreviousPath = path => {
   return path.slice(0, -1).concat(last - 1);
 };
 exports.getPreviousPath = getPreviousPath;
-const isLastChild = (nodeEntry, childPath) => {
-  const lastChildPath = getLastChildPath(nodeEntry);
-  return _slate.Path.equals(lastChildPath, childPath);
-};
-exports.isLastChild = isLastChild;
 const getSelectedElems = editor => {
   const elems = [];
   const nodeEntries = _slate.Editor.nodes(editor, {
@@ -382,6 +372,16 @@ const findDescendant = (editor, options) => {
 
 // is
 exports.findDescendant = findDescendant;
+const isTextNode = node => {
+  if (!node) return false;
+  if (!_objectUtils.default.hasProperty(node, 'children') && _objectUtils.default.hasProperty(node, 'text')) return true;
+};
+exports.isTextNode = isTextNode;
+const isLastChild = (nodeEntry, childPath) => {
+  const lastChildPath = getLastChildPath(nodeEntry);
+  return _slate.Path.equals(lastChildPath, childPath);
+};
+exports.isLastChild = isLastChild;
 const isStartPoint = (editor, point, at) => {
   return !!point && _slate.Editor.isStart(editor, point, at);
 };
@@ -542,6 +542,17 @@ const isRangeInSameBlock = function (editor) {
   return _slate.Path.equals(startBlock[1], endBlock[1]);
 };
 exports.isRangeInSameBlock = isRangeInSameBlock;
+const isFirstChild = path => {
+  return path.at(-1) === 0;
+};
+exports.isFirstChild = isFirstChild;
+const isEmptyArticle = editor => {
+  if (editor.children.length === 0) {
+    return true;
+  }
+  return false;
+};
+exports.isEmptyArticle = isEmptyArticle;
 const getStartPoint = (editor, at) => {
   return _slate.Editor.start(editor, at);
 };
@@ -554,10 +565,6 @@ const getPointBefore = (editor, at) => {
   return _slate.Editor.before(editor, at);
 };
 exports.getPointBefore = getPointBefore;
-const isFirstChild = path => {
-  return path.at(-1) === 0;
-};
-exports.isFirstChild = isFirstChild;
 const someNode = (editor, options) => {
   return !!findNode(editor, options);
 };

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

@@ -13,8 +13,7 @@ var _dtableUtils = require("dtable-utils");
 var _context = _interopRequireDefault(require("../../../../context"));
 var _eventBus = _interopRequireDefault(require("../../../utils/event-bus"));
 var _core = require("../../core");
-var _helpers = require("../../toolbar/side-toolbar/helpers");
-var _helpers2 = require("../seatable-column/helpers");
+var _helpers = require("../seatable-column/helpers");
 var _constants = require("../../../constants");
 var _constants2 = require("../../constants");
 var _base64ToUnit8array = _interopRequireDefault(require("../../../../utils/base64-to-unit8array"));
@@ -131,7 +130,7 @@ const getImageURL = (data, editor) => {
     column_key
   } = data;
   if (column_key) {
-    const column = (0, _helpers2.getColumnByKey)(editor.columns || [], column_key);
+    const column = (0, _helpers.getColumnByKey)(editor.columns || [], column_key);
     const {
       type
     } = column || {};
@@ -141,7 +140,7 @@ const getImageURL = (data, editor) => {
       return firstSrc;
     } else if (type === _dtableUtils.CellType.DIGITAL_SIGN) {
       const partUrl = editor.getColumnCellValue(column_key) || '';
-      const imgUrl = (0, _helpers2.getDigitalSignImgUrl)(partUrl);
+      const imgUrl = (0, _helpers.getDigitalSignImgUrl)(partUrl);
       return imgUrl;
     }
   }

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

@@ -176,7 +176,14 @@ const withImage = editor => {
       _slate.Transforms.removeNodes(editor, {
         at: deletePath
       });
-      const beforeEntry = _slate.Editor.node(editor, _slate.Path.previous(deletePath));
+      if ((0, _core.isEmptyArticle)(editor)) {
+        const p = (0, _core.generateEmptyElement)(_constants.ELEMENT_TYPE.PARAGRAPH);
+        _slate.Transforms.insertNodes(editor, p, {
+          at: [0]
+        });
+      }
+      const prevPath = deletePath[0] === 0 ? deletePath : _slate.Path.previous(deletePath);
+      const beforeEntry = _slate.Editor.node(editor, prevPath);
       const selectPath = (0, _core.getLastChildPath)(beforeEntry);
       const endOfFirstNode = _slate.Editor.end(editor, selectPath);
       const range = {

package/package.json

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