@seafile/sdoc-editor 3.0.121 → 3.0.123

package/dist/comment/helper.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useCursorPosition = exports.updateElementsAttrs = exports.updateCommentedElementsAttrs = exports.getSelectionRange = exports.getSelectedElemIds = exports.getPrimaryElementId = exports.getElementCommentCountTop = exports.getDomById = exports.getCursorPosition = exports.getCommentedTextsByElementId = exports.getAvatarUrl = exports.commentContainerWikiTransfer = void 0;
+exports.useCursorPosition = exports.updateElementsAttrs = exports.updateCommentedElementsAttrs = exports.getWikiHeaderHeight = exports.getSelectionRange = exports.getSelectedElemIds = exports.getPrimaryElementId = exports.getElementCommentCountTop = exports.getDomById = exports.getCursorPosition = exports.getCommentedTextsByElementId = exports.getAvatarUrl = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createForOfIteratorHelper"));
@@ -57,23 +57,13 @@ var getAvatarUrl = exports.getAvatarUrl = function getAvatarUrl() {
   var avatarUrl = "".concat(server, "/media/avatars/default.png");
   return avatarUrl;
 };
-var commentContainerWikiTransfer = exports.commentContainerWikiTransfer = function commentContainerWikiTransfer(result, value) {
-  var newResult;
-  var isWikiTitleIcon = document.querySelector('.wiki-page-icon-wrapper');
-  var isWikiTitleCover = document.getElementById('wiki-page-cover');
-  if (isWikiTitleIcon && !isWikiTitleCover) {
-    // 90 is icon height in wiki
-    newResult = result - value - 90;
-  } else if (!isWikiTitleIcon && isWikiTitleCover) {
-    // 203 is icon height in wiki
-    newResult = result - value - 203;
-  } else if (isWikiTitleIcon && isWikiTitleCover) {
-    // 205 is icon and cover height in wiki
-    newResult = result - value - 205;
-  } else {
-    newResult = result - value;
-  }
-  return newResult;
+var getWikiHeaderHeight = exports.getWikiHeaderHeight = function getWikiHeaderHeight() {
+  var pageCover = window.document.getElementById('wiki-page-cover');
+  var pageCoverHeight = (pageCover === null || pageCover === void 0 ? void 0 : pageCover.offsetHeight) || 0;
+  var pageTitle = window.document.getElementById('wiki-page-title');
+  var pageTitleHeight = (pageTitle === null || pageTitle === void 0 ? void 0 : pageTitle.offsetHeight) || 0;
+  var topNavHeight = 44;
+  return pageCoverHeight + pageTitleHeight + topNavHeight;
 };
 var getElementCommentCountTop = exports.getElementCommentCountTop = function getElementCommentCountTop(editor, element, scrollTop) {
   var minY;
@@ -94,7 +84,8 @@ var getElementCommentCountTop = exports.getElementCommentCountTop = function get
   resultY = minY - 100 + scrollTop; // 100: header height(56) + toolbar height(37)
   if (editor.editorType === _constants.WIKI_EDITOR) {
     // 55 is basic top title height in wiki
-    resultY = commentContainerWikiTransfer(resultY, 55);
+    var headerHight = getWikiHeaderHeight();
+    resultY = minY - headerHight + scrollTop;
   }
   return resultY;
 };

package/dist/extension/plugins/file-view/render-elem/index.css

@@ -27,13 +27,13 @@
   border-radius: 4px;
 }
 
-.sdoc-file-view-container .sdoc-file-view-content {
+/* .sdoc-file-view-container .sdoc-file-view-content {
   height: 400px;
 }
 
 .sdoc-file-view-container .sdoc-file-view-content .sea-metadata {
   height: 396px;
-}
+} */
 
 .sdoc-file-view-container .sdoc-file-view-content .sea-metadata .sea-metadata-table-main-container {
   border: 1px solid #eee;
@@ -48,4 +48,5 @@
   background-color: #007bff;
   border: 1px solid #fff;
   cursor: se-resize;
+  display: none;
 }

package/dist/extension/plugins/file-view/render-elem/index.js

@@ -49,13 +49,13 @@ var FileViewPlugin = function FileViewPlugin(_ref) {
     var viewSettings = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, settings), {}, {
       view_data: {
         wiki_id: data.wiki_id,
-        file_view_id: data.file_view_id,
-        height: data.height
+        file_view_id: data.file_view_id
+        // height: data.height,
         // width: data.width,
       }
     });
     return viewSettings;
