@univerjs/thread-comment-ui 1.0.0-alpha.2 → 1.0.0-alpha.4
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.
- package/lib/cjs/index.js +46 -27
- package/lib/es/index.js +48 -29
- package/lib/index.css +36 -0
- package/lib/index.js +48 -29
- package/lib/umd/index.js +3 -3
- package/package.json +11 -11
package/lib/cjs/index.js
CHANGED
|
@@ -125,7 +125,7 @@ const SetActiveCommentOperation = {
|
|
|
125
125
|
//#endregion
|
|
126
126
|
//#region package.json
|
|
127
127
|
var name = "@univerjs/thread-comment-ui";
|
|
128
|
-
var version = "1.0.0-alpha.
|
|
128
|
+
var version = "1.0.0-alpha.4";
|
|
129
129
|
|
|
130
130
|
//#endregion
|
|
131
131
|
//#region src/config/config.ts
|
|
@@ -269,7 +269,10 @@ const transformTextNodes2Document = (nodes) => {
|
|
|
269
269
|
paragraphId: (0, _univerjs_core.createParagraphId)(/* @__PURE__ */ new Set()),
|
|
270
270
|
paragraphStyle: {}
|
|
271
271
|
}],
|
|
272
|
-
sectionBreaks: [{
|
|
272
|
+
sectionBreaks: [{
|
|
273
|
+
sectionId: (0, _univerjs_core.createSectionId)(/* @__PURE__ */ new Set()),
|
|
274
|
+
startIndex: str.length - 1
|
|
275
|
+
}],
|
|
273
276
|
dataStream: str,
|
|
274
277
|
customRanges
|
|
275
278
|
};
|
|
@@ -296,7 +299,6 @@ function getSnapshot(body) {
|
|
|
296
299
|
};
|
|
297
300
|
}
|
|
298
301
|
const ThreadCommentEditor = (0, react.forwardRef)((props, ref) => {
|
|
299
|
-
var _editor$current5;
|
|
300
302
|
const { comment, onSave, id, onCancel, autoFocus, unitId, type, editorId } = props;
|
|
301
303
|
const commandService = (0, _univerjs_ui.useDependency)(_univerjs_core.ICommandService);
|
|
302
304
|
const localeService = (0, _univerjs_ui.useDependency)(_univerjs_core.LocaleService);
|
|
@@ -305,18 +307,9 @@ const ThreadCommentEditor = (0, react.forwardRef)((props, ref) => {
|
|
|
305
307
|
const editor = (0, react.useRef)(null);
|
|
306
308
|
const rootEditorId = type === _univerjs_core.UniverInstanceType.UNIVER_DOC ? _univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY : unitId;
|
|
307
309
|
const [canSubmit, setCanSubmit] = (0, react.useState)(() => {
|
|
308
|
-
var
|
|
309
|
-
return _univerjs_core.BuildTextUtils.transform.getPlainText((
|
|
310
|
+
var _comment$text$dataStr, _comment$text;
|
|
311
|
+
return _univerjs_core.BuildTextUtils.transform.getPlainText((_comment$text$dataStr = comment === null || comment === void 0 || (_comment$text = comment.text) === null || _comment$text === void 0 ? void 0 : _comment$text.dataStream) !== null && _comment$text$dataStr !== void 0 ? _comment$text$dataStr : "");
|
|
310
312
|
});
|
|
311
|
-
(0, react.useEffect)(() => {
|
|
312
|
-
var _editor$current$getDo2, _editor$current2, _editor$current3;
|
|
313
|
-
setCanSubmit(_univerjs_core.BuildTextUtils.transform.getPlainText((_editor$current$getDo2 = (_editor$current2 = editor.current) === null || _editor$current2 === void 0 || (_editor$current2 = _editor$current2.getDocumentData().body) === null || _editor$current2 === void 0 ? void 0 : _editor$current2.dataStream) !== null && _editor$current$getDo2 !== void 0 ? _editor$current$getDo2 : ""));
|
|
314
|
-
const sub = (_editor$current3 = editor.current) === null || _editor$current3 === void 0 ? void 0 : _editor$current3.selectionChange$.subscribe(() => {
|
|
315
|
-
var _editor$current$getDo3, _editor$current4;
|
|
316
|
-
setCanSubmit(_univerjs_core.BuildTextUtils.transform.getPlainText((_editor$current$getDo3 = (_editor$current4 = editor.current) === null || _editor$current4 === void 0 || (_editor$current4 = _editor$current4.getDocumentData().body) === null || _editor$current4 === void 0 ? void 0 : _editor$current4.dataStream) !== null && _editor$current$getDo3 !== void 0 ? _editor$current$getDo3 : ""));
|
|
317
|
-
});
|
|
318
|
-
return () => sub === null || sub === void 0 ? void 0 : sub.unsubscribe();
|
|
319
|
-
}, [(_editor$current5 = editor.current) === null || _editor$current5 === void 0 ? void 0 : _editor$current5.selectionChange$]);
|
|
320
313
|
const keyboardEventConfig = (0, react.useMemo)(() => ({
|
|
321
314
|
keyCodes: [{ keyCode: _univerjs_ui.KeyCode.ENTER }],
|
|
322
315
|
handler: (keyCode) => {
|
|
@@ -324,11 +317,11 @@ const ThreadCommentEditor = (0, react.forwardRef)((props, ref) => {
|
|
|
324
317
|
}
|
|
325
318
|
}), [commandService]);
|
|
326
319
|
(0, react.useImperativeHandle)(ref, () => ({ reply(text) {
|
|
327
|
-
var _editor$
|
|
320
|
+
var _editor$current;
|
|
328
321
|
if (!editor.current) return;
|
|
329
322
|
focusThreadCommentEditor(editorService, editorId, editor.current);
|
|
330
323
|
const documentData = getSnapshot(text);
|
|
331
|
-
(_editor$
|
|
324
|
+
(_editor$current = editor.current) === null || _editor$current === void 0 || _editor$current.setDocumentData(documentData, [{
|
|
332
325
|
startOffset: documentData.body.dataStream.length - 2,
|
|
333
326
|
endOffset: documentData.body.dataStream.length - 2,
|
|
334
327
|
collapsed: true
|
|
@@ -378,6 +371,10 @@ const ThreadCommentEditor = (0, react.forwardRef)((props, ref) => {
|
|
|
378
371
|
keyboardEventConfig,
|
|
379
372
|
placeholder: localeService.t("thread-comment-ui.editor.placeholder"),
|
|
380
373
|
initialValue: (comment === null || comment === void 0 ? void 0 : comment.text) && getSnapshot(comment.text),
|
|
374
|
+
onChange: (data) => {
|
|
375
|
+
var _data$body$dataStream, _data$body;
|
|
376
|
+
return setCanSubmit(_univerjs_core.BuildTextUtils.transform.getPlainText((_data$body$dataStream = (_data$body = data.body) === null || _data$body === void 0 ? void 0 : _data$body.dataStream) !== null && _data$body$dataStream !== void 0 ? _data$body$dataStream : ""));
|
|
377
|
+
},
|
|
381
378
|
onFocusChange: (isFocus) => isFocus && setEditing(isFocus),
|
|
382
379
|
isSingle: false,
|
|
383
380
|
maxHeight: 64,
|
|
@@ -421,6 +418,18 @@ let ThreadCommentTreeLocation = /* @__PURE__ */ function(ThreadCommentTreeLocati
|
|
|
421
418
|
return ThreadCommentTreeLocation;
|
|
422
419
|
}({});
|
|
423
420
|
const MOCK_ID = "__mock__";
|
|
421
|
+
function formatCommentDateTime(value, locale) {
|
|
422
|
+
const date = (0, _univerjs_core.dateKit)(value);
|
|
423
|
+
const localeTag = _univerjs_core.LOCALE_META[locale].tag;
|
|
424
|
+
return date.formatIntl(localeTag, {
|
|
425
|
+
year: "numeric",
|
|
426
|
+
month: "numeric",
|
|
427
|
+
day: "numeric",
|
|
428
|
+
hour: "2-digit",
|
|
429
|
+
minute: "2-digit",
|
|
430
|
+
hour12: false
|
|
431
|
+
});
|
|
432
|
+
}
|
|
424
433
|
const ThreadCommentItem = (props) => {
|
|
425
434
|
const { item, unitId, subUnitId, editing, onEditingChange, onReply, resolved, isRoot, onClose, onDeleteComment, type, threadCommentEditorId } = props;
|
|
426
435
|
const commandService = (0, _univerjs_ui.useDependency)(_univerjs_core.ICommandService);
|
|
@@ -433,6 +442,8 @@ const ThreadCommentItem = (props) => {
|
|
|
433
442
|
const [showReply, setShowReply] = (0, react.useState)(false);
|
|
434
443
|
const uiConfig = (0, _univerjs_ui.useConfigValue)(_univerjs_ui.UI_PLUGIN_CONFIG_KEY);
|
|
435
444
|
const avatarFallback = uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.avatarFallback;
|
|
445
|
+
const currentLocale = (0, _univerjs_ui.useObservable)(localeService.currentLocale$, localeService.getCurrentLocale());
|
|
446
|
+
const dateText = formatCommentDateTime(item.dT, currentLocale);
|
|
436
447
|
const handleDeleteItem = () => {
|
|
437
448
|
if ((onDeleteComment === null || onDeleteComment === void 0 ? void 0 : onDeleteComment(item)) === false) return;
|
|
438
449
|
commandService.executeCommand(isRoot ? _univerjs_thread_comment.DeleteCommentTreeCommand.id : _univerjs_thread_comment.DeleteCommentCommand.id, {
|
|
@@ -443,12 +454,12 @@ const ThreadCommentItem = (props) => {
|
|
|
443
454
|
if (isRoot) onClose === null || onClose === void 0 || onClose();
|
|
444
455
|
};
|
|
445
456
|
return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
|
|
446
|
-
className: "univer-relative univer-mb-3 univer-pl-[30px]",
|
|
457
|
+
className: "univer-relative univer-mb-3 univer-pl-[30px] rtl:univer-pl-0 rtl:univer-pr-[30px]",
|
|
447
458
|
onMouseLeave: () => setShowReply(false),
|
|
448
459
|
onMouseEnter: () => setShowReply(true),
|
|
449
460
|
children: [
|
|
450
461
|
/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
|
|
451
|
-
className: "univer-absolute univer-left-0 univer-top-0 univer-size-6 univer-rounded-full univer-bg-cover univer-bg-center univer-bg-no-repeat",
|
|
462
|
+
className: "univer-absolute univer-left-0 univer-top-0 univer-size-6 univer-rounded-full univer-bg-cover univer-bg-center univer-bg-no-repeat rtl:univer-left-auto rtl:univer-right-0",
|
|
452
463
|
style: { backgroundImage: `url(${(user === null || user === void 0 ? void 0 : user.avatar) || avatarFallback})` }
|
|
453
464
|
}),
|
|
454
465
|
user ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
|
|
@@ -457,7 +468,7 @@ const ThreadCommentItem = (props) => {
|
|
|
457
468
|
className: "univer-text-sm univer-font-medium univer-leading-5",
|
|
458
469
|
children: (user === null || user === void 0 ? void 0 : user.name) || " "
|
|
459
470
|
}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [isMock || resolved ? null : showReply && user ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
|
|
460
|
-
className: "univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-sm univer-text-base hover:univer-bg-gray-50 dark:hover:!univer-bg-gray-800",
|
|
471
|
+
className: "univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-sm univer-text-base hover:univer-bg-gray-50 rtl:univer-ml-0 rtl:univer-mr-1 dark:hover:!univer-bg-gray-800",
|
|
461
472
|
onClick: () => onReply(user),
|
|
462
473
|
children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_icons.ReplyToCommentIcon, {})
|
|
463
474
|
}) : null, isCommentBySelf && !isMock && !resolved ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_design.Dropdown, {
|
|
@@ -477,14 +488,15 @@ const ThreadCommentItem = (props) => {
|
|
|
477
488
|
})
|
|
478
489
|
}),
|
|
479
490
|
children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
|
|
480
|
-
className: "univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-sm univer-text-base hover:univer-bg-gray-50 dark:hover:!univer-bg-gray-800",
|
|
491
|
+
className: "univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-sm univer-text-base hover:univer-bg-gray-50 rtl:univer-ml-0 rtl:univer-mr-1 dark:hover:!univer-bg-gray-800",
|
|
481
492
|
children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_icons.MoreHorizontalIcon, {})
|
|
482
493
|
})
|
|
483
494
|
}) : null] })]
|
|
484
495
|
}) : null,
|
|
485
496
|
/* @__PURE__ */ (0, react_jsx_runtime.jsx)("time", {
|
|
486
|
-
|
|
487
|
-
|
|
497
|
+
dir: "ltr",
|
|
498
|
+
className: "univer-mb-1 univer-block univer-text-xs/normal univer-text-gray-600 dark:!univer-text-gray-200",
|
|
499
|
+
children: dateText
|
|
488
500
|
}),
|
|
489
501
|
editing ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ThreadCommentEditor, {
|
|
490
502
|
type,
|
|
@@ -531,8 +543,14 @@ const ThreadCommentTree = (props) => {
|
|
|
531
543
|
const threadCommentModel = (0, _univerjs_ui.useDependency)(_univerjs_thread_comment.ThreadCommentModel);
|
|
532
544
|
const [isHover, setIsHover] = (0, react.useState)(false);
|
|
533
545
|
const [editingId, setEditingId] = (0, react.useState)("");
|
|
534
|
-
|
|
535
|
-
const comments = id ? threadCommentModel.getCommentWithChildren(unitId, subUnitId, id) : null
|
|
546
|
+
const updte$ = (0, react.useMemo)(() => threadCommentModel.commentUpdate$.pipe((0, rxjs.debounceTime)(16)), [threadCommentModel]);
|
|
547
|
+
const comments = (0, _univerjs_ui.useObservable)(() => id ? updte$.pipe((0, rxjs.map)(() => threadCommentModel.getCommentWithChildren(unitId, subUnitId, id)), (0, rxjs.startWith)(threadCommentModel.getCommentWithChildren(unitId, subUnitId, id))) : (0, rxjs.of)(null), null, false, [
|
|
548
|
+
id,
|
|
549
|
+
subUnitId,
|
|
550
|
+
threadCommentModel,
|
|
551
|
+
unitId,
|
|
552
|
+
updte$
|
|
553
|
+
]);
|
|
536
554
|
const commandService = (0, _univerjs_ui.useDependency)(_univerjs_core.ICommandService);
|
|
537
555
|
const userManagerService = (0, _univerjs_ui.useDependency)(_univerjs_core.UserManagerService);
|
|
538
556
|
const resolved = comments === null || comments === void 0 ? void 0 : comments.root.resolved;
|
|
@@ -613,7 +631,7 @@ const ThreadCommentTree = (props) => {
|
|
|
613
631
|
className: "univer-mb-4 univer-flex univer-flex-row univer-items-center univer-justify-between univer-text-sm univer-leading-5",
|
|
614
632
|
children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
|
|
615
633
|
className: "univer-flex univer-flex-1 univer-flex-row univer-items-center univer-overflow-hidden",
|
|
616
|
-
children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { className: "univer-mr-2 univer-h-3.5 univer-w-[3px] univer-flex-shrink-0 univer-flex-grow-0 univer-rounded-sm univer-bg-yellow-500" }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_design.Tooltip, {
|
|
634
|
+
children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { className: "univer-mr-2 univer-h-3.5 univer-w-[3px] univer-flex-shrink-0 univer-flex-grow-0 univer-rounded-sm univer-bg-yellow-500 rtl:univer-ml-2 rtl:univer-mr-0" }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_design.Tooltip, {
|
|
617
635
|
showIfEllipsis: true,
|
|
618
636
|
title,
|
|
619
637
|
children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
|
|
@@ -624,11 +642,11 @@ const ThreadCommentTree = (props) => {
|
|
|
624
642
|
}), !!comments && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
|
|
625
643
|
className: "univer-flex univer-flex-shrink-0 univer-flex-grow-0 univer-flex-row",
|
|
626
644
|
children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
|
|
627
|
-
className: (0, _univerjs_design.clsx)("univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-[3px] univer-text-base hover:univer-bg-gray-50 dark:hover:!univer-bg-gray-800", { "univer-text-green-500": resolved }),
|
|
645
|
+
className: (0, _univerjs_design.clsx)("univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-[3px] univer-text-base hover:univer-bg-gray-50 rtl:univer-ml-0 rtl:univer-mr-1 dark:hover:!univer-bg-gray-800", { "univer-text-green-500": resolved }),
|
|
628
646
|
onClick: handleResolve,
|
|
629
647
|
children: resolved ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_icons.SuccessIcon, {}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_icons.SuccessOutlineIcon, {})
|
|
630
648
|
}), (currentUser === null || currentUser === void 0 ? void 0 : currentUser.userID) === comments.root.personId ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
|
|
631
|
-
className: "univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-[3px] univer-text-base hover:univer-bg-gray-50 dark:hover:!univer-bg-gray-800",
|
|
649
|
+
className: "univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-[3px] univer-text-base hover:univer-bg-gray-50 rtl:univer-ml-0 rtl:univer-mr-1 dark:hover:!univer-bg-gray-800",
|
|
632
650
|
onClick: handleDeleteRoot,
|
|
633
651
|
children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_icons.DeleteIcon, {})
|
|
634
652
|
}) : null]
|
|
@@ -792,6 +810,7 @@ const ThreadCommentPanel = (props) => {
|
|
|
792
810
|
(_document$getElementB = document.getElementById(id)) === null || _document$getElementB === void 0 || _document$getElementB.scrollIntoView({ block: "center" });
|
|
793
811
|
}, [activeCommentId]);
|
|
794
812
|
const renderComment = (section) => (comment, index) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ThreadCommentTree, {
|
|
813
|
+
full: true,
|
|
795
814
|
location,
|
|
796
815
|
getSubUnitName,
|
|
797
816
|
id: comment.id,
|
package/lib/es/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { BuildTextUtils, CommandType, CustomRangeType, DOCS_COMMENT_EDITOR_UNIT_ID_KEY, DOCS_NORMAL_EDITOR_UNIT_ID_KEY, DependentOn, Disposable, ICommandService, IConfigService, IUniverInstanceService, Inject, Injector, LocaleService, Plugin, Tools, UniverInstanceType, UserManagerService, createParagraphId, generateRandomId, getBodySlice, merge, mergeOverrideWithDependencies } from "@univerjs/core";
|
|
1
|
+
import { BuildTextUtils, CommandType, CustomRangeType, DOCS_COMMENT_EDITOR_UNIT_ID_KEY, DOCS_NORMAL_EDITOR_UNIT_ID_KEY, DependentOn, Disposable, ICommandService, IConfigService, IUniverInstanceService, Inject, Injector, LOCALE_META, LocaleService, Plugin, Tools, UniverInstanceType, UserManagerService, createParagraphId, createSectionId, dateKit, generateRandomId, getBodySlice, merge, mergeOverrideWithDependencies } from "@univerjs/core";
|
|
2
2
|
import { ISidebarService, KeyCode, UI_PLUGIN_CONFIG_KEY, useConfigValue, useDependency, useObservable } from "@univerjs/ui";
|
|
3
|
-
import { BehaviorSubject, debounceTime, filter } from "rxjs";
|
|
3
|
+
import { BehaviorSubject, debounceTime, filter, map, of, startWith } from "rxjs";
|
|
4
4
|
import { AddCommentCommand, DeleteCommentCommand, DeleteCommentTreeCommand, ResolveCommentCommand, ThreadCommentModel, UniverThreadCommentPlugin, UpdateCommentCommand, getDT } from "@univerjs/thread-comment";
|
|
5
5
|
import { Button, Dropdown, Select, Tooltip, borderClassName, clsx, scrollbarClassName } from "@univerjs/design";
|
|
6
6
|
import { DeleteIcon, IncreaseIcon, MoreHorizontalIcon, ReplyToCommentIcon, SuccessIcon, SuccessOutlineIcon } from "@univerjs/icons";
|
|
@@ -124,7 +124,7 @@ const SetActiveCommentOperation = {
|
|
|
124
124
|
//#endregion
|
|
125
125
|
//#region package.json
|
|
126
126
|
var name = "@univerjs/thread-comment-ui";
|
|
127
|
-
var version = "1.0.0-alpha.
|
|
127
|
+
var version = "1.0.0-alpha.4";
|
|
128
128
|
|
|
129
129
|
//#endregion
|
|
130
130
|
//#region src/config/config.ts
|
|
@@ -268,7 +268,10 @@ const transformTextNodes2Document = (nodes) => {
|
|
|
268
268
|
paragraphId: createParagraphId(/* @__PURE__ */ new Set()),
|
|
269
269
|
paragraphStyle: {}
|
|
270
270
|
}],
|
|
271
|
-
sectionBreaks: [{
|
|
271
|
+
sectionBreaks: [{
|
|
272
|
+
sectionId: createSectionId(/* @__PURE__ */ new Set()),
|
|
273
|
+
startIndex: str.length - 1
|
|
274
|
+
}],
|
|
272
275
|
dataStream: str,
|
|
273
276
|
customRanges
|
|
274
277
|
};
|
|
@@ -295,7 +298,6 @@ function getSnapshot(body) {
|
|
|
295
298
|
};
|
|
296
299
|
}
|
|
297
300
|
const ThreadCommentEditor = forwardRef((props, ref) => {
|
|
298
|
-
var _editor$current5;
|
|
299
301
|
const { comment, onSave, id, onCancel, autoFocus, unitId, type, editorId } = props;
|
|
300
302
|
const commandService = useDependency(ICommandService);
|
|
301
303
|
const localeService = useDependency(LocaleService);
|
|
@@ -304,18 +306,9 @@ const ThreadCommentEditor = forwardRef((props, ref) => {
|
|
|
304
306
|
const editor = useRef(null);
|
|
305
307
|
const rootEditorId = type === UniverInstanceType.UNIVER_DOC ? DOCS_NORMAL_EDITOR_UNIT_ID_KEY : unitId;
|
|
306
308
|
const [canSubmit, setCanSubmit] = useState(() => {
|
|
307
|
-
var
|
|
308
|
-
return BuildTextUtils.transform.getPlainText((
|
|
309
|
+
var _comment$text$dataStr, _comment$text;
|
|
310
|
+
return BuildTextUtils.transform.getPlainText((_comment$text$dataStr = comment === null || comment === void 0 || (_comment$text = comment.text) === null || _comment$text === void 0 ? void 0 : _comment$text.dataStream) !== null && _comment$text$dataStr !== void 0 ? _comment$text$dataStr : "");
|
|
309
311
|
});
|
|
310
|
-
useEffect(() => {
|
|
311
|
-
var _editor$current$getDo2, _editor$current2, _editor$current3;
|
|
312
|
-
setCanSubmit(BuildTextUtils.transform.getPlainText((_editor$current$getDo2 = (_editor$current2 = editor.current) === null || _editor$current2 === void 0 || (_editor$current2 = _editor$current2.getDocumentData().body) === null || _editor$current2 === void 0 ? void 0 : _editor$current2.dataStream) !== null && _editor$current$getDo2 !== void 0 ? _editor$current$getDo2 : ""));
|
|
313
|
-
const sub = (_editor$current3 = editor.current) === null || _editor$current3 === void 0 ? void 0 : _editor$current3.selectionChange$.subscribe(() => {
|
|
314
|
-
var _editor$current$getDo3, _editor$current4;
|
|
315
|
-
setCanSubmit(BuildTextUtils.transform.getPlainText((_editor$current$getDo3 = (_editor$current4 = editor.current) === null || _editor$current4 === void 0 || (_editor$current4 = _editor$current4.getDocumentData().body) === null || _editor$current4 === void 0 ? void 0 : _editor$current4.dataStream) !== null && _editor$current$getDo3 !== void 0 ? _editor$current$getDo3 : ""));
|
|
316
|
-
});
|
|
317
|
-
return () => sub === null || sub === void 0 ? void 0 : sub.unsubscribe();
|
|
318
|
-
}, [(_editor$current5 = editor.current) === null || _editor$current5 === void 0 ? void 0 : _editor$current5.selectionChange$]);
|
|
319
312
|
const keyboardEventConfig = useMemo(() => ({
|
|
320
313
|
keyCodes: [{ keyCode: KeyCode.ENTER }],
|
|
321
314
|
handler: (keyCode) => {
|
|
@@ -323,11 +316,11 @@ const ThreadCommentEditor = forwardRef((props, ref) => {
|
|
|
323
316
|
}
|
|
324
317
|
}), [commandService]);
|
|
325
318
|
useImperativeHandle(ref, () => ({ reply(text) {
|
|
326
|
-
var _editor$
|
|
319
|
+
var _editor$current;
|
|
327
320
|
if (!editor.current) return;
|
|
328
321
|
focusThreadCommentEditor(editorService, editorId, editor.current);
|
|
329
322
|
const documentData = getSnapshot(text);
|
|
330
|
-
(_editor$
|
|
323
|
+
(_editor$current = editor.current) === null || _editor$current === void 0 || _editor$current.setDocumentData(documentData, [{
|
|
331
324
|
startOffset: documentData.body.dataStream.length - 2,
|
|
332
325
|
endOffset: documentData.body.dataStream.length - 2,
|
|
333
326
|
collapsed: true
|
|
@@ -377,6 +370,10 @@ const ThreadCommentEditor = forwardRef((props, ref) => {
|
|
|
377
370
|
keyboardEventConfig,
|
|
378
371
|
placeholder: localeService.t("thread-comment-ui.editor.placeholder"),
|
|
379
372
|
initialValue: (comment === null || comment === void 0 ? void 0 : comment.text) && getSnapshot(comment.text),
|
|
373
|
+
onChange: (data) => {
|
|
374
|
+
var _data$body$dataStream, _data$body;
|
|
375
|
+
return setCanSubmit(BuildTextUtils.transform.getPlainText((_data$body$dataStream = (_data$body = data.body) === null || _data$body === void 0 ? void 0 : _data$body.dataStream) !== null && _data$body$dataStream !== void 0 ? _data$body$dataStream : ""));
|
|
376
|
+
},
|
|
380
377
|
onFocusChange: (isFocus) => isFocus && setEditing(isFocus),
|
|
381
378
|
isSingle: false,
|
|
382
379
|
maxHeight: 64,
|
|
@@ -420,6 +417,18 @@ let ThreadCommentTreeLocation = /* @__PURE__ */ function(ThreadCommentTreeLocati
|
|
|
420
417
|
return ThreadCommentTreeLocation;
|
|
421
418
|
}({});
|
|
422
419
|
const MOCK_ID = "__mock__";
|
|
420
|
+
function formatCommentDateTime(value, locale) {
|
|
421
|
+
const date = dateKit(value);
|
|
422
|
+
const localeTag = LOCALE_META[locale].tag;
|
|
423
|
+
return date.formatIntl(localeTag, {
|
|
424
|
+
year: "numeric",
|
|
425
|
+
month: "numeric",
|
|
426
|
+
day: "numeric",
|
|
427
|
+
hour: "2-digit",
|
|
428
|
+
minute: "2-digit",
|
|
429
|
+
hour12: false
|
|
430
|
+
});
|
|
431
|
+
}
|
|
423
432
|
const ThreadCommentItem = (props) => {
|
|
424
433
|
const { item, unitId, subUnitId, editing, onEditingChange, onReply, resolved, isRoot, onClose, onDeleteComment, type, threadCommentEditorId } = props;
|
|
425
434
|
const commandService = useDependency(ICommandService);
|
|
@@ -432,6 +441,8 @@ const ThreadCommentItem = (props) => {
|
|
|
432
441
|
const [showReply, setShowReply] = useState(false);
|
|
433
442
|
const uiConfig = useConfigValue(UI_PLUGIN_CONFIG_KEY);
|
|
434
443
|
const avatarFallback = uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.avatarFallback;
|
|
444
|
+
const currentLocale = useObservable(localeService.currentLocale$, localeService.getCurrentLocale());
|
|
445
|
+
const dateText = formatCommentDateTime(item.dT, currentLocale);
|
|
435
446
|
const handleDeleteItem = () => {
|
|
436
447
|
if ((onDeleteComment === null || onDeleteComment === void 0 ? void 0 : onDeleteComment(item)) === false) return;
|
|
437
448
|
commandService.executeCommand(isRoot ? DeleteCommentTreeCommand.id : DeleteCommentCommand.id, {
|
|
@@ -442,12 +453,12 @@ const ThreadCommentItem = (props) => {
|
|
|
442
453
|
if (isRoot) onClose === null || onClose === void 0 || onClose();
|
|
443
454
|
};
|
|
444
455
|
return /* @__PURE__ */ jsxs("div", {
|
|
445
|
-
className: "univer-relative univer-mb-3 univer-pl-[30px]",
|
|
456
|
+
className: "univer-relative univer-mb-3 univer-pl-[30px] rtl:univer-pl-0 rtl:univer-pr-[30px]",
|
|
446
457
|
onMouseLeave: () => setShowReply(false),
|
|
447
458
|
onMouseEnter: () => setShowReply(true),
|
|
448
459
|
children: [
|
|
449
460
|
/* @__PURE__ */ jsx("div", {
|
|
450
|
-
className: "univer-absolute univer-left-0 univer-top-0 univer-size-6 univer-rounded-full univer-bg-cover univer-bg-center univer-bg-no-repeat",
|
|
461
|
+
className: "univer-absolute univer-left-0 univer-top-0 univer-size-6 univer-rounded-full univer-bg-cover univer-bg-center univer-bg-no-repeat rtl:univer-left-auto rtl:univer-right-0",
|
|
451
462
|
style: { backgroundImage: `url(${(user === null || user === void 0 ? void 0 : user.avatar) || avatarFallback})` }
|
|
452
463
|
}),
|
|
453
464
|
user ? /* @__PURE__ */ jsxs("div", {
|
|
@@ -456,7 +467,7 @@ const ThreadCommentItem = (props) => {
|
|
|
456
467
|
className: "univer-text-sm univer-font-medium univer-leading-5",
|
|
457
468
|
children: (user === null || user === void 0 ? void 0 : user.name) || " "
|
|
458
469
|
}), /* @__PURE__ */ jsxs("div", { children: [isMock || resolved ? null : showReply && user ? /* @__PURE__ */ jsx("div", {
|
|
459
|
-
className: "univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-sm univer-text-base hover:univer-bg-gray-50 dark:hover:!univer-bg-gray-800",
|
|
470
|
+
className: "univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-sm univer-text-base hover:univer-bg-gray-50 rtl:univer-ml-0 rtl:univer-mr-1 dark:hover:!univer-bg-gray-800",
|
|
460
471
|
onClick: () => onReply(user),
|
|
461
472
|
children: /* @__PURE__ */ jsx(ReplyToCommentIcon, {})
|
|
462
473
|
}) : null, isCommentBySelf && !isMock && !resolved ? /* @__PURE__ */ jsx(Dropdown, {
|
|
@@ -476,14 +487,15 @@ const ThreadCommentItem = (props) => {
|
|
|
476
487
|
})
|
|
477
488
|
}),
|
|
478
489
|
children: /* @__PURE__ */ jsx("div", {
|
|
479
|
-
className: "univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-sm univer-text-base hover:univer-bg-gray-50 dark:hover:!univer-bg-gray-800",
|
|
490
|
+
className: "univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-sm univer-text-base hover:univer-bg-gray-50 rtl:univer-ml-0 rtl:univer-mr-1 dark:hover:!univer-bg-gray-800",
|
|
480
491
|
children: /* @__PURE__ */ jsx(MoreHorizontalIcon, {})
|
|
481
492
|
})
|
|
482
493
|
}) : null] })]
|
|
483
494
|
}) : null,
|
|
484
495
|
/* @__PURE__ */ jsx("time", {
|
|
485
|
-
|
|
486
|
-
|
|
496
|
+
dir: "ltr",
|
|
497
|
+
className: "univer-mb-1 univer-block univer-text-xs/normal univer-text-gray-600 dark:!univer-text-gray-200",
|
|
498
|
+
children: dateText
|
|
487
499
|
}),
|
|
488
500
|
editing ? /* @__PURE__ */ jsx(ThreadCommentEditor, {
|
|
489
501
|
type,
|
|
@@ -530,8 +542,14 @@ const ThreadCommentTree = (props) => {
|
|
|
530
542
|
const threadCommentModel = useDependency(ThreadCommentModel);
|
|
531
543
|
const [isHover, setIsHover] = useState(false);
|
|
532
544
|
const [editingId, setEditingId] = useState("");
|
|
533
|
-
|
|
534
|
-
const comments = id ? threadCommentModel.getCommentWithChildren(unitId, subUnitId, id) : null
|
|
545
|
+
const updte$ = useMemo(() => threadCommentModel.commentUpdate$.pipe(debounceTime(16)), [threadCommentModel]);
|
|
546
|
+
const comments = useObservable(() => id ? updte$.pipe(map(() => threadCommentModel.getCommentWithChildren(unitId, subUnitId, id)), startWith(threadCommentModel.getCommentWithChildren(unitId, subUnitId, id))) : of(null), null, false, [
|
|
547
|
+
id,
|
|
548
|
+
subUnitId,
|
|
549
|
+
threadCommentModel,
|
|
550
|
+
unitId,
|
|
551
|
+
updte$
|
|
552
|
+
]);
|
|
535
553
|
const commandService = useDependency(ICommandService);
|
|
536
554
|
const userManagerService = useDependency(UserManagerService);
|
|
537
555
|
const resolved = comments === null || comments === void 0 ? void 0 : comments.root.resolved;
|
|
@@ -612,7 +630,7 @@ const ThreadCommentTree = (props) => {
|
|
|
612
630
|
className: "univer-mb-4 univer-flex univer-flex-row univer-items-center univer-justify-between univer-text-sm univer-leading-5",
|
|
613
631
|
children: [/* @__PURE__ */ jsxs("div", {
|
|
614
632
|
className: "univer-flex univer-flex-1 univer-flex-row univer-items-center univer-overflow-hidden",
|
|
615
|
-
children: [/* @__PURE__ */ jsx("div", { className: "univer-mr-2 univer-h-3.5 univer-w-[3px] univer-flex-shrink-0 univer-flex-grow-0 univer-rounded-sm univer-bg-yellow-500" }), /* @__PURE__ */ jsx(Tooltip, {
|
|
633
|
+
children: [/* @__PURE__ */ jsx("div", { className: "univer-mr-2 univer-h-3.5 univer-w-[3px] univer-flex-shrink-0 univer-flex-grow-0 univer-rounded-sm univer-bg-yellow-500 rtl:univer-ml-2 rtl:univer-mr-0" }), /* @__PURE__ */ jsx(Tooltip, {
|
|
616
634
|
showIfEllipsis: true,
|
|
617
635
|
title,
|
|
618
636
|
children: /* @__PURE__ */ jsx("span", {
|
|
@@ -623,11 +641,11 @@ const ThreadCommentTree = (props) => {
|
|
|
623
641
|
}), !!comments && /* @__PURE__ */ jsxs("div", {
|
|
624
642
|
className: "univer-flex univer-flex-shrink-0 univer-flex-grow-0 univer-flex-row",
|
|
625
643
|
children: [/* @__PURE__ */ jsx("div", {
|
|
626
|
-
className: clsx("univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-[3px] univer-text-base hover:univer-bg-gray-50 dark:hover:!univer-bg-gray-800", { "univer-text-green-500": resolved }),
|
|
644
|
+
className: clsx("univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-[3px] univer-text-base hover:univer-bg-gray-50 rtl:univer-ml-0 rtl:univer-mr-1 dark:hover:!univer-bg-gray-800", { "univer-text-green-500": resolved }),
|
|
627
645
|
onClick: handleResolve,
|
|
628
646
|
children: resolved ? /* @__PURE__ */ jsx(SuccessIcon, {}) : /* @__PURE__ */ jsx(SuccessOutlineIcon, {})
|
|
629
647
|
}), (currentUser === null || currentUser === void 0 ? void 0 : currentUser.userID) === comments.root.personId ? /* @__PURE__ */ jsx("div", {
|
|
630
|
-
className: "univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-[3px] univer-text-base hover:univer-bg-gray-50 dark:hover:!univer-bg-gray-800",
|
|
648
|
+
className: "univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-[3px] univer-text-base hover:univer-bg-gray-50 rtl:univer-ml-0 rtl:univer-mr-1 dark:hover:!univer-bg-gray-800",
|
|
631
649
|
onClick: handleDeleteRoot,
|
|
632
650
|
children: /* @__PURE__ */ jsx(DeleteIcon, {})
|
|
633
651
|
}) : null]
|
|
@@ -791,6 +809,7 @@ const ThreadCommentPanel = (props) => {
|
|
|
791
809
|
(_document$getElementB = document.getElementById(id)) === null || _document$getElementB === void 0 || _document$getElementB.scrollIntoView({ block: "center" });
|
|
792
810
|
}, [activeCommentId]);
|
|
793
811
|
const renderComment = (section) => (comment, index) => /* @__PURE__ */ jsx(ThreadCommentTree, {
|
|
812
|
+
full: true,
|
|
794
813
|
location,
|
|
795
814
|
getSubUnitName,
|
|
796
815
|
id: comment.id,
|
package/lib/index.css
CHANGED
|
@@ -58,6 +58,10 @@
|
|
|
58
58
|
box-sizing: border-box;
|
|
59
59
|
}
|
|
60
60
|
|
|
61
|
+
.univer-block {
|
|
62
|
+
display: block;
|
|
63
|
+
}
|
|
64
|
+
|
|
61
65
|
.univer-flex {
|
|
62
66
|
display: flex;
|
|
63
67
|
}
|
|
@@ -313,6 +317,38 @@
|
|
|
313
317
|
background-color: var(--univer-gray-50);
|
|
314
318
|
}
|
|
315
319
|
|
|
320
|
+
.rtl\:univer-left-auto:where([dir="rtl"], [dir="rtl"] *) {
|
|
321
|
+
left: auto;
|
|
322
|
+
}
|
|
323
|
+
|
|
324
|
+
.rtl\:univer-right-0:where([dir="rtl"], [dir="rtl"] *) {
|
|
325
|
+
right: 0;
|
|
326
|
+
}
|
|
327
|
+
|
|
328
|
+
.rtl\:univer-ml-0:where([dir="rtl"], [dir="rtl"] *) {
|
|
329
|
+
margin-left: 0;
|
|
330
|
+
}
|
|
331
|
+
|
|
332
|
+
.rtl\:univer-ml-2:where([dir="rtl"], [dir="rtl"] *) {
|
|
333
|
+
margin-left: .5rem;
|
|
334
|
+
}
|
|
335
|
+
|
|
336
|
+
.rtl\:univer-mr-0:where([dir="rtl"], [dir="rtl"] *) {
|
|
337
|
+
margin-right: 0;
|
|
338
|
+
}
|
|
339
|
+
|
|
340
|
+
.rtl\:univer-mr-1:where([dir="rtl"], [dir="rtl"] *) {
|
|
341
|
+
margin-right: .25rem;
|
|
342
|
+
}
|
|
343
|
+
|
|
344
|
+
.rtl\:univer-pl-0:where([dir="rtl"], [dir="rtl"] *) {
|
|
345
|
+
padding-left: 0;
|
|
346
|
+
}
|
|
347
|
+
|
|
348
|
+
.rtl\:univer-pr-\[30px\]:where([dir="rtl"], [dir="rtl"] *) {
|
|
349
|
+
padding-right: 30px;
|
|
350
|
+
}
|
|
351
|
+
|
|
316
352
|
.dark\:\!univer-bg-gray-900:where(.univer-dark, .univer-dark *) {
|
|
317
353
|
background-color: var(--univer-gray-900) !important;
|
|
318
354
|
}
|
package/lib/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { BuildTextUtils, CommandType, CustomRangeType, DOCS_COMMENT_EDITOR_UNIT_ID_KEY, DOCS_NORMAL_EDITOR_UNIT_ID_KEY, DependentOn, Disposable, ICommandService, IConfigService, IUniverInstanceService, Inject, Injector, LocaleService, Plugin, Tools, UniverInstanceType, UserManagerService, createParagraphId, generateRandomId, getBodySlice, merge, mergeOverrideWithDependencies } from "@univerjs/core";
|
|
1
|
+
import { BuildTextUtils, CommandType, CustomRangeType, DOCS_COMMENT_EDITOR_UNIT_ID_KEY, DOCS_NORMAL_EDITOR_UNIT_ID_KEY, DependentOn, Disposable, ICommandService, IConfigService, IUniverInstanceService, Inject, Injector, LOCALE_META, LocaleService, Plugin, Tools, UniverInstanceType, UserManagerService, createParagraphId, createSectionId, dateKit, generateRandomId, getBodySlice, merge, mergeOverrideWithDependencies } from "@univerjs/core";
|
|
2
2
|
import { ISidebarService, KeyCode, UI_PLUGIN_CONFIG_KEY, useConfigValue, useDependency, useObservable } from "@univerjs/ui";
|
|
3
|
-
import { BehaviorSubject, debounceTime, filter } from "rxjs";
|
|
3
|
+
import { BehaviorSubject, debounceTime, filter, map, of, startWith } from "rxjs";
|
|
4
4
|
import { AddCommentCommand, DeleteCommentCommand, DeleteCommentTreeCommand, ResolveCommentCommand, ThreadCommentModel, UniverThreadCommentPlugin, UpdateCommentCommand, getDT } from "@univerjs/thread-comment";
|
|
5
5
|
import { Button, Dropdown, Select, Tooltip, borderClassName, clsx, scrollbarClassName } from "@univerjs/design";
|
|
6
6
|
import { DeleteIcon, IncreaseIcon, MoreHorizontalIcon, ReplyToCommentIcon, SuccessIcon, SuccessOutlineIcon } from "@univerjs/icons";
|
|
@@ -124,7 +124,7 @@ const SetActiveCommentOperation = {
|
|
|
124
124
|
//#endregion
|
|
125
125
|
//#region package.json
|
|
126
126
|
var name = "@univerjs/thread-comment-ui";
|
|
127
|
-
var version = "1.0.0-alpha.
|
|
127
|
+
var version = "1.0.0-alpha.4";
|
|
128
128
|
|
|
129
129
|
//#endregion
|
|
130
130
|
//#region src/config/config.ts
|
|
@@ -268,7 +268,10 @@ const transformTextNodes2Document = (nodes) => {
|
|
|
268
268
|
paragraphId: createParagraphId(/* @__PURE__ */ new Set()),
|
|
269
269
|
paragraphStyle: {}
|
|
270
270
|
}],
|
|
271
|
-
sectionBreaks: [{
|
|
271
|
+
sectionBreaks: [{
|
|
272
|
+
sectionId: createSectionId(/* @__PURE__ */ new Set()),
|
|
273
|
+
startIndex: str.length - 1
|
|
274
|
+
}],
|
|
272
275
|
dataStream: str,
|
|
273
276
|
customRanges
|
|
274
277
|
};
|
|
@@ -295,7 +298,6 @@ function getSnapshot(body) {
|
|
|
295
298
|
};
|
|
296
299
|
}
|
|
297
300
|
const ThreadCommentEditor = forwardRef((props, ref) => {
|
|
298
|
-
var _editor$current5;
|
|
299
301
|
const { comment, onSave, id, onCancel, autoFocus, unitId, type, editorId } = props;
|
|
300
302
|
const commandService = useDependency(ICommandService);
|
|
301
303
|
const localeService = useDependency(LocaleService);
|
|
@@ -304,18 +306,9 @@ const ThreadCommentEditor = forwardRef((props, ref) => {
|
|
|
304
306
|
const editor = useRef(null);
|
|
305
307
|
const rootEditorId = type === UniverInstanceType.UNIVER_DOC ? DOCS_NORMAL_EDITOR_UNIT_ID_KEY : unitId;
|
|
306
308
|
const [canSubmit, setCanSubmit] = useState(() => {
|
|
307
|
-
var
|
|
308
|
-
return BuildTextUtils.transform.getPlainText((
|
|
309
|
+
var _comment$text$dataStr, _comment$text;
|
|
310
|
+
return BuildTextUtils.transform.getPlainText((_comment$text$dataStr = comment === null || comment === void 0 || (_comment$text = comment.text) === null || _comment$text === void 0 ? void 0 : _comment$text.dataStream) !== null && _comment$text$dataStr !== void 0 ? _comment$text$dataStr : "");
|
|
309
311
|
});
|
|
310
|
-
useEffect(() => {
|
|
311
|
-
var _editor$current$getDo2, _editor$current2, _editor$current3;
|
|
312
|
-
setCanSubmit(BuildTextUtils.transform.getPlainText((_editor$current$getDo2 = (_editor$current2 = editor.current) === null || _editor$current2 === void 0 || (_editor$current2 = _editor$current2.getDocumentData().body) === null || _editor$current2 === void 0 ? void 0 : _editor$current2.dataStream) !== null && _editor$current$getDo2 !== void 0 ? _editor$current$getDo2 : ""));
|
|
313
|
-
const sub = (_editor$current3 = editor.current) === null || _editor$current3 === void 0 ? void 0 : _editor$current3.selectionChange$.subscribe(() => {
|
|
314
|
-
var _editor$current$getDo3, _editor$current4;
|
|
315
|
-
setCanSubmit(BuildTextUtils.transform.getPlainText((_editor$current$getDo3 = (_editor$current4 = editor.current) === null || _editor$current4 === void 0 || (_editor$current4 = _editor$current4.getDocumentData().body) === null || _editor$current4 === void 0 ? void 0 : _editor$current4.dataStream) !== null && _editor$current$getDo3 !== void 0 ? _editor$current$getDo3 : ""));
|
|
316
|
-
});
|
|
317
|
-
return () => sub === null || sub === void 0 ? void 0 : sub.unsubscribe();
|
|
318
|
-
}, [(_editor$current5 = editor.current) === null || _editor$current5 === void 0 ? void 0 : _editor$current5.selectionChange$]);
|
|
319
312
|
const keyboardEventConfig = useMemo(() => ({
|
|
320
313
|
keyCodes: [{ keyCode: KeyCode.ENTER }],
|
|
321
314
|
handler: (keyCode) => {
|
|
@@ -323,11 +316,11 @@ const ThreadCommentEditor = forwardRef((props, ref) => {
|
|
|
323
316
|
}
|
|
324
317
|
}), [commandService]);
|
|
325
318
|
useImperativeHandle(ref, () => ({ reply(text) {
|
|
326
|
-
var _editor$
|
|
319
|
+
var _editor$current;
|
|
327
320
|
if (!editor.current) return;
|
|
328
321
|
focusThreadCommentEditor(editorService, editorId, editor.current);
|
|
329
322
|
const documentData = getSnapshot(text);
|
|
330
|
-
(_editor$
|
|
323
|
+
(_editor$current = editor.current) === null || _editor$current === void 0 || _editor$current.setDocumentData(documentData, [{
|
|
331
324
|
startOffset: documentData.body.dataStream.length - 2,
|
|
332
325
|
endOffset: documentData.body.dataStream.length - 2,
|
|
333
326
|
collapsed: true
|
|
@@ -377,6 +370,10 @@ const ThreadCommentEditor = forwardRef((props, ref) => {
|
|
|
377
370
|
keyboardEventConfig,
|
|
378
371
|
placeholder: localeService.t("thread-comment-ui.editor.placeholder"),
|
|
379
372
|
initialValue: (comment === null || comment === void 0 ? void 0 : comment.text) && getSnapshot(comment.text),
|
|
373
|
+
onChange: (data) => {
|
|
374
|
+
var _data$body$dataStream, _data$body;
|
|
375
|
+
return setCanSubmit(BuildTextUtils.transform.getPlainText((_data$body$dataStream = (_data$body = data.body) === null || _data$body === void 0 ? void 0 : _data$body.dataStream) !== null && _data$body$dataStream !== void 0 ? _data$body$dataStream : ""));
|
|
376
|
+
},
|
|
380
377
|
onFocusChange: (isFocus) => isFocus && setEditing(isFocus),
|
|
381
378
|
isSingle: false,
|
|
382
379
|
maxHeight: 64,
|
|
@@ -420,6 +417,18 @@ let ThreadCommentTreeLocation = /* @__PURE__ */ function(ThreadCommentTreeLocati
|
|
|
420
417
|
return ThreadCommentTreeLocation;
|
|
421
418
|
}({});
|
|
422
419
|
const MOCK_ID = "__mock__";
|
|
420
|
+
function formatCommentDateTime(value, locale) {
|
|
421
|
+
const date = dateKit(value);
|
|
422
|
+
const localeTag = LOCALE_META[locale].tag;
|
|
423
|
+
return date.formatIntl(localeTag, {
|
|
424
|
+
year: "numeric",
|
|
425
|
+
month: "numeric",
|
|
426
|
+
day: "numeric",
|
|
427
|
+
hour: "2-digit",
|
|
428
|
+
minute: "2-digit",
|
|
429
|
+
hour12: false
|
|
430
|
+
});
|
|
431
|
+
}
|
|
423
432
|
const ThreadCommentItem = (props) => {
|
|
424
433
|
const { item, unitId, subUnitId, editing, onEditingChange, onReply, resolved, isRoot, onClose, onDeleteComment, type, threadCommentEditorId } = props;
|
|
425
434
|
const commandService = useDependency(ICommandService);
|
|
@@ -432,6 +441,8 @@ const ThreadCommentItem = (props) => {
|
|
|
432
441
|
const [showReply, setShowReply] = useState(false);
|
|
433
442
|
const uiConfig = useConfigValue(UI_PLUGIN_CONFIG_KEY);
|
|
434
443
|
const avatarFallback = uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.avatarFallback;
|
|
444
|
+
const currentLocale = useObservable(localeService.currentLocale$, localeService.getCurrentLocale());
|
|
445
|
+
const dateText = formatCommentDateTime(item.dT, currentLocale);
|
|
435
446
|
const handleDeleteItem = () => {
|
|
436
447
|
if ((onDeleteComment === null || onDeleteComment === void 0 ? void 0 : onDeleteComment(item)) === false) return;
|
|
437
448
|
commandService.executeCommand(isRoot ? DeleteCommentTreeCommand.id : DeleteCommentCommand.id, {
|
|
@@ -442,12 +453,12 @@ const ThreadCommentItem = (props) => {
|
|
|
442
453
|
if (isRoot) onClose === null || onClose === void 0 || onClose();
|
|
443
454
|
};
|
|
444
455
|
return /* @__PURE__ */ jsxs("div", {
|
|
445
|
-
className: "univer-relative univer-mb-3 univer-pl-[30px]",
|
|
456
|
+
className: "univer-relative univer-mb-3 univer-pl-[30px] rtl:univer-pl-0 rtl:univer-pr-[30px]",
|
|
446
457
|
onMouseLeave: () => setShowReply(false),
|
|
447
458
|
onMouseEnter: () => setShowReply(true),
|
|
448
459
|
children: [
|
|
449
460
|
/* @__PURE__ */ jsx("div", {
|
|
450
|
-
className: "univer-absolute univer-left-0 univer-top-0 univer-size-6 univer-rounded-full univer-bg-cover univer-bg-center univer-bg-no-repeat",
|
|
461
|
+
className: "univer-absolute univer-left-0 univer-top-0 univer-size-6 univer-rounded-full univer-bg-cover univer-bg-center univer-bg-no-repeat rtl:univer-left-auto rtl:univer-right-0",
|
|
451
462
|
style: { backgroundImage: `url(${(user === null || user === void 0 ? void 0 : user.avatar) || avatarFallback})` }
|
|
452
463
|
}),
|
|
453
464
|
user ? /* @__PURE__ */ jsxs("div", {
|
|
@@ -456,7 +467,7 @@ const ThreadCommentItem = (props) => {
|
|
|
456
467
|
className: "univer-text-sm univer-font-medium univer-leading-5",
|
|
457
468
|
children: (user === null || user === void 0 ? void 0 : user.name) || " "
|
|
458
469
|
}), /* @__PURE__ */ jsxs("div", { children: [isMock || resolved ? null : showReply && user ? /* @__PURE__ */ jsx("div", {
|
|
459
|
-
className: "univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-sm univer-text-base hover:univer-bg-gray-50 dark:hover:!univer-bg-gray-800",
|
|
470
|
+
className: "univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-sm univer-text-base hover:univer-bg-gray-50 rtl:univer-ml-0 rtl:univer-mr-1 dark:hover:!univer-bg-gray-800",
|
|
460
471
|
onClick: () => onReply(user),
|
|
461
472
|
children: /* @__PURE__ */ jsx(ReplyToCommentIcon, {})
|
|
462
473
|
}) : null, isCommentBySelf && !isMock && !resolved ? /* @__PURE__ */ jsx(Dropdown, {
|
|
@@ -476,14 +487,15 @@ const ThreadCommentItem = (props) => {
|
|
|
476
487
|
})
|
|
477
488
|
}),
|
|
478
489
|
children: /* @__PURE__ */ jsx("div", {
|
|
479
|
-
className: "univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-sm univer-text-base hover:univer-bg-gray-50 dark:hover:!univer-bg-gray-800",
|
|
490
|
+
className: "univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-sm univer-text-base hover:univer-bg-gray-50 rtl:univer-ml-0 rtl:univer-mr-1 dark:hover:!univer-bg-gray-800",
|
|
480
491
|
children: /* @__PURE__ */ jsx(MoreHorizontalIcon, {})
|
|
481
492
|
})
|
|
482
493
|
}) : null] })]
|
|
483
494
|
}) : null,
|
|
484
495
|
/* @__PURE__ */ jsx("time", {
|
|
485
|
-
|
|
486
|
-
|
|
496
|
+
dir: "ltr",
|
|
497
|
+
className: "univer-mb-1 univer-block univer-text-xs/normal univer-text-gray-600 dark:!univer-text-gray-200",
|
|
498
|
+
children: dateText
|
|
487
499
|
}),
|
|
488
500
|
editing ? /* @__PURE__ */ jsx(ThreadCommentEditor, {
|
|
489
501
|
type,
|
|
@@ -530,8 +542,14 @@ const ThreadCommentTree = (props) => {
|
|
|
530
542
|
const threadCommentModel = useDependency(ThreadCommentModel);
|
|
531
543
|
const [isHover, setIsHover] = useState(false);
|
|
532
544
|
const [editingId, setEditingId] = useState("");
|
|
533
|
-
|
|
534
|
-
const comments = id ? threadCommentModel.getCommentWithChildren(unitId, subUnitId, id) : null
|
|
545
|
+
const updte$ = useMemo(() => threadCommentModel.commentUpdate$.pipe(debounceTime(16)), [threadCommentModel]);
|
|
546
|
+
const comments = useObservable(() => id ? updte$.pipe(map(() => threadCommentModel.getCommentWithChildren(unitId, subUnitId, id)), startWith(threadCommentModel.getCommentWithChildren(unitId, subUnitId, id))) : of(null), null, false, [
|
|
547
|
+
id,
|
|
548
|
+
subUnitId,
|
|
549
|
+
threadCommentModel,
|
|
550
|
+
unitId,
|
|
551
|
+
updte$
|
|
552
|
+
]);
|
|
535
553
|
const commandService = useDependency(ICommandService);
|
|
536
554
|
const userManagerService = useDependency(UserManagerService);
|
|
537
555
|
const resolved = comments === null || comments === void 0 ? void 0 : comments.root.resolved;
|
|
@@ -612,7 +630,7 @@ const ThreadCommentTree = (props) => {
|
|
|
612
630
|
className: "univer-mb-4 univer-flex univer-flex-row univer-items-center univer-justify-between univer-text-sm univer-leading-5",
|
|
613
631
|
children: [/* @__PURE__ */ jsxs("div", {
|
|
614
632
|
className: "univer-flex univer-flex-1 univer-flex-row univer-items-center univer-overflow-hidden",
|
|
615
|
-
children: [/* @__PURE__ */ jsx("div", { className: "univer-mr-2 univer-h-3.5 univer-w-[3px] univer-flex-shrink-0 univer-flex-grow-0 univer-rounded-sm univer-bg-yellow-500" }), /* @__PURE__ */ jsx(Tooltip, {
|
|
633
|
+
children: [/* @__PURE__ */ jsx("div", { className: "univer-mr-2 univer-h-3.5 univer-w-[3px] univer-flex-shrink-0 univer-flex-grow-0 univer-rounded-sm univer-bg-yellow-500 rtl:univer-ml-2 rtl:univer-mr-0" }), /* @__PURE__ */ jsx(Tooltip, {
|
|
616
634
|
showIfEllipsis: true,
|
|
617
635
|
title,
|
|
618
636
|
children: /* @__PURE__ */ jsx("span", {
|
|
@@ -623,11 +641,11 @@ const ThreadCommentTree = (props) => {
|
|
|
623
641
|
}), !!comments && /* @__PURE__ */ jsxs("div", {
|
|
624
642
|
className: "univer-flex univer-flex-shrink-0 univer-flex-grow-0 univer-flex-row",
|
|
625
643
|
children: [/* @__PURE__ */ jsx("div", {
|
|
626
|
-
className: clsx("univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-[3px] univer-text-base hover:univer-bg-gray-50 dark:hover:!univer-bg-gray-800", { "univer-text-green-500": resolved }),
|
|
644
|
+
className: clsx("univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-[3px] univer-text-base hover:univer-bg-gray-50 rtl:univer-ml-0 rtl:univer-mr-1 dark:hover:!univer-bg-gray-800", { "univer-text-green-500": resolved }),
|
|
627
645
|
onClick: handleResolve,
|
|
628
646
|
children: resolved ? /* @__PURE__ */ jsx(SuccessIcon, {}) : /* @__PURE__ */ jsx(SuccessOutlineIcon, {})
|
|
629
647
|
}), (currentUser === null || currentUser === void 0 ? void 0 : currentUser.userID) === comments.root.personId ? /* @__PURE__ */ jsx("div", {
|
|
630
|
-
className: "univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-[3px] univer-text-base hover:univer-bg-gray-50 dark:hover:!univer-bg-gray-800",
|
|
648
|
+
className: "univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-[3px] univer-text-base hover:univer-bg-gray-50 rtl:univer-ml-0 rtl:univer-mr-1 dark:hover:!univer-bg-gray-800",
|
|
631
649
|
onClick: handleDeleteRoot,
|
|
632
650
|
children: /* @__PURE__ */ jsx(DeleteIcon, {})
|
|
633
651
|
}) : null]
|
|
@@ -791,6 +809,7 @@ const ThreadCommentPanel = (props) => {
|
|
|
791
809
|
(_document$getElementB = document.getElementById(id)) === null || _document$getElementB === void 0 || _document$getElementB.scrollIntoView({ block: "center" });
|
|
792
810
|
}, [activeCommentId]);
|
|
793
811
|
const renderComment = (section) => (comment, index) => /* @__PURE__ */ jsx(ThreadCommentTree, {
|
|
812
|
+
full: true,
|
|
794
813
|
location,
|
|
795
814
|
getSubUnitName,
|
|
796
815
|
id: comment.id,
|
package/lib/umd/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
(function(e,t){typeof exports==`object`&&typeof module<`u`?t(exports,require("@univerjs/core"),require("@univerjs/ui"),require("rxjs"),require("@univerjs/thread-comment"),require("@univerjs/design"),require("react"),require("@univerjs/docs-ui"),require("react/jsx-runtime")):typeof define==`function`&&define.amd?define([`exports`,`@univerjs/core`,`@univerjs/ui`,`rxjs`,`@univerjs/thread-comment`,`@univerjs/design`,`react`,`@univerjs/docs-ui`,`react/jsx-runtime`],t):(e=typeof globalThis<`u`?globalThis:e||self,t(e.UniverThreadCommentUi={},e.UniverCore,e.UniverUi,e.rxjs,e.UniverThreadComment,e.UniverDesign,e.React,e.UniverDocsUi,e.React))})(this,function(e,t,n,r,i,a,o,s,c){Object.defineProperty(e,Symbol.toStringTag,{value:`Module`});function l(e){"@babel/helpers - typeof";return l=typeof Symbol==`function`&&typeof Symbol.iterator==`symbol`?function(e){return typeof e}:function(e){return e&&typeof Symbol==`function`&&e.constructor===Symbol&&e!==Symbol.prototype?`symbol`:typeof e},l(e)}function u(e,t){if(l(e)!=`object`||!e)return e;var n=e[Symbol.toPrimitive];if(n!==void 0){var r=n.call(e,t||`default`);if(l(r)!=`object`)return r;throw TypeError(`@@toPrimitive must return a primitive value.`)}return(t===`string`?String:Number)(e)}function d(e){var t=u(e,`string`);return l(t)==`symbol`?t:t+``}function f(e,t,n){return(t=d(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function p(e,t){return function(n,r){t(n,r,e)}}function m(e,t,n,r){var i=arguments.length,a=i<3?t:r===null?r=Object.getOwnPropertyDescriptor(t,n):r,o;if(typeof Reflect==`object`&&typeof Reflect.decorate==`function`)a=Reflect.decorate(e,t,n,r);else for(var s=e.length-1;s>=0;s--)(o=e[s])&&(a=(i<3?o(a):i>3?o(t,n,a):o(t,n))||a);return i>3&&a&&Object.defineProperty(t,n,a),a}let h=class extends t.Disposable{constructor(e,t){super(),this._sidebarService=e,this._univerInstanceService=t,f(this,`_panelVisible`,!1),f(this,`_panelVisible$`,new r.BehaviorSubject(!1)),f(this,`_activeCommentId`,void 0),f(this,`_activeCommentId$`,new r.BehaviorSubject(void 0)),f(this,`panelVisible$`,this._panelVisible$.asObservable()),f(this,`activeCommentId$`,this._activeCommentId$.asObservable()),this._init(),this.disposeWithMe(()=>{this._activeCommentId$.complete(),this._panelVisible$.complete()})}_init(){this.disposeWithMe(this._sidebarService.sidebarOptions$.subscribe(e=>{e.visible||this.setPanelVisible(!1)})),this.disposeWithMe(this._univerInstanceService.getCurrentTypeOfUnit$(t.UniverInstanceType.UNIVER_SHEET).pipe((0,r.filter)(e=>!e)).subscribe(()=>{this._sidebarService.close()}))}get panelVisible(){return this._panelVisible}get activeCommentId(){return this._activeCommentId}setPanelVisible(e){this._panelVisible=e,this._panelVisible$.next(e)}setActiveComment(e){this._activeCommentId=e,this._activeCommentId$.next(e)}};h=m([p(0,(0,t.Inject)(n.ISidebarService)),p(1,t.IUniverInstanceService)],h);let g={id:`thread-comment-ui.operation.set-active-comment`,type:t.CommandType.OPERATION,handler(e,t){return e.get(h).setActiveComment(t),!0}};var _=`@univerjs/thread-comment-ui`,v=`1.0.0-alpha.2`;let y={},b=class extends t.Plugin{constructor(e=y,n,r,i){super(),this._config=e,this._injector=n,this._commandService=r,this._configService=i;let{menu:a,...o}=(0,t.merge)({},y,this._config);a&&this._configService.setConfig(`menu`,a,{merge:!0}),this._configService.setConfig(`thread-comment-ui.config`,o)}onStarting(){var e;(0,t.mergeOverrideWithDependencies)([[h]],(e=this._config)==null?void 0:e.overrides).forEach(e=>{this._injector.add(e)}),[g].forEach(e=>{this._commandService.registerCommand(e)})}};f(b,`pluginName`,`UNIVER_THREAD_COMMENT_UI_PLUGIN`),f(b,`packageName`,_),f(b,`version`,v),f(b,`type`,t.UniverInstanceType.UNIVER_UNKNOWN),b=m([(0,t.DependentOn)(i.UniverThreadCommentPlugin),p(1,(0,t.Inject)(t.Injector)),p(2,t.ICommandService),p(3,t.IConfigService)],b);function x({ref:e,...t}){let{icon:n,id:r,className:i,extend:a,...s}=t,c=`univerjs-icon univerjs-icon-${r} ${i||``}`.trim(),l=(0,o.useRef)(`_${T()}`);return S(n,`${r}`,{defIds:n.defIds,idSuffix:l.current},{ref:e,className:c,...s},a)}function S(e,t,n,r,i){return(0,o.createElement)(e.tag,{key:t,...C(e,n,i),...r},(w(e,n).children||[]).map((r,a)=>S(r,`${t}-${e.tag}-${a}`,n,void 0,i)))}function C(e,t,n){let r={...e.attrs};n!=null&&n.colorChannel1&&r.fill===`colorChannel1`&&(r.fill=n.colorChannel1),n!=null&&n.colorChannel1&&r.stroke===`colorChannel1`&&(r.stroke=n.colorChannel1),e.tag===`mask`&&r.id&&(r.id+=t.idSuffix),Object.entries(r).forEach(([e,n])=>{e===`mask`&&typeof n==`string`&&(r[e]=n.replace(/url\(#(.*)\)/,`url(#$1${t.idSuffix})`))});let{defIds:i}=t;return!i||i.length===0?r:(e.tag===`use`&&r[`xlink:href`]&&(r[`xlink:href`]+=t.idSuffix),Object.entries(r).forEach(([e,n])=>{typeof n==`string`&&(r[e]=n.replace(/url\(#(.*)\)/,`url(#$1${t.idSuffix})`))}),r)}function w(e,t){var n;let{defIds:r}=t;return!r||r.length===0?e:e.tag===`defs`&&(n=e.children)!=null&&n.length?{...e,children:e.children.map(e=>typeof e.attrs.id==`string`&&r&&r.includes(e.attrs.id)?{...e,attrs:{...e.attrs,id:e.attrs.id+t.idSuffix}}:e)}:e}function T(){return Math.random().toString(36).substring(2,8)}x.displayName=`UniverIcon`;let E={tag:`svg`,attrs:{xmlns:`http://www.w3.org/2000/svg`,fill:`none`,viewBox:`0 0 16 16`,width:`1em`,height:`1em`},children:[{tag:`path`,attrs:{fill:`currentColor`,d:`M5.3313 1.4667C5.3313 1.13533 5.59993 0.866699 5.9313 0.866699H10.069C10.4004 0.866699 10.669 1.13533 10.669 1.4667C10.669 1.79807 10.4004 2.0667 10.069 2.0667H5.9313C5.59993 2.0667 5.3313 1.79807 5.3313 1.4667Z`}},{tag:`path`,attrs:{fill:`currentColor`,d:`M1.09985 3.64443C1.09985 3.31306 1.36848 3.04443 1.69985 3.04443H14.2999C14.6312 3.04443 14.8999 3.31306 14.8999 3.64443C14.8999 3.9758 14.6312 4.24443 14.2999 4.24443H1.69985C1.36848 4.24443 1.09985 3.9758 1.09985 3.64443Z`}},{tag:`path`,attrs:{fill:`currentColor`,d:`M6.12398 8.30171C6.35829 8.0674 6.73819 8.0674 6.97251 8.30171L8.00007 9.32928L9.02764 8.30171C9.26195 8.0674 9.64185 8.0674 9.87617 8.30171C10.1105 8.53603 10.1105 8.91593 9.87617 9.15024L8.8486 10.1778L9.87617 11.2054C10.1105 11.4397 10.1105 11.8196 9.87617 12.0539C9.64185 12.2882 9.26195 12.2882 9.02764 12.0539L8.00007 11.0263L6.97251 12.0539C6.73819 12.2882 6.35829 12.2882 6.12398 12.0539C5.88966 11.8196 5.88966 11.4397 6.12398 11.2054L7.15154 10.1778L6.12398 9.15024C5.88966 8.91593 5.88966 8.53603 6.12398 8.30171Z`}},{tag:`path`,attrs:{fill:`currentColor`,d:`M4.75332 5.22217C3.86966 5.22217 3.15332 5.93851 3.15332 6.82217V12.5331C3.15332 13.9691 4.31738 15.1332 5.75332 15.1332H10.2465C11.6825 15.1332 12.8465 13.9691 12.8465 12.5331V6.82217C12.8465 5.93851 12.1302 5.22217 11.2465 5.22217H4.75332ZM4.35332 6.82217C4.35332 6.60125 4.53241 6.42217 4.75332 6.42217H11.2465C11.4674 6.42217 11.6465 6.60125 11.6465 6.82217V12.5331C11.6465 13.3063 11.0197 13.9332 10.2465 13.9332H5.75332C4.98012 13.9332 4.35332 13.3063 4.35332 12.5331V6.82217Z`,fillRule:`evenodd`,clipRule:`evenodd`}}]},D=(0,o.forwardRef)(function(e,t){return(0,o.createElement)(x,Object.assign({},e,{id:`delete-icon`,ref:t,icon:E}))});D.displayName=`DeleteIcon`;let O={tag:`svg`,attrs:{xmlns:`http://www.w3.org/2000/svg`,fill:`none`,viewBox:`0 0 16 16`,width:`1em`,height:`1em`},children:[{tag:`path`,attrs:{fill:`currentColor`,d:`M8.6 1.99991C8.60001 1.66854 8.33138 1.39991 8.00001 1.3999C7.66864 1.3999 7.40001 1.66853 7.4 1.9999L7.39996 7.3999H1.9999C1.66853 7.3999 1.3999 7.66853 1.3999 7.9999C1.3999 8.33127 1.66853 8.5999 1.9999 8.5999H7.39995L7.3999 13.9999C7.3999 14.3313 7.66853 14.5999 7.9999 14.5999C8.33127 14.5999 8.5999 14.3313 8.5999 13.9999L8.59995 8.5999H13.9999C14.3313 8.5999 14.5999 8.33127 14.5999 7.9999C14.5999 7.66853 14.3313 7.3999 13.9999 7.3999H8.59996L8.6 1.99991Z`}}]},k=(0,o.forwardRef)(function(e,t){return(0,o.createElement)(x,Object.assign({},e,{id:`increase-icon`,ref:t,icon:O}))});k.displayName=`IncreaseIcon`;let A={tag:`svg`,attrs:{xmlns:`http://www.w3.org/2000/svg`,fill:`none`,viewBox:`0 0 16 16`,width:`1em`,height:`1em`},children:[{tag:`path`,attrs:{fill:`currentColor`,d:`M3 9C3.55228 9 4 8.55228 4 8C4 7.44772 3.55228 7 3 7C2.44772 7 2 7.44772 2 8C2 8.55228 2.44772 9 3 9Z`}},{tag:`path`,attrs:{fill:`currentColor`,d:`M8 9C8.55228 9 9 8.55228 9 8C9 7.44772 8.55228 7 8 7C7.44772 7 7 7.44772 7 8C7 8.55228 7.44772 9 8 9Z`}},{tag:`path`,attrs:{fill:`currentColor`,d:`M13 9C13.5523 9 14 8.55228 14 8C14 7.44772 13.5523 7 13 7C12.4477 7 12 7.44772 12 8C12 8.55228 12.4477 9 13 9Z`}}]},j=(0,o.forwardRef)(function(e,t){return(0,o.createElement)(x,Object.assign({},e,{id:`more-horizontal-icon`,ref:t,icon:A}))});j.displayName=`MoreHorizontalIcon`;let M={tag:`svg`,attrs:{xmlns:`http://www.w3.org/2000/svg`,fill:`none`,viewBox:`0 0 16 16`,width:`1em`,height:`1em`},children:[{tag:`path`,attrs:{stroke:`currentColor`,d:`M7.48389 10.3267V12.1905C7.48389 12.7428 7.9316 13.1905 8.48389 13.1905H11.2216L12.2955 14.2644L13.3695 13.1905H14.1593C14.7116 13.1905 15.1593 12.7428 15.1593 12.1905V8.46289C15.1593 7.91061 14.7116 7.46289 14.1593 7.46289H12.2955`,strokeLinecap:`round`,strokeLinejoin:`round`,strokeWidth:1.2}},{tag:`path`,attrs:{stroke:`currentColor`,d:`M0.840332 3.73535C0.840332 2.63078 1.73576 1.73535 2.84033 1.73535H10.2955C11.4001 1.73535 12.2955 2.63078 12.2955 3.73535V8.32676C12.2955 9.43132 11.4001 10.3268 10.2955 10.3268H5.6014L4.1695 11.7587L3.05978 10.3268H2.84033C1.73576 10.3268 0.840332 9.43133 0.840332 8.32676V3.73535Z`,strokeLinecap:`round`,strokeLinejoin:`round`,strokeWidth:1.2}},{tag:`path`,attrs:{stroke:`currentColor`,d:`M6.41016 6.1311H6.76813`,strokeLinecap:`round`,strokeWidth:1.2}},{tag:`path`,attrs:{stroke:`currentColor`,d:`M8.91626 6.1311H9.27424`,strokeLinecap:`round`,strokeWidth:1.2}},{tag:`path`,attrs:{stroke:`currentColor`,d:`M3.90454 6.1311H4.26252`,strokeLinecap:`round`,strokeWidth:1.2}}]},N=(0,o.forwardRef)(function(e,t){return(0,o.createElement)(x,Object.assign({},e,{id:`reply-to-comment-icon`,ref:t,icon:M}))});N.displayName=`ReplyToCommentIcon`;let P={tag:`svg`,attrs:{xmlns:`http://www.w3.org/2000/svg`,fill:`none`,viewBox:`0 0 16 16`,width:`1em`,height:`1em`},children:[{tag:`path`,attrs:{fill:`currentColor`,d:`M8 15C11.866 15 15 11.866 15 8C15 4.13401 11.866 1 8 1C4.13401 1 1 4.13401 1 8C1 11.866 4.13401 15 8 15ZM11.7245 6.42417C11.9588 6.18985 11.9588 5.80995 11.7245 5.57564C11.4901 5.34132 11.1102 5.34132 10.8759 5.57564L7.3002 9.15137L5.72446 7.57564C5.49014 7.34132 5.11025 7.34132 4.87593 7.57564C4.64162 7.80995 4.64162 8.18985 4.87593 8.42417L6.87593 10.4242C7.11025 10.6585 7.49014 10.6585 7.72446 10.4242L11.7245 6.42417Z`,fillRule:`evenodd`,clipRule:`evenodd`}}]},F=(0,o.forwardRef)(function(e,t){return(0,o.createElement)(x,Object.assign({},e,{id:`success-icon`,ref:t,icon:P}))});F.displayName=`SuccessIcon`;let I={tag:`svg`,attrs:{xmlns:`http://www.w3.org/2000/svg`,fill:`none`,viewBox:`0 0 17 17`,width:`1em`,height:`1em`},children:[{tag:`circle`,attrs:{cx:8.73,cy:8.4,r:6.4,stroke:`currentColor`,strokeWidth:1.2}},{tag:`path`,attrs:{stroke:`currentColor`,d:`M6.02637 8.40356L8.02637 10.4036L12.0264 6.40356`,strokeLinecap:`round`,strokeLinejoin:`round`,strokeWidth:1.2}}]},L=(0,o.forwardRef)(function(e,t){return(0,o.createElement)(x,Object.assign({},e,{id:`success-outline-icon`,ref:t,icon:I}))});L.displayName=`SuccessOutlineIcon`;function R(e,t,n){return e.id?e.id:[`thread-comment-panel-temp`,n,e.unitId,e.subUnitId,e.threadId,e.ref,e.dT,t].join(`-`)}let z=e=>{let{dataStream:t,customRanges:n}=e,r=t.endsWith(`\r
|
|
1
|
+
(function(e,t){typeof exports==`object`&&typeof module<`u`?t(exports,require("@univerjs/core"),require("@univerjs/ui"),require("rxjs"),require("@univerjs/thread-comment"),require("@univerjs/design"),require("react"),require("@univerjs/docs-ui"),require("react/jsx-runtime")):typeof define==`function`&&define.amd?define([`exports`,`@univerjs/core`,`@univerjs/ui`,`rxjs`,`@univerjs/thread-comment`,`@univerjs/design`,`react`,`@univerjs/docs-ui`,`react/jsx-runtime`],t):(e=typeof globalThis<`u`?globalThis:e||self,t(e.UniverThreadCommentUi={},e.UniverCore,e.UniverUi,e.rxjs,e.UniverThreadComment,e.UniverDesign,e.React,e.UniverDocsUi,e.React))})(this,function(e,t,n,r,i,a,o,s,c){Object.defineProperty(e,Symbol.toStringTag,{value:`Module`});function l(e){"@babel/helpers - typeof";return l=typeof Symbol==`function`&&typeof Symbol.iterator==`symbol`?function(e){return typeof e}:function(e){return e&&typeof Symbol==`function`&&e.constructor===Symbol&&e!==Symbol.prototype?`symbol`:typeof e},l(e)}function u(e,t){if(l(e)!=`object`||!e)return e;var n=e[Symbol.toPrimitive];if(n!==void 0){var r=n.call(e,t||`default`);if(l(r)!=`object`)return r;throw TypeError(`@@toPrimitive must return a primitive value.`)}return(t===`string`?String:Number)(e)}function d(e){var t=u(e,`string`);return l(t)==`symbol`?t:t+``}function f(e,t,n){return(t=d(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function p(e,t){return function(n,r){t(n,r,e)}}function m(e,t,n,r){var i=arguments.length,a=i<3?t:r===null?r=Object.getOwnPropertyDescriptor(t,n):r,o;if(typeof Reflect==`object`&&typeof Reflect.decorate==`function`)a=Reflect.decorate(e,t,n,r);else for(var s=e.length-1;s>=0;s--)(o=e[s])&&(a=(i<3?o(a):i>3?o(t,n,a):o(t,n))||a);return i>3&&a&&Object.defineProperty(t,n,a),a}let h=class extends t.Disposable{constructor(e,t){super(),this._sidebarService=e,this._univerInstanceService=t,f(this,`_panelVisible`,!1),f(this,`_panelVisible$`,new r.BehaviorSubject(!1)),f(this,`_activeCommentId`,void 0),f(this,`_activeCommentId$`,new r.BehaviorSubject(void 0)),f(this,`panelVisible$`,this._panelVisible$.asObservable()),f(this,`activeCommentId$`,this._activeCommentId$.asObservable()),this._init(),this.disposeWithMe(()=>{this._activeCommentId$.complete(),this._panelVisible$.complete()})}_init(){this.disposeWithMe(this._sidebarService.sidebarOptions$.subscribe(e=>{e.visible||this.setPanelVisible(!1)})),this.disposeWithMe(this._univerInstanceService.getCurrentTypeOfUnit$(t.UniverInstanceType.UNIVER_SHEET).pipe((0,r.filter)(e=>!e)).subscribe(()=>{this._sidebarService.close()}))}get panelVisible(){return this._panelVisible}get activeCommentId(){return this._activeCommentId}setPanelVisible(e){this._panelVisible=e,this._panelVisible$.next(e)}setActiveComment(e){this._activeCommentId=e,this._activeCommentId$.next(e)}};h=m([p(0,(0,t.Inject)(n.ISidebarService)),p(1,t.IUniverInstanceService)],h);let g={id:`thread-comment-ui.operation.set-active-comment`,type:t.CommandType.OPERATION,handler(e,t){return e.get(h).setActiveComment(t),!0}};var _=`@univerjs/thread-comment-ui`,v=`1.0.0-alpha.4`;let y={},b=class extends t.Plugin{constructor(e=y,n,r,i){super(),this._config=e,this._injector=n,this._commandService=r,this._configService=i;let{menu:a,...o}=(0,t.merge)({},y,this._config);a&&this._configService.setConfig(`menu`,a,{merge:!0}),this._configService.setConfig(`thread-comment-ui.config`,o)}onStarting(){var e;(0,t.mergeOverrideWithDependencies)([[h]],(e=this._config)==null?void 0:e.overrides).forEach(e=>{this._injector.add(e)}),[g].forEach(e=>{this._commandService.registerCommand(e)})}};f(b,`pluginName`,`UNIVER_THREAD_COMMENT_UI_PLUGIN`),f(b,`packageName`,_),f(b,`version`,v),f(b,`type`,t.UniverInstanceType.UNIVER_UNKNOWN),b=m([(0,t.DependentOn)(i.UniverThreadCommentPlugin),p(1,(0,t.Inject)(t.Injector)),p(2,t.ICommandService),p(3,t.IConfigService)],b);function x({ref:e,...t}){let{icon:n,id:r,className:i,extend:a,...s}=t,c=`univerjs-icon univerjs-icon-${r} ${i||``}`.trim(),l=(0,o.useRef)(`_${T()}`);return S(n,`${r}`,{defIds:n.defIds,idSuffix:l.current},{ref:e,className:c,...s},a)}function S(e,t,n,r,i){return(0,o.createElement)(e.tag,{key:t,...C(e,n,i),...r},(w(e,n).children||[]).map((r,a)=>S(r,`${t}-${e.tag}-${a}`,n,void 0,i)))}function C(e,t,n){let r={...e.attrs};n!=null&&n.colorChannel1&&r.fill===`colorChannel1`&&(r.fill=n.colorChannel1),n!=null&&n.colorChannel1&&r.stroke===`colorChannel1`&&(r.stroke=n.colorChannel1),e.tag===`mask`&&r.id&&(r.id+=t.idSuffix),Object.entries(r).forEach(([e,n])=>{e===`mask`&&typeof n==`string`&&(r[e]=n.replace(/url\(#(.*)\)/,`url(#$1${t.idSuffix})`))});let{defIds:i}=t;return!i||i.length===0?r:(e.tag===`use`&&r[`xlink:href`]&&(r[`xlink:href`]+=t.idSuffix),Object.entries(r).forEach(([e,n])=>{typeof n==`string`&&(r[e]=n.replace(/url\(#(.*)\)/,`url(#$1${t.idSuffix})`))}),r)}function w(e,t){var n;let{defIds:r}=t;return!r||r.length===0?e:e.tag===`defs`&&(n=e.children)!=null&&n.length?{...e,children:e.children.map(e=>typeof e.attrs.id==`string`&&r&&r.includes(e.attrs.id)?{...e,attrs:{...e.attrs,id:e.attrs.id+t.idSuffix}}:e)}:e}function T(){return Math.random().toString(36).substring(2,8)}x.displayName=`UniverIcon`;let E={tag:`svg`,attrs:{xmlns:`http://www.w3.org/2000/svg`,fill:`none`,viewBox:`0 0 16 16`,width:`1em`,height:`1em`},children:[{tag:`path`,attrs:{fill:`currentColor`,d:`M5.3313 1.4667C5.3313 1.13533 5.59993 0.866699 5.9313 0.866699H10.069C10.4004 0.866699 10.669 1.13533 10.669 1.4667C10.669 1.79807 10.4004 2.0667 10.069 2.0667H5.9313C5.59993 2.0667 5.3313 1.79807 5.3313 1.4667Z`}},{tag:`path`,attrs:{fill:`currentColor`,d:`M1.09985 3.64443C1.09985 3.31306 1.36848 3.04443 1.69985 3.04443H14.2999C14.6312 3.04443 14.8999 3.31306 14.8999 3.64443C14.8999 3.9758 14.6312 4.24443 14.2999 4.24443H1.69985C1.36848 4.24443 1.09985 3.9758 1.09985 3.64443Z`}},{tag:`path`,attrs:{fill:`currentColor`,d:`M6.12398 8.30171C6.35829 8.0674 6.73819 8.0674 6.97251 8.30171L8.00007 9.32928L9.02764 8.30171C9.26195 8.0674 9.64185 8.0674 9.87617 8.30171C10.1105 8.53603 10.1105 8.91593 9.87617 9.15024L8.8486 10.1778L9.87617 11.2054C10.1105 11.4397 10.1105 11.8196 9.87617 12.0539C9.64185 12.2882 9.26195 12.2882 9.02764 12.0539L8.00007 11.0263L6.97251 12.0539C6.73819 12.2882 6.35829 12.2882 6.12398 12.0539C5.88966 11.8196 5.88966 11.4397 6.12398 11.2054L7.15154 10.1778L6.12398 9.15024C5.88966 8.91593 5.88966 8.53603 6.12398 8.30171Z`}},{tag:`path`,attrs:{fill:`currentColor`,d:`M4.75332 5.22217C3.86966 5.22217 3.15332 5.93851 3.15332 6.82217V12.5331C3.15332 13.9691 4.31738 15.1332 5.75332 15.1332H10.2465C11.6825 15.1332 12.8465 13.9691 12.8465 12.5331V6.82217C12.8465 5.93851 12.1302 5.22217 11.2465 5.22217H4.75332ZM4.35332 6.82217C4.35332 6.60125 4.53241 6.42217 4.75332 6.42217H11.2465C11.4674 6.42217 11.6465 6.60125 11.6465 6.82217V12.5331C11.6465 13.3063 11.0197 13.9332 10.2465 13.9332H5.75332C4.98012 13.9332 4.35332 13.3063 4.35332 12.5331V6.82217Z`,fillRule:`evenodd`,clipRule:`evenodd`}}]},D=(0,o.forwardRef)(function(e,t){return(0,o.createElement)(x,Object.assign({},e,{id:`delete-icon`,ref:t,icon:E}))});D.displayName=`DeleteIcon`;let O={tag:`svg`,attrs:{xmlns:`http://www.w3.org/2000/svg`,fill:`none`,viewBox:`0 0 16 16`,width:`1em`,height:`1em`},children:[{tag:`path`,attrs:{fill:`currentColor`,d:`M8.6 1.99991C8.60001 1.66854 8.33138 1.39991 8.00001 1.3999C7.66864 1.3999 7.40001 1.66853 7.4 1.9999L7.39996 7.3999H1.9999C1.66853 7.3999 1.3999 7.66853 1.3999 7.9999C1.3999 8.33127 1.66853 8.5999 1.9999 8.5999H7.39995L7.3999 13.9999C7.3999 14.3313 7.66853 14.5999 7.9999 14.5999C8.33127 14.5999 8.5999 14.3313 8.5999 13.9999L8.59995 8.5999H13.9999C14.3313 8.5999 14.5999 8.33127 14.5999 7.9999C14.5999 7.66853 14.3313 7.3999 13.9999 7.3999H8.59996L8.6 1.99991Z`}}]},k=(0,o.forwardRef)(function(e,t){return(0,o.createElement)(x,Object.assign({},e,{id:`increase-icon`,ref:t,icon:O}))});k.displayName=`IncreaseIcon`;let A={tag:`svg`,attrs:{xmlns:`http://www.w3.org/2000/svg`,fill:`none`,viewBox:`0 0 16 16`,width:`1em`,height:`1em`},children:[{tag:`path`,attrs:{fill:`currentColor`,d:`M3 9C3.55228 9 4 8.55228 4 8C4 7.44772 3.55228 7 3 7C2.44772 7 2 7.44772 2 8C2 8.55228 2.44772 9 3 9Z`}},{tag:`path`,attrs:{fill:`currentColor`,d:`M8 9C8.55228 9 9 8.55228 9 8C9 7.44772 8.55228 7 8 7C7.44772 7 7 7.44772 7 8C7 8.55228 7.44772 9 8 9Z`}},{tag:`path`,attrs:{fill:`currentColor`,d:`M13 9C13.5523 9 14 8.55228 14 8C14 7.44772 13.5523 7 13 7C12.4477 7 12 7.44772 12 8C12 8.55228 12.4477 9 13 9Z`}}]},j=(0,o.forwardRef)(function(e,t){return(0,o.createElement)(x,Object.assign({},e,{id:`more-horizontal-icon`,ref:t,icon:A}))});j.displayName=`MoreHorizontalIcon`;let M={tag:`svg`,attrs:{xmlns:`http://www.w3.org/2000/svg`,fill:`none`,viewBox:`0 0 16 16`,width:`1em`,height:`1em`},children:[{tag:`path`,attrs:{stroke:`currentColor`,d:`M7.48389 10.3267V12.1905C7.48389 12.7428 7.9316 13.1905 8.48389 13.1905H11.2216L12.2955 14.2644L13.3695 13.1905H14.1593C14.7116 13.1905 15.1593 12.7428 15.1593 12.1905V8.46289C15.1593 7.91061 14.7116 7.46289 14.1593 7.46289H12.2955`,strokeLinecap:`round`,strokeLinejoin:`round`,strokeWidth:1.2}},{tag:`path`,attrs:{stroke:`currentColor`,d:`M0.840332 3.73535C0.840332 2.63078 1.73576 1.73535 2.84033 1.73535H10.2955C11.4001 1.73535 12.2955 2.63078 12.2955 3.73535V8.32676C12.2955 9.43132 11.4001 10.3268 10.2955 10.3268H5.6014L4.1695 11.7587L3.05978 10.3268H2.84033C1.73576 10.3268 0.840332 9.43133 0.840332 8.32676V3.73535Z`,strokeLinecap:`round`,strokeLinejoin:`round`,strokeWidth:1.2}},{tag:`path`,attrs:{stroke:`currentColor`,d:`M6.41016 6.1311H6.76813`,strokeLinecap:`round`,strokeWidth:1.2}},{tag:`path`,attrs:{stroke:`currentColor`,d:`M8.91626 6.1311H9.27424`,strokeLinecap:`round`,strokeWidth:1.2}},{tag:`path`,attrs:{stroke:`currentColor`,d:`M3.90454 6.1311H4.26252`,strokeLinecap:`round`,strokeWidth:1.2}}]},N=(0,o.forwardRef)(function(e,t){return(0,o.createElement)(x,Object.assign({},e,{id:`reply-to-comment-icon`,ref:t,icon:M}))});N.displayName=`ReplyToCommentIcon`;let P={tag:`svg`,attrs:{xmlns:`http://www.w3.org/2000/svg`,fill:`none`,viewBox:`0 0 16 16`,width:`1em`,height:`1em`},children:[{tag:`path`,attrs:{fill:`currentColor`,d:`M8 15C11.866 15 15 11.866 15 8C15 4.13401 11.866 1 8 1C4.13401 1 1 4.13401 1 8C1 11.866 4.13401 15 8 15ZM11.7245 6.42417C11.9588 6.18985 11.9588 5.80995 11.7245 5.57564C11.4901 5.34132 11.1102 5.34132 10.8759 5.57564L7.3002 9.15137L5.72446 7.57564C5.49014 7.34132 5.11025 7.34132 4.87593 7.57564C4.64162 7.80995 4.64162 8.18985 4.87593 8.42417L6.87593 10.4242C7.11025 10.6585 7.49014 10.6585 7.72446 10.4242L11.7245 6.42417Z`,fillRule:`evenodd`,clipRule:`evenodd`}}]},F=(0,o.forwardRef)(function(e,t){return(0,o.createElement)(x,Object.assign({},e,{id:`success-icon`,ref:t,icon:P}))});F.displayName=`SuccessIcon`;let I={tag:`svg`,attrs:{xmlns:`http://www.w3.org/2000/svg`,fill:`none`,viewBox:`0 0 17 17`,width:`1em`,height:`1em`},children:[{tag:`circle`,attrs:{cx:8.73,cy:8.4,r:6.4,stroke:`currentColor`,strokeWidth:1.2}},{tag:`path`,attrs:{stroke:`currentColor`,d:`M6.02637 8.40356L8.02637 10.4036L12.0264 6.40356`,strokeLinecap:`round`,strokeLinejoin:`round`,strokeWidth:1.2}}]},L=(0,o.forwardRef)(function(e,t){return(0,o.createElement)(x,Object.assign({},e,{id:`success-outline-icon`,ref:t,icon:I}))});L.displayName=`SuccessOutlineIcon`;function R(e,t,n){return e.id?e.id:[`thread-comment-panel-temp`,n,e.unitId,e.subUnitId,e.threadId,e.ref,e.dT,t].join(`-`)}let z=e=>{let{dataStream:t,customRanges:n}=e,r=t.endsWith(`\r
|
|
2
2
|
`)?t.length-2:t.length,i=[],a=0;return n==null||n.forEach(e=>{a<e.startIndex&&i.push({type:`text`,content:t.slice(a,e.startIndex)}),i.push({type:`mention`,content:{label:t.slice(e.startIndex,e.endIndex+1),id:e.rangeId}}),a=e.endIndex+1}),i.push({type:`text`,content:t.slice(a,r)}),i},B=e=>{if(!e)return[];let{paragraphs:n=[]}=e;return n.map((r,i)=>z((0,t.getBodySlice)(e,i===0?0:n[i-1].startIndex+1,r.startIndex)))},V=e=>{let n=``,r=[];return e.forEach(e=>{switch(e.type){case`text`:n+=e.content;break;case`mention`:{let i=n.length;n+=e.content.label;let a=n.length-1;r.push({rangeId:e.content.id,rangeType:t.CustomRangeType.MENTION,startIndex:i,endIndex:a,properties:{},wholeEntity:!0});break}default:break}}),n+=`\r
|
|
3
|
-
`,{textRuns:[],paragraphs:[{startIndex:n.length-2,paragraphId:(0,t.createParagraphId)(new Set),paragraphStyle:{}}],sectionBreaks:[{startIndex:n.length-1}],dataStream:n,customRanges:r}};function H(e,t,n){e.focus(t),n==null||n.focus()}function U(e){let{location:n,unitId:r,subUnitId:i,commentId:a,fallbackId:o}=e;return`${t.DOCS_COMMENT_EDITOR_UNIT_ID_KEY}_${n}_${r}_${i}_${a||o}`}function W(e){return{id:`d`,body:e,documentStyle:{}}}let G=(0,o.forwardRef)((e,r)=>{
|
|
4
|
-
\r`},personId:(s=
|
|
3
|
+
`,{textRuns:[],paragraphs:[{startIndex:n.length-2,paragraphId:(0,t.createParagraphId)(new Set),paragraphStyle:{}}],sectionBreaks:[{sectionId:(0,t.createSectionId)(new Set),startIndex:n.length-1}],dataStream:n,customRanges:r}};function H(e,t,n){e.focus(t),n==null||n.focus()}function U(e){let{location:n,unitId:r,subUnitId:i,commentId:a,fallbackId:o}=e;return`${t.DOCS_COMMENT_EDITOR_UNIT_ID_KEY}_${n}_${r}_${i}_${a||o}`}function W(e){return{id:`d`,body:e,documentStyle:{}}}let G=(0,o.forwardRef)((e,r)=>{let{comment:i,onSave:l,id:u,onCancel:d,autoFocus:f,unitId:p,type:m,editorId:h}=e,_=(0,n.useDependency)(t.ICommandService),v=(0,n.useDependency)(t.LocaleService),[y,b]=(0,o.useState)(!1),x=(0,n.useDependency)(s.IEditorService),S=(0,o.useRef)(null),C=m===t.UniverInstanceType.UNIVER_DOC?t.DOCS_NORMAL_EDITOR_UNIT_ID_KEY:p,[w,T]=(0,o.useState)(()=>{var e,n;return t.BuildTextUtils.transform.getPlainText((e=i==null||(n=i.text)==null?void 0:n.dataStream)==null?``:e)}),E=(0,o.useMemo)(()=>({keyCodes:[{keyCode:n.KeyCode.ENTER}],handler:e=>{e===n.KeyCode.ENTER&&_.executeCommand(s.BreakLineCommand.id)}}),[_]);return(0,o.useImperativeHandle)(r,()=>({reply(e){var n;if(!S.current)return;H(x,h,S.current);let r=W(e);(n=S.current)==null||n.setDocumentData(r,[{startOffset:r.body.dataStream.length-2,endOffset:r.body.dataStream.length-2,collapsed:!0}]),T(t.BuildTextUtils.transform.getPlainText(r.body.dataStream)),b(!0)}})),(0,o.useEffect)(()=>{if(!f)return;let e=setTimeout(()=>{H(x,h,S.current)});return()=>clearTimeout(e)},[f,h,x]),(0,c.jsxs)(`div`,{onClick:e=>e.preventDefault(),children:[(0,c.jsx)(`div`,{onMouseDown:()=>{H(x,h,S.current),b(!0)},children:(0,c.jsx)(s.RichTextEditor,{className:`univer-w-full`,editorRef:S,editorId:h,autoFocus:f,keyboardEventConfig:E,placeholder:v.t(`thread-comment-ui.editor.placeholder`),initialValue:(i==null?void 0:i.text)&&W(i.text),onChange:e=>{var n,r;return T(t.BuildTextUtils.transform.getPlainText((n=(r=e.body)==null?void 0:r.dataStream)==null?``:n))},onFocusChange:e=>e&&b(e),isSingle:!1,maxHeight:64,onClickOutside:()=>{setTimeout(()=>{x.focus(C)},30)}})}),y?(0,c.jsxs)(`div`,{className:`univer-mt-3 univer-flex univer-flex-row univer-justify-end univer-gap-2`,children:[(0,c.jsx)(a.Button,{type:`button`,onClick:()=>{let e=S.current;e==null||e.blur(),e==null||e.replaceText(``,!1),e==null||e.setSelectionRanges([],!1),T(``),d==null||d(),b(!1),_.executeCommand(g.id)},children:v.t(`thread-comment-ui.editor.cancel`)}),(0,c.jsx)(a.Button,{type:`button`,variant:`primary`,disabled:!w,onClick:()=>{let e=S.current;if(e){let n=t.Tools.deepClone(e.getDocumentData().body);e.blur(),e.replaceText(``,!1),e.setSelectionRanges([],!1),T(``),b(!1),l==null||l({...i,text:n})}},children:v.t(u?`thread-comment-ui.editor.save`:`thread-comment-ui.editor.reply`)})]}):null]})}),K=function(e){return e.CELL=`CELL`,e.PANEL=`PANEL`,e}({}),q=`__mock__`;function J(e,n){let r=(0,t.dateKit)(e),i=t.LOCALE_META[n].tag;return r.formatIntl(i,{year:`numeric`,month:`numeric`,day:`numeric`,hour:`2-digit`,minute:`2-digit`,hour12:!1})}let Y=e=>{let{item:r,unitId:s,subUnitId:l,editing:u,onEditingChange:d,onReply:f,resolved:p,isRoot:m,onClose:h,onDeleteComment:g,type:_,threadCommentEditorId:v}=e,y=(0,n.useDependency)(t.ICommandService),b=(0,n.useDependency)(t.LocaleService),x=(0,n.useDependency)(t.UserManagerService),S=x.getUser(r.personId),C=(0,n.useObservable)(x.currentUser$),w=(C==null?void 0:C.userID)===r.personId,T=r.id===q,[E,D]=(0,o.useState)(!1),O=(0,n.useConfigValue)(n.UI_PLUGIN_CONFIG_KEY),k=O==null?void 0:O.avatarFallback,A=(0,n.useObservable)(b.currentLocale$,b.getCurrentLocale()),M=J(r.dT,A);return(0,c.jsxs)(`div`,{className:`univer-relative univer-mb-3 univer-pl-[30px] rtl:univer-pl-0 rtl:univer-pr-[30px]`,onMouseLeave:()=>D(!1),onMouseEnter:()=>D(!0),children:[(0,c.jsx)(`div`,{className:`univer-absolute univer-left-0 univer-top-0 univer-size-6 univer-rounded-full univer-bg-cover univer-bg-center univer-bg-no-repeat rtl:univer-left-auto rtl:univer-right-0`,style:{backgroundImage:`url(${(S==null?void 0:S.avatar)||k})`}}),S?(0,c.jsxs)(`div`,{className:`univer-mb-1 univer-flex univer-h-6 univer-items-center univer-justify-between`,children:[(0,c.jsx)(`div`,{className:`univer-text-sm univer-font-medium univer-leading-5`,children:(S==null?void 0:S.name)||` `}),(0,c.jsxs)(`div`,{children:[T||p?null:E&&S?(0,c.jsx)(`div`,{className:`univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-sm univer-text-base hover:univer-bg-gray-50 rtl:univer-ml-0 rtl:univer-mr-1 dark:hover:!univer-bg-gray-800`,onClick:()=>f(S),children:(0,c.jsx)(N,{})}):null,w&&!T&&!p?(0,c.jsx)(a.Dropdown,{overlay:(0,c.jsx)(`div`,{className:`univer-rounded-lg`,children:(0,c.jsxs)(`ul`,{className:`univer-m-0 univer-box-border univer-grid univer-list-none univer-p-1.5 univer-text-sm [&_a]:univer-block [&_a]:univer-cursor-pointer [&_a]:univer-rounded [&_a]:univer-px-2 [&_a]:univer-py-1.5 [&_a]:univer-transition-colors`,children:[(0,c.jsx)(`li`,{children:(0,c.jsx)(`a`,{className:`hover:univer-bg-gray-200`,onClick:()=>d==null?void 0:d(!0),children:b.t(`thread-comment-ui.item.edit`)})}),(0,c.jsx)(`li`,{children:(0,c.jsx)(`a`,{className:`hover:univer-bg-gray-200`,onClick:()=>{(g==null?void 0:g(r))!==!1&&(y.executeCommand(m?i.DeleteCommentTreeCommand.id:i.DeleteCommentCommand.id,{unitId:s,subUnitId:l,commentId:r.id}),m&&(h==null||h()))},children:b.t(`thread-comment-ui.item.delete`)})})]})}),children:(0,c.jsx)(`div`,{className:`univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-sm univer-text-base hover:univer-bg-gray-50 rtl:univer-ml-0 rtl:univer-mr-1 dark:hover:!univer-bg-gray-800`,children:(0,c.jsx)(j,{})})}):null]})]}):null,(0,c.jsx)(`time`,{dir:`ltr`,className:`univer-mb-1 univer-block univer-text-xs/normal univer-text-gray-600 dark:!univer-text-gray-200`,children:M}),u?(0,c.jsx)(G,{type:_,id:r.id,comment:r,onCancel:()=>d==null?void 0:d(!1),autoFocus:!0,unitId:s,subUnitId:l,editorId:v,onSave:({text:e,attachments:t})=>{d==null||d(!1),y.executeCommand(i.UpdateCommentCommand.id,{unitId:s,subUnitId:l,payload:{commentId:r.id,text:e,attachments:t}})}}):(0,c.jsx)(`div`,{className:`univer-text-sm univer-text-gray-900 dark:!univer-text-white`,children:B(r.text).map((e,t)=>(0,c.jsx)(`div`,{className:`univer-break-words`,children:e.map((e,t)=>{switch(e.type){case`mention`:return(0,c.jsxs)(`a`,{className:`univer-text-primary-600`,children:[e.content.label,` `]},t);default:return e.content}})},t))})]})},X=e=>{var s,l,u;let{id:d,unitId:f,subUnitId:p,refStr:m,showEdit:h=!0,onClick:_,showHighlight:v,onClose:y,getSubUnitName:b,location:x,autoFocus:S,onMouseEnter:C,onMouseLeave:w,onAddComment:T,onDeleteComment:E,onResolve:O,type:k,style:A,full:j}=e,M=(0,n.useDependency)(i.ThreadCommentModel),[N,P]=(0,o.useState)(!1),[I,R]=(0,o.useState)(``),z=(0,o.useMemo)(()=>M.commentUpdate$.pipe((0,r.debounceTime)(16)),[M]),B=(0,n.useObservable)(()=>d?z.pipe((0,r.map)(()=>M.getCommentWithChildren(f,p,d)),(0,r.startWith)(M.getCommentWithChildren(f,p,d))):(0,r.of)(null),null,!1,[d,p,M,f,z]),H=(0,n.useDependency)(t.ICommandService),W=(0,n.useDependency)(t.UserManagerService),K=B==null?void 0:B.root.resolved,J=(0,n.useObservable)(W.currentUser$),X=(0,o.useRef)(null),ee=(0,o.useMemo)(()=>(0,t.generateRandomId)(6),[]),te=[...B?[B.root]:[{id:q,text:{dataStream:`
|
|
4
|
+
\r`},personId:(s=J==null?void 0:J.userID)==null?``:s,ref:m==null?``:m,dT:``,unitId:f,subUnitId:p,threadId:``}],...(l=B==null?void 0:B.children)==null?[]:l],Z=(0,o.useRef)(null),ne=e=>{e.stopPropagation(),K?H.executeCommand(g.id,{unitId:f,subUnitId:p,commentId:d}):H.executeCommand(g.id),H.executeCommand(i.ResolveCommentCommand.id,{unitId:f,subUnitId:p,commentId:d,resolved:!K}),O==null||O(!K)},re=e=>{e.stopPropagation(),H.executeCommand(g.id),!(B!=null&&B.root&&(E==null?void 0:E(B.root))===!1)&&(H.executeCommand(i.DeleteCommentTreeCommand.id,{unitId:f,subUnitId:p,commentId:d}),y==null||y())};(0,o.useEffect)(()=>w==null?void 0:w(),[]);let Q=b((u=B==null?void 0:B.root.subUnitId)==null?p:u),ie=h&&!I&&!K,$=`${m||(B==null?void 0:B.root.ref)||``}${Q?` · `:``}${Q}`,ae=U({location:x,unitId:f,subUnitId:p,commentId:d,fallbackId:ee});return(0,c.jsxs)(`div`,{id:`${x}-${f}-${p}-${d}`,className:(0,a.clsx)(`univer-relative univer-box-border univer-rounded-md univer-bg-white univer-p-4 dark:!univer-bg-gray-900 dark:!univer-text-white`,a.borderClassName,{"univer-w-[278px]":!j,"univer-w-full":j,"univer-shadow":!K&&(v||N||x===`CELL`)}),style:A,onClick:_,onMouseEnter:()=>{C==null||C(),P(!0)},onMouseLeave:()=>{w==null||w(),P(!1)},children:[!K&&v&&(0,c.jsx)(`div`,{className:`univer-absolute univer-left-0 univer-right-0 univer-top-0 univer-h-1.5 univer-rounded-t-md univer-bg-yellow-400`}),(0,c.jsxs)(`div`,{className:`univer-mb-4 univer-flex univer-flex-row univer-items-center univer-justify-between univer-text-sm univer-leading-5`,children:[(0,c.jsxs)(`div`,{className:`univer-flex univer-flex-1 univer-flex-row univer-items-center univer-overflow-hidden`,children:[(0,c.jsx)(`div`,{className:`univer-mr-2 univer-h-3.5 univer-w-[3px] univer-flex-shrink-0 univer-flex-grow-0 univer-rounded-sm univer-bg-yellow-500 rtl:univer-ml-2 rtl:univer-mr-0`}),(0,c.jsx)(a.Tooltip,{showIfEllipsis:!0,title:$,children:(0,c.jsx)(`span`,{className:`univer-flex-1 univer-truncate`,children:$})})]}),!!B&&(0,c.jsxs)(`div`,{className:`univer-flex univer-flex-shrink-0 univer-flex-grow-0 univer-flex-row`,children:[(0,c.jsx)(`div`,{className:(0,a.clsx)(`univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-[3px] univer-text-base hover:univer-bg-gray-50 rtl:univer-ml-0 rtl:univer-mr-1 dark:hover:!univer-bg-gray-800`,{"univer-text-green-500":K}),onClick:ne,children:K?(0,c.jsx)(F,{}):(0,c.jsx)(L,{})}),(J==null?void 0:J.userID)===B.root.personId?(0,c.jsx)(`div`,{className:`univer-ml-1 univer-inline-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-[3px] univer-text-base hover:univer-bg-gray-50 rtl:univer-ml-0 rtl:univer-mr-1 dark:hover:!univer-bg-gray-800`,onClick:re,children:(0,c.jsx)(D,{})}):null]})]}),(0,c.jsx)(`div`,{ref:Z,className:(0,a.clsx)(`univer-max-h-80 univer-overflow-y-auto univer-overflow-x-hidden`,a.scrollbarClassName),children:te.map(e=>(0,c.jsx)(Y,{unitId:f,subUnitId:p,item:e,isRoot:e.id===(B==null?void 0:B.root.id),editing:I===e.id,resolved:B==null?void 0:B.root.resolved,type:k,threadCommentEditorId:ae,onClose:y,onEditingChange:t=>{R(t?e.id:``)},onReply:e=>{e&&requestAnimationFrame(()=>{var t;(t=X.current)==null||t.reply(V([{type:`mention`,content:{id:e.userID,label:`@${e.name}`}},{type:`text`,content:` `}]))})},onAddComment:T,onDeleteComment:E},e.id))}),ie&&(0,c.jsx)(`div`,{children:(0,c.jsx)(G,{ref:X,type:k,unitId:f,subUnitId:p,editorId:ae,onSave:async({text:e,attachments:n})=>{var r,a;let o={text:e,attachments:n,dT:(0,i.getDT)(),id:(0,t.generateRandomId)(),ref:m,personId:(r=J==null?void 0:J.userID)==null?``:r,parentId:B==null?void 0:B.root.id,unitId:f,subUnitId:p,threadId:(a=B==null?void 0:B.root.threadId)==null?``:a};(T==null?void 0:T(o))!==!1&&(await H.executeCommand(i.AddCommentCommand.id,{unitId:f,subUnitId:p,comment:o}),Z.current&&(Z.current.scrollTop=Z.current.scrollHeight))},autoFocus:S||!B,onCancel:()=>{B||y==null||y()}},`${S}`)})]})};e.SetActiveCommentOperation=g,e.ThreadCommentPanel=e=>{let{unitId:r,subUnitId$:s,type:l,onAdd:u,getSubUnitName:d,onResolve:f,sortComments:p,onItemLeave:m,onItemEnter:_,disableAdd:v,tempComment:y,onAddComment:b,onDeleteComment:x,showComments:S}=e,[C,w]=(0,o.useState)(`all`),[T,E]=(0,o.useState)(`all`),D=(0,n.useDependency)(t.LocaleService),O=(0,n.useDependency)(t.UserManagerService),A=(0,n.useDependency)(i.ThreadCommentModel),[j,M]=(0,o.useState)(()=>A.getUnit(r)),N=(0,n.useObservable)((0,n.useDependency)(h).activeCommentId$),P=(0,n.useObservable)(A.commentUpdate$),F=(0,n.useDependency)(t.ICommandService),I=(0,n.useObservable)(s),L=(0,o.useRef)(!0),z=`PANEL`,B=(0,n.useObservable)(O.currentUser$),V=(0,o.useMemo)(()=>{var e;let t=C===`all`?j:(e=j.filter(e=>e.subUnitId===I))==null?[]:e,n=p==null?(e=>e):p,r=t.map(e=>{var t;return{...e.root,children:(t=e.children)==null?[]:t,users:e.relativeUsers}});if(S){let e=new Map;return r.forEach(t=>{e.set(t.id,t)}),[...S,``].map(t=>e.get(t)).filter(Boolean)}else return n(r)},[S,C,j,p,I]),H=(0,o.useMemo)(()=>[...V.filter(e=>!e.resolved),...V.filter(e=>e.resolved)],[V]),U=(0,o.useMemo)(()=>T===`resolved`?H.filter(e=>e.resolved):T===`unsolved`?H.filter(e=>!e.resolved):T===`concern_me`&&B!=null&&B.userID?H.filter(e=>e==null?void 0:e.users.has(B.userID)):H,[H,B==null?void 0:B.userID,T]),W=y?[y,...U]:U,G=W.filter(e=>!e.resolved),K=W.filter(e=>e.resolved),q=T!==`all`||C!==`all`,J=()=>{E(`all`),w(`all`)};(0,o.useEffect)(()=>{r&&M(A.getUnit(r))},[r,A,P]),(0,o.useEffect)(()=>{var e;if(!N)return;if(!L.current){L.current=!0;return}let{unitId:t,subUnitId:n,commentId:r}=N,i=`${z}-${t}-${n}-${r}`;(e=document.getElementById(i))==null||e.scrollIntoView({block:`center`})},[N]);let Y=e=>(t,n)=>(0,c.jsx)(X,{full:!0,location:z,getSubUnitName:d,id:t.id,unitId:t.unitId,subUnitId:t.subUnitId,refStr:t.ref,type:l,showEdit:(N==null?void 0:N.commentId)===t.id,showHighlight:(N==null?void 0:N.commentId)===t.id,onClick:()=>{L.current=!1,t.resolved?F.executeCommand(g.id):F.executeCommand(g.id,{unitId:t.unitId,subUnitId:t.subUnitId,commentId:t.id,temp:!1})},onMouseEnter:()=>_==null?void 0:_(t),onMouseLeave:()=>m==null?void 0:m(t),onAddComment:b,onDeleteComment:x,onResolve:e=>f==null?void 0:f(t.id,e)},R(t,n,e));return(0,c.jsxs)(`div`,{className:`univer-flex univer-min-h-full univer-flex-col univer-pb-3`,children:[(0,c.jsxs)(`div`,{className:`univer-mt-3 univer-flex univer-flex-row univer-justify-between`,children:[l===t.UniverInstanceType.UNIVER_SHEET?(0,c.jsx)(a.Select,{borderless:!0,value:C,options:[{value:`current`,label:D.t(`thread-comment-ui.filter.sheet.current`)},{value:`all`,label:D.t(`thread-comment-ui.filter.sheet.all`)}],onChange:w}):null,(0,c.jsx)(a.Select,{borderless:!0,value:T,options:[{value:`all`,label:D.t(`thread-comment-ui.filter.status.all`)},{value:`resolved`,label:D.t(`thread-comment-ui.filter.status.resolved`)},{value:`unsolved`,label:D.t(`thread-comment-ui.filter.status.unsolved`)},{value:`concern_me`,label:D.t(`thread-comment-ui.filter.status.concernMe`)}],onChange:E})]}),W.length===0?(0,c.jsxs)(`div`,{className:`univer-flex univer-flex-1 univer-flex-col univer-items-center univer-justify-center univer-text-sm univer-text-gray-600 dark:!univer-text-gray-200`,children:[D.t(`thread-comment-ui.panel.empty`),q?(0,c.jsx)(`div`,{className:`univer-mt-2 univer-flex univer-flex-row`,children:(0,c.jsx)(a.Button,{onClick:J,children:D.t(`thread-comment-ui.panel.reset`)})}):v?null:(0,c.jsx)(`div`,{className:`univer-mt-2 univer-flex univer-flex-row`,children:(0,c.jsxs)(a.Button,{onClick:u,children:[(0,c.jsx)(k,{className:`univer-mr-1.5`}),D.t(`thread-comment-ui.panel.addComment`)]})})]}):(0,c.jsxs)(`div`,{className:`univer-mt-3 univer-flex univer-flex-col univer-gap-3`,children:[G.map(Y(`unsolved`)),K.length>0&&(0,c.jsx)(`div`,{className:`univer-text-xs`,children:D.t(`thread-comment-ui.panel.solved`)}),K.map(Y(`solved`))]})]})},Object.defineProperty(e,"ThreadCommentPanelService",{enumerable:!0,get:function(){return h}}),e.ThreadCommentTree=X,e.ThreadCommentTreeLocation=K,Object.defineProperty(e,"UniverThreadCommentUIPlugin",{enumerable:!0,get:function(){return b}})});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@univerjs/thread-comment-ui",
|
|
3
|
-
"version": "1.0.0-alpha.
|
|
3
|
+
"version": "1.0.0-alpha.4",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Shared thread comment UI components and services for Univer.",
|
|
6
6
|
"author": "DreamNum Co., Ltd. <developer@univer.ai>",
|
|
@@ -58,22 +58,22 @@
|
|
|
58
58
|
"rxjs": ">=7.0.0"
|
|
59
59
|
},
|
|
60
60
|
"dependencies": {
|
|
61
|
-
"@univerjs/icons": "1.
|
|
62
|
-
"@univerjs/design": "1.0.0-alpha.
|
|
63
|
-
"@univerjs/
|
|
64
|
-
"@univerjs/
|
|
65
|
-
"@univerjs/
|
|
66
|
-
"@univerjs/ui": "1.0.0-alpha.
|
|
61
|
+
"@univerjs/icons": "1.29.0",
|
|
62
|
+
"@univerjs/design": "1.0.0-alpha.4",
|
|
63
|
+
"@univerjs/docs-ui": "1.0.0-alpha.4",
|
|
64
|
+
"@univerjs/thread-comment": "1.0.0-alpha.4",
|
|
65
|
+
"@univerjs/core": "1.0.0-alpha.4",
|
|
66
|
+
"@univerjs/ui": "1.0.0-alpha.4"
|
|
67
67
|
},
|
|
68
68
|
"devDependencies": {
|
|
69
|
-
"postcss": "^8.5.
|
|
69
|
+
"postcss": "^8.5.19",
|
|
70
70
|
"react": "18.3.1",
|
|
71
71
|
"rxjs": "^7.8.2",
|
|
72
72
|
"tailwindcss": "3.4.18",
|
|
73
73
|
"typescript": "^6.0.3",
|
|
74
|
-
"vitest": "^4.1.
|
|
75
|
-
"@univerjs-
|
|
76
|
-
"@univerjs/
|
|
74
|
+
"vitest": "^4.1.10",
|
|
75
|
+
"@univerjs/engine-render": "1.0.0-alpha.4",
|
|
76
|
+
"@univerjs-infra/shared": "1.0.0-alpha.4"
|
|
77
77
|
},
|
|
78
78
|
"scripts": {
|
|
79
79
|
"test": "vitest run",
|