@seafile/sdoc-editor 1.0.135 → 1.0.137-ljtest

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

@@ -58,6 +58,13 @@ const GlobalComment = _ref => {
   }, [contentRef]);
   (0, _react.useEffect)(() => {
     detectScroll();
+    // When a comment is updated, update the comment details page
+    if (activeCommentGroup) {
+      const newActiveCommentGroup = commentList.find(item => item.id === activeCommentGroup.id);
+      setActiveCommentGroup(newActiveCommentGroup);
+      deleteUnseenNotifications && deleteUnseenNotifications(newActiveCommentGroup);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [commentList, detectScroll]);
   const updateScrollPosition = (0, _react.useCallback)(() => {
     var _contentRef$current3;

package/dist/basic-sdk/comment/reducer/notification-reducer.js

@@ -8,6 +8,7 @@ var _constants = require("../constants");
 var _model = require("../../../model");
 var _ = require("../../");
 var _constants2 = require("../../constants");
+var _constants3 = require("../../../constants");
 const initNotificationsInfo = exports.initNotificationsInfo = {
   isFetching: true,
   notifications_map: {},
@@ -70,6 +71,10 @@ const notificationReducer = (state, action) => {
         }
         const eventBus = _.EventBus.getInstance();
         eventBus.dispatch(_constants2.INTERNAL_EVENT.UNSEEN_NOTIFICATIONS_COUNT, Object.keys(notifications_map).length);
+        // No unread messages, clearly marked
+        if (Object.keys(notifications_map).length === 0) {
+          eventBus.dispatch(_constants3.EXTERNAL_EVENT.CLEAR_NOTIFICATION);
+        }
         return {
           ...state,
           notifications_map

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

@@ -159,7 +159,9 @@ const WikiEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
       editor: validEditor,
       slateValue: slateValue,
       showComment: false
-    }))))));
+    })), !_utils.isMobile && isWikiReadOnly && /*#__PURE__*/_react.default.createElement(_wikiOutline.default, {
+      doc: slateValue
+    })))));
   }
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_layout.EditorContainer, {
     editor: validEditor

package/dist/basic-sdk/extension/constants/menus-config.js

@@ -391,11 +391,6 @@ const SIDE_INSERT_MENUS_CONFIG = exports.SIDE_INSERT_MENUS_CONFIG = {
     iconClass: 'sdocfont sdoc-multi-column',
     type: _elementType.FOUR_COLUMN,
     text: 'Four_column'
-  }, {
-    id: _elementType.FIVE_COLUMN,
-    iconClass: 'sdocfont sdoc-multi-column',
-    type: _elementType.FIVE_COLUMN,
-    text: 'Five_column'
   }],
   [_elementType.BLOCKQUOTE]: {
     id: _elementType.BLOCKQUOTE,

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

@@ -54,30 +54,23 @@ const withCallout = editor => {
   newEditor.insertFragment = data => {
     if ((0, _helper.getCalloutEntry)(editor)) {
       var _data$find;
-      // Prvent insert new line when insert fragment
-      if (_slate.Range.isCollapsed(editor.selection)) {
-        const paragraphEntry = (0, _core.getSelectedNodeEntryByType)(newEditor, _constants.PARAGRAPH);
-        if (paragraphEntry) {
-          const parentNodeEntry = _slate.Editor.parent(editor, paragraphEntry[1]);
-          if (parentNodeEntry && parentNodeEntry[0].type === _constants.CALL_OUT) {
-            if (!_slate.Node.string(paragraphEntry[0]).length) {
-              insertFragment(data);
-              if ([_constants.ORDERED_LIST, _constants.UNORDERED_LIST].includes(data[0].type)) {
-                _slate.Transforms.removeNodes(newEditor, {
-                  at: paragraphEntry[1]
-                });
-              }
-              return;
-            }
-          }
-        }
-      }
-      const eventBus = _eventBus.default.getInstance();
-      const unsupportType = (_data$find = data.find(node => !_constant.CALLOUT_ALLOWED_INSIDE_TYPES.includes(node.type))) === null || _data$find === void 0 ? void 0 : _data$find.type;
-      if (unsupportType) {
-        eventBus.dispatch(_constants2.INTERNAL_EVENT.DISPLAY_CALLOUT_UNSUPPORT_ALERT, unsupportType);
+      // No paste any unsupportedType content into callout
+      const unsupportedType = (_data$find = data.find(node => !_constant.CALLOUT_ALLOWED_INSIDE_TYPES.includes(node.type))) === null || _data$find === void 0 ? void 0 : _data$find.type;
+      if (unsupportedType) {
+        const eventBus = _eventBus.default.getInstance();
+        eventBus.dispatch(_constants2.INTERNAL_EVENT.DISPLAY_CALLOUT_UNSUPPORT_ALERT, unsupportedType);
         return;
       }
+
+      // Unwrap the callout nodes if nested within another callout
+      const hasCalloutNode = data.some(node => node.type === _constants.CALL_OUT);
+      if (hasCalloutNode) {
+        const newData = data.flatMap(node => node.type === _constants.CALL_OUT ? node.children : [node]);
+        insertFragment(newData);
+      } else {
+        insertFragment(data);
+      }
+      return;
     }
     return insertFragment(data);
   };

package/package.json

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