@seafile/sdoc-editor 2.0.123 → 2.0.124

package/dist/editor/sdoc-comment-editor.js

@@ -8,13 +8,18 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/regeneratorRuntime"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
+var _reactI18next = require("react-i18next");
 var _slate = require("@seafile/slate");
 var _deepCopy = _interopRequireDefault(require("deep-copy"));
+var _notificationHooks = require("../comment/hooks/notification-hooks");
 var _fileLoading = _interopRequireDefault(require("../components/file-loading"));
+var _toast = _interopRequireDefault(require("../components/toast"));
 var _constants = require("../constants");
-var _context = _interopRequireDefault(require("../context"));
+var _context2 = _interopRequireDefault(require("../context"));
 var _extension = require("../extension");
 var _core = require("../extension/core");
 var _commentEditorToolbar = _interopRequireDefault(require("../extension/toolbar/comment-editor-toolbar"));
@@ -23,6 +28,8 @@ var _useScrollContext = require("../hooks/use-scroll-context");
 var _layout = require("../layout");
 var _nodeId = _interopRequireDefault(require("../node-id"));
 var _socket = require("../socket");
+var _commonUtils = require("../utils/common-utils");
+var _eventBus = _interopRequireDefault(require("../utils/event-bus"));
 var _commentArticle = _interopRequireDefault(require("./comment-article"));
 var SdocCommentEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var propsEditor = _ref.editor,
@@ -37,10 +44,15 @@ var SdocCommentEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
     slateValue = _useState2[0],
     _setSlateValue = _useState2[1];
   var commentEditorContainerRef = (0, _react.useRef)(null);
+  var commentTimeoutRef = (0, _react.useRef)(null);
+  var _useNotificationConte = (0, _notificationHooks.useNotificationContext)(),
+    notificationsInfo = _useNotificationConte.notificationsInfo;
+  var _useTranslation = (0, _reactI18next.useTranslation)('sdoc-editor'),
+    t = _useTranslation.t;
   var validEditor = (0, _react.useMemo)(function () {
     if (propsEditor) return propsEditor;
     var defaultEditor = (0, _extension.createCommentEditor)();
-    var editorConfig = _context["default"].getEditorConfig();
+    var editorConfig = _context2["default"].getEditorConfig();
     var newEditor = (0, _nodeId["default"])((0, _socket.withSocketIO)(defaultEditor, {
       document: document,
       config: editorConfig
@@ -52,6 +64,70 @@ var SdocCommentEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
     return newEditor;
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
+  (0, _react.useEffect)(function () {
+    if (!(commentEditorContainerRef !== null && commentEditorContainerRef !== void 0 && commentEditorContainerRef.current)) return;
+    if (Object.keys(notificationsInfo.notifications_map || {}).length === 0) return;
+    if (!commentEditorContainerRef.current.closest('.global-comment-input-wrapper')) return;
+    var clearAllNotification = /*#__PURE__*/function () {
+      var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee() {
+        var res, notifications, eventBus, errorMessage;
+        return (0, _regeneratorRuntime2["default"])().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.prev = 0;
+              _context.next = 3;
+              return _context2["default"].readAllNotifications();
+            case 3:
+              _context.next = 5;
+              return _context2["default"].listUnseenNotifications();
+            case 5:
+              res = _context.sent;
+              notifications = res.data.notifications;
+              eventBus = _eventBus["default"].getInstance();
+              eventBus.dispatch(_constants.INTERNAL_EVENT.UNSEEN_NOTIFICATIONS_COUNT, notifications === null || notifications === void 0 ? void 0 : notifications.length);
+              eventBus.dispatch(_constants.INTERNAL_EVENT.NEW_NOTIFICATION);
+              eventBus.dispatch(_constants.INTERNAL_EVENT.CLEAR_NOTIFICATION);
+              _context.next = 17;
+              break;
+            case 13:
+              _context.prev = 13;
+              _context.t0 = _context["catch"](0);
+              errorMessage = (0, _commonUtils.getErrorMsg)(_context.t0);
+              _toast["default"].danger(t(errorMessage));
+            case 17:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, null, [[0, 13]]);
+      }));
+      return function clearAllNotification() {
+        return _ref2.apply(this, arguments);
+      };
+    }();
+    var el = commentEditorContainerRef && commentEditorContainerRef.current;
+
+    // Mark comment as read if focusing commentEditorContainerRef over 3s
+    var handleFocusIn = function handleFocusIn(e) {
+      commentTimeoutRef.current = setTimeout(function () {
+        clearAllNotification();
+        commentTimeoutRef.current = null;
+      }, 3000);
+    };
+    var handleBlur = function handleBlur() {
+      clearTimeout(commentTimeoutRef.current);
+      commentTimeoutRef.current = null;
+    };
+    el.addEventListener('focusin', handleFocusIn);
+    el.addEventListener('focusout', handleBlur);
+    return function () {
+      el.removeEventListener('focusin', handleFocusIn);
+      el.removeEventListener('focusout', handleBlur);
+      if (commentTimeoutRef.current) {
+        clearTimeout(commentTimeoutRef.current);
+        commentTimeoutRef.current = null;
+      }
+    };
+  }, [notificationsInfo]);
 
   // useMount: focus editor
   (0, _react.useEffect)(function () {

package/dist/extension/plugins/image/helpers.js

@@ -16,6 +16,7 @@ var _slugid = _interopRequireDefault(require("slugid"));
 var _urlJoin = _interopRequireDefault(require("url-join"));
 var _constants = require("../../../constants");
 var _context2 = _interopRequireDefault(require("../../../context"));
+var _socketManager = _interopRequireDefault(require("../../../socket/socket-manager"));
 var _eventBus = _interopRequireDefault(require("../../../utils/event-bus"));
 var _constants2 = require("../../constants");
 var _core = require("../../core");
@@ -209,7 +210,7 @@ var queryCopyMoveProgressView = exports.queryCopyMoveProgressView = function que
   };
   var _start = /*#__PURE__*/function () {
     var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee() {
-      var res, successful, eventBus;
+      var res, successful, eventBus, socketManager;
       return (0, _regeneratorRuntime2["default"])().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -223,6 +224,8 @@ var queryCopyMoveProgressView = exports.queryCopyMoveProgressView = function que
               // Reload image
               eventBus = _eventBus["default"].getInstance();
               eventBus.dispatch(_constants.INTERNAL_EVENT.RELOAD_IMAGE);
+              socketManager = _socketManager["default"].getInstance();
+              socketManager.sendReloadImage();
             } else {
               timer = setTimeout(_start, interval);
             }

package/dist/socket/socket-client.js

@@ -93,6 +93,12 @@ var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketCli
       doc_uuid: docUuid
     });
   });