-  }, [data.file_view_id, data.height, data.wiki_id]);
+  }, [data.file_view_id, data.wiki_id]);
   (0, _react.useEffect)(function () {
     var copyContent = _localStorageUtils["default"].getItem(_constants.RECENT_COPY_CONTENT);
     var wikiId = _context["default"].getSetting('wikiId');
@@ -144,16 +144,7 @@ var FileViewPlugin = function FileViewPlugin(_ref) {
       'event': onResizeEnd
     }]);
   }, [onMouseMove, onResizeEnd, registerEvent]);
-  var style = (0, _react.useMemo)(function () {
-    var height = data.height;
-    if (height) {
-      return {
-        // width,
-        height: height
-      };
-    }
-    return null;
-  }, [data]);
+  console.log(viewSettings);
   return /*#__PURE__*/_react["default"].createElement("div", Object.assign({
     "data-id": element.id
   }, attributes, {
@@ -164,8 +155,7 @@ var FileViewPlugin = function FileViewPlugin(_ref) {
     className: (0, _classnames["default"])('sdoc-file-view-content', {
       'is-selected': isSelected
     }),
-    ref: wrapperRef,
-    style: style
+    ref: wrapperRef
   }, /*#__PURE__*/_react["default"].createElement(_seafileDatabase.FileView, {
     settings: viewSettings,
     ref: databaseRef,

package/dist/hooks/use-selection-position.js

@@ -58,8 +58,8 @@ var useCommentListPosition = exports.useCommentListPosition = function useCommen
     var topPara;
     topPara = rect.bottom - headerHeight + 10 + scrollTop;
     if (editor.editorType === _constants.WIKI_EDITOR) {
-      // 55 is basic top title height in wiki
-      topPara = (0, _helper.commentContainerWikiTransfer)(topPara, 55);
+      var wikiHeaderHight = (0, _helper.getWikiHeaderHeight)();
+      topPara = rect.bottom - wikiHeaderHight + 10 + scrollTop;
     }
     var rightPara = editorArticleRight - rect.left - 300; // 300 is comment container's width
     return {
@@ -73,8 +73,8 @@ var useCommentListPosition = exports.useCommentListPosition = function useCommen
   if (selectionPosition && selectionPosition.y !== 0) {
     selectionPosition.y = selectionPosition.y - headerHeight + scrollTop;
     if (editor.editorType === _constants.WIKI_EDITOR) {
-      // 47 is top nav bar height in wiki
-      selectionPosition.y = (0, _helper.commentContainerWikiTransfer)(selectionPosition.y, 47);
+      var _wikiHeaderHight = (0, _helper.getWikiHeaderHeight)();
+      selectionPosition.y = selectionPosition.y - _wikiHeaderHight + scrollTop;
     }
   }
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "3.0.121",
+  "version": "3.0.123",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -20,7 +20,7 @@
     "@seafile/comment-editor": "1.0.19",
     "@seafile/print-js": "1.6.6",
     "@seafile/react-image-lightbox": "5.0.4",
-    "@seafile/seafile-database": "0.0.41",
+    "@seafile/seafile-database": "0.0.43",
     "@seafile/slate": "0.91.8",
     "@seafile/slate-history": "0.86.2",
     "@seafile/slate-hyperscript": "0.81.7",
@@ -72,5 +72,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "86fe08615af2e429b778e9075e7331b4dad5f77f"
+  "gitHead": "a9e3b6f309ad176cd1ec83997229670e75af81fc"
 }