@seafile/sdoc-editor 2.0.174 → 2.0.176

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/toolbar/context-toolbar/index.js

@@ -16,6 +16,10 @@ var _constants = require("../../constants");
 var _core = require("../../core");
 var _menu = _interopRequireDefault(require("../../plugins/text-style/menu"));
 require("./index.css");
+function getRangeObject(selectionObject) {
+  if (selectionObject.rangeCount === 0) return null;
+  return selectionObject.getRangeAt(0);
+}
 var ContextToolbar = function ContextToolbar() {
   var ref = (0, _react.useRef)(null);
   var editor = (0, _slateReact.useSlateStatic)();
@@ -26,7 +30,8 @@ var ContextToolbar = function ContextToolbar() {
   var setContextToolbarPosition = (0, _react.useCallback)(function () {
     var el = ref.current;
     var domSelection = window.getSelection();
-    var domRange = domSelection.getRangeAt(0);
+    var domRange = getRangeObject(domSelection);
+    if (!domRange) return;
     var rect = domRange.getBoundingClientRect();
     var top = rect.top - 42 - 12; // top = Current top - Element height - Shaded part
     el.style.top = "".concat(top, "px");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "2.0.174",
+  "version": "2.0.176",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -71,5 +71,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "19d472282408a4a677e937b4ed0a699d4bb5cfa5"
+  "gitHead": "af682c37664669ad91b127c27821758bd1d61a30"
 }