@seafile/sdoc-editor 2.0.134 → 2.0.136-alpha.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -13,12 +13,14 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm
13
13
  var _react = _interopRequireWildcard(require("react"));
14
14
  var _reactI18next = require("react-i18next");
15
15
  var _reactstrap = require("reactstrap");
16
+ var _commentEditor = require("@seafile/comment-editor");
16
17
  var _dayjs = _interopRequireDefault(require("dayjs"));
17
18
  var _tooltip = _interopRequireDefault(require("../../components/tooltip"));
18
19
  var _context2 = _interopRequireDefault(require("../../context"));
20
+ var _useCollaborators2 = require("../../hooks/use-collaborators");
19
21
  var _mdToHtml = _interopRequireDefault(require("../../slate-convert/md-to-html"));
20
22
  var _notificationHooks = require("../hooks/notification-hooks");
21
- var _commentEditor = _interopRequireDefault(require("./comment-editor"));
23
+ var _useParticipants = require("../hooks/use-participants");
22
24
  var _commentImagePreviewer = _interopRequireDefault(require("./comment-image-previewer"));
23
25
  var CommentItemContent = function CommentItemContent(_ref) {
24
26
  var isActive = _ref.isActive,
@@ -29,6 +31,11 @@ var CommentItemContent = function CommentItemContent(_ref) {
29
31
  onDeleteComment = _ref.onDeleteComment,
30
32
  t = _ref.t,
31
33
  targetId = _ref.targetId;
34
+ var _useParticipantsConte = (0, _useParticipants.useParticipantsContext)(),
35
+ addParticipants = _useParticipantsConte.addParticipants,
36
+ participants = _useParticipantsConte.participants;
37
+ var _useCollaborators = (0, _useCollaborators2.useCollaborators)(),
38
+ collaborators = _useCollaborators.collaborators;
32
39
  var _useState = (0, _react.useState)(false),
33
40
  _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
34
41
  isDropdownOpen = _useState2[0],
@@ -119,6 +126,18 @@ var CommentItemContent = function CommentItemContent(_ref) {
119
126
  setImageUrl(event.target.src);
120
127
  }
121
128
  }, []);
