@univerjs/sheets-thread-comment-ui 1.0.0-insiders.20260809-70eefdd → 1.0.0-rc.0

package/lib/es/index.js

@@ -1,16 +1,17 @@
-import { CommandType, DependentOn, Disposable, DisposableCollection, ICommandService, IConfigService, IUniverInstanceService, Inject, Injector, InterceptorEffectEnum, LocaleService, Plugin, RANGE_TYPE, Range, Rectangle, Tools, UniverInstanceType, merge } from "@univerjs/core";
+import { CommandType, DependentOn, Disposable, DisposableCollection, ICommandService, IConfigService, IPermissionService, IUniverInstanceService, Inject, Injector, InterceptorEffectEnum, LocaleService, Plugin, RANGE_TYPE, Range, Rectangle, RxDisposable, ThemeService, Tools, UniverInstanceType, UserManagerService, merge, toDisposable } from "@univerjs/core";
+import { IDrawingManagerService, UniverDrawingPlugin, getDrawingShapeKeyByDrawingSearch } from "@univerjs/drawing";
 import { INTERCEPTOR_POINT, RangeProtectionPermissionViewPoint, SetWorksheetActiveOperation, SheetInterceptorService, SheetPermissionCheckController, SheetsSelectionsService, UniverSheetsPlugin, WorkbookCommentPermission, WorksheetViewPermission, getSheetCommandTarget } from "@univerjs/sheets";
 import { SheetsThreadCommentModel, UniverSheetsThreadCommentPlugin } from "@univerjs/sheets-thread-comment";
-import { SetActiveCommentOperation, ThreadCommentPanel, ThreadCommentPanelService, ThreadCommentTree, ThreadCommentTreeLocation, UniverThreadCommentUIPlugin } from "@univerjs/thread-comment-ui";
-import { ComponentManager, ContextMenuGroup, ContextMenuPosition, IMenuManagerService, IShortcutService, ISidebarService, IconManager, KeyCode, MenuItemType, MetaKeys, RibbonInsertGroup, getMenuHiddenObservable, useDependency, useObservable } from "@univerjs/ui";
-import { COPY_TYPE, CellPopupManagerService, HoverManagerService, IEditorBridgeService, IMarkSelectionService, ISheetClipboardService, ScrollToRangeOperation, SheetCanvasPopManagerService, SheetSkeletonManagerService, UniverSheetsUIPlugin, getCurrentRangeDisable$, whenSheetEditorFocused } from "@univerjs/sheets-ui";
-import { BehaviorSubject, debounceTime, map, startWith } from "rxjs";
+import { AddCommentCommand, AddCommentMutation, DeleteCommentCommand, DeleteCommentMutation, DeleteCommentTreeCommand, IThreadCommentDataSourceService, ResolveCommentCommand, ThreadCommentAnchorKind, ThreadCommentModel, UniverThreadCommentPlugin, UpdateCommentCommand, deserializeThreadCommentAnchor, serializeThreadCommentAnchor } from "@univerjs/thread-comment";
+import { MobileThreadCommentPanel, SetActiveCommentOperation, ThreadCommentCanvasOverlay, ThreadCommentDraftService, ThreadCommentPanel, ThreadCommentPanelService, ThreadCommentTree, ThreadCommentTreeLocation, UniverThreadCommentMobileUIPlugin, UniverThreadCommentUIPlugin } from "@univerjs/thread-comment-ui";
+import { ComponentManager, ContextMenuGroup, ContextMenuPosition, FloatingObjectToolbarPosition, IMenuManagerService, IShortcutService, ISidebarService, IconManager, KeyCode, MenuItemType, MetaKeys, RibbonInsertGroup, UniverMobileUIPlugin, getMenuHiddenObservable, useDependency, useObservable } from "@univerjs/ui";
+import { COPY_TYPE, CellPopupManagerService, HoverManagerService, IEditorBridgeService, IMarkSelectionService, ISheetClipboardService, ScrollToRangeOperation, SheetCanvasPopManagerService, SheetSkeletonManagerService, UniverSheetsMobileUIPlugin, UniverSheetsUIPlugin, deriveStateFromActiveSheet$, getCurrentRangeDisable$, whenSheetEditorFocused } from "@univerjs/sheets-ui";
+import { BehaviorSubject, combineLatest, debounceTime, map, startWith } from "rxjs";
 import { IRenderManagerService, UniverRenderEnginePlugin } from "@univerjs/engine-render";
-import { AddCommentCommand, AddCommentMutation, DeleteCommentCommand, DeleteCommentMutation, DeleteCommentTreeCommand, IThreadCommentDataSourceService, ResolveCommentCommand, UniverThreadCommentPlugin, UpdateCommentCommand } from "@univerjs/thread-comment";
-import { CommentIcon } from "@univerjs/icons";
-import { jsx } from "react/jsx-runtime";
+import { CommentIcon, InsertCommentDoubleIcon } from "@univerjs/icons";
 import { serializeRange, singleReferenceToGrid } from "@univerjs/engine-formula";
 import { useCallback, useEffect, useMemo, useRef } from "react";
+import { jsx } from "react/jsx-runtime";
 
 //#region src/types/const.ts
 /**
@@ -30,6 +31,7 @@ import { useCallback, useEffect, useMemo, useRef } from "react";
 */
 const SHEETS_THREAD_COMMENT_MODAL = "univer.sheet.thread-comment-modal";
 const SHEETS_THREAD_COMMENT_PANEL = "univer.sheet.thread-comment-panel";
+const SHOW_ADD_SHEET_COMMENT_OPERATION_ID = "sheet.operation.show-comment-modal";
 const PLUGIN_NAME = "SHEET_THREAD_COMMENT_UI_PLUGIN";
 
 //#endregion
