@seafile/sdoc-editor 2.0.175 → 2.0.177

package/dist/extension/commons/select-file-dialog/local-files/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _regeneratorValues2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/regeneratorValues"));
 var _regenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/asyncToGenerator"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
@@ -13,9 +14,8 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm
 var _react = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _slugid = _interopRequireDefault(require("slugid"));
 var _toast = _interopRequireDefault(require("../../../../components/toast"));
-var _context2 = _interopRequireDefault(require("../../../../context"));
+var _context4 = _interopRequireDefault(require("../../../../context"));
 var _commonUtils = require("../../../../utils/common-utils");
 var _helpers = require("../helpers");
 require("./index.css");
@@ -61,13 +61,89 @@ var LocalFiles = function LocalFiles(_ref) {
     setTreeData((0, _toConsumableArray2["default"])(data));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
+  var expandPath = /*#__PURE__*/function () {
+    var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee(currentDirPath, currentDirId, treeData) {
+      var pathParts, currentLevel, _loop, _ret, i;
+      return (0, _regenerator2["default"])().w(function (_context2) {
+        while (1) switch (_context2.n) {
+          case 0:
+            pathParts = currentDirPath.split('/').filter(Boolean);
+            currentLevel = treeData;
+            _loop = /*#__PURE__*/(0, _regenerator2["default"])().m(function _loop() {
+              var dirName, currentItem;
+              return (0, _regenerator2["default"])().w(function (_context) {
+                while (1) switch (_context.n) {
+                  case 0:
+                    dirName = pathParts[i];
+                    currentItem = currentLevel.find(function (item) {
+                      return item.name === dirName && item.type === 'dir';
+                    });
+                    if (currentItem) {
+                      _context.n = 1;
+                      break;
+                    }
+                    return _context.a(2, 0);
+                  case 1:
+                    _context.n = 2;
+                    return onToggle(null, currentItem, treeData);
+                  case 2:
+                    if (!(currentDirId === currentItem.indexId)) {
+                      _context.n = 3;
+                      break;
+                    }
+                    return _context.a(2, 0);
+                  case 3:
+                    currentLevel = currentItem.children || [];
+                  case 4:
+                    return _context.a(2);
+                }
+              }, _loop);
+            });
+            i = 0;
+          case 1:
+            if (!(i < pathParts.length)) {
+              _context2.n = 4;
+              break;
+            }
+            return _context2.d((0, _regeneratorValues2["default"])(_loop()), 2);
+          case 2:
+            _ret = _context2.v;
+            if (!(_ret === 0)) {
+              _context2.n = 3;
+              break;
+            }
+            return _context2.a(3, 4);
+          case 3:
+            i++;
+            _context2.n = 1;
+            break;
+          case 4:
+            return _context2.a(2);
+        }
+      }, _callee);
+    }));
+    return function expandPath(_x, _x2, _x3) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
   var getTreeData = (0, _react.useCallback)(function (p, indexId, treeData) {
-    return _context2["default"].getSdocLocalFiles(p, fileType).then(function (res) {
+    return _context4["default"].getSdocLocalFiles(p, fileType).then(function (res) {
       res.data.forEach(function (item) {
-        item.indexId = _slugid["default"].nice();
+        item.path = "/".concat(item.name);
+        item.indexId = item.id;
       });
       setHasSearchResult(false);
       setIsCurrentLibrary(true);
+
+      // Open current directory by default
+      if (!indexId && !treeData) {
+        var currentDirPath = _context4["default"].getSetting('docPath').split('/').slice(0, -1).join('/');
+        if (currentDirPath) {
+          var currentDirId = _context4["default"].getSetting('currentDirId');
+          expandPath(currentDirPath, currentDirId, res.data);
+        }
+      }
+
       // Open folder
       if (indexId && treeData.length > 0) {
         var newFileListData = (0, _helpers.addDataToTree)(treeData, indexId, res.data, p);
@@ -97,21 +173,21 @@ var LocalFiles = function LocalFiles(_ref) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isOpenSearch, searchContent, isOpenSearch]);
   var onToggle = (0, _react.useCallback)(/*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee(e, item, treeData) {
-      return (0, _regenerator2["default"])().w(function (_context) {
-        while (1) switch (_context.n) {
+    var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee2(e, item, treeData) {
+      return (0, _regenerator2["default"])().w(function (_context3) {
+        while (1) switch (_context3.n) {
           case 0:
-            e.stopPropagation();
+            e && e.stopPropagation();
             if (!expandedFolder.has(item.indexId)) {
-              _context.n = 1;
+              _context3.n = 1;
               break;
             }
             collapsedFolder(treeData, item.indexId);
             expandedFolder["delete"](item.indexId);
-            _context.n = 3;
+            _context3.n = 3;
             break;
           case 1:
-            _context.n = 2;
+            _context3.n = 2;
             return getTreeData(item.path, item.indexId, treeData);
           case 2:
             expandedFolder.add(item.indexId);
@@ -121,12 +197,12 @@ var LocalFiles = function LocalFiles(_ref) {
             setExpandedFolder(new Set(Array.from(expandedFolder)));
             // eslint-disable-next-line react-hooks/exhaustive-deps
           case 4:
-            return _context.a(2);
+            return _context3.a(2);
         }
-      }, _callee);
+      }, _callee2);
     }));
-    return function (_x, _x2, _x3) {
-      return _ref2.apply(this, arguments);
+    return function (_x4, _x5, _x6) {
+      return _ref3.apply(this, arguments);
     };
   }(), [expandedFolder]);
   var onSelectFile = (0, _react.useCallback)(function (e, file) {
@@ -136,9 +212,9 @@ var LocalFiles = function LocalFiles(_ref) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   var getSearchFiles = (0, _react.useCallback)(function (searchContent, fileType) {
-    return _context2["default"].getSearchFilesByFilename(searchContent, 1, 100, fileType).then(function (res) {
+    return _context4["default"].getSearchFilesByFilename(searchContent, 1, 100, fileType).then(function (res) {
       res.data.results.forEach(function (item) {
-        item.indexId = _slugid["default"].nice();
+        item.indexId = item.id;
         item.type = 'file';
         item.file_uuid = item.doc_uuid;
       });

package/dist/extension/plugins/whiteboard/index.css

@@ -39,3 +39,22 @@
   position: relative;
   z-index: 1;
 }
+
+.whiteboard-zoom-out-container {
+  position: fixed;
+  inset: 0;
+  background: rgba(0, 0, 0, 0.7);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 9999;
+}
+
+.whiteboard-zoom-out-container .sdoc-whiteboard-element-full-screen {
+  pointer-events: auto;
+  background: #fff;
+  border-radius: 12px;
+  width: 80%;
+  height: 80%;
+  overflow: auto;
+}

package/dist/extension/plugins/whiteboard/render-elem.js

@@ -9,6 +9,7 @@ exports.renderWhiteboard = renderWhiteboard;
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createForOfIteratorHelper"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
+var _reactDom = _interopRequireDefault(require("react-dom"));
 var _slate = require("@seafile/slate");
 var _slateReact = require("@seafile/slate-react");
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -38,14 +39,20 @@ var Whiteboard = function Whiteboard(_ref) {
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     menuPosition = _useState2[0],
     setMenuPosition = _useState2[1];
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    isShowZoomOut = _useState4[0],
+    setIsShowZoomOut = _useState4[1];
   (0, _react.useEffect)(function () {
     var handleMessage = function handleMessage(event) {
       var _event$data;
       if (((_event$data = event.data) === null || _event$data === void 0 ? void 0 : _event$data.type) === 'checkSdocParent') {
         var isSdocClass = whiteboardRef === null || whiteboardRef === void 0 ? void 0 : whiteboardRef.current.classList.contains('sdoc-whiteboard-element');
+        var isWhiteboardFullScreen = whiteboardRef === null || whiteboardRef === void 0 ? void 0 : whiteboardRef.current.classList.contains('sdoc-whiteboard-element-full-screen');
         whiteboardRef === null || whiteboardRef === void 0 ? void 0 : whiteboardRef.current.contentWindow.postMessage({
           type: 'checkSdocParentResult',
-          isInSdoc: isSdocClass
+          isInSdoc: isSdocClass,
+          isFullScreen: isWhiteboardFullScreen
         }, '*');
       }
     };
@@ -123,18 +130,23 @@ var Whiteboard = function Whiteboard(_ref) {
       setMenuPosition(_menuPosition);
     }
   }, [editor, isSelected, readOnly]);
-  var openFullscreen = function openFullscreen() {
-    if (whiteboardRef.current.requestFullscreen) {
-      // Chrome
-      whiteboardRef.current.requestFullscreen();
-    } else if (whiteboardRef.current.webkitRequestFullscreen) {
-      // Safari
-      whiteboardRef.current.webkitRequestFullscreen();
-    } else if (whiteboardRef.current.msRequestFullscreen) {
-      // IE11
-      whiteboardRef.current.msRequestFullscreen();
-    }
+  var openFullscreen = function openFullscreen(e) {
+    e.stopPropagation();
+    setIsShowZoomOut(true);
   };
+  (0, _react.useEffect)(function () {
+    var handleKeyDown = function handleKeyDown(e) {
+      if (e.key === 'Escape') {
+        setIsShowZoomOut(false);
+      }
+    };
+    if (isShowZoomOut) {
+      document.addEventListener('keydown', handleKeyDown);
+    }
+    return function () {
+      document.removeEventListener('keydown', handleKeyDown);
+    };
+  }, [isShowZoomOut, setIsShowZoomOut]);
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])('sdoc-whiteboard-container', {
       'isSelected': isSelected
@@ -152,12 +164,21 @@ var Whiteboard = function Whiteboard(_ref) {
     className: "iframe-overlay",
     onDoubleClick: handleDoubleClick,
     onClick: handleOnClick
-  })), isSelected && !readOnly && /*#__PURE__*/_react["default"].createElement(_hoverMenu["default"], {
+  })), isSelected && !readOnly && !isShowZoomOut && /*#__PURE__*/_react["default"].createElement(_hoverMenu["default"], {
     menuPosition: menuPosition,
     onOpen: handleDoubleClick,
     openFullscreen: openFullscreen,
     onDeleteWhiteboard: onDeleteWhiteboard
-  }));
+  }), isShowZoomOut && (/*#__PURE__*/_reactDom["default"].createPortal(/*#__PURE__*/_react["default"].createElement("div", {
+    className: "whiteboard-zoom-out-container",
+    onClick: function onClick() {
+      return setIsShowZoomOut(false);
+    }
+  }, /*#__PURE__*/_react["default"].createElement("iframe", {
+    className: "sdoc-whiteboard-element-full-screen",
+    src: link,
+    ref: whiteboardRef
+  })), document.body)));
 };
 function renderWhiteboard(props, editor) {
   var element = props.element,

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

@@ -8,7 +8,7 @@ var _helper = require("../comment/helper");
 var _constants = require("../constants");
 var _useScrollContext = require("./use-scroll-context");
 var useCommentListPosition = exports.useCommentListPosition = function useCommentListPosition(selectedElementIds, isContextComment, isClickedContextComment, commentedDom, commentDetail, closeComment, editor) {
-  var _document$querySelect;
+  var _document$querySelect2;
   var headerHeight = 100;
   var scrollRef = (0, _useScrollContext.useScrollContext)();
   var _ref = scrollRef.current || {},
@@ -17,7 +17,9 @@ var useCommentListPosition = exports.useCommentListPosition = function useCommen
   if (isContextComment || isClickedContextComment) {
     var rect;
     if (isContextComment) {
-      rect = commentedDom.getBoundingClientRect();
+      var _document$querySelect;
+      var commentedDomId = commentedDom.getAttribute('data-id');
+      rect = (_document$querySelect = document.querySelector("[data-id=\"".concat(commentedDomId, "\"]"))) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.getBoundingClientRect();
     }
 
     // rect is the last commented context dom
@@ -65,7 +67,7 @@ var useCommentListPosition = exports.useCommentListPosition = function useCommen
       y: topPara
     };
   }
-  var selectionPosition = (_document$querySelect = document.querySelectorAll("[data-id=\"".concat(selectedElementIds[0], "\"]"))[0]) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.getBoundingClientRect();
+  var selectionPosition = (_document$querySelect2 = document.querySelectorAll("[data-id=\"".concat(selectedElementIds[0], "\"]"))[0]) === null || _document$querySelect2 === void 0 ? void 0 : _document$querySelect2.getBoundingClientRect();
   // Boundary check
   if (!selectionPosition) closeComment();
   if (selectionPosition && selectionPosition.y !== 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "2.0.175",
+  "version": "2.0.177",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -71,5 +71,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7571dd50f700f6501066ef98591f84c371cda413"
+  "gitHead": "471a56e253db6798199eee066673bc59a9f6172b"
 }