129
+ var commentEditorProps = {
130
+ className: 'pb-3',
131
+ addParticipants: addParticipants,
132
+ participants: participants,
133
+ collaborators: collaborators,
134
+ content: comment.comment,
135
+ insertContent: updateContent,
136
+ hiddenComment: setIsEditing,
137
+ api: {
138
+ uploadLocalImage: _context2["default"].uploadLocalImage
139
+ }
140
+ };
122
141
  return /*#__PURE__*/_react["default"].createElement("div", {
123
142
  className: "comment-item"
124
143
  }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -187,12 +206,7 @@ var CommentItemContent = function CommentItemContent(_ref) {
187
206
  dangerouslySetInnerHTML: {
188
207
  __html: editorContent
189
208
  }
190
- })), isEditing && /*#__PURE__*/_react["default"].createElement(_commentEditor["default"], {
191
- className: "pb-3",
192
- content: comment.comment,
193
- updateContent: updateContent,
194
- setIsEditing: setIsEditing
195
- }), imageUrl && /*#__PURE__*/_react["default"].createElement(_commentImagePreviewer["default"], {
209
+ })), isEditing && /*#__PURE__*/_react["default"].createElement(_commentEditor.SeafileCommentEditor, commentEditorProps), imageUrl && /*#__PURE__*/_react["default"].createElement(_commentImagePreviewer["default"], {
196
210
  imageUrl: imageUrl,
197
211
  toggle: function toggle() {
198
212
  return setImageUrl('');
@@ -12,11 +12,13 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm
12
12
  var _react = _interopRequireWildcard(require("react"));
13
13
  var _reactI18next = require("react-i18next");
14
14
  var _reactstrap = require("reactstrap");
15
+ var _commentEditor = require("@seafile/comment-editor");
15
16
  var _dayjs = _interopRequireDefault(require("dayjs"));
16
17
  var _context2 = _interopRequireDefault(require("../../context"));
18
+ var _useCollaborators2 = require("../../hooks/use-collaborators");
17
19
  var _mdToHtml = _interopRequireDefault(require("../../slate-convert/md-to-html"));
20
+ var _useParticipants = require("../hooks/use-participants");
18
21
  var _commentDeletePopover = _interopRequireDefault(require("./comment-delete-popover"));
19
- var _commentEditor = _interopRequireDefault(require("./comment-editor"));
20
22
  var _commentImagePreviewer = _interopRequireDefault(require("./comment-image-previewer"));
21
23
  var CommentItemReply = function CommentItemReply(_ref) {
22
24
  var isActive = _ref.isActive,
@@ -25,6 +27,11 @@ var CommentItemReply = function CommentItemReply(_ref) {
25
27
  deleteReply = _ref.deleteReply,
26
28
  updateReply = _ref.updateReply,
27
29
  t = _ref.t;
30
+ var _useParticipantsConte = (0, _useParticipants.useParticipantsContext)(),
31
+ addParticipants = _useParticipantsConte.addParticipants,
32
+ participants = _useParticipantsConte.participants;
33
+ var _useCollaborators = (0, _useCollaborators2.useCollaborators)(),
34
+ collaborators = _useCollaborators.collaborators;
28
35
  var _useState = (0, _react.useState)(false),
29
36
  _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
30
37
  isDropdownOpen = _useState2[0],
@@ -101,6 +108,19 @@ var CommentItemReply = function CommentItemReply(_ref) {
101
108
  setImageUrl(event.target.src);
102
109
  }
103
110
  }, []);
111
+ var commentEditorProps = {
112
+ type: 'reply',
113
+ className: 'pb-3',
114
+ addParticipants: addParticipants,
115
+ participants: participants,
116
+ collaborators: collaborators,
117
+ content: editorContent,
118
+ insertContent: updateContent,
119
+ hiddenComment: setIsEditing,
120
+ api: {
121
+ uploadLocalImage: _context2["default"].uploadLocalImage
122
+ }
123
+ };
104
124
  return /*#__PURE__*/_react["default"].createElement("div", {
105
125
  className: "comment-item",
106
126
  ref: itemRef
@@ -150,13 +170,7 @@ var CommentItemReply = function CommentItemReply(_ref) {
150
170
  dangerouslySetInnerHTML: {
151
171
  __html: editorContent
152
172
  }
153
- })), isEditing && /*#__PURE__*/_react["default"].createElement(_commentEditor["default"], {
154
- className: "pb-3",
155
- type: "reply",
156
- content: editorContent,
157
- updateContent: updateContent,
158
- setIsEditing: setIsEditing
159
- }), isShowDeletePopover && isActive && /*#__PURE__*/_react["default"].createElement(_commentDeletePopover["default"], {
173
+ })), isEditing && /*#__PURE__*/_react["default"].createElement(_commentEditor.SeafileCommentEditor, commentEditorProps), isShowDeletePopover && isActive && /*#__PURE__*/_react["default"].createElement(_commentDeletePopover["default"], {
160
174
  parentDom: itemRef.current,
161
175
  type: "reply",
162
176
  deleteConfirm: _deleteReply,
@@ -14,14 +14,16 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm
14
14
  var _react = _interopRequireWildcard(require("react"));
15
15
  var _reactI18next = require("react-i18next");
16
16
  var _reactstrap = require("reactstrap");
17
+ var _commentEditor = require("@seafile/comment-editor");
17
18
  var _classnames = _interopRequireDefault(require("classnames"));
18
19
  var _dayjs = _interopRequireDefault(require("dayjs"));
19
20
  var _slugid = _interopRequireDefault(require("slugid"));
20
21
  var _context2 = _interopRequireDefault(require("../../context"));
22
+ var _useCollaborators2 = require("../../hooks/use-collaborators");
21
23
  var _useSelectionPosition = require("../../hooks/use-selection-position");
22
24
  var _helper = require("../helper");
23
25
  var _useCommentContext2 = require("../hooks/comment-hooks/use-comment-context");
24
- var _commentEditor = _interopRequireDefault(require("./comment-editor"));
26
+ var _useParticipants = require("../hooks/use-participants");
25
27
  var _commentItemWrapper = _interopRequireDefault(require("./comment-item-wrapper"));
26
28
  require("./comment-list.css");
27
29
  var CommentList = function CommentList(_ref) {
@@ -41,7 +43,12 @@ var CommentList = function CommentList(_ref) {
41
43
  t = _ref.t;
42
44
  var commentPopover = (0, _react.useRef)(null);
43
45
  var commentDetailRef = (0, _react.useRef)(null);
44
- var position = (0, _useSelectionPosition.useCommentListPosition)(activeElementIds, isContextComment, isClickedContextComment, commentedDom, commentDetail, closeComment);
46
+ var position = (0, _useSelectionPosition.useCommentListPosition)(activeElementIds, isContextComment, isClickedContextComment, commentedDom, commentDetail, closeComment, editor);
47
+ var _useParticipantsConte = (0, _useParticipants.useParticipantsContext)(),
48
+ addParticipants = _useParticipantsConte.addParticipants,
49
+ participants = _useParticipantsConte.participants;
50
+ var _useCollaborators = (0, _useCollaborators2.useCollaborators)(),
51
+ collaborators = _useCollaborators.collaborators;
45
52
  var _useCommentContext = (0, _useCommentContext2.useCommentContext)(),
46
53
  dispatch = _useCommentContext.dispatch;
47
54
  var _useState = (0, _react.useState)(false),
@@ -202,12 +209,17 @@ var CommentList = function CommentList(_ref) {
202
209
  style: {
203
210
  paddingTop: isEmptyComment ? '16px' : ''
204
211
  }
205
- }, isEmptyComment && /*#__PURE__*/_react["default"].createElement(_commentEditor["default"], {
212
+ }, isEmptyComment && /*#__PURE__*/_react["default"].createElement(_commentEditor.SeafileCommentEditor, {
213
+ addParticipants: addParticipants,
214
+ participants: participants,
215
+ collaborators: collaborators,
206
216
  type: "comment",
207
217
  insertContent: addNewComment,
208
218
  hiddenComment: hiddenComment,
209
- isContextComment: isContextComment,
210
- closeComment: closeComment
219
+ closePanel: closeComment,
220
+ api: {
221
+ uploadLocalImage: _context2["default"].uploadLocalImage
222
+ }
211
223
  }), !isEmptyComment && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, !isActiveEditor && /*#__PURE__*/_react["default"].createElement(_reactstrap.Input, {
212
224
  value: inputContent !== null && inputContent !== void 0 && inputContent.trim() ? '.....' : '',
213
225
  readOnly: true,
@@ -215,29 +227,40 @@ var CommentList = function CommentList(_ref) {
215
227
  onFocus: function onFocus() {
216
228
  setActiveCommentKey(index);
217
229
  }
218
- }), isActiveEditor && /*#__PURE__*/_react["default"].createElement(_commentEditor["default"], {
230
+ }), isActiveEditor && /*#__PURE__*/_react["default"].createElement(_commentEditor.SeafileCommentEditor, {
219
231
  type: "reply",
220
232
  placeholder: 'Enter_reply_shift_Enter_for_new_line_Enter_to_send',
221
- commentContent: commentInputs[item.id] || '',
233
+ addParticipants: addParticipants,
234
+ participants: participants,
235
+ collaborators: collaborators,
236
+ content: commentInputs[item.id] || '',
222
237
  insertContent: function insertContent(value) {
223
238
  return handleReplySubmit(value, item.id);
224
239
  },
225
240
  onContentChange: function onContentChange(content) {
226
241
  return handleInputChange(item.id, content);
227
242
  },
228
- hiddenComment: hiddenComment
243
+ hiddenComment: hiddenComment,
244
+ api: {
245
+ uploadLocalImage: _context2["default"].uploadLocalImage
246
+ }
229
247
  }))));
230
248
  }), Object.values(commentDetail).length === 0 && /*#__PURE__*/_react["default"].createElement("div", {
231
249
  className: "non-global-comment-input-wrapper",
232
250
  style: {
233
251
  paddingTop: isEmptyComment ? '16px' : ''
234
252
  }
235
- }, isEmptyComment && /*#__PURE__*/_react["default"].createElement(_commentEditor["default"], {
253
+ }, isEmptyComment && /*#__PURE__*/_react["default"].createElement(_commentEditor.SeafileCommentEditor, {
236
254
  type: "comment",
255
+ addParticipants: addParticipants,
256
+ participants: participants,
257
+ collaborators: collaborators,
237
258
  insertContent: addNewComment,
238
259
  hiddenComment: hiddenComment,
239
- isContextComment: isContextComment,
240
- closeComment: closeComment
260
+ closePanel: closeComment,
261
+ api: {
262
+ uploadLocalImage: _context2["default"].uploadLocalImage
263
+ }
241
264
  }), !isEmptyComment && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, !showEditor && /*#__PURE__*/_react["default"].createElement(_reactstrap.Input, {
242
265
  value: inputContent !== null && inputContent !== void 0 && inputContent.trim() ? '.....' : '',
243
266
  readOnly: true,
@@ -245,15 +268,21 @@ var CommentList = function CommentList(_ref) {
245
268
  onFocus: function onFocus() {
246
269
  setShowEditor(true);
247
270
  }
248
- }), showEditor && /*#__PURE__*/_react["default"].createElement(_commentEditor["default"], {
271
+ }), showEditor && /*#__PURE__*/_react["default"].createElement(_commentEditor.SeafileCommentEditor, {
249
272
  type: "reply",
250
273
  placeholder: 'Enter_reply_shift_Enter_for_new_line_Enter_to_send',
251
- commentContent: inputContent,
274
+ addParticipants: addParticipants,
275
+ participants: participants,
276
+ collaborators: collaborators,
277
+ content: inputContent,
252
278
  insertContent: replyComment,
253
279
  onContentChange: function onContentChange(content) {
254
280
  setInputContent(content);
255
281
  },
256
- hiddenComment: hiddenComment
282
+ hiddenComment: hiddenComment,
283
+ api: {
284
+ uploadLocalImage: _context2["default"].uploadLocalImage
285
+ }
257
286
  }))));
258
287
  };
259
288
  var _default = exports["default"] = (0, _reactI18next.withTranslation)('sdoc-editor')(CommentList);
@@ -194,7 +194,7 @@ var EditorComment = function EditorComment(_ref) {
194
194
  className: "comment-container-main"
195
195
  }), /*#__PURE__*/_react["default"].createElement("div", {
196
196
  className: (0, _classnames["default"])('comment-container-right', {
197
- 'isContextComment': isContextComment
197
+ 'is-context-comment': isContextComment
198
198
  })
199
199
  }, /*#__PURE__*/_react["default"].createElement(_elementsCommentCount["default"], {
200
200
  elementCommentsMap: element_comments_map,
@@ -6,8 +6,11 @@ Object.defineProperty(exports, "__esModule", {
6
6
  });
7
7
  exports["default"] = void 0;
8
8
  var _react = _interopRequireDefault(require("react"));
9
+ var _commentEditor = require("@seafile/comment-editor");
9
10
  var _classnames = _interopRequireDefault(require("classnames"));
10
- var _commentEditor = _interopRequireDefault(require("../comment-editor"));
11
+ var _context = _interopRequireDefault(require("../../../context"));
12
+ var _useCollaborators2 = require("../../../hooks/use-collaborators");
13
+ var _useParticipants = require("../../hooks/use-participants");
11
14
  var GlobalCommentEditor = function GlobalCommentEditor(_ref) {
12
15
  var isScrollDisplayed = _ref.isScrollDisplayed,
13
16
  globalCommentContent = _ref.globalCommentContent,
@@ -15,20 +18,32 @@ var GlobalCommentEditor = function GlobalCommentEditor(_ref) {
15
18
  insertDocComment = _ref.insertDocComment,
16
19
  hiddenCommentEditor = _ref.hiddenCommentEditor,
17
20
  onContentChange = _ref.onContentChange;
21
+ var _useParticipantsConte = (0, _useParticipants.useParticipantsContext)(),
22
+ addParticipants = _useParticipantsConte.addParticipants,
23
+ participants = _useParticipantsConte.participants;
24
+ var _useCollaborators = (0, _useCollaborators2.useCollaborators)(),
25
+ collaborators = _useCollaborators.collaborators;
26
+ var commentEditorProps = {
27
+ type: type,
28
+ className: 'sdoc-doc-comment-editor',
29
+ hiddenUserInfo: true,
30
+ content: globalCommentContent,
31
+ insertContent: insertDocComment,
32
+ onContentChange: onContentChange,
33
+ hiddenComment: hiddenCommentEditor,
34
+ addParticipants: addParticipants,
35
+ collaborators: collaborators,
36
+ participants: participants,
37
+ api: {
38
+ uploadLocalImage: _context["default"].uploadLocalImage
39
+ }
40
+ };
18
41
  return /*#__PURE__*/_react["default"].createElement("div", {
19
42
  className: (0, _classnames["default"])('sdoc-doc-comment-editor-container', 'sdoc-comment-list-container', {
20
43
  'scrolled': isScrollDisplayed
21
44
  })
22
45
  }, /*#__PURE__*/_react["default"].createElement("div", {
23
46
  className: "sdoc-doc-comment-editor-content"
24
- }, /*#__PURE__*/_react["default"].createElement(_commentEditor["default"], {
25
- type: type,
26
- className: "sdoc-doc-comment-editor",
27
- commentContent: globalCommentContent,
28
- hiddenUserInfo: true,
29
- insertContent: insertDocComment,
30
- hiddenComment: hiddenCommentEditor,
31
- onContentChange: onContentChange
32
- })));
47
+ }, /*#__PURE__*/_react["default"].createElement(_commentEditor.SeafileCommentEditor, commentEditorProps)));
33
48
  };
34
49
  var _default = exports["default"] = GlobalCommentEditor;
@@ -321,6 +321,6 @@
321
321
  font-weight: unset;
322
322
  }
323
323
 
324
- .sdoc-comment-drawer .sdoc-comment-list-container .global-comment-item-detail-wrapper .comment-item:not(:last-child){
324
+ .sdoc-comment-drawer .sdoc-comment-list-container .global-comment-item-detail-wrapper .comment-item:not(:last-child) {
325
325
  margin-bottom: 16px;
326
326
  }
@@ -4,13 +4,14 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.useCursorPosition = exports.updateElementsAttrs = exports.updateCommentedElementsAttrs = exports.getSelectionRange = exports.getSelectedElemIds = exports.getPrimaryElementId = exports.getElementCommentCountTop = exports.getDomById = exports.getCursorPosition = exports.getCommentedTextsByElementId = exports.getAvatarUrl = void 0;
7
+ exports.useCursorPosition = exports.updateElementsAttrs = exports.updateCommentedElementsAttrs = exports.getSelectionRange = exports.getSelectedElemIds = exports.getPrimaryElementId = exports.getElementCommentCountTop = exports.getDomById = exports.getCursorPosition = exports.getCommentedTextsByElementId = exports.getAvatarUrl = exports.commentContainerWikiTransfer = void 0;
8
8
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
9
9
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
10
10
  var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createForOfIteratorHelper"));
11
11
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
12
12
  var _slate = require("@seafile/slate");
13
13
  var _slateReact = require("@seafile/slate-react");
14
+ var _constants = require("../constants");
14
15
  var _context = _interopRequireDefault(require("../context"));
15
16
  var _core = require("../extension/core");
16
17
  var _useScrollContext = require("../hooks/use-scroll-context");
@@ -56,6 +57,24 @@ var getAvatarUrl = exports.getAvatarUrl = function getAvatarUrl() {
56
57
  var avatarUrl = "".concat(server, "/media/avatars/default.png");
57
58
  return avatarUrl;
58
59
  };
60
+ var commentContainerWikiTransfer = exports.commentContainerWikiTransfer = function commentContainerWikiTransfer(result, value) {
61
+ var newResult;
62
+ var isWikiTitleIcon = document.querySelector('.wiki-page-icon-wrapper');
63
+ var isWikiTitleCover = document.getElementById('wiki-page-cover');
64
+ if (isWikiTitleIcon && !isWikiTitleCover) {
65
+ // 90 is icon height in wiki
66
+ newResult = result - value - 90;
67
+ } else if (!isWikiTitleIcon && isWikiTitleCover) {
68
+ // 203 is icon height in wiki
69
+ newResult = result - value - 203;
70
+ } else if (isWikiTitleIcon && isWikiTitleCover) {
71
+ // 205 is icon and cover height in wiki
72
+ newResult = result - value - 205;
73
+ } else {
74
+ newResult = result - value;
75
+ }
76
+ return newResult;
77
+ };
59
78
  var getElementCommentCountTop = exports.getElementCommentCountTop = function getElementCommentCountTop(editor, element, scrollTop) {
60
79
  var minY;
61
80
  var children = element.children || [];
@@ -71,7 +90,13 @@ var getElementCommentCountTop = exports.getElementCommentCountTop = function get
71
90
  if (!minY) minY = y;
72
91
  minY = Math.min(minY, y);
73
92
  });
74
- return minY - 93 + scrollTop; // 100: header height(56) + toolbar height(37)
93
+ var resultY;
94
+ resultY = minY - 93 + scrollTop; // 100: header height(56) + toolbar height(37)
95
+ if (editor.editorType === _constants.WIKI_EDITOR) {
96
+ // 55 is basic top title height in wiki
97
+ resultY = commentContainerWikiTransfer(resultY, 55);
98
+ }
99
+ return resultY;
75
100
  };