@@ -168,7 +170,7 @@ SheetsThreadCommentPopupService = __decorate([__decorateParam(0, Inject(SheetCan
 //#region src/commands/operations/comment.operation.ts
 const ShowAddSheetCommentModalOperation = {
 	type: CommandType.OPERATION,
-	id: "sheet.operation.show-comment-modal",
+	id: SHOW_ADD_SHEET_COMMENT_OPERATION_ID,
 	handler(accessor) {
 		var _selectionManagerServ;
 		const selectionManagerService = accessor.get(SheetsSelectionsService);
@@ -209,26 +211,84 @@ const ToggleSheetCommentPanelOperation = {
 		if (panelService.panelVisible) {
 			sidebarService.close();
 			panelService.setPanelVisible(false);
-		} else {
-			sidebarService.open({
-				header: { title: "sheets-thread-comment-ui.panel.title" },
-				children: { label: SHEETS_THREAD_COMMENT_PANEL },
-				width: 360
-			});
-			panelService.setPanelVisible(true);
-		}
+		} else openSheetCommentPanel(sidebarService, panelService);
+		return true;
+	}
+};
+const OpenSheetCommentPanelOperation = {
+	id: "sheet.operation.open-comment-panel",
+	type: CommandType.OPERATION,
+	handler(accessor) {
+		openSheetCommentPanel(accessor.get(ISidebarService), accessor.get(ThreadCommentPanelService));
+		return true;
+	}
+};
+function openSheetCommentPanel(sidebarService, panelService) {
+	var _sidebarService$optio;
+	if (!panelService.panelVisible || ((_sidebarService$optio = sidebarService.options.children) === null || _sidebarService$optio === void 0 ? void 0 : _sidebarService$optio.label) !== "univer.sheet.thread-comment-panel") sidebarService.open({
+		header: { title: "sheets-thread-comment-ui.panel.title" },
+		children: { label: SHEETS_THREAD_COMMENT_PANEL },
+		width: 360,
+		onClose: () => panelService.setPanelVisible(false)
+	});
+	panelService.setPanelVisible(true);
+}
+const AddSheetDrawingCommentOperation = {
+	id: "sheet.operation.add-drawing-comment",
+	type: CommandType.OPERATION,
+	handler(accessor) {
+		var _workbook$getActiveSh;
+		const drawing = accessor.get(IDrawingManagerService).getFocusDrawings()[0];
+		const workbook = accessor.get(IUniverInstanceService).getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET);
+		if (!drawing || !workbook || drawing.unitId !== workbook.getUnitId() || drawing.subUnitId !== ((_workbook$getActiveSh = workbook.getActiveSheet()) === null || _workbook$getActiveSh === void 0 ? void 0 : _workbook$getActiveSh.getSheetId())) return false;
+		accessor.get(ThreadCommentDraftService).place({
+			unitId: drawing.unitId,
+			subUnitId: drawing.subUnitId,
+			anchor: {
+				kind: ThreadCommentAnchorKind.SHEET_DRAWING,
+				pageId: drawing.subUnitId,
+				elementId: drawing.drawingId
+			}
+		});
+		const panelService = accessor.get(ThreadCommentPanelService);
+		accessor.get(ISidebarService).open({
+			header: { title: "sheets-thread-comment-ui.panel.title" },
+			children: { label: SHEETS_THREAD_COMMENT_PANEL },
+			width: 360,
+			onClose: () => panelService.setPanelVisible(false)
+		});
+		panelService.setPanelVisible(true);
 		return true;
 	}
 };
 
 //#endregion
 //#region src/menu/menu.ts
+function getDrawingCommentDisable$(accessor) {
+	const univerInstanceService = accessor.get(IUniverInstanceService);
+	const permissionService = accessor.get(IPermissionService);
+	return deriveStateFromActiveSheet$(univerInstanceService, true, ({ workbook, worksheet }) => {
+		const unitId = workbook.getUnitId();
+		const subUnitId = worksheet.getSheetId();
+		return permissionService.composePermission$([new WorkbookCommentPermission(unitId).id, new WorksheetViewPermission(unitId, subUnitId).id]).pipe(map((permissions) => permissions.some((permission) => permission.value === false)));
+	});
+}
+const drawingCommentMenuFactory = (accessor) => ({
+	id: AddSheetDrawingCommentOperation.id,
+	type: MenuItemType.BUTTON,
+	icon: "InsertCommentDoubleIcon",
+	title: "sheets-thread-comment-ui.menu.addComment",
+	tooltip: "sheets-thread-comment-ui.menu.addComment",
+	hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+	disabled$: getDrawingCommentDisable$(accessor)
+});
 const threadCommentMenuFactory = (accessor) => {
 	return {
 		id: ShowAddSheetCommentModalOperation.id,
 		type: MenuItemType.BUTTON,
-		icon: "CommentIcon",
+		icon: "InsertCommentDoubleIcon",
 		title: "sheets-thread-comment-ui.menu.addComment",
+		tooltip: "sheets-thread-comment-ui.menu.addComment",
 		hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
 		disabled$: getCurrentRangeDisable$(accessor, {
 			workbookTypes: [WorkbookCommentPermission],
@@ -242,7 +302,8 @@ const threadPanelMenuFactory = (accessor) => {
 		id: ToggleSheetCommentPanelOperation.id,
 		type: MenuItemType.BUTTON,
 		icon: "CommentIcon",
-		tooltip: "sheets-thread-comment-ui.menu.commentManagement",
+		title: "sheets-thread-comment-ui.menu.openComments",
+		tooltip: "sheets-thread-comment-ui.menu.openComments",
 		disabled$: getCurrentRangeDisable$(accessor, {
 			workbookTypes: [WorkbookCommentPermission],
 			worksheetTypes: [WorksheetViewPermission],
@@ -260,26 +321,103 @@ const AddCommentShortcut = {
 //#endregion
 //#region src/menu/schema.ts
 const menuSchema = {
-	[RibbonInsertGroup.MEDIA]: { [ToggleSheetCommentPanelOperation.id]: {
-		order: 2,
-		gridLayout: {
-			row: 1,
-			column: 3,
-			rowSpan: 2,
-			showLabel: true
+	[RibbonInsertGroup.MEDIA]: {
+		[ToggleSheetCommentPanelOperation.id]: {
+			order: 2,
+			gridLayout: {
+				row: 1,
+				column: 3,
+				showLabel: true
+			},
+			menuItemFactory: threadPanelMenuFactory
 		},
-		menuItemFactory: threadPanelMenuFactory
-	} },
+		[ShowAddSheetCommentModalOperation.id]: {
+			order: 2.1,
+			gridLayout: {
+				row: 2,
+				column: 3,
+				showLabel: true
+			},
+			menuItemFactory: threadCommentMenuFactory
+		}
+	},
 	[ContextMenuPosition.MAIN_AREA]: { [ContextMenuGroup.OTHERS]: { [ShowAddSheetCommentModalOperation.id]: {
 		order: 0,
 		menuItemFactory: threadCommentMenuFactory
+	} } },
+	[FloatingObjectToolbarPosition.SHEET]: { [AddSheetDrawingCommentOperation.id]: {
+		order: 10,
+		menuItemFactory: drawingCommentMenuFactory
+	} },
+	[ContextMenuPosition.DRAWING]: { [ContextMenuGroup.OTHERS]: { [AddSheetDrawingCommentOperation.id]: {
+		order: 0,
+		menuItemFactory: drawingCommentMenuFactory
 	} } }
 };
 
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-thread-comment-ui";
-var version = "1.0.0-insiders.20260809-70eefdd";
+var version = "1.0.0-rc.0";
+
+//#endregion
+//#region src/services/mobile/mobile-sheet-comment-draft.service.ts
+var MobileSheetCommentDraftService = class extends Disposable {
+	constructor() {
+		super();
+		_defineProperty(this, "_draft$", new BehaviorSubject(null));
+		_defineProperty(this, "draft$", this._draft$.asObservable());
+		this.disposeWithMe(() => this._draft$.complete());
+	}
+	get draft() {
+		return this._draft$.getValue();
+	}
+	place(draft) {
+		this._draft$.next(draft);
+	}
+	cancel() {
+		this._draft$.next(null);
+	}
+};
+
+//#endregion
+//#region src/commands/operations/mobile/show-add-sheet-comment.operation.ts
+const ShowAddSheetCommentMobileOperation = {
+	type: CommandType.OPERATION,
+	id: SHOW_ADD_SHEET_COMMENT_OPERATION_ID,
+	handler(accessor) {
+		var _accessor$get$getCurr;
+		const activeCell = (_accessor$get$getCurr = accessor.get(SheetsSelectionsService).getCurrentLastSelection()) === null || _accessor$get$getCurr === void 0 ? void 0 : _accessor$get$getCurr.primary;
+		if (!activeCell) return false;
+		const target = getSheetCommandTarget(accessor.get(IUniverInstanceService));
+		if (!target) return false;
+		const { unitId, subUnitId } = target;
+		const row = activeCell.startRow;
+		const column = activeCell.startColumn;
+		const panelService = accessor.get(ThreadCommentPanelService);
+		const mobileDraftService = accessor.get(MobileSheetCommentDraftService);
+		const rootId = accessor.get(SheetsThreadCommentModel).getByLocation(unitId, subUnitId, row, column);
+		accessor.get(ThreadCommentDraftService).cancel();
+		if (rootId) {
+			mobileDraftService.cancel();
+			panelService.setActiveComment({
+				unitId,
+				subUnitId,
+				commentId: rootId
+			});
+		} else {
+			panelService.setActiveComment(void 0);
+			mobileDraftService.place({
+				unitId,
+				subUnitId,
+				row,
+				column
+			});
+		}
+		openSheetCommentPanel(accessor.get(ISidebarService), panelService);
+		return true;
+	}
+};
 
 //#endregion
 //#region src/config/config.ts
@@ -287,43 +425,9 @@ const SHEETS_THREAD_COMMENT_UI_PLUGIN_CONFIG_KEY = "sheets-thread-comment.config
 const configSymbol = Symbol(SHEETS_THREAD_COMMENT_UI_PLUGIN_CONFIG_KEY);
 const defaultPluginConfig = {};
 
-//#endregion
-//#region src/views/SheetsThreadCommentCell.tsx
-const SheetsThreadCommentCell = () => {
-	const univerInstanceService = useDependency(IUniverInstanceService);
-	const sheetsThreadCommentPopupService = useDependency(SheetsThreadCommentPopupService);
-	const activePopup = useObservable(sheetsThreadCommentPopupService.activePopup$);
-	const sheetThreadCommentModel = useDependency(SheetsThreadCommentModel);
-	const rootId = useObservable(activePopup ? () => sheetThreadCommentModel.commentUpdate$.pipe(map(() => sheetThreadCommentModel.getByLocation(activePopup.unitId, activePopup.subUnitId, activePopup.row, activePopup.col)), startWith(sheetThreadCommentModel.getByLocation(activePopup.unitId, activePopup.subUnitId, activePopup.row, activePopup.col))) : null, void 0, false, [activePopup, sheetThreadCommentModel]);
-	if (!activePopup) return null;
-	const { row, col, unitId, subUnitId, trigger } = activePopup;
-	const ref = `${Tools.chatAtABC(col)}${row + 1}`;
-	const onClose = () => {
-		sheetsThreadCommentPopupService.hidePopup();
-	};
-	const getSubUnitName = (id) => {
-		var _univerInstanceServic;
-		return ((_univerInstanceServic = univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET)) === null || _univerInstanceServic === void 0 || (_univerInstanceServic = _univerInstanceServic.getSheetBySheetId(id)) === null || _univerInstanceServic === void 0 ? void 0 : _univerInstanceServic.getName()) ?? "";
-	};
-	return /* @__PURE__ */ jsx(ThreadCommentTree, {
-		onClick: () => {
-			sheetsThreadCommentPopupService.persistPopup();
-		},
-		location: ThreadCommentTreeLocation.CELL,
-		id: rootId,
-		unitId,
-		subUnitId,
-		type: UniverInstanceType.UNIVER_SHEET,
-		refStr: ref,
-		onClose,
-		getSubUnitName,
-		autoFocus: trigger === "context-menu"
-	});
-};
-
 //#endregion
 //#region src/views/SheetsThreadCommentPanel.tsx
-const SheetsThreadCommentPanel = () => {
+const SheetsThreadCommentPanel = ({ ThreadCommentPanelComponent = ThreadCommentPanel } = {}) => {
 	var _workbook$getActiveSh;
 	const markSelectionService = useDependency(IMarkSelectionService);
 	const univerInstanceService = useDependency(IUniverInstanceService);
@@ -331,6 +435,19 @@ const SheetsThreadCommentPanel = () => {
 	const workbook = univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET);
 	const unitId = workbook.getUnitId();
 	const commandService = useDependency(ICommandService);
+	const draftService = useDependency(ThreadCommentDraftService);
+	const userManagerService = useDependency(UserManagerService);
+	const draft = useObservable(draftService.draft$, draftService.draft);
+	const tempDrawingComment = (draft === null || draft === void 0 ? void 0 : draft.anchor.kind) === ThreadCommentAnchorKind.SHEET_DRAWING && draft.unitId === unitId ? {
+		id: "",
+		threadId: "",
+		unitId: draft.unitId,
+		subUnitId: draft.subUnitId,
+		ref: serializeThreadCommentAnchor(draft.anchor),
+		dT: "",
+		personId: userManagerService.getCurrentUser().userID,
+		text: { dataStream: "\r\n" }
+	} : null;
 	const subUnitId$ = useMemo(() => workbook.activeSheet$.pipe(map((i) => i === null || i === void 0 ? void 0 : i.getSheetId())), [workbook.activeSheet$]);
 	const subUnitId = useObservable(subUnitId$, (_workbook$getActiveSh = workbook.getActiveSheet()) === null || _workbook$getActiveSh === void 0 ? void 0 : _workbook$getActiveSh.getSheetId());
 	const hoverShapeId = useRef(null);
@@ -345,6 +462,15 @@ const SheetsThreadCommentPanel = () => {
 		});
 		const sort = (comments) => {
 			return comments.map((comment) => {
+				const anchor = deserializeThreadCommentAnchor(comment.ref);
+				if ((anchor === null || anchor === void 0 ? void 0 : anchor.kind) === ThreadCommentAnchorKind.SHEET_DRAWING) return {
+					...comment,
+					p: [
+						sheetIndex[comment.subUnitId] ?? 0,
+						Number.MAX_SAFE_INTEGER,
+						0
+					]
+				};
 				const ref = singleReferenceToGrid(comment.ref);
 				const p = [
 					sheetIndex[comment.subUnitId] ?? 0,
@@ -366,6 +492,7 @@ const SheetsThreadCommentPanel = () => {
 		return [...sort(comments.filter((comment) => !comment.resolved)), ...sort(comments.filter((comment) => comment.resolved))];
 	}, [workbook]);
 	const showShape = useCallback((comment) => {
+		if (deserializeThreadCommentAnchor(comment.ref)) return null;
 		if (comment.unitId === unitId && comment.subUnitId === subUnitId && !comment.resolved) {
 			const { row, column } = singleReferenceToGrid(comment.ref);
 			const worksheet = workbook.getSheetBySheetId(comment.subUnitId);
@@ -422,7 +549,7 @@ const SheetsThreadCommentPanel = () => {
 			hoverShapeId.current = null;
 		}
 	}, [markSelectionService, panelVisible]);
-	return /* @__PURE__ */ jsx(ThreadCommentPanel, {
+	return /* @__PURE__ */ jsx(ThreadCommentPanelComponent, {
 		unitId,
 		subUnitId$,
 		type: UniverInstanceType.UNIVER_SHEET,
@@ -435,12 +562,50 @@ const SheetsThreadCommentPanel = () => {
 		onDeleteComment: () => {
 			handleLeave();
 			return true;
+		},
+		tempComment: tempDrawingComment,
+		onTempCommentClose: () => draftService.cancel(),
+		formatRef: (comment) => {
+			const anchor = deserializeThreadCommentAnchor(comment.ref);
+			return (anchor === null || anchor === void 0 ? void 0 : anchor.kind) === ThreadCommentAnchorKind.SHEET_DRAWING ? `#${anchor.elementId}` : comment.ref;
 		}
 	});
 };
 
 //#endregion
-//#region src/controllers/components.controller.ts
+//#region src/views/mobile/MobileSheetsThreadCommentPanel.tsx
+function MobileSheetsThreadCommentPanelContent(props) {
+	const draftService = useDependency(MobileSheetCommentDraftService);
+	const userManagerService = useDependency(UserManagerService);
+	const draft = useObservable(draftService.draft$, draftService.draft);
+	const tempCellComment = (draft === null || draft === void 0 ? void 0 : draft.unitId) === props.unitId ? {
+		id: "",
+		threadId: "",
+		unitId: draft.unitId,
+		subUnitId: draft.subUnitId,
+		ref: `${Tools.chatAtABC(draft.column)}${draft.row + 1}`,
+		dT: "",
+		personId: userManagerService.getCurrentUser().userID,
+		text: { dataStream: "\r\n" }
+	} : null;
+	const handleTempCommentClose = () => {
+		var _props$onTempCommentC;
+		draftService.cancel();
+		(_props$onTempCommentC = props.onTempCommentClose) === null || _props$onTempCommentC === void 0 || _props$onTempCommentC.call(props);
+	};
+	return /* @__PURE__ */ jsx(MobileThreadCommentPanel, {
+		...props,
+		tempComment: props.tempComment ?? tempCellComment,
+		onTempCommentClose: handleTempCommentClose,
+		autoFocusActiveComment: true
+	});
+}
+function MobileSheetsThreadCommentPanel() {
+	return /* @__PURE__ */ jsx(SheetsThreadCommentPanel, { ThreadCommentPanelComponent: MobileSheetsThreadCommentPanelContent });
+}
+
+//#endregion
+//#region src/controllers/mobile/components.controller.ts
 /**
 * Copyright 2023-present DreamNum Co., Ltd.
 *
@@ -456,24 +621,108 @@ const SheetsThreadCommentPanel = () => {
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-let ComponentsController = class ComponentsController extends Disposable {
+let MobileComponentsController = class MobileComponentsController extends Disposable {
 	constructor(_componentManager, _iconManager) {
 		super();
 		this._componentManager = _componentManager;
 		this._iconManager = _iconManager;
-		this._registerComponents();
-		this._registerIcons();
-	}
-	_registerComponents() {
-		[[SHEETS_THREAD_COMMENT_MODAL, SheetsThreadCommentCell], [SHEETS_THREAD_COMMENT_PANEL, SheetsThreadCommentPanel]].forEach(([key, comp]) => {
-			this.disposeWithMe(this._componentManager.register(key, comp));
-		});
+		this.disposeWithMe(this._componentManager.register(SHEETS_THREAD_COMMENT_PANEL, MobileSheetsThreadCommentPanel));
+		this.disposeWithMe(this._iconManager.register({
+			CommentIcon,
+			InsertCommentDoubleIcon
+		}));
 	}
-	_registerIcons() {
-		this.disposeWithMe(this._iconManager.register({ CommentIcon }));
+};
+MobileComponentsController = __decorate([__decorateParam(0, Inject(ComponentManager)), __decorateParam(1, Inject(IconManager))], MobileComponentsController);
+
+//#endregion
+//#region src/menu/mobile-menu.ts
+function getMobileThreadCommentMenuTitle(accessor) {
+	var _selectionService$get;
+	const selectionService = accessor.get(SheetsSelectionsService);
+	const selection = (_selectionService$get = selectionService.getCurrentLastSelection()) === null || _selectionService$get === void 0 ? void 0 : _selectionService$get.primary;
+	const selectionParam = selectionService.currentSelectionParam;
+	if (!selection || !selectionParam) return "sheets-thread-comment-ui.menu.addComment";
+	return accessor.get(SheetsThreadCommentModel).getByLocation(selectionParam.unitId, selectionParam.sheetId, selection.startRow, selection.startColumn) ? "sheets-thread-comment-ui.menu.openComments" : "sheets-thread-comment-ui.menu.addComment";
+}
+const mobileThreadCommentMenuFactory = (accessor) => ({
+	id: ShowAddSheetCommentMobileOperation.id,
+	type: MenuItemType.BUTTON,
+	icon: "InsertCommentDoubleIcon",
+	title: "sheets-thread-comment-ui.menu.addComment",
+	hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+	disabled$: getCurrentRangeDisable$(accessor, {
+		workbookTypes: [WorkbookCommentPermission],
+		worksheetTypes: [WorksheetViewPermission],
+		rangeTypes: [RangeProtectionPermissionViewPoint]
+	})
+});
+const mobileContextThreadCommentMenuFactory = (accessor) => ({
+	...mobileThreadCommentMenuFactory(accessor),
+	title: getMobileThreadCommentMenuTitle(accessor)
+});
+
+//#endregion
+//#region src/menu/mobile-schema.ts
+const mobileMenuSchema = {
+	[RibbonInsertGroup.MEDIA]: {
+		[ToggleSheetCommentPanelOperation.id]: {
+			order: 2,
+			gridLayout: {
+				row: 1,
+				column: 3,
+				showLabel: true
+			},
+			menuItemFactory: threadPanelMenuFactory
+		},
+		[ShowAddSheetCommentMobileOperation.id]: {
+			order: 2.1,
+			gridLayout: {
+				row: 2,
+				column: 3,
+				showLabel: true
+			},
+			menuItemFactory: mobileThreadCommentMenuFactory
+		}
+	},
+	[ContextMenuPosition.MAIN_AREA]: { [ContextMenuGroup.OTHERS]: { [ShowAddSheetCommentMobileOperation.id]: {
+		order: 0,
+		menuItemFactory: mobileContextThreadCommentMenuFactory
+	} } },
+	[FloatingObjectToolbarPosition.SHEET]: { [AddSheetDrawingCommentOperation.id]: {
+		order: 10,
+		menuItemFactory: drawingCommentMenuFactory
+	} },
+	[ContextMenuPosition.DRAWING]: { [ContextMenuGroup.OTHERS]: { [AddSheetDrawingCommentOperation.id]: {
+		order: 0,
+		menuItemFactory: drawingCommentMenuFactory
+	} } }
+};
+
+//#endregion
+//#region src/controllers/mobile/sheets-thread-comment.controller.ts
+/**
+* Copyright 2023-present DreamNum Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+let SheetsThreadCommentMobileController = class SheetsThreadCommentMobileController extends Disposable {
+	constructor(menuManagerService) {
+		super();
+		menuManagerService.mergeMenu(mobileMenuSchema);
 	}
 };
-ComponentsController = __decorate([__decorateParam(0, Inject(ComponentManager)), __decorateParam(1, Inject(IconManager))], ComponentsController);
+SheetsThreadCommentMobileController = __decorate([__decorateParam(0, IMenuManagerService)], SheetsThreadCommentMobileController);
 
 //#endregion
 //#region src/controllers/render-controllers/render.controller.ts
@@ -652,6 +901,331 @@ SheetsThreadCommentCopyPasteController = __decorate([
 	__decorateParam(2, IThreadCommentDataSourceService)
 ], SheetsThreadCommentCopyPasteController);
 
+//#endregion
+//#region src/controllers/sheets-thread-comment-permission.controller.ts
+let SheetsThreadCommentPermissionController = class SheetsThreadCommentPermissionController extends Disposable {
+	constructor(_localeService, _commandService, _sheetPermissionCheckController, _sheetsThreadCommentModel) {
+		super();
+		this._localeService = _localeService;
+		this._commandService = _commandService;
+		this._sheetPermissionCheckController = _sheetPermissionCheckController;
+		this._sheetsThreadCommentModel = _sheetsThreadCommentModel;
+		this._commandExecutedListener();
+	}
+	_commandExecutedListener() {
+		this.disposeWithMe(this._commandService.beforeCommandExecuted((command) => {
+			const { id } = command;
+			if (id === AddSheetDrawingCommentOperation.id || id === ShowAddSheetCommentModalOperation.id || id === ToggleSheetCommentPanelOperation.id) {
+				if (!this._sheetPermissionCheckController.permissionCheckWithoutRange({
+					workbookTypes: [WorkbookCommentPermission],
+					worksheetTypes: [WorksheetViewPermission]
+				})) this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("sheets-thread-comment-ui.permission.commentErr"));
+			} else if (id === AddCommentCommand.id) {
+				const { unitId, subUnitId, comment } = command.params;
+				if (!this._hasCommentPermission(unitId, subUnitId, comment.ref)) this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("sheets-thread-comment-ui.permission.commentErr"));
+			} else if (id === UpdateCommentCommand.id) {
+				const { unitId, subUnitId, payload } = command.params;
+				const { commentId } = payload;
+				const comment = this._sheetsThreadCommentModel.getComment(unitId, subUnitId, commentId);
+				if (comment && !this._hasCommentPermission(unitId, subUnitId, comment.ref)) this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("sheets-thread-comment-ui.permission.commentErr"));
+			} else if (id === ResolveCommentCommand.id || id === DeleteCommentCommand.id || id === DeleteCommentTreeCommand.id) {
+				const { unitId, subUnitId, commentId } = command.params;
+				const comment = this._sheetsThreadCommentModel.getComment(unitId, subUnitId, commentId);
+				if (comment && !this._hasCommentPermission(unitId, subUnitId, comment.ref)) this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("sheets-thread-comment-ui.permission.commentErr"));
+			}
+		}));
+	}
+	_hasCommentPermission(unitId, subUnitId, ref) {
+		const permissionTypes = {
+			workbookTypes: [WorkbookCommentPermission],
+			worksheetTypes: [WorksheetViewPermission]
+		};
+		const anchor = deserializeThreadCommentAnchor(ref);
+		if ((anchor === null || anchor === void 0 ? void 0 : anchor.kind) === ThreadCommentAnchorKind.SHEET_DRAWING) return this._sheetPermissionCheckController.permissionCheckWithoutRange(permissionTypes, unitId, subUnitId);
+		const { row, column } = singleReferenceToGrid(ref);
+		if (!Number.isFinite(row) || !Number.isFinite(column)) return false;
+		return this._sheetPermissionCheckController.permissionCheckWithRanges({
+			...permissionTypes,
+			rangeTypes: [RangeProtectionPermissionViewPoint]
+		}, [{
+			startRow: row,
+			startColumn: column,
+			endRow: row,
+			endColumn: column
+		}], unitId, subUnitId);
+	}
+};
+SheetsThreadCommentPermissionController = __decorate([
+	__decorateParam(0, Inject(LocaleService)),
+	__decorateParam(1, ICommandService),
+	__decorateParam(2, Inject(SheetPermissionCheckController)),
+	__decorateParam(3, Inject(SheetsThreadCommentModel))
+], SheetsThreadCommentPermissionController);
+
+//#endregion
+//#region src/mobile-plugin.ts
+let UniverSheetsThreadCommentMobileUIPlugin = class UniverSheetsThreadCommentMobileUIPlugin extends Plugin {
+	constructor(_config = defaultPluginConfig, _injector, _commandService, _configService) {
+		super();
+		this._config = _config;
+		this._injector = _injector;
+		this._commandService = _commandService;
+		this._configService = _configService;
+		const { menu, ...rest } = merge({}, defaultPluginConfig, this._config);
+		if (menu) this._configService.setConfig("menu", menu, { merge: true });
+		this._configService.setConfig(SHEETS_THREAD_COMMENT_UI_PLUGIN_CONFIG_KEY, rest);
+	}
+	onStarting() {
+		[
+			[MobileComponentsController],
+			[SheetsThreadCommentMobileController],
+			[SheetsThreadCommentRenderController],
+			[SheetsThreadCommentCopyPasteController],
+			[SheetsThreadCommentPopupService],
+			[SheetsThreadCommentPermissionController],
+			[MobileSheetCommentDraftService]
+		].forEach((dependency) => this._injector.add(dependency));
+		this._injector.get(MobileComponentsController);
+		[
+			AddSheetDrawingCommentOperation,
+			OpenSheetCommentPanelOperation,
+			ShowAddSheetCommentMobileOperation,
+			ToggleSheetCommentPanelOperation
+		].forEach((command) => this._commandService.registerCommand(command));
+		this._injector.get(SheetsThreadCommentMobileController);
+	}
+	onReady() {
+		this._injector.get(SheetsThreadCommentRenderController);
+	}
+	onRendered() {
+		this._injector.get(SheetsThreadCommentCopyPasteController);
+		this._injector.get(SheetsThreadCommentPermissionController);
+	}
+};
+_defineProperty(UniverSheetsThreadCommentMobileUIPlugin, "pluginName", PLUGIN_NAME);
+_defineProperty(UniverSheetsThreadCommentMobileUIPlugin, "packageName", name);
+_defineProperty(UniverSheetsThreadCommentMobileUIPlugin, "version", version);
+_defineProperty(UniverSheetsThreadCommentMobileUIPlugin, "type", UniverInstanceType.UNIVER_SHEET);
+UniverSheetsThreadCommentMobileUIPlugin = __decorate([
+	DependentOn(UniverRenderEnginePlugin, UniverThreadCommentPlugin, UniverSheetsPlugin, UniverThreadCommentMobileUIPlugin, UniverSheetsThreadCommentPlugin, UniverMobileUIPlugin, UniverSheetsMobileUIPlugin),
+	__decorateParam(1, Inject(Injector)),
+	__decorateParam(2, Inject(ICommandService)),
+	__decorateParam(3, IConfigService)
+], UniverSheetsThreadCommentMobileUIPlugin);
+
+//#endregion
+//#region src/views/SheetsThreadCommentCell.tsx
+const SheetsThreadCommentCell = () => {
+	const univerInstanceService = useDependency(IUniverInstanceService);
+	const sheetsThreadCommentPopupService = useDependency(SheetsThreadCommentPopupService);
+	const activePopup = useObservable(sheetsThreadCommentPopupService.activePopup$);
+	const sheetThreadCommentModel = useDependency(SheetsThreadCommentModel);
+	const getRootId = () => {
+		if (!activePopup) return;
+		const { unitId, subUnitId, row, col, commentId } = activePopup;
+		const activeComment = commentId ? sheetThreadCommentModel.getAllByLocation(unitId, subUnitId, row, col).find((comment) => comment.id === commentId) : void 0;
+		return activeComment && !activeComment.resolved ? activeComment.id : sheetThreadCommentModel.getByLocation(unitId, subUnitId, row, col);
+	};
+	const rootId = useObservable(activePopup ? () => sheetThreadCommentModel.commentUpdate$.pipe(map(() => getRootId()), startWith(getRootId())) : null, void 0, false, [activePopup, sheetThreadCommentModel]);
+	if (!activePopup) return null;
+	const { row, col, unitId, subUnitId, trigger } = activePopup;
+	const ref = `${Tools.chatAtABC(col)}${row + 1}`;
+	const onClose = () => {
+		sheetsThreadCommentPopupService.hidePopup();
+	};
+	const getSubUnitName = (id) => {
+		var _univerInstanceServic;
+		return ((_univerInstanceServic = univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET)) === null || _univerInstanceServic === void 0 || (_univerInstanceServic = _univerInstanceServic.getSheetBySheetId(id)) === null || _univerInstanceServic === void 0 ? void 0 : _univerInstanceServic.getName()) ?? "";
+	};
+	return /* @__PURE__ */ jsx(ThreadCommentTree, {
+		onClick: () => {
+			sheetsThreadCommentPopupService.persistPopup();
+		},
+		location: ThreadCommentTreeLocation.CELL,
+		id: rootId,
+		unitId,
+		subUnitId,
+		type: UniverInstanceType.UNIVER_SHEET,
+		refStr: ref,
+		onClose,
+		getSubUnitName,
+		autoFocus: trigger === "context-menu"
+	});
+};
+
+//#endregion
+//#region src/controllers/components.controller.ts
+/**
+* Copyright 2023-present DreamNum Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+let ComponentsController = class ComponentsController extends Disposable {
+	constructor(_componentManager, _iconManager) {
+		super();
+		this._componentManager = _componentManager;
+		this._iconManager = _iconManager;
+		this._registerComponents();
+		this._registerIcons();
+	}
+	_registerComponents() {
+		[[SHEETS_THREAD_COMMENT_MODAL, SheetsThreadCommentCell], [SHEETS_THREAD_COMMENT_PANEL, SheetsThreadCommentPanel]].forEach(([key, comp]) => {
+			this.disposeWithMe(this._componentManager.register(key, comp));
+		});
+	}
+	_registerIcons() {
+		this.disposeWithMe(this._iconManager.register({
+			CommentIcon,
+			InsertCommentDoubleIcon
+		}));
+	}
+};
+ComponentsController = __decorate([__decorateParam(0, Inject(ComponentManager)), __decorateParam(1, Inject(IconManager))], ComponentsController);
+
+//#endregion
+//#region src/controllers/render-controllers/drawing.render-controller.ts
+const SHEET_COMMENT_DRAWING_OVERLAY_KEY = "sheet-thread-comment-drawing-overlay";
+const SHEET_COMMENT_DRAWING_OVERLAY_LAYER_INDEX = 10100;
+let SheetsThreadCommentDrawingRenderController = class SheetsThreadCommentDrawingRenderController extends RxDisposable {
+	constructor(_context, _commandService, _drawingManagerService, _commentModel, _panelService, _themeService) {
+		super();
+		this._context = _context;
+		this._commandService = _commandService;
+		this._drawingManagerService = _drawingManagerService;
+		this._commentModel = _commentModel;
+		this._panelService = _panelService;
+		this._themeService = _themeService;
+		_defineProperty(this, "_overlay", void 0);
+		this._overlay = new ThreadCommentCanvasOverlay(SHEET_COMMENT_DRAWING_OVERLAY_KEY, {
+			...this._getColors(),
+			zoomRatio: 1,
+			markers: [],
+			underlines: []
+		});
+		this._context.scene.addObject(this._overlay, SHEET_COMMENT_DRAWING_OVERLAY_LAYER_INDEX);
+		this.disposeWithMe(toDisposable(this._overlay.onPointerDown$.subscribeEvent((_event, state) => this._onOverlayPointerDown(state))));
+		this.disposeWithMe(toDisposable(this._context.engine.onTransformChange$.subscribeEvent(() => this._syncOverlay())));
+		this.disposeWithMe(this._context.unit.activeSheet$.subscribe(() => this._syncOverlay()));
+		this.disposeWithMe(this._commentModel.commentUpdate$.subscribe((update) => {
+			if (update.unitId === this._context.unitId) this._syncOverlay();
+		}));
+		[this._panelService.activeCommentId$, this._panelService.hoveredCommentId$].forEach((observable) => this.disposeWithMe(observable.subscribe(() => this._syncOverlay())));
+		[
+			this._drawingManagerService.add$,
+			this._drawingManagerService.update$,
+			this._drawingManagerService.remove$
+		].forEach((observable) => this.disposeWithMe(observable.subscribe((drawings) => {
+			if (drawings.some((drawing) => drawing.unitId === this._context.unitId)) this._syncOverlay();
+		})));
+		this.disposeWithMe(this._themeService.currentTheme$.subscribe(() => this._syncOverlay()));
+		this._syncOverlay();
+	}
+	_onOverlayPointerDown(state) {
+		var _this$_context$unit$g;
+		const commentId = this._overlay.hitCommentId;
+		const subUnitId = (_this$_context$unit$g = this._context.unit.getActiveSheet()) === null || _this$_context$unit$g === void 0 ? void 0 : _this$_context$unit$g.getSheetId();
+		if (!commentId || !subUnitId) return;
+		state.stopPropagation();
+		this._panelService.setActiveComment({
+			unitId: this._context.unitId,
+			subUnitId,
+			commentId,
+			trigger: "sheet-canvas"
+		});
+		this._commandService.executeCommand(OpenSheetCommentPanelOperation.id).catch(() => void 0);
+	}
+	_syncOverlay() {
+		const worksheet = this._context.unit.getActiveSheet();
+		const subUnitId = worksheet === null || worksheet === void 0 ? void 0 : worksheet.getSheetId();
+		if (!worksheet || !subUnitId) {
+			this._overlay.updateState({
+				markers: [],
+				underlines: [],
+				focusedCommentIds: [],
+				focusOutlines: []
+			});
+			return;
+		}
+		const underlines = /* @__PURE__ */ new Map();
+		this._commentModel.query({
+			unitIds: [this._context.unitId],
+			subUnitIds: [subUnitId],
+			anchorKinds: [ThreadCommentAnchorKind.SHEET_DRAWING],
+			resolved: false
+		}).forEach(({ root }) => {
+			const anchor = deserializeThreadCommentAnchor(root.ref);
+			if ((anchor === null || anchor === void 0 ? void 0 : anchor.kind) !== ThreadCommentAnchorKind.SHEET_DRAWING) return;
+			const outline = this._getDrawingOutline(subUnitId, anchor.elementId);
+			if (outline) underlines.set(anchor.elementId, {
+				commentId: root.id,
+				left: outline.left,
+				top: outline.top + outline.height + 2 / worksheet.getZoomRatio(),
+				width: outline.width
+			});
+		});
+		const focusedCommentIds = [];
+		const focusOutlines = /* @__PURE__ */ new Map();
+		[this._panelService.activeCommentId, this._panelService.hoveredCommentId].forEach((target) => {
+			if (!target || target.unitId !== this._context.unitId || target.subUnitId !== subUnitId) return;
+			const comment = this._commentModel.getComment(target.unitId, target.subUnitId, target.commentId);
+			const anchor = comment && deserializeThreadCommentAnchor(comment.ref);
+			if ((anchor === null || anchor === void 0 ? void 0 : anchor.kind) !== ThreadCommentAnchorKind.SHEET_DRAWING) return;
+			focusedCommentIds.push(target.commentId);
+			const outline = this._getDrawingOutline(subUnitId, anchor.elementId);
+			if (outline) focusOutlines.set(anchor.elementId, outline);
+		});
+		this._overlay.updateState({
+			...this._getColors(),
+			zoomRatio: worksheet.getZoomRatio(),
+			markers: [],
+			underlines: Array.from(underlines.values()),
+			focusedCommentIds,
+			focusOutlines: Array.from(focusOutlines.values())
+		});
+	}
+	_getDrawingOutline(subUnitId, drawingId) {
+		var _this$_context$scene$, _this$_context$scene;
+		const objectKey = getDrawingShapeKeyByDrawingSearch({
+			unitId: this._context.unitId,
+			subUnitId,
+			drawingId
+		});
+		const object = ((_this$_context$scene$ = (_this$_context$scene = this._context.scene).getObjectIncludeInGroup) === null || _this$_context$scene$ === void 0 ? void 0 : _this$_context$scene$.call(_this$_context$scene, objectKey)) ?? this._context.scene.getObject(objectKey);
+		if (!object) return null;
+		const bounds = object.getRealBound();
+		return {
+			left: bounds.left,
+			top: bounds.top,
+			width: bounds.width,
+			height: bounds.height
+		};
+	}
+	_getColors() {
+		return {
+			accentColor: this._themeService.getColorFromTheme("yellow.400"),
+			foregroundColor: this._themeService.getColorFromTheme("gray.900"),
+			outlineColor: this._themeService.getColorFromTheme("white")
+		};
+	}
+};
+SheetsThreadCommentDrawingRenderController = __decorate([
+	__decorateParam(1, ICommandService),
+	__decorateParam(2, IDrawingManagerService),
+	__decorateParam(3, Inject(ThreadCommentModel)),
+	__decorateParam(4, Inject(ThreadCommentPanelService)),
+	__decorateParam(5, Inject(ThemeService))
+], SheetsThreadCommentDrawingRenderController);
+
 //#endregion
 //#region src/controllers/sheets-thread-comment-hover.controller.ts
 /**
@@ -717,84 +1291,11 @@ SheetsThreadCommentHoverController = __decorate([
 	__decorateParam(3, Inject(SheetPermissionCheckController))
 ], SheetsThreadCommentHoverController);
 
-//#endregion
-//#region src/controllers/sheets-thread-comment-permission.controller.ts
-let SheetsThreadCommentPermissionController = class SheetsThreadCommentPermissionController extends Disposable {
-	constructor(_localeService, _commandService, _sheetPermissionCheckController, _sheetsThreadCommentModel) {
-		super();
-		this._localeService = _localeService;
-		this._commandService = _commandService;
-		this._sheetPermissionCheckController = _sheetPermissionCheckController;
-		this._sheetsThreadCommentModel = _sheetsThreadCommentModel;
-		this._commandExecutedListener();
-	}
-	_commandExecutedListener() {
-		this.disposeWithMe(this._commandService.beforeCommandExecuted((command) => {
-			const { id } = command;
-			if (id === ShowAddSheetCommentModalOperation.id || id === ToggleSheetCommentPanelOperation.id) {
-				if (!this._sheetPermissionCheckController.permissionCheckWithoutRange({
-					workbookTypes: [WorkbookCommentPermission],
-					worksheetTypes: [WorksheetViewPermission]
-				})) this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("sheets-thread-comment-ui.permission.commentErr"));
-			} else if (id === AddCommentCommand.id) {
-				const { unitId, subUnitId, comment } = command.params;
-				const { row, column } = singleReferenceToGrid(comment.ref);
-				if (!this._sheetPermissionCheckController.permissionCheckWithRanges({
-					workbookTypes: [WorkbookCommentPermission],
-					worksheetTypes: [WorksheetViewPermission],
-					rangeTypes: [RangeProtectionPermissionViewPoint]
-				}, [{
-					startRow: row,
-					startColumn: column,
-					endRow: row,
-					endColumn: column
-				}], unitId, subUnitId)) this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("sheets-thread-comment-ui.permission.commentErr"));
-			} else if (id === UpdateCommentCommand.id) {
-				const { unitId, subUnitId, payload } = command.params;
-				const { commentId } = payload;
-				const comment = this._sheetsThreadCommentModel.getComment(unitId, subUnitId, commentId);
-				if (comment) {
-					const { row, column } = singleReferenceToGrid(comment.ref);
-					if (!this._sheetPermissionCheckController.permissionCheckWithRanges({
-						workbookTypes: [WorkbookCommentPermission],
-						worksheetTypes: [WorksheetViewPermission],
-						rangeTypes: [RangeProtectionPermissionViewPoint]
-					}, [{
-						startRow: row,
-						startColumn: column,
-						endRow: row,
-						endColumn: column
-					}], unitId, subUnitId)) this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("sheets-thread-comment-ui.permission.commentErr"));
-				}
-			} else if (id === ResolveCommentCommand.id || id === DeleteCommentCommand.id || id === DeleteCommentTreeCommand.id) {
-				const { unitId, subUnitId, commentId } = command.params;
-				const comment = this._sheetsThreadCommentModel.getComment(unitId, subUnitId, commentId);
-				if (comment) {
-					const { row, column } = singleReferenceToGrid(comment.ref);
-					if (!this._sheetPermissionCheckController.permissionCheckWithRanges({
-						workbookTypes: [WorkbookCommentPermission],
-						worksheetTypes: [WorksheetViewPermission],
-						rangeTypes: [RangeProtectionPermissionViewPoint]
-					}, [{
-						startRow: row,
-						startColumn: column,
-						endRow: row,
-						endColumn: column
-					}], unitId, subUnitId)) this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("sheets-thread-comment-ui.permission.commentErr"));
-				}
-			}
-		}));
-	}
-};
-SheetsThreadCommentPermissionController = __decorate([
-	__decorateParam(0, Inject(LocaleService)),
-	__decorateParam(1, ICommandService),
-	__decorateParam(2, Inject(SheetPermissionCheckController)),
-	__decorateParam(3, Inject(SheetsThreadCommentModel))
-], SheetsThreadCommentPermissionController);
-
 //#endregion
 //#region src/controllers/sheets-thread-comment-popup.controller.ts
+function resolveFocusedSheetComment(activeComment, hoveredComment, unitId, subUnitId) {
+	for (const comment of [hoveredComment, activeComment]) if (comment && comment.unitId === unitId && comment.subUnitId === subUnitId) return comment;
+}
 let SheetsThreadCommentPopupController = class SheetsThreadCommentPopupController extends Disposable {
 	constructor(_commandService, _sheetsThreadCommentPopupService, _sheetsThreadCommentModel, _threadCommentPanelService, _univerInstanceService, _sheetPermissionCheckController, _markSelectionService, _sheetSelectionService, _editorBridgeService, _renderManagerService) {
 		super();
@@ -872,6 +1373,8 @@ let SheetsThreadCommentPopupController = class SheetsThreadCommentPopupControlle
 				const { unitId, subUnitId, commentId, trigger } = commentInfo;
 				const comment = this._sheetsThreadCommentModel.getComment(unitId, subUnitId, commentId);
 				if (!comment || comment.resolved) return;
+				const anchor = deserializeThreadCommentAnchor(comment.ref);
+				if ((anchor === null || anchor === void 0 ? void 0 : anchor.kind) === ThreadCommentAnchorKind.SHEET_DRAWING) return;
 				const currentUnit = this._univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET);
 				if (!currentUnit) return;
 				if (currentUnit.getUnitId() !== unitId) return;
@@ -913,16 +1416,18 @@ let SheetsThreadCommentPopupController = class SheetsThreadCommentPopupControlle
 		}));
 	}
 	_initMarkSelection() {
-		this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.pipe(debounceTime(100)).subscribe((activeComment) => {
-			var _this$_univerInstance;
-			if (!activeComment) {
+		this.disposeWithMe(combineLatest([this._threadCommentPanelService.activeCommentId$, this._threadCommentPanelService.hoveredCommentId$]).pipe(debounceTime(100)).subscribe(([activeComment, hoveredComment]) => {
+			var _currentUnit$getActiv2, _this$_univerInstance;
+			const currentUnit = this._univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET);
+			const focusedComment = resolveFocusedSheetComment(activeComment, hoveredComment, currentUnit === null || currentUnit === void 0 ? void 0 : currentUnit.getUnitId(), currentUnit === null || currentUnit === void 0 || (_currentUnit$getActiv2 = currentUnit.getActiveSheet()) === null || _currentUnit$getActiv2 === void 0 ? void 0 : _currentUnit$getActiv2.getSheetId());
+			if (!focusedComment) {
 				if (this._selectionShapeInfo) {
 					this._markSelectionService.removeShape(this._selectionShapeInfo.shapeId);
 					this._selectionShapeInfo = null;
 				}
 				return;
 			}
-			const { unitId, subUnitId, commentId } = activeComment;
+			const { unitId, subUnitId, commentId } = focusedComment;
 			if (this._selectionShapeInfo) {
 				this._markSelectionService.removeShape(this._selectionShapeInfo.shapeId);
 				this._selectionShapeInfo = null;
@@ -950,7 +1455,7 @@ let SheetsThreadCommentPopupController = class SheetsThreadCommentPopupControlle
 			}, [], -1);
 			if (!shapeId) return;
 			this._selectionShapeInfo = {
-				...activeComment,
+				...focusedComment,
 				shapeId
 			};
 		}));
@@ -1006,11 +1511,12 @@ SheetsThreadCommentController = __decorate([__decorateParam(0, IMenuManagerServi
 //#endregion
 //#region src/plugin.ts
 let UniverSheetsThreadCommentUIPlugin = class UniverSheetsThreadCommentUIPlugin extends Plugin {
-	constructor(_config = defaultPluginConfig, _injector, _commandService, _configService) {
+	constructor(_config = defaultPluginConfig, _injector, _commandService, _renderManagerService, _configService) {
 		super();
 		this._config = _config;
 		this._injector = _injector;
 		this._commandService = _commandService;
+		this._renderManagerService = _renderManagerService;
 		this._configService = _configService;
 		const { menu, ...rest } = merge({}, defaultPluginConfig, this._config);
 		if (menu) this._configService.setConfig("menu", menu, { merge: true });
@@ -1030,7 +1536,12 @@ let UniverSheetsThreadCommentUIPlugin = class UniverSheetsThreadCommentUIPlugin
 		].forEach((dep) => {
 			this._injector.add(dep);
 		});
-		[ShowAddSheetCommentModalOperation, ToggleSheetCommentPanelOperation].forEach((command) => {
+		[
+			AddSheetDrawingCommentOperation,
+			OpenSheetCommentPanelOperation,
+			ShowAddSheetCommentModalOperation,
+			ToggleSheetCommentPanelOperation
+		].forEach((command) => {
 			this._commandService.registerCommand(command);
 		});
 		this._injector.get(SheetsThreadCommentController);
@@ -1039,6 +1550,7 @@ let UniverSheetsThreadCommentUIPlugin = class UniverSheetsThreadCommentUIPlugin
 		this._injector.get(SheetsThreadCommentRenderController);
 	}
 	onRendered() {
+		this._renderManagerService.registerRenderModule(UniverInstanceType.UNIVER_SHEET, [SheetsThreadCommentDrawingRenderController]);
 		this._injector.get(SheetsThreadCommentCopyPasteController);
 		this._injector.get(SheetsThreadCommentHoverController);
 		this._injector.get(SheetsThreadCommentPopupController);
@@ -1050,11 +1562,12 @@ _defineProperty(UniverSheetsThreadCommentUIPlugin, "packageName", name);
 _defineProperty(UniverSheetsThreadCommentUIPlugin, "version", version);
 _defineProperty(UniverSheetsThreadCommentUIPlugin, "type", UniverInstanceType.UNIVER_SHEET);
 UniverSheetsThreadCommentUIPlugin = __decorate([
-	DependentOn(UniverRenderEnginePlugin, UniverThreadCommentPlugin, UniverSheetsPlugin, UniverThreadCommentUIPlugin, UniverSheetsThreadCommentPlugin, UniverSheetsUIPlugin),
+	DependentOn(UniverRenderEnginePlugin, UniverThreadCommentPlugin, UniverDrawingPlugin, UniverSheetsPlugin, UniverThreadCommentUIPlugin, UniverSheetsThreadCommentPlugin, UniverSheetsUIPlugin),
 	__decorateParam(1, Inject(Injector)),
 	__decorateParam(2, Inject(ICommandService)),
-	__decorateParam(3, IConfigService)
+	__decorateParam(3, IRenderManagerService),
+	__decorateParam(4, IConfigService)
 ], UniverSheetsThreadCommentUIPlugin);
 
 //#endregion
-export { SheetsThreadCommentPopupService, menuSchema as SheetsThreadCommentUIMenuSchema, ShowAddSheetCommentModalOperation, ToggleSheetCommentPanelOperation, UniverSheetsThreadCommentUIPlugin };
+export { SheetsThreadCommentPopupService, menuSchema as SheetsThreadCommentUIMenuSchema, ShowAddSheetCommentModalOperation, ToggleSheetCommentPanelOperation, UniverSheetsThreadCommentMobileUIPlugin, UniverSheetsThreadCommentUIPlugin };