@seafile/sdoc-editor 2.0.80 → 2.0.81

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

@@ -138,8 +138,9 @@ const EditorComment = _ref => {
       }, 0);
     };
     const handleClickCommentedText = event => {
+      var _parentDom$className2;
       const parentDom = event.target.parentElement;
-      if (parentDom.className.split(/\s+/).some(cls => cls.startsWith('sdoc_comment'))) {
+      if (parentDom !== null && parentDom !== void 0 && (_parentDom$className2 = parentDom.className) !== null && _parentDom$className2 !== void 0 && _parentDom$className2.split(/\s+/).some(cls => cls.startsWith('sdoc_comment'))) {
         commentedDomRef.current = parentDom;
         const matchedAttributes = parentDom.className.split(' ').filter(cls => cls.startsWith('sdoc_comment_'));
         const clickedCommmentIdArray = matchedAttributes.map(item => item.replace('sdoc_comment_', ''));

package/dist/basic-sdk/editor/sdoc-editor.js

@@ -138,9 +138,11 @@ const SdocEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
       isShowFullScreen
     } = _ref2;
     if (isShowFullScreen) {
+      // Boundary situation
+      (0, _helpers.removeMarks)(validEditor);
       setShowFullScreen(true);
     }
-  }, []);
+  }, [validEditor]);
   (0, _react.useEffect)(() => {
     const eventBus = _eventBus.default.getInstance();
     const unsubscribePresentationFullScreen = eventBus.subscribe(_constants.INTERNAL_EVENT.TOGGLE_PRESENTATION_MODE, handleFullScreenPresentation);

package/dist/basic-sdk/index.js

@@ -118,12 +118,36 @@ Object.defineProperty(exports, "Tooltip", {
     return _tooltip.default;
   }
 });
+Object.defineProperty(exports, "WIKI_EDITOR", {
+  enumerable: true,
+  get: function () {
+    return _constants.WIKI_EDITOR;
+  }
+});
+Object.defineProperty(exports, "WIKI_EDITOR_EDIT_AREA_WIDTH", {
+  enumerable: true,
+  get: function () {
+    return _constants.WIKI_EDITOR_EDIT_AREA_WIDTH;
+  }
+});
+Object.defineProperty(exports, "WikiEditor", {
+  enumerable: true,
+  get: function () {
+    return _wikiEditor.default;
+  }
+});
 Object.defineProperty(exports, "context", {
   enumerable: true,
   get: function () {
     return _context.default;
   }
 });
+Object.defineProperty(exports, "createWikiEditor", {
+  enumerable: true,
+  get: function () {
+    return _extension.createWikiEditor;
+  }
+});
 Object.defineProperty(exports, "deserializeHtml", {
   enumerable: true,
   get: function () {
@@ -202,6 +226,18 @@ Object.defineProperty(exports, "usePlugins", {
     return _usePlugins.usePlugins;
   }
 });
+Object.defineProperty(exports, "withNodeId", {
+  enumerable: true,
+  get: function () {
+    return _nodeId.default;
+  }
+});
+Object.defineProperty(exports, "withSocketIO", {
+  enumerable: true,
+  get: function () {
+    return _socket.withSocketIO;
+  }
+});
 var _fileLoading = _interopRequireDefault(require("./components/file-loading"));
 var _loading = _interopRequireDefault(require("./components/loading"));
 var _toast = _interopRequireDefault(require("./components/toast"));
@@ -210,12 +246,16 @@ var _constants = require("./constants");
 var _context = _interopRequireDefault(require("./context"));
 var _revisionEditor = _interopRequireDefault(require("./editor/revision-editor"));
 var _sdocEditor = _interopRequireDefault(require("./editor/sdoc-editor"));
+var _wikiEditor = _interopRequireDefault(require("./editor/wiki-editor"));
+var _extension = require("./extension");
 var _dropdownMenuItem = _interopRequireDefault(require("./extension/commons/dropdown-menu-item"));
 var _menuShortcutIndicator = _interopRequireDefault(require("./extension/commons/menu-shortcut-indicator"));
 var _useCollaborators = require("./hooks/use-collaborators");
 var _usePlugins = require("./hooks/use-plugins");
+var _nodeId = _interopRequireDefault(require("./node-id"));
 var _outline = _interopRequireDefault(require("./outline"));
 var _slateConvert = require("./slate-convert");
+var _socket = require("./socket");
 var _commonUtils = require("./utils/common-utils");
 var _diff = require("./utils/diff");
 var _eventBus = _interopRequireDefault(require("./utils/event-bus"));

package/dist/components/doc-info/index.js

@@ -8,9 +8,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
+var _basicSdk = require("../../basic-sdk");
 var _revisionAvatar = _interopRequireDefault(require("../../assets/images/revision-avatar.png"));
 var _sdocFreezed = _interopRequireDefault(require("../../assets/images/sdoc-freezed.png"));
-var _basicSdk = require("../../basic-sdk");
 var _constants = require("../../constants");
 var _utils = require("../../utils");
 var _draftDropdown = _interopRequireDefault(require("../draft-dropdown"));

package/dist/components/doc-operations/more-operations.js

@@ -1,18 +1,18 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _DTableSwitch2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableSwitch"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _reactstrap = require("reactstrap");
 var _printJs = _interopRequireDefault(require("@seafile/print-js"));
 var _basicSdk = require("../../basic-sdk");
 var _constants = require("../../constants");
+var _switch = _interopRequireDefault(require("../switch"));
 const MoreOperations = _ref => {
   let {
     isStarred,
@@ -144,10 +144,10 @@ const MoreOperations = _ref => {
   }, t('Document_history')), !_basicSdk.isMobile && /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownItem, {
     id: "sdoc-full-width-mode-wrapper",
     className: "sdoc-dropdown-menu-item"
-  }, /*#__PURE__*/_react.default.createElement(_DTableSwitch2.default, {
+  }, /*#__PURE__*/_react.default.createElement(_switch.default, {
     checked: isFullWidthMode,
     placeholder: t('Full_width_mode'),
-    switchClassName: "sdoc-full-width-mode-wrapper w-100",
+    className: "sdoc-full-width-mode-wrapper w-100",
     onChange: onSwitchMode
   })), parentFolderURL && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: "sdoc-operator-folder-divider"

package/dist/components/doc-operations/presentation-operation/index.js

@@ -13,7 +13,15 @@ const PresentationOperation = () => {
     t
   } = (0, _reactI18next.useTranslation)('sdoc-editor');
   const id = 'sdoc_presentation';
+  const {
+    plugins,
+    closePlugin
+  } = (0, _basicSdk.usePlugins)();
   const onPresentationToggle = (0, _react.useCallback)(() => {
+    // Close plugins before presentation mode
+    if (plugins && ['sdoc-info', 'sdoc-comment'].includes(plugins[0].name)) {
+      closePlugin && closePlugin();
+    }
     const eventBus = _basicSdk.EventBus.getInstance();
     eventBus.dispatch(_basicSdk.INTERNAL_EVENT.TOGGLE_PRESENTATION_MODE, {
       isShowFullScreen: true
@@ -22,7 +30,7 @@ const PresentationOperation = () => {
     if (node !== null && node !== void 0 && node.requestFullscreen) {
       node.requestFullscreen().catch(err => console.error('Failed to enter fullscreen:', err));
     }
-  }, []);
+  }, [closePlugin, plugins]);
   return /*#__PURE__*/_react.default.createElement("span", {
     className: "op-item",
     id: id,

package/dist/components/doc-operations/style.css

@@ -79,7 +79,7 @@
   width: 8px;
 }
 
-.sdoc-operator-folder .sdoc-dropdown-menu .sdoc-dropdown-menu-item .sdoc-full-width-mode-wrapper .custom-switch .custom-switch-input:checked ~ .custom-switch-indicator:before {
+.sdoc-operator-folder .sdoc-dropdown-menu .sdoc-dropdown-menu-item .sdoc-full-width-mode-wrapper .custom-switch .custom-switch-input:checked~.custom-switch-indicator:before {
   left: 12px;
 }
 

package/dist/components/tip-dialog/index.js

@@ -10,8 +10,8 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _reactstrap = require("reactstrap");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _contentReplaced = _interopRequireDefault(require("../../assets/images/content-replaced.png"));
 var _basicSdk = require("../../basic-sdk");
+var _contentReplaced = _interopRequireDefault(require("../../assets/images/content-replaced.png"));
 var _constants = require("../../constants");
 var _modalHeader = _interopRequireDefault(require("../modal-header"));
 require("./index.css");

package/dist/constants/index.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.TIP_TYPE = exports.TIP_TITLE = exports.TIP_CONTENT = exports.NEW_REVISION = exports.EXTERNAL_EVENT = void 0;
-var _constants = require("../basic-sdk/constants");
+var _basicSdk = require("../basic-sdk");
 const EXTERNAL_EVENT = exports.EXTERNAL_EVENT = {
   INTERNAL_LINK_CLICK: 'internal_link_click',
   TOGGLE_STAR: 'toggle_star',
@@ -14,14 +14,14 @@ const EXTERNAL_EVENT = exports.EXTERNAL_EVENT = {
   UNFREEZE: 'unfreeze',
   // change internal event to external event
   // editor
-  REFRESH_DOCUMENT: _constants.INTERNAL_EVENT.REFRESH_DOCUMENT,
-  NEW_NOTIFICATION: _constants.INTERNAL_EVENT.NEW_NOTIFICATION,
-  CLEAR_NOTIFICATION: _constants.INTERNAL_EVENT.CLEAR_NOTIFICATION,
+  REFRESH_DOCUMENT: _basicSdk.INTERNAL_EVENT.REFRESH_DOCUMENT,
+  NEW_NOTIFICATION: _basicSdk.INTERNAL_EVENT.NEW_NOTIFICATION,
+  CLEAR_NOTIFICATION: _basicSdk.INTERNAL_EVENT.CLEAR_NOTIFICATION,
   // wiki
-  CREATE_SDOC_FILE: _constants.INTERNAL_EVENT.CREATE_SDOC_FILE,
-  CREATE_WIKI_PAGE: _constants.INTERNAL_EVENT.CREATE_WIKI_PAGE,
+  CREATE_SDOC_FILE: _basicSdk.INTERNAL_EVENT.CREATE_SDOC_FILE,
+  CREATE_WIKI_PAGE: _basicSdk.INTERNAL_EVENT.CREATE_WIKI_PAGE,
   // document
-  IMAGE_COLUMN_TOGGLE: _constants.INTERNAL_EVENT.IMAGE_COLUMN_TOGGLE,
+  IMAGE_COLUMN_TOGGLE: _basicSdk.INTERNAL_EVENT.IMAGE_COLUMN_TOGGLE,
   COLLABORATORS_UPDATED: 'collaborators_updated',
   CHANGE_HEADER_WIDTH: 'change_header_width'
 };

package/dist/layout/layout.js

@@ -9,7 +9,6 @@ exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _basicSdk = require("../basic-sdk");
-var _localStorageUtils = _interopRequireDefault(require("../basic-sdk/utils/local-storage-utils"));
 const Layout = _ref => {
   let {
     children,
@@ -23,7 +22,7 @@ const Layout = _ref => {
     if (isSdocRevision) return;
     const docUuid = _basicSdk.context.getSetting('docUuid');
     const docName = _basicSdk.context.getSetting('docName');
-    const recentFiles = _localStorageUtils.default.getItem('sdoc-recent-files', []);
+    const recentFiles = _basicSdk.LocalStorage.getItem('sdoc-recent-files', []);
     let arr = [];
     const newFile = {
       doc_uuid: docUuid,
@@ -42,7 +41,7 @@ const Layout = _ref => {
     } else {
       arr.push(newFile);
     }
-    _localStorageUtils.default.setItem('sdoc-recent-files', arr);
+    _basicSdk.LocalStorage.setItem('sdoc-recent-files', arr);
   };
   (0, _react.useEffect)(() => {
     setTimeout(() => {

package/dist/pages/sdoc-wiki-editor.js

@@ -9,11 +9,6 @@ exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _basicSdk = require("../basic-sdk");
-var _constants = require("../basic-sdk/constants");
-var _wikiEditor = _interopRequireDefault(require("../basic-sdk/editor/wiki-editor"));
-var _extension = require("../basic-sdk/extension");
-var _nodeId = _interopRequireDefault(require("../basic-sdk/node-id"));
-var _socket = require("../basic-sdk/socket");
 var _errorBoundary = _interopRequireDefault(require("../components/error-boundary"));
 require("../assets/css/simple-viewer.css");
 const SdocWikiEditor = _ref => {
@@ -25,25 +20,25 @@ const SdocWikiEditor = _ref => {
   } = _ref;
   _basicSdk.context.initApi();
   const validEditor = (0, _react.useMemo)(() => {
-    const defaultEditor = (0, _extension.createWikiEditor)();
+    const defaultEditor = (0, _basicSdk.createWikiEditor)();
     // getEditorConfig cashe the config, so we need to update the uuid,for wiki editor
     docUuid && _basicSdk.context.updateConfigUuid(docUuid);
     const editorConfig = _basicSdk.context.getEditorConfig();
     let newEditor = null;
     if (!isWikiReadOnly) {
-      newEditor = (0, _nodeId.default)((0, _socket.withSocketIO)(defaultEditor, {
+      newEditor = (0, _basicSdk.withNodeId)((0, _basicSdk.withSocketIO)(defaultEditor, {
         document,
         config: editorConfig
       }));
     } else {
-      newEditor = (0, _nodeId.default)(defaultEditor);
+      newEditor = (0, _basicSdk.withNodeId)(defaultEditor);
     }
     const {
       cursors
     } = document;
     newEditor.cursors = cursors || {};
-    newEditor.width = _constants.WIKI_EDITOR_EDIT_AREA_WIDTH; // default width
-    newEditor.editorType = _constants.WIKI_EDITOR;
+    newEditor.width = _basicSdk.WIKI_EDITOR_EDIT_AREA_WIDTH; // default width
+    newEditor.editorType = _basicSdk.WIKI_EDITOR;
     return newEditor;
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -55,7 +50,7 @@ const SdocWikiEditor = _ref => {
       validEditor.closeConnection();
     };
   }, [isWikiReadOnly, validEditor]);
-  return /*#__PURE__*/_react.default.createElement(_errorBoundary.default, null, /*#__PURE__*/_react.default.createElement(_wikiEditor.default, {
+  return /*#__PURE__*/_react.default.createElement(_errorBoundary.default, null, /*#__PURE__*/_react.default.createElement(_basicSdk.WikiEditor, {
     document: document,
     docUuid: docUuid,
     editor: validEditor,

package/dist/pages/simple-editor.js

@@ -9,7 +9,6 @@ exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _basicSdk = require("../basic-sdk");
-var _views = require("../basic-sdk/views");
 var _docInfo = _interopRequireDefault(require("../components/doc-info"));
 var _docOperations = _interopRequireDefault(require("../components/doc-operations"));
 var _errorBoundary = _interopRequireDefault(require("../components/error-boundary"));
@@ -145,7 +144,7 @@ const SimpleEditor = _ref => {
     revisionContent: revisionContent,
     isShowChanges: isShowChanges,
     didMountCallback: setDiffChanges
-  }), isSdocRevision && isPublished && /*#__PURE__*/_react.default.createElement(_views.PublishedRevisionDiffViewer, {
+  }), isSdocRevision && isPublished && /*#__PURE__*/_react.default.createElement(_basicSdk.PublishedRevisionDiffViewer, {
     revisionContent: revisionContent,
     isShowChanges: isShowChanges,
     didMountCallback: setDiffChanges

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "2.0.80",
+  "version": "2.0.81",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",
@@ -104,7 +104,7 @@
     "css-minimizer-webpack-plugin": "5.0.1",
     "dotenv": "^10.0.0",
     "dotenv-expand": "^5.1.0",
-    "dtable-sdk": "5.0.8",
+    "dtable-sdk": "5.0.10",
     "dtable-utils": "5.0.1",
     "ejs": "3.1.10",
     "eslint": "^8.3.0",

package/dist/entry.js

@@ -1,9 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _sdocEditor = _interopRequireDefault(require("./basic-sdk/editor/sdoc-editor"));
-var _default = exports.default = _sdocEditor.default;