76
101
  var getSelectedElemIds = exports.getSelectedElemIds = function getSelectedElemIds(editor) {
77
102
  var selection = editor.selection;
@@ -18,7 +18,7 @@ var _constants = require("../constants");
18
18
  var _context = _interopRequireDefault(require("../context"));
19
19
  var _extension = require("../extension");
20
20
  var _insertElementDialog = _interopRequireDefault(require("../extension/commons/insert-element-dialog"));
21
- var _core = require("../extension/core");
21
+ var _helpers = require("../extension/plugins/ai/ai-module/helpers");
22
22
  var _useColorContext = require("../hooks/use-color-context");
23
23
  var _useScrollContext = require("../hooks/use-scroll-context");
24
24
  var _layout = require("../layout");
@@ -34,7 +34,9 @@ var WikiEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
34
34
  document = _ref.document,
35
35
  isReloading = _ref.isReloading,
36
36
  isWikiReadOnly = _ref.isWikiReadOnly,
37
- scrollRef = _ref.scrollRef;
37
+ scrollRef = _ref.scrollRef,
38
+ showComment = _ref.showComment,
39
+ isShowRightPanel = _ref.isShowRightPanel;
38
40
  var validEditor = (0, _react.useMemo)(function () {
39
41
  if (propsEditor) return propsEditor;
40
42
  var defaultEditor = (0, _extension.createDefaultEditor)();
@@ -90,6 +92,18 @@ var WikiEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
90
92
  (0, _react.useEffect)(function () {
91
93
  var eventBus = _eventBus["default"].getInstance();
92
94
  eventBus.subscribe(_constants.INTERNAL_EVENT.REFRESH_DOCUMENT, onRefreshDocument);
95
+
96
+ // Remove Marks on special conditions like unexpected exit or refresh page using AI or context comment
97
+ var hasSpecialMark = !_slate.Editor.nodes(validEditor, {
98
+ at: [],
99
+ match: function match(n) {
100
+ return _slate.Text.isText(n) && (n.sdoc_ai === true || n.comment === true);
101
+ }
102
+ }).next().done;
103
+ if (hasSpecialMark) {
104
+ (0, _helpers.removeMarks)(validEditor);
105
+ }
106
+ // eslint-disable-next-line react-hooks/exhaustive-deps
93
107
  }, [onRefreshDocument]);
94
108
 
95
109
  // The parent component can call the method of this component through ref
@@ -162,7 +176,7 @@ var WikiEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
162
176
  editor: validEditor,
163
177
  slateValue: slateValue,
164
178
  updateSlateValue: onValueChange,
165
- showComment: false
179
+ showComment: showComment
166
180
  })), /*#__PURE__*/_react["default"].createElement(_wikiOutline["default"], {
167
181
  doc: slateValue
168
182
  }))))), /*#__PURE__*/_react["default"].createElement(_insertElementDialog["default"], {
@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
8
8
  exports["default"] = void 0;
9
9
  var _react = _interopRequireWildcard(require("react"));
10
10
  var _reactI18next = require("react-i18next");
11
+ var _objectUtils = _interopRequireDefault(require("../../../../../utils/object-utils"));
11
12
  var _constants = require("../../../../constants");
12
13
  var _constants2 = require("../../constants");
13
14
  var _helpers = require("../../helpers");
@@ -54,6 +55,10 @@ var TableHeader = function TableHeader(_ref) {
54
55
  var handleDragStart = function handleDragStart(event) {
55
56
  event.stopPropagation();
56
57
  var tableSelectedRange = editor.tableSelectedRange;
58
+ if (_objectUtils["default"].isSameObject(tableSelectedRange, _constants2.EMPTY_SELECTED_RANGE)) {
59
+ event.preventDefault();
60
+ return;
61
+ }
57
62
  var tableId = table.id;
58
63
  var minColIndex = tableSelectedRange.minColIndex,
59
64
  maxColIndex = tableSelectedRange.maxColIndex,
@@ -85,7 +90,9 @@ var TableHeader = function TableHeader(_ref) {
85
90
  var handleDragEnd = function handleDragEnd(event) {
86
91
  setIsDragMove(false);
87
92
  var indicator = document.getElementById('sdoc-drag-image');
88
- indicator.style.display = 'none';
93
+ if (indicator) {
94
+ indicator.style.display = 'none';
95
+ }
89
96
  };
90
97
  return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_columnsHeader["default"], {
91
98
  table: table,
@@ -156,7 +156,7 @@ var TextStyleMenuList = function TextStyleMenuList(_ref) {
156
156
  tipMessage: t('Reduce_font_size')
157
157
  }, /*#__PURE__*/_react["default"].createElement("i", {
158
158
  className: "sdocfont sdoc-reduce-font-size"
159
- }))), idPrefix && ![_constants.DOCUMENT_PLUGIN_EDITOR, _constants.WIKI_EDITOR].includes(editor.editorType) && /*#__PURE__*/_react["default"].createElement(_commentContextMenu["default"], null), idPrefix && enableSeafileAI && /*#__PURE__*/_react["default"].createElement(_aiMenu.AIContextMenu, {
159
+ }))), idPrefix && ![_constants.DOCUMENT_PLUGIN_EDITOR].includes(editor.editorType) && /*#__PURE__*/_react["default"].createElement(_commentContextMenu["default"], null), idPrefix && enableSeafileAI && /*#__PURE__*/_react["default"].createElement(_aiMenu.AIContextMenu, {
160
160
  isRichEditor: isRichEditor
161
161
  }));
162
162
  };