+  (0, _defineProperty2["default"])(this, "sendReloadImage", function () {
+    var docUuid = _this.config.docUuid;
+    _this.socket.emit('reload-image', {
+      doc_uuid: docUuid
+    });
+  });
   (0, _defineProperty2["default"])(this, "onJoinRoom", function (userInfo) {
     (0, _debug.serverDebug)('%s joined room success.', userInfo.username);
     var socketManager = _socketManager["default"].getInstance();
@@ -108,6 +114,11 @@ var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketCli
     var socketManager = _socketManager["default"].getInstance();
     socketManager.dispatchConnectState('user-updated', userInfo);
   });
+  (0, _defineProperty2["default"])(this, "onReloadImage", function () {
+    (0, _debug.serverDebug)('Reload image by other people copy images from different repos');
+    var socketManager = _socketManager["default"].getInstance();
+    socketManager.dispatchConnectState('reload_image');
+  });
   /**
    * receive remote broadcast operations
    * @param {*} params {operations, version}
@@ -197,6 +208,7 @@ var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketCli
   this.socket.on('join-room', this.onJoinRoom);
   this.socket.on('leave-room', this.onLeaveRoom);
   this.socket.on('user-updated', this.onUserUpdated);
+  this.socket.on('reload-image', this.onReloadImage);
   this.socket.on('update-document', this.onReceiveRemoteOperations);
 
   // doc replaced

package/dist/socket/socket-manager.js

@@ -61,6 +61,9 @@ var SocketManager = /*#__PURE__*/(0, _createClass2["default"])(function SocketMa
   (0, _defineProperty2["default"])(this, "sendUserUpdated", function (name) {
     _this.socketClient.sendUserUpdated(name);
   });
+  (0, _defineProperty2["default"])(this, "sendReloadImage", function () {
+    _this.socketClient.sendReloadImage();
+  });
   (0, _defineProperty2["default"])(this, "onReceiveLocalOperations", function (operations) {
     if (_this.editor.readonly) return;
     _this.pendingOperationList.push(operations);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "2.0.123",
+  "version": "2.0.124",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -70,5 +70,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6381a83479253e6fbdc0955a14c0ded4ca799d53"
+  "gitHead": "9b30ab7dd281cd78875a7a366e98b517aa4b47b9"
 }