@@ -0,0 +1,50 @@
1
+ .sdoc-whiteboard-hover-menu-container {
2
+ position: absolute;
3
+ height: 42px;
4
+ z-index: 101;
5
+ width: auto;
6
+ }
7
+
8
+ .sdoc-whiteboard-hover-menu-container .hover-menu-container {
9
+ height: 36px;
10
+ background-color: #fff;
11
+ display: flex;
12
+ justify-content: flex-start;
13
+ align-items: center;
14
+ border-radius: 3px;
15
+ box-shadow: 0 1px 0 rgba(0, 0, 0, 0.08);
16
+ border: 1px solid #e8e8e8;
17
+ }
18
+
19
+ .sdoc-whiteboard-hover-menu-container .hover-menu-container>span {
20
+ padding: 0 8px;
21
+ }
22
+
23
+ .sdoc-whiteboard-hover-menu-container .hover-menu-container>span:not(:last-of-type) {
24
+ padding: 0 8px;
25
+ border-right: 1px solid #e5e5e5;
26
+ }
27
+
28
+ .sdoc-whiteboard-hover-menu-container .hover-menu-container .op-item {
29
+ position: relative;
30
+ font-size: 12px;
31
+ color: #212529;
32
+ padding: 0 5px;
33
+ border-radius: 2px;
34
+ min-width: 24px;
35
+ height: 24px;
36
+ display: inline-flex;
37
+ align-items: center;
38
+ justify-content: center;
39
+ }
40
+
41
+ .sdoc-whiteboard-hover-menu-container .hover-menu-container .op-item:hover {
42
+ color: #212529;
43
+ text-decoration: none;
44
+ background: #f1f1f1;
45
+ }
46
+
47
+ .sdoc-whiteboard-hover-menu-container .hover-menu-container .icon-font {
48
+ font-size: 12px;
49
+ color: #999999;
50
+ }
@@ -0,0 +1,71 @@
1
+ "use strict";
2
+
3
+ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard")["default"];
4
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
5
+ Object.defineProperty(exports, "__esModule", {
6
+ value: true
7
+ });
8
+ exports["default"] = void 0;
9
+ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
10
+ var _react = _interopRequireWildcard(require("react"));
11
+ var _reactI18next = require("react-i18next");
12
+ var _tooltip = _interopRequireDefault(require("../../../../components/tooltip"));
13
+ var _commons = require("../../../commons");
14
+ require("./index.css");
15
+ var WhiteboardHoverMenu = function WhiteboardHoverMenu(_ref) {
16
+ var menuPosition = _ref.menuPosition,
17
+ onOpen = _ref.onOpen,
18
+ openFullscreen = _ref.openFullscreen,
19
+ onDeleteWhiteboard = _ref.onDeleteWhiteboard;
20
+ var _useTranslation = (0, _reactI18next.useTranslation)('sdoc-editor'),
21
+ t = _useTranslation.t;
22
+ var _useState = (0, _react.useState)(false),
23
+ _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
24
+ showTooltip = _useState2[0],
25
+ setShowTooltip = _useState2[1];
26
+ (0, _react.useEffect)(function () {
27
+ setShowTooltip(true);
28
+ }, []);
29
+ return /*#__PURE__*/_react["default"].createElement(_commons.ElementPopover, null, /*#__PURE__*/_react["default"].createElement("div", {
30
+ className: "sdoc-whiteboard-hover-menu-container",
31
+ style: menuPosition
32
+ }, /*#__PURE__*/_react["default"].createElement("div", {
33
+ className: "hover-menu-container"
34
+ }, /*#__PURE__*/_react["default"].createElement("span", {
35
+ className: "op-group-item"
36
+ }, /*#__PURE__*/_react["default"].createElement("span", {
37
+ id: "sdoc_whiteboard_open",
38
+ role: "button",
39
+ className: "op-item",
40
+ onClick: onOpen
41
+ }, /*#__PURE__*/_react["default"].createElement("span", {
42
+ className: "mr-1"
43
+ }, t('Open')))), /*#__PURE__*/_react["default"].createElement("span", {
44
+ className: "op-group-item"
45
+ }, /*#__PURE__*/_react["default"].createElement("span", {
46
+ id: "sdoc_whiteboard_delete",
47
+ role: "button",
48
+ className: "op-item",
49
+ onClick: onDeleteWhiteboard
50
+ }, /*#__PURE__*/_react["default"].createElement("i", {
51
+ className: "sdocfont sdoc-delete icon-font"
52
+ }), showTooltip && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
53
+ target: "sdoc_whiteboard_delete",
54
+ placement: "top",
55
+ fade: true
56
+ }, t('Delete')))), /*#__PURE__*/_react["default"].createElement("span", {
57
+ className: "op-group-item"
58
+ }, /*#__PURE__*/_react["default"].createElement("span", {
59
+ id: "sdoc_whiteboard_full_screen_mode",
60
+ role: "button",
61
+ className: "op-item",
62
+ onClick: openFullscreen
63
+ }, /*#__PURE__*/_react["default"].createElement("i", {
64
+ className: "sdocfont sdoc-fullscreen icon-font"
65
+ }), showTooltip && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
66
+ target: "sdoc_whiteboard_full_screen_mode",
67
+ placement: "top",
68
+ fade: true
69
+ }, t('Full_screen_mode')))))));
70
+ };
71
+ var _default = exports["default"] = WhiteboardHoverMenu;
@@ -1,17 +1,23 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
4
3
  var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard")["default"];
4
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
8
  exports.renderWhiteboard = renderWhiteboard;
9
+ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
9
10
  var _react = _interopRequireWildcard(require("react"));
11
+ var _slate = require("@seafile/slate");
10
12
  var _slateReact = require("@seafile/slate-react");
11
13
  var _classnames = _interopRequireDefault(require("classnames"));
12
14
  var _constants = require("../../../constants");
13
15
  var _context = _interopRequireDefault(require("../../../context"));
16
+ var _useScrollContext = require("../../../hooks/use-scroll-context");
14
17
  var _eventBus = _interopRequireDefault(require("../../../utils/event-bus"));
18
+ var _core = require("../../core");
19
+ var _utils = require("../../utils");
20
+ var _hoverMenu = _interopRequireDefault(require("./hover-menu"));
15
21
  require("./index.css");
16
22
  var Whiteboard = function Whiteboard(_ref) {
17
23
  var editor = _ref.editor,
@@ -21,7 +27,16 @@ var Whiteboard = function Whiteboard(_ref) {
21
27
  title = element.title,
22
28
  link = element.link;
23
29
  var whiteboardRef = (0, _react.useRef)();
30
+ var scrollRef = (0, _useScrollContext.useScrollContext)();
24
31
  var isSelected = (0, _slateReact.useSelected)();
32
+ var readOnly = (0, _slateReact.useReadOnly)();
33
+ var _useState = (0, _react.useState)({
34
+ top: '',
35
+ left: ''
36
+ }),
37
+ _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
38
+ menuPosition = _useState2[0],
39
+ setMenuPosition = _useState2[1];
25
40
  (0, _react.useEffect)(function () {
26
41
  var handleMessage = function handleMessage(event) {
27
42
  var _event$data;
@@ -47,6 +62,14 @@ var Whiteboard = function Whiteboard(_ref) {
47
62
  unsubscribeResizeArticle();
48
63
  };
49
64
  }, []);
65
+ var onDeleteWhiteboard = (0, _react.useCallback)(function () {
66
+ var path = _slateReact.ReactEditor.findPath(editor, element);
67
+ _slate.Transforms.removeNodes(editor, {
68
+ at: path
69
+ });
70
+ (0, _core.focusEditor)(editor);
71
+ _slate.Transforms.select(editor, editor.selection);
72
+ }, [editor, element]);
50
73
  var handleDoubleClick = function handleDoubleClick(event) {
51
74
  event.preventDefault();
52
75
  var siteRoot = _context["default"].getSetting('siteRoot');
@@ -54,7 +77,45 @@ var Whiteboard = function Whiteboard(_ref) {
54
77
  window.open(url, '_blank');
55
78
  return;
56
79
  };
57
- return /*#__PURE__*/_react["default"].createElement("div", {
80
+ var handleScroll = (0, _react.useCallback)(function (e) {
81
+ if (readOnly) return;
82
+ if (!isSelected) return;
83
+ if (e.currentTarget.scrollTop) {
84
+ var _menuPosition = (0, _utils.getMenuPosition)(whiteboardRef.current, editor);
85
+ setMenuPosition(_menuPosition);
86
+ }
87
+ }, [editor, isSelected, readOnly]);
88
+ (0, _react.useEffect)(function () {
89
+ if (readOnly) return;
90
+ var observerRefValue = null;
91
+ if (scrollRef.current) {
92
+ scrollRef.current.addEventListener('scroll', handleScroll);
93
+ observerRefValue = scrollRef.current;
94
+ }
95
+ return function () {
96
+ observerRefValue.removeEventListener('scroll', handleScroll);
97
+ };
98
+ }, [handleScroll, readOnly, scrollRef]);
99
+ var handleOnClick = (0, _react.useCallback)(function () {
100
+ if (readOnly) return;
101
+ if (isSelected) {
102
+ var _menuPosition2 = (0, _utils.getMenuPosition)(whiteboardRef.current, editor);
103
+ setMenuPosition(_menuPosition2);
104
+ }
105
+ }, [editor, isSelected, readOnly]);
106
+ var openFullscreen = function openFullscreen() {
107
+ if (whiteboardRef.current.requestFullscreen) {
108
+ // Chrome
109
+ whiteboardRef.current.requestFullscreen();
110
+ } else if (whiteboardRef.current.webkitRequestFullscreen) {
111
+ // Safari
112
+ whiteboardRef.current.webkitRequestFullscreen();
113
+ } else if (whiteboardRef.current.msRequestFullscreen) {
114
+ // IE11
115
+ whiteboardRef.current.msRequestFullscreen();
116
+ }
117
+ };
118
+ return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
58
119
  className: (0, _classnames["default"])('sdoc-whiteboard-container', {
59
120
  'isSelected': isSelected
60
121
  }),
@@ -69,7 +130,13 @@ var Whiteboard = function Whiteboard(_ref) {
69
130
  ref: whiteboardRef
70
131
  }), /*#__PURE__*/_react["default"].createElement("div", {
71
132
  className: "iframe-overlay",
72
- onDoubleClick: handleDoubleClick
133
+ onDoubleClick: handleDoubleClick,
134
+ onClick: handleOnClick
135
+ })), isSelected && !readOnly && /*#__PURE__*/_react["default"].createElement(_hoverMenu["default"], {
136
+ menuPosition: menuPosition,
137
+ onOpen: handleDoubleClick,
138
+ openFullscreen: openFullscreen,
139
+ onDeleteWhiteboard: onDeleteWhiteboard
73
140
  }));
74
141
  };
75
142
  function renderWhiteboard(props, editor) {
@@ -15,13 +15,17 @@ var PluginsContext = /*#__PURE__*/_react["default"].createContext(null);
15
15
  var PluginsProvider = exports.PluginsProvider = function PluginsProvider(_ref) {
16
16
  var showComment = _ref.showComment,
17
17
  propsPlugins = _ref.plugins,
18
- children = _ref.children;
18
+ children = _ref.children,
19
+ setIsShowRightPanel = _ref.setIsShowRightPanel;
19
20
  var _useState = (0, _react.useState)(''),
20
21
  _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
21
22
  displayName = _useState2[0],
22
23
  setDisplayName = _useState2[1];
23
24
  var closePlugin = (0, _react.useCallback)(function () {
24
25
  setDisplayName('');
26
+ // Deal with comment component in wiki
27
+ setIsShowRightPanel && setIsShowRightPanel(false);
28
+ // eslint-disable-next-line react-hooks/exhaustive-deps
25
29
  }, []);
26
30
  var plugins = (0, _react.useMemo)(function () {
27
31
  var allPlugins = propsPlugins;
@@ -4,8 +4,10 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.useCommentListPosition = void 0;
7
+ var _helper = require("../comment/helper");
8
+ var _constants = require("../constants");
7
9
  var _useScrollContext = require("./use-scroll-context");
8
- var useCommentListPosition = exports.useCommentListPosition = function useCommentListPosition(selectedElementIds, isContextComment, isClickedContextComment, commentedDom, commentDetail, closeComment) {
10
+ var useCommentListPosition = exports.useCommentListPosition = function useCommentListPosition(selectedElementIds, isContextComment, isClickedContextComment, commentedDom, commentDetail, closeComment, editor) {
9
11
  var _document$querySelect;
10
12
  var headerHeight = 100;
11
13
  var scrollRef = (0, _useScrollContext.useScrollContext)();
@@ -51,7 +53,12 @@ var useCommentListPosition = exports.useCommentListPosition = function useCommen
51
53
  }
52
54
  }
53
55
  var editorArticleRight = document.getElementById('sdoc-editor-print-wrapper').getBoundingClientRect().right;
54
- var topPara = rect.bottom - headerHeight + 10 + scrollTop;
56
+ var topPara;
57
+ topPara = rect.bottom - headerHeight + 10 + scrollTop;
58
+ if (editor.editorType === _constants.WIKI_EDITOR) {
59
+ // 55 is basic top title height in wiki
60
+ topPara = (0, _helper.commentContainerWikiTransfer)(topPara, 55);
61
+ }
55
62
  var rightPara = editorArticleRight - rect.left - 300; // 300 is comment container's width
56
63
  return {
57
64
  right: rightPara,
@@ -63,6 +70,10 @@ var useCommentListPosition = exports.useCommentListPosition = function useCommen
63
70
  if (!selectionPosition) closeComment();
64
71
  if (selectionPosition && selectionPosition.y !== 0) {
65
72
  selectionPosition.y = selectionPosition.y - headerHeight + scrollTop;
73
+ if (editor.editorType === _constants.WIKI_EDITOR) {
74
+ // 47 is top nav bar height in wiki
75
+ selectionPosition.y = (0, _helper.commentContainerWikiTransfer)(selectionPosition.y, 47);
76
+ }
66
77
  }
67
78
  return {
68
79
  x: selectionPosition === null || selectionPosition === void 0 ? void 0 : selectionPosition.x,
package/dist/index.js CHANGED
@@ -10,6 +10,12 @@ Object.defineProperty(exports, "CollaboratorsProvider", {
10
10
  return _useCollaborators.CollaboratorsProvider;
11
11
  }
12
12
  });
13
+ Object.defineProperty(exports, "CommentContextProvider", {
14
+ enumerable: true,
15
+ get: function get() {
16
+ return _provider["default"];
17
+ }
18
+ });
13
19
  Object.defineProperty(exports, "DiffViewer", {
14
20
  enumerable: true,
15
21
  get: function get() {
@@ -88,6 +94,12 @@ Object.defineProperty(exports, "RevisionEditor", {
88
94
  return _revisionEditor["default"];
89
95
  }
90
96
  });
97
+ Object.defineProperty(exports, "RightPanel", {
98
+ enumerable: true,
99
+ get: function get() {
100
+ return _index["default"];
101
+ }
102
+ });
91
103
  Object.defineProperty(exports, "SDocEditor", {
92
104
  enumerable: true,
93
105
  get: function get() {
@@ -244,6 +256,7 @@ Object.defineProperty(exports, "withSocketIO", {
244
256
  return _socket.withSocketIO;
245
257
  }
246
258
  });
259
+ var _provider = _interopRequireDefault(require("./comment/provider"));
247
260
  var _fileLoading = _interopRequireDefault(require("./components/file-loading"));
248
261
  var _loading = _interopRequireDefault(require("./components/loading"));
249
262
  var _toast = _interopRequireDefault(require("./components/toast"));
@@ -260,6 +273,7 @@ var _useCollaborators = require("./hooks/use-collaborators");
260
273
  var _usePlugins = require("./hooks/use-plugins");
261
274
  var _nodeId = _interopRequireDefault(require("./node-id"));
262
275
  var _outline = _interopRequireDefault(require("./outline"));
276
+ var _index = _interopRequireDefault(require("./right-panel/index"));
263
277
  var _slateConvert = require("./slate-convert");
264
278
  var _socket = require("./socket");
265
279
  var _commonUtils = require("./utils/common-utils");
@@ -17,7 +17,8 @@ var _fullWidthMode = require("../utils/full-width-mode");
17
17
  var _localStorageUtils = _interopRequireDefault(require("../utils/local-storage-utils"));
18
18
  function ArticleContainer(_ref) {
19
19
  var editor = _ref.editor,
20
- children = _ref.children;
20
+ children = _ref.children,
21
+ isShowCommentPanelInWiki = _ref.isShowCommentPanelInWiki;
21
22
  var scrollRef = (0, _useScrollContext.useScrollContext)();
22
23
  var articleRef = (0, _react.useRef)(null);
23
24
  var _useState = (0, _react.useState)({}),
@@ -63,7 +64,6 @@ function ArticleContainer(_ref) {
63
64
  };
64
65
  }, [editor.editorType, handleWindowResize]);
65
66
  (0, _react.useEffect)(function () {
66
- if (editor.editorType === _constants.WIKI_EDITOR) return;
67
67
  if (editor.editorType === _constants.DOCUMENT_PLUGIN_EDITOR) return;
68
68
  handleWindowResize();
69
69
  window.addEventListener('resize', handleWindowResize);
@@ -73,7 +73,7 @@ function ArticleContainer(_ref) {
73
73
  // eslint-disable-next-line react-hooks/exhaustive-deps
74
74
  }, []);
75
75
  var articleStyle = editor.getArticleStyle && editor.getArticleStyle();
76
- var articleContainerStyle = editor.getArticleStyle ? {
76
+ var articleContainerStyle = editor.editorType !== _constants.WIKI_EDITOR && editor.getArticleStyle ? {
77
77
  width: articleStyle.width
78
78
  } : containerStyle;
79
79
  return /*#__PURE__*/_react["default"].createElement("div", {
@@ -9,6 +9,8 @@ exports["default"] = void 0;
9
9
  var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
10
10
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
11
11
  var _react = _interopRequireWildcard(require("react"));
12
+ var _comment = _interopRequireDefault(require("../comment"));
13
+ var _commentOperation = _interopRequireDefault(require("../comment/components/comment-operation"));
12
14
  var _constants = require("../constants");
13
15
  var _usePlugins2 = require("../hooks/use-plugins");
14
16
  var _eventBus = _interopRequireDefault(require("../utils/event-bus"));
@@ -27,6 +29,16 @@ var RightPanel = function RightPanel(_ref) {
27
29
  _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
28
30
  width = _useState2[0],
29
31
  setWidth = _useState2[1];
32
+ if (editor.editorType === _constants.WIKI_EDITOR) {
33
+ plugins = [{
34
+ name: 'sdoc-comment',
35
+ icon: /*#__PURE__*/_react["default"].createElement(_commentOperation["default"], null),
36
+ resizable_width: true,
37
+ display_type: _constants.PLUGIN_DISPLAY_TYPE.RIGHT_PANEL,
38
+ component: _comment["default"]
39
+ }];
40
+ displayPluginName = 'sdoc-comment';
41
+ }
30
42
  var panelWrapperStyle = (0, _react.useMemo)(function () {
31
43
  if (!displayPluginName) return null;
32
44
  var style = {
@@ -10,9 +10,9 @@ var _localStorageUtils = _interopRequireDefault(require("./local-storage-utils")
10
10
  var getStyleByDefaultMode = exports.getStyleByDefaultMode = function getStyleByDefaultMode(scrollRef, editor) {
11
11
  var sdocStorage = _localStorageUtils["default"].getItem(_constants.SDOC_STORAGE) || {};
12
12
  var isShowOutline = sdocStorage.outlineOpen;
13
- var containerStyle = {
13
+ var containerStyle = editor.editorType !== _constants.WIKI_EDITOR ? {
14
14
  width: _constants.ARTICLE_DEFAULT_WIDTH
15
- };
15
+ } : {};
16
16
 
17
17
  // Has outline
18
18
  if (isShowOutline && editor.editorType !== _constants.WIKI_EDITOR) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@seafile/sdoc-editor",
3
- "version": "2.0.134",
3
+ "version": "2.0.136-alpha.0",
4
4
  "main": "dist/index.js",
5
5
  "scripts": {
6
6
  "test": "jest",
@@ -17,6 +17,7 @@
17
17
  "license": "ISC",
18
18
  "description": "",
19
19
  "dependencies": {
20
+ "@seafile/comment-editor": "^0.0.3",
20
21
  "@seafile/print-js": "1.6.6",
21
22
  "@seafile/react-image-lightbox": "4.0.2",
22
23
  "@seafile/slate": "0.91.8",
@@ -69,6 +70,5 @@
69
70
  },
70
71
  "publishConfig": {
71
72
  "access": "public"
72
- },
73
- "gitHead": "5ab8c21594b1d82f829e8d8fe6fa39954e2ed463"
74
- }
73
+ }
74
+ }
package/LICENSE.txt DELETED
@@ -1,13 +0,0 @@
1
- Copyright (c) 2025 Seafile Ltd.
2
-
3
- Licensed under the Apache License, Version 2.0 (the "License");
4
- you may not use this file except in compliance with the License.
5
- You may obtain a copy of the License at
6
-
7
- http://www.apache.org/licenses/LICENSE-2.0
8
-
9
- Unless required by applicable law or agreed to in writing, software
10
- distributed under the License is distributed on an "AS IS" BASIS,
11
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
- See the License for the specific language governing permissions and
13
- limitations under the License.
@@ -1,162 +0,0 @@
1
- "use strict";
2
-
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
4
- var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard")["default"];
5
- Object.defineProperty(exports, "__esModule", {
6
- value: true
7
- });
8
- exports["default"] = void 0;
9
- var _react = _interopRequireWildcard(require("react"));
10
- var _reactI18next = require("react-i18next");
11
- var _slate = require("@seafile/slate");
12
- var _slateReact = require("@seafile/slate-react");
13
- var _classnames = _interopRequireDefault(require("classnames"));
14
- var _constants = require("../../constants");
15
- var _context = _interopRequireDefault(require("../../context"));
16
- var _sdocCommentEditor = _interopRequireDefault(require("../../editor/sdoc-comment-editor"));
17
- var _extension = require("../../extension");
18
- var _constants2 = require("../../extension/constants");
19
- var _core = require("../../extension/core");
20
- var _nodeId = _interopRequireDefault(require("../../node-id"));
21
- var _mdToSlate = _interopRequireDefault(require("../../slate-convert/md-to-slate"));
22
- var _slateToMd = _interopRequireDefault(require("../../slate-convert/slate-to-md"));
23
- var _eventBus = _interopRequireDefault(require("../../utils/event-bus"));
24
- var _useParticipants = require("../hooks/use-participants");
25
- var getSubmitTip = function getSubmitTip(type, content) {
26
- if (content) return 'Save';
27
- return type === 'comment' ? 'Comment' : 'Reply';
28
- };
29
- var DEFAULT_PLACEHOLDER = 'Enter_comment_shift_enter_for_new_line_Enter_to_send';
30
- var CommentEditor = function CommentEditor(_ref) {
31
- var type = _ref.type,
32
- className = _ref.className,
33
- content = _ref.content,
34
- commentContent = _ref.commentContent,
35
- _ref$placeholder = _ref.placeholder,
36
- placeholder = _ref$placeholder === void 0 ? DEFAULT_PLACEHOLDER : _ref$placeholder,
37
- insertContent = _ref.insertContent,
38
- updateContent = _ref.updateContent,
39
- setIsEditing = _ref.setIsEditing,
40
- hiddenComment = _ref.hiddenComment,
41
- hiddenUserInfo = _ref.hiddenUserInfo,
42
- onContentChange = _ref.onContentChange,
43
- isContextComment = _ref.isContextComment,
44
- closeComment = _ref.closeComment;
45
- var commentWrapperRef = (0, _react.useRef)();
46
- var _useTranslation = (0, _reactI18next.useTranslation)('sdoc-editor'),
47
- t = _useTranslation.t;
48
- var _useParticipantsConte = (0, _useParticipants.useParticipantsContext)(),
49
- addParticipants = _useParticipantsConte.addParticipants;
50
- var submitTip = (0, _react.useMemo)(function () {
51
- return getSubmitTip(type, content);
52
- }, [content, type]);
53
- var userInfo = _context["default"].getUserInfo();
54
- var document = (0, _react.useMemo)(function () {
55
- var cursor = {};
56
- var elements = null;
57
- elements = [(0, _core.generateEmptyElement)(_constants2.PARAGRAPH, {
58
- placeholder: placeholder
59
- })];
60
- return {
61
- elements: elements,
62
- cursor: cursor
63
- };
64
- }, [placeholder]);
65
- var editor = (0, _react.useMemo)(function () {
66
- var defaultEditor = (0, _extension.createCommentEditor)();
67
- var newEditor = (0, _nodeId["default"])(defaultEditor);
68
- var cursors = document.cursors;
69
- newEditor.cursors = cursors || {};
70
- newEditor.width = _constants.COMMENT_EDITOR_EDIT_AREA_WIDTH; // default width
71
- newEditor.editorType = _constants.COMMENT_EDITOR;
72
- return newEditor;
73
- }, [document]);
74
- var updateValue = (0, _react.useCallback)(function (value) {
75
- if (!value || value.trim() === '') return;
76
- if (!content) return insertContent(value);
77
- updateContent && updateContent(value);
78
- }, [content, insertContent, updateContent]);
79
- var onSubmit = (0, _react.useCallback)(function (event) {
80
- event && event.stopPropagation();
81
- var mdString = (0, _slateToMd["default"])(editor.children);
82
- updateValue(mdString);
83
- addParticipants(userInfo.username);
84
- editor.children = [(0, _core.generateEmptyElement)(_constants2.PARAGRAPH, {
85
- placeholder: placeholder
86
- })];
87
- _slate.Transforms.select(editor, _slate.Editor.start(editor, []));
88
- onContentChange && onContentChange(null);
89
- closeComment && closeComment();
90
- }, [editor, updateValue, addParticipants, userInfo.username, placeholder, onContentChange, closeComment]);
91
- var onSubmitByEnterKey = (0, _react.useCallback)(function (event) {
92
- if (!_slateReact.ReactEditor.isFocused(editor)) return;
93
- onSubmit(event);
94
- }, [editor, onSubmit]);
95
- (0, _react.useEffect)(function () {
96
- var eventBus = _eventBus["default"].getInstance();
97
- var unsubscribePostComment = eventBus.subscribe(_constants.INTERNAL_EVENT.COMMENT_EDITOR_POST_COMMENT, onSubmitByEnterKey);
98
- return function () {
99
- unsubscribePostComment();
100
- };
101
- }, [onSubmitByEnterKey]);
102
- var onCancel = (0, _react.useCallback)(function (event) {
103
- event.stopPropagation();
104
- var eventType = event.type,
105
- keyCode = event.keyCode,
106
- target = event.target;
107
- if (eventType === 'keydown' && keyCode !== _constants.KeyCodes.Esc) return;
108
- if (eventType === 'click') {
109
- var isSdocContentWrapper = target.classList.contains('sdoc-content-wrapper');
110
- var listContainer = window.document.querySelector('#global-comment-list-container');
111
- var resizeContainer = window.document.querySelector('.sdoc-comment-resize-handler');
112
- var isClickOnListContainer = listContainer && listContainer.contains(target);
113
- var isClickOnCommentEditorContainer = commentWrapperRef.current.contains(target);
114
- var isClickResizeContainer = resizeContainer && resizeContainer.contains(target);
115
- var isPreventCancel = isClickOnListContainer || isClickOnCommentEditorContainer || isClickResizeContainer || isSdocContentWrapper;
116
- if (isPreventCancel) return;
117
- }
118
- setIsEditing && setIsEditing(false);
119
- hiddenComment && hiddenComment(false);
120
- if (onContentChange) {
121
- if (editor.children.find(function (n) {
122
- return _slate.Node.string(n).trim();
123
- })) {
124
- onContentChange((0, _slateToMd["default"])(editor.children));
125
- } else {
126
- onContentChange(null);
127
- }
128
- }
129
- // eslint-disable-next-line react-hooks/exhaustive-deps
130
- }, [setIsEditing]);
131
- (0, _react.useEffect)(function () {
132
- var children = (0, _mdToSlate["default"])(content);
133
- if (commentContent) {
134
- children = (0, _mdToSlate["default"])(commentContent);
135
- }
136
- editor.children = children;
137
- _slate.Transforms.select(editor, _slate.Editor.end(editor, []));
138
- }, [editor, content, commentContent]);
139
- return /*#__PURE__*/_react["default"].createElement("div", {
140
- className: (0, _classnames["default"])('comment-editor-wrapper', className),
141
- ref: commentWrapperRef
142
- }, type === 'comment' && !hiddenUserInfo && /*#__PURE__*/_react["default"].createElement("div", {
143
- className: "comment-editor-user-info"
144
- }, /*#__PURE__*/_react["default"].createElement("div", {
145
- className: "comment-editor-user-img"
146
- }, /*#__PURE__*/_react["default"].createElement("img", {
147
- src: userInfo.avatar_url,
148
- alt: "",
149
- height: "100%",
150
- width: "100%"
151
- })), /*#__PURE__*/_react["default"].createElement("div", {
152
- className: "comment-editor-user-name"
153
- }, userInfo.name)), /*#__PURE__*/_react["default"].createElement(_sdocCommentEditor["default"], {
154
- editor: editor,
155
- type: type,
156
- document: document,
157
- onSubmit: onSubmit,
158
- submitBtnText: t(submitTip),
159
- onCancel: onCancel
160
- }));
161
- };
162
- var _default = exports["default"] = CommentEditor;
@@ -1,209 +0,0 @@
1
- "use strict";
2
-
3
- var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard")["default"];
4
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
5
- Object.defineProperty(exports, "__esModule", {
6
- value: true
7
- });
8
- exports["default"] = void 0;
9
- var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
10
- var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
11
- var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/regeneratorRuntime"));
12
- var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/asyncToGenerator"));
13
- var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
14
- var _react = _interopRequireWildcard(require("react"));
15
- var _reactI18next = require("react-i18next");
16
- var _slate = require("@seafile/slate");
17
- var _deepCopy = _interopRequireDefault(require("deep-copy"));
18
- var _notificationHooks = require("../comment/hooks/notification-hooks");
19
- var _fileLoading = _interopRequireDefault(require("../components/file-loading"));
20
- var _toast = _interopRequireDefault(require("../components/toast"));
21
- var _constants = require("../constants");
22
- var _context2 = _interopRequireDefault(require("../context"));
23
- var _extension = require("../extension");
24
- var _core = require("../extension/core");
25
- var _commentEditorToolbar = _interopRequireDefault(require("../extension/toolbar/comment-editor-toolbar"));
26
- var _useCollaborators = require("../hooks/use-collaborators");
27
- var _useScrollContext = require("../hooks/use-scroll-context");
28
- var _layout = require("../layout");
29
- var _nodeId = _interopRequireDefault(require("../node-id"));
30
- var _socket = require("../socket");
31
- var _commonUtils = require("../utils/common-utils");
32
- var _eventBus = _interopRequireDefault(require("../utils/event-bus"));
33
- var _commentArticle = _interopRequireDefault(require("./comment-article"));
34
- var SdocCommentEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
35
- var propsEditor = _ref.editor,
36
- document = _ref.document,
37
- isReloading = _ref.isReloading,
38
- type = _ref.type,
39
- onSubmit = _ref.onSubmit,
40
- submitBtnText = _ref.submitBtnText,
41
- onCancel = _ref.onCancel;
42
- var _useState = (0, _react.useState)(document.elements),
43
- _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
44
- slateValue = _useState2[0],
45
- _setSlateValue = _useState2[1];
46
- var commentEditorContainerRef = (0, _react.useRef)(null);
47
- var commentTimeoutRef = (0, _react.useRef)(null);
48
- var _useNotificationConte = (0, _notificationHooks.useNotificationContext)(),
49
- notificationsInfo = _useNotificationConte.notificationsInfo;
50
- var _useTranslation = (0, _reactI18next.useTranslation)('sdoc-editor'),
51
- t = _useTranslation.t;
52
- var validEditor = (0, _react.useMemo)(function () {
53
- if (propsEditor) return propsEditor;
54
- var defaultEditor = (0, _extension.createCommentEditor)();
55
- var editorConfig = _context2["default"].getEditorConfig();
56
- var newEditor = (0, _nodeId["default"])((0, _socket.withSocketIO)(defaultEditor, {
57
- document: document,
58
- config: editorConfig
59
- }));
60
- var cursors = document.cursors;
61
- newEditor.cursors = cursors || {};
62
- newEditor.width = _constants.COMMENT_EDITOR_EDIT_AREA_WIDTH; // default width
63
-
64
- return newEditor;
65
- // eslint-disable-next-line react-hooks/exhaustive-deps
66
- }, []);
67
- (0, _react.useEffect)(function () {
68
- if (!(commentEditorContainerRef !== null && commentEditorContainerRef !== void 0 && commentEditorContainerRef.current)) return;
69
- if (Object.keys(notificationsInfo.notifications_map || {}).length === 0) return;
70
- if (!commentEditorContainerRef.current.closest('.global-comment-input-wrapper')) return;
71
- var clearAllNotification = /*#__PURE__*/function () {
72
- var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee() {
73
- var res, notifications, eventBus, errorMessage;
74
- return (0, _regeneratorRuntime2["default"])().wrap(function _callee$(_context) {
75
- while (1) switch (_context.prev = _context.next) {
76
- case 0:
77
- _context.prev = 0;
78
- _context.next = 3;
79
- return _context2["default"].readAllNotifications();
80
- case 3:
81
- _context.next = 5;
82
- return _context2["default"].listUnseenNotifications();
83
- case 5:
84
- res = _context.sent;
85
- notifications = res.data.notifications;
86
- eventBus = _eventBus["default"].getInstance();
87
- eventBus.dispatch(_constants.INTERNAL_EVENT.UNSEEN_NOTIFICATIONS_COUNT, notifications === null || notifications === void 0 ? void 0 : notifications.length);
88
- eventBus.dispatch(_constants.INTERNAL_EVENT.NEW_NOTIFICATION);
89
- eventBus.dispatch(_constants.INTERNAL_EVENT.CLEAR_NOTIFICATION);
90
- _context.next = 17;
91
- break;
92
- case 13:
93
- _context.prev = 13;
94
- _context.t0 = _context["catch"](0);
95
- errorMessage = (0, _commonUtils.getErrorMsg)(_context.t0);
96
- _toast["default"].danger(t(errorMessage));
97
- case 17:
98
- case "end":
99
- return _context.stop();
100
- }
101
- }, _callee, null, [[0, 13]]);
102
- }));
103
- return function clearAllNotification() {
104
- return _ref2.apply(this, arguments);
105
- };
106
- }();
107
- var el = commentEditorContainerRef && commentEditorContainerRef.current;
108
-
109
- // Mark comment as read if focusing commentEditorContainerRef over 3s
110
- var handleFocusIn = function handleFocusIn(e) {
111
- commentTimeoutRef.current = setTimeout(function () {
112
- clearAllNotification();
113
- commentTimeoutRef.current = null;
114
- }, 3000);
115
- };
116
- var handleBlur = function handleBlur() {
117
- clearTimeout(commentTimeoutRef.current);
118
- commentTimeoutRef.current = null;
119
- };
120
- el.addEventListener('focusin', handleFocusIn);
121
- el.addEventListener('focusout', handleBlur);
122
- return function () {
123
- el.removeEventListener('focusin', handleFocusIn);
124
- el.removeEventListener('focusout', handleBlur);
125
- if (commentTimeoutRef.current) {
126
- clearTimeout(commentTimeoutRef.current);
127
- commentTimeoutRef.current = null;
128
- }
129
- };
130
- }, [notificationsInfo]);
131
-
132
- // useMount: focus editor
133
- (0, _react.useEffect)(function () {
134
- var _validEditor$children = (0, _slicedToArray2["default"])(validEditor.children, 1),
135
- firstNode = _validEditor$children[0];
136
- if (firstNode) {
137
- var _firstNode$children = (0, _slicedToArray2["default"])(firstNode.children, 1),
138
- firstNodeFirstChild = _firstNode$children[0];
139
- if (firstNodeFirstChild) {
140
- var endOfFirstNode = _slate.Editor.end(validEditor, [0, 0]);
141
- var range = {
142
- anchor: endOfFirstNode,
143
- focus: endOfFirstNode
144
- };
145
- (0, _core.focusEditor)(validEditor, range);
146
- }
147
- // Force refresh to fix comment list
148
- _setSlateValue((0, _toConsumableArray2["default"])(validEditor.children));
149
- }
150
- // eslint-disable-next-line react-hooks/exhaustive-deps
151
- }, []);
152
-
153
- // The parent component can call the method of this component through ref
154
- (0, _react.useImperativeHandle)(ref, function () {
155
- return {
156
- setSlateValue: function setSlateValue(document) {
157
- // Force update of editor's child elements
158
- validEditor.children = document.elements;
159
- _setSlateValue((0, _toConsumableArray2["default"])(document.elements));
160
- },
161
- updateDocumentVersion: function updateDocumentVersion(document) {
162
- validEditor.updateDocumentVersion(document);
163
- },
164
- // get value
165
- getSlateValue: function getSlateValue() {
166
- return (0, _deepCopy["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, document), {}, {
167
- elements: slateValue
168
- }));
169
- }
170
-
171
- // eslint-disable-next-line react-hooks/exhaustive-deps
172
- };
173
- }, [document, validEditor, slateValue]);
174
- if (isReloading) {
175
- return /*#__PURE__*/_react["default"].createElement("div", {
176
- className: "h-100 w-100 d-flex align-items-center justify-content-center"
177
- }, /*#__PURE__*/_react["default"].createElement(_fileLoading["default"], null));
178
- }
179
- var handleFocusEditor = function handleFocusEditor(e) {
180
- if (e.target === commentEditorContainerRef.current) {
181
- var focusPoint = _slate.Editor.end(validEditor, []);
182
- (0, _core.focusEditor)(validEditor, focusPoint);
183
- }
184
- };
185
- return /*#__PURE__*/_react["default"].createElement(_layout.EditorContainer, {
186
- editor: validEditor
187
- }, /*#__PURE__*/_react["default"].createElement(_useCollaborators.CollaboratorsProvider, null, /*#__PURE__*/_react["default"].createElement("div", {
188
- className: "sdoc-comment-editor-wrapper"
189
- }, /*#__PURE__*/_react["default"].createElement("div", {
190
- ref: commentEditorContainerRef,
191
- className: "article sdoc-comment-editor",
192
- onClick: handleFocusEditor
193
- }, /*#__PURE__*/_react["default"].createElement(_useScrollContext.ScrollContext.Provider, {
194
- value: {
195
- scrollRef: commentEditorContainerRef
196
- }
197
- }, /*#__PURE__*/_react["default"].createElement(_commentArticle["default"], {
198
- type: type,
199
- editor: validEditor,
200
- slateValue: slateValue,
201
- updateSlateValue: _setSlateValue
202
- }))), /*#__PURE__*/_react["default"].createElement(_commentEditorToolbar["default"], {
203
- editor: validEditor,
204
- onSubmit: onSubmit,
205
- submitBtnText: submitBtnText,
206
- onCancel: onCancel
207
- }))));
208
- });
209
- var _default = exports["default"] = SdocCommentEditor;