@univerjs/sheets-table-ui 1.0.0-alpha.2 → 1.0.0-alpha.4

package/lib/index.js

@@ -1,11 +1,11 @@
-import { ColorKit, CommandType, DependentOn, Disposable, ErrorService, ICommandService, IConfigService, IContextService, IPermissionService, IUniverInstanceService, Inject, Injector, InterceptorEffectEnum, LocaleService, ObjectMatrix, Plugin, Rectangle, RxDisposable, UniverInstanceType, VerticalAlign, cellToRange, fromCallback, merge, registerDependencies, toDisposable, touchDependencies } from "@univerjs/core";
-import { CURSOR_TYPE, DEFAULT_FONTFACE_PLANE, IRenderManagerService, Rect, Shape } from "@univerjs/engine-render";
 import { AddSheetTableCommand, AddTableThemeCommand, DeleteSheetTableCommand, RemoveTableThemeCommand, SHEET_TABLE_CUSTOM_THEME_PREFIX, SetSheetTableCommand, SetSheetTableFilterCommand, SheetTableInsertColCommand, SheetTableInsertColumnAtCommand, SheetTableInsertRowAtCommand, SheetTableInsertRowCommand, SheetTableRemoveColCommand, SheetTableRemoveColumnAtCommand, SheetTableRemoveRowCommand, SheetTableService, SheetsTableController, SheetsTableSortStateEnum, TABLE_FILTER_EMPTY_VALUE, TableColumnFilterTypeEnum, TableConditionTypeEnum, TableDateCompareTypeEnum, TableManager, TableNumberCompareTypeEnum, TableStringCompareTypeEnum, UniverSheetsTablePlugin, customEmptyThemeWithBorderStyle, getExistingNamesSet, isConditionFilter, isManualTableFilter, processStyleWithBorderStyle, validateSheetTableName } from "@univerjs/sheets-table";
-import { ISheetSelectionRenderService, SHEET_VIEW_KEY, SelectAllCommand, SetScrollOperation, SetZoomRatioOperation, SheetCanvasPopManagerService, SheetSkeletonManagerService, getCoordByCell, getCurrentRangeDisable$, getTransformCoord } from "@univerjs/sheets-ui";
 import { ComponentManager, ContextMenuGroup, ContextMenuPosition, IDialogService, IMenuManagerService, ISidebarService, IconManager, MenuItemType, RibbonDataGroup, getMenuHiddenObservable, useDependency, useObservable } from "@univerjs/ui";
+import { ColorKit, CommandType, DependentOn, Disposable, ErrorService, ICommandService, IConfigService, IContextService, IPermissionService, IUniverInstanceService, Inject, Injector, InterceptorEffectEnum, LocaleService, ObjectMatrix, Plugin, Rectangle, RxDisposable, UniverInstanceType, VerticalAlign, cellToRange, fromCallback, merge, registerDependencies, toDisposable, touchDependencies } from "@univerjs/core";
+import { INTERCEPTOR_POINT, RangeThemeStyle, SelectRangeCommand, SetRangeThemeMutation, SetRangeValuesMutation, SetSelectionsOperation, SetVerticalTextAlignCommand, SheetInterceptorService, SheetRangeThemeModel, SheetsSelectionsService, WorkbookEditablePermission, WorkbookPermissionService, expandToContinuousRange, getPrimaryForRange, getSheetCommandTarget, isSingleCellSelection } from "@univerjs/sheets";
+import { ExpandSelectionCommand, ISheetSelectionRenderService, MoveSelectionCommand, MoveSelectionEnterAndTabCommand, SHEET_VIEW_KEY, SelectAllCommand, SetScrollOperation, SetZoomRatioOperation, SheetCanvasPopManagerService, SheetSkeletonManagerService, getCoordByCell, getCurrentRangeDisable$, getTransformCoord } from "@univerjs/sheets-ui";
 import { Subject, distinctUntilChanged, filter, map, merge as merge$1, of, startWith, switchMap, takeUntil } from "rxjs";
-import { INTERCEPTOR_POINT, RangeThemeStyle, SetRangeThemeMutation, SetRangeValuesMutation, SetSelectionsOperation, SetVerticalTextAlignCommand, SheetInterceptorService, SheetRangeThemeModel, SheetsSelectionsService, WorkbookEditablePermission, WorkbookPermissionService, expandToContinuousRange, getPrimaryForRange, getSheetCommandTarget, isSingleCellSelection } from "@univerjs/sheets";
-import { AscendingIcon, DeleteColumnDoubleIcon, DescendingIcon, DropdownIcon, LeftInsertColumnDoubleIcon, MoreDownIcon, RightInsertColumnDoubleIcon, TableIcon } from "@univerjs/icons";
+import { CURSOR_TYPE, DEFAULT_FONTFACE_PLANE, IRenderManagerService, Rect, Shape } from "@univerjs/engine-render";
+import { AscendingIcon, DeleteColumnDoubleIcon, DescendingIcon, DownIcon, LeftInsertColumnDoubleIcon, MoreDownIcon, RightInsertColumnDoubleIcon, TableIcon } from "@univerjs/icons";
 import { Button, ButtonGroup, CascaderList, Checkbox, ColorPicker, DatePicker, DateRangePicker, Dropdown, Input, InputNumber, Segmented, Select, borderClassName, clsx, scrollbarClassName } from "@univerjs/design";
 import { SortRangeCommand, SortType } from "@univerjs/sheets-sort";
 import { useCallback, useEffect, useMemo, useState } from "react";
@@ -13,11 +13,6 @@ import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { IDefinedNamesService, deserializeRangeWithSheet, serializeRange } from "@univerjs/engine-formula";
 import { RangeSelector } from "@univerjs/sheets-formula-ui";
 
-//#region package.json
-var name = "@univerjs/sheets-table-ui";
-var version = "1.0.0-alpha.2";
-
-//#endregion
 //#region src/const.ts
 /**
 * Copyright 2023-present DreamNum Co., Ltd.
@@ -48,6 +43,210 @@ const TABLE_DEFAULT_BG_COLOR = "rgb(255, 255, 255)";
 const TABLE_BORDER_NONE = "none";
 const TABLE_BORDER_DEFAULT = "1px solid rgb(var(--grey-200))";
 
+//#endregion
+//#region src/commands/operations/open-table-selector.operation.ts
+const OpenTableSelectorOperation = {
+	type: CommandType.OPERATION,
+	id: "sheet.operation.open-table-selector",
+	async handler(accessor) {
+		var _lastSelection$range;
+		const univerInstanceService = accessor.get(IUniverInstanceService);
+		const commandService = accessor.get(ICommandService);
+		const target = getSheetCommandTarget(univerInstanceService);
+		if (!target) return false;
+		const { unitId, subUnitId, worksheet } = target;
+		const lastSelection = accessor.get(SheetsSelectionsService).getCurrentLastSelection();
+		const range = (_lastSelection$range = lastSelection === null || lastSelection === void 0 ? void 0 : lastSelection.range) !== null && _lastSelection$range !== void 0 ? _lastSelection$range : {
+			startRow: 0,
+			endRow: 0,
+			startColumn: 0,
+			endColumn: 0
+		};
+		const rangeInfo = await openRangeSelector(accessor, unitId, subUnitId, isSingleCellSelection(lastSelection) ? expandToContinuousRange(range, {
+			up: true,
+			left: true,
+			right: true,
+			down: true
+		}, worksheet) : range);
+		if (!rangeInfo) return false;
+		commandService.executeCommand(AddSheetTableCommand.id, { ...rangeInfo });
+		return true;
+	}
+};
+async function openRangeSelector(accessor, unitId, subUnitId, range, tableId) {
+	const dialogService = accessor.get(IDialogService);
+	const localeService = accessor.get(LocaleService);
+	return new Promise((resolve) => {
+		const dialogProps = {
+			unitId,
+			subUnitId,
+			range,
+			tableId,
+			onConfirm: (info) => {
+				resolve(info);
+				dialogService.close(TABLE_SELECTOR_DIALOG);
+			},
+			onCancel: () => {
+				resolve(null);
+				dialogService.close(TABLE_SELECTOR_DIALOG);
+			}
+		};
+		dialogService.open({
+			id: TABLE_SELECTOR_DIALOG,
+			title: { title: localeService.t("sheets-table-ui.selectRange") },
+			draggable: true,
+			destroyOnClose: true,
+			mask: false,
+			maskClosable: false,
+			children: { label: {
+				name: TABLE_SELECTOR_DIALOG,
+				props: dialogProps
+			} },
+			width: 300,
+			onClose: () => {
+				resolve(null);
+				dialogService.close(TABLE_SELECTOR_DIALOG);
+			}
+		});
+	});
+}
+
+//#endregion
+//#region src/menu/menu.ts
+const SHEET_TABLE_CONTEXT_INSERT_MENU_ID = "sheet.table.context-insert_menu-id";
+const SHEET_TABLE_CONTEXT_REMOVE_MENU_ID = "sheet.table.context-remove_menu-id";
+function sheetTableToolbarInsertMenuFactory(accessor) {
+	return {
+		id: OpenTableSelectorOperation.id,
+		type: MenuItemType.BUTTON,
+		icon: "TableIcon",
+		tooltip: "sheets-table-ui.title",
+		title: "sheets-table-ui.title",
+		hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+		disabled$: getCurrentRangeDisable$(accessor, {}, true)
+	};
+}
+function SheetTableInsertContextMenuFactory(accessor) {
+	return {
+		id: SHEET_TABLE_CONTEXT_INSERT_MENU_ID,
+		type: MenuItemType.SUBITEMS,
+		icon: "InsertDoubleIcon",
+		title: "sheets-table-ui.insert.main",
+		hidden$: getSheetTableRowColOperationHidden$(accessor)
+	};
+}
+function SheetTableRemoveContextMenuFactory(accessor) {
+	return {
+		id: SHEET_TABLE_CONTEXT_REMOVE_MENU_ID,
+		type: MenuItemType.SUBITEMS,
+		icon: "ReduceDoubleIcon",
+		title: "sheets-table-ui.remove.main",
+		hidden$: getSheetTableRowColOperationHidden$(accessor)
+	};
+}
+function SheetTableInsertRowMenuFactory(accessor) {
+	return {
+		id: SheetTableInsertRowCommand.id,
+		type: MenuItemType.BUTTON,
+		title: "sheets-table-ui.insert.row",
+		hidden$: getSheetTableHeaderOperationHidden$(accessor)
+	};
+}
+function SheetTableInsertColMenuFactory() {
+	return {
+		id: SheetTableInsertColCommand.id,
+		title: "sheets-table-ui.insert.col",
+		type: MenuItemType.BUTTON
+	};
+}
+function SheetTableRemoveRowMenuFactory(accessor) {
+	return {
+		id: SheetTableRemoveRowCommand.id,
+		type: MenuItemType.BUTTON,
+		title: "sheets-table-ui.remove.row",
+		hidden$: getSheetTableHeaderOperationHidden$(accessor)
+	};
+}
+function SheetTableRemoveColMenuFactory() {
+	return {
+		id: SheetTableRemoveColCommand.id,
+		title: "sheets-table-ui.remove.col",
+		type: MenuItemType.BUTTON
+	};
+}
+function getSheetTableRowColOperationHidden$(accessor) {
+	const sheetsSelectionsService = accessor.get(SheetsSelectionsService);
+	return accessor.get(IUniverInstanceService).getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET).pipe(switchMap((workbook) => {
+		if (!workbook) return of(true);
+		return workbook.activeSheet$.pipe(switchMap((sheet) => {
+			if (!sheet) return of(true);
+			return sheetsSelectionsService.selectionMoveEnd$.pipe(switchMap((selections) => {
+				if (!selections.length || selections.length > 1) return of(true);
+				const range = selections[0].range;
+				return of(!accessor.get(SheetsTableController).getContainerTableWithRange(workbook.getUnitId(), sheet.getSheetId(), range));
+			}));
+		}));
+	}));
+}
+function getSheetTableHeaderOperationHidden$(accessor) {
+	const sheetsSelectionsService = accessor.get(SheetsSelectionsService);
+	return accessor.get(IUniverInstanceService).getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET).pipe(switchMap((workbook) => {
+		if (!workbook) return of(true);
+		return workbook.activeSheet$.pipe(switchMap((sheet) => {
+			if (!sheet) return of(true);
+			return sheetsSelectionsService.selectionMoveEnd$.pipe(switchMap((selections) => {
+				if (!selections.length || selections.length > 1) return of(true);
+				const range = selections[0].range;
+				const isInTable = accessor.get(SheetsTableController).getContainerTableWithRange(workbook.getUnitId(), sheet.getSheetId(), range);
+				if (!isInTable) return of(true);
+				const tableRange = isInTable.getRange();
+				if (range.startRow === tableRange.startRow) return of(true);
+				return of(false);
+			}));
+		}));
+	}));
+}
+
+//#endregion
+//#region src/menu/schema.ts
+const menuSchema = {
+	[RibbonDataGroup.ORGANIZATION]: { [OpenTableSelectorOperation.id]: {
+		order: 0,
+		menuItemFactory: sheetTableToolbarInsertMenuFactory
+	} },
+	[ContextMenuPosition.MAIN_AREA]: { [ContextMenuGroup.LAYOUT]: {
+		[SHEET_TABLE_CONTEXT_INSERT_MENU_ID]: {
+			order: 5,
+			menuItemFactory: SheetTableInsertContextMenuFactory,
+			[SheetTableInsertRowCommand.id]: {
+				order: 1,
+				menuItemFactory: SheetTableInsertRowMenuFactory
+			},
+			[SheetTableInsertColCommand.id]: {
+				order: 2,
+				menuItemFactory: SheetTableInsertColMenuFactory
+			}
+		},
+		[SHEET_TABLE_CONTEXT_REMOVE_MENU_ID]: {
+			order: 6,
+			menuItemFactory: SheetTableRemoveContextMenuFactory,
+			[SheetTableRemoveRowCommand.id]: {
+				order: 1,
+				menuItemFactory: SheetTableRemoveRowMenuFactory
+			},
+			[SheetTableRemoveColCommand.id]: {
+				order: 2,
+				menuItemFactory: SheetTableRemoveColMenuFactory
+			}
+		}
+	} }
+};
+
+//#endregion
+//#region package.json
+var name = "@univerjs/sheets-table-ui";
+var version = "1.0.0-alpha.4";
+
 //#endregion
 //#region \0@oxc-project+runtime@0.137.0/helpers/esm/typeof.js
 function _typeof(o) {
@@ -206,74 +405,6 @@ const OpenTableFilterPanelOperation = {
 	}
 };
 
-//#endregion
-//#region src/commands/operations/open-table-selector.operation.ts
-const OpenTableSelectorOperation = {
-	type: CommandType.OPERATION,
-	id: "sheet.operation.open-table-selector",
-	async handler(accessor) {
-		var _lastSelection$range;
-		const univerInstanceService = accessor.get(IUniverInstanceService);
-		const commandService = accessor.get(ICommandService);
-		const target = getSheetCommandTarget(univerInstanceService);
-		if (!target) return false;
-		const { unitId, subUnitId, worksheet } = target;
-		const lastSelection = accessor.get(SheetsSelectionsService).getCurrentLastSelection();
-		const range = (_lastSelection$range = lastSelection === null || lastSelection === void 0 ? void 0 : lastSelection.range) !== null && _lastSelection$range !== void 0 ? _lastSelection$range : {
-			startRow: 0,
-			endRow: 0,
-			startColumn: 0,
-			endColumn: 0
-		};
-		const rangeInfo = await openRangeSelector(accessor, unitId, subUnitId, isSingleCellSelection(lastSelection) ? expandToContinuousRange(range, {
-			up: true,
-			left: true,
-			right: true,
-			down: true
-		}, worksheet) : range);
-		if (!rangeInfo) return false;
-		commandService.executeCommand(AddSheetTableCommand.id, { ...rangeInfo });
-		return true;
-	}
-};
-async function openRangeSelector(accessor, unitId, subUnitId, range, tableId) {
-	const dialogService = accessor.get(IDialogService);
-	const localeService = accessor.get(LocaleService);
-	return new Promise((resolve) => {
-		const dialogProps = {
-			unitId,
-			subUnitId,
-			range,
-			tableId,
-			onConfirm: (info) => {
-				resolve(info);
-				dialogService.close(TABLE_SELECTOR_DIALOG);
-			},
-			onCancel: () => {
-				resolve(null);
-				dialogService.close(TABLE_SELECTOR_DIALOG);
-			}
-		};
-		dialogService.open({
-			id: TABLE_SELECTOR_DIALOG,
-			title: { title: localeService.t("sheets-table-ui.selectRange") },
-			draggable: true,
-			destroyOnClose: true,
-			mask: false,
-			maskClosable: false,
-			children: { label: {
-				name: TABLE_SELECTOR_DIALOG,
-				props: dialogProps
-			} },
-			width: 300,
-			onClose: () => {
-				resolve(null);
-				dialogService.close(TABLE_SELECTOR_DIALOG);
-			}
-		});
-	});
-}
-
 //#endregion
 //#region src/config/config.ts
 const SHEETS_TABLE_UI_PLUGIN_CONFIG_KEY = "sheets-table-ui.config";
@@ -900,7 +1031,7 @@ function SheetTableItemsFilterPanel(props) {
 	const localeService = useDependency(LocaleService);
 	const { data: items, itemsCountMap, allItemsCount } = useDependency(SheetsTableUiService).getTableFilterItems(unitId, subUnitId, tableId, columnIndex);
 	const [allChecked, setAllChecked] = useState(tableFilter === void 0 ? true : checkedItemSet.size === itemsCountMap.size);
-	const [checkedCount, setCheckedCount] = useState(allChecked ? allItemsCount : getCheckedItemCount(itemsCountMap, checkedItemSet));
+	const [checkedCount, setCheckedCount] = useState(() => allChecked ? allItemsCount : getCheckedItemCount(itemsCountMap, checkedItemSet));
 	const indeterminate = !allChecked && checkedItemSet.size > 0;
 	const [searchText, setSearchText] = useState("");
 	const displayItems = useMemo(() => {
@@ -1017,10 +1148,20 @@ function SheetTableItemsFilterPanel(props) {
 
 //#endregion
 //#region src/views/components/SheetTableFilterPanel.tsx
+const FILTER_BY_OPTIONS = [{
+	label: "sheets-table-ui.filter.by-values",
+	value: "items"
+}, {
+	label: "sheets-table-ui.filter.by-conditions",
+	value: "condition"
+}];
 function SheetTableFilterPanel() {
 	var _permissionService$ge;
 	const localeService = useDependency(LocaleService);
-	const filterByItems = useFilterByOptions(localeService);
+	const filterByItems = FILTER_BY_OPTIONS.map((option) => ({
+		...option,
+		label: localeService.t(option.label)
+	}));
 	const tableUiService = useDependency(SheetsTableUiService);
 	const tableManager = useDependency(TableManager);
 	const commandService = useDependency(ICommandService);
@@ -1031,7 +1172,7 @@ function SheetTableFilterPanel() {
 	const { unitId, subUnitId, tableId, tableFilter, currentFilterBy, columnIndex } = props;
 	const { data } = tableUiService.getTableFilterItems(unitId, subUnitId, tableId, columnIndex);
 	const checkedItems = tableUiService.getTableFilterCheckedItems(unitId, tableId, columnIndex);
-	const [checkedItemSet, setCheckedItemSet] = useState(new Set(checkedItems));
+	const [checkedItemSet, setCheckedItemSet] = useState(() => new Set(checkedItems));
 	const [filterBy, setFilterBy] = useState(currentFilterBy || "items");
 	const [conditionInfo, setConditionInfo] = useState(() => {
 		const tableFilter = props.tableFilter;
@@ -1232,15 +1373,6 @@ function SheetTableFilterPanel() {
 		]
 	});
 }
-function useFilterByOptions(localeService) {
-	return useMemo(() => [{
-		label: localeService.t("sheets-table-ui.filter.by-values"),
-		value: "items"
-	}, {
-		label: localeService.t("sheets-table-ui.filter.by-conditions"),
-		value: "condition"
-	}], [localeService.getCurrentLocale(), localeService]);
-}
 
 //#endregion
 //#region src/views/components/SheetTableRenameDialog.tsx
@@ -1452,7 +1584,7 @@ const SheetTableThemePanel = (props) => {
 	const rangeThemeMapChanged = useObservable(rangeThemeModel.rangeThemeMapChange$);
 	const tableRefresh = useObservable(sheetTableThemeUIController.refreshTable$);
 	const errorService = useDependency(ErrorService);
-	const [, setRefresh] = useState(Math.random());
+	const [, setRefresh] = useState(Math.random);
 	const themeConfig = useObservable(tableManager.tableThemeChanged$, {
 		theme: table === null || table === void 0 ? void 0 : table.getTableStyleId(),
 		oldTheme: table === null || table === void 0 ? void 0 : table.getTableStyleId(),
@@ -1647,7 +1779,7 @@ const SheetTableThemePanel = (props) => {
 										"univer-text-gray-900": !headerBgIsDark
 									}),
 									style: { background: headerBg }
-								}), /* @__PURE__ */ jsx(DropdownIcon, { className: "univer-size-2" })]
+								}), /* @__PURE__ */ jsx(DownIcon, { className: "univer-size-2" })]
 							})
 						})]
 					}),
@@ -1678,7 +1810,7 @@ const SheetTableThemePanel = (props) => {
 								children: [/* @__PURE__ */ jsx("div", {
 									className: clsx("univer-size-4 univer-rounded-lg univer-bg-gray-400", borderClassName),
 									style: { background: firstRowBg }
-								}), /* @__PURE__ */ jsx(DropdownIcon, { className: "univer-size-2" })]
+								}), /* @__PURE__ */ jsx(DownIcon, { className: "univer-size-2" })]
 							})
 						})]
 					}),
@@ -1707,7 +1839,7 @@ const SheetTableThemePanel = (props) => {
 								children: [/* @__PURE__ */ jsx("div", {
 									className: clsx("univer-size-4 univer-rounded-lg univer-bg-gray-400", borderClassName),
 									style: { background: secondRowBg }
-								}), /* @__PURE__ */ jsx(DropdownIcon, { className: "univer-size-2" })]
+								}), /* @__PURE__ */ jsx(DownIcon, { className: "univer-size-2" })]
 							})
 						})]
 					}),
@@ -1739,7 +1871,7 @@ const SheetTableThemePanel = (props) => {
 								children: [/* @__PURE__ */ jsx("div", {
 									className: clsx("univer-size-4 univer-rounded-lg univer-bg-gray-400", borderClassName),
 									style: { background: lastRowBg }
-								}), /* @__PURE__ */ jsx(DropdownIcon, { className: "univer-size-2" })]
+								}), /* @__PURE__ */ jsx(DownIcon, { className: "univer-size-2" })]
 							})
 						})]
 					})
@@ -2083,6 +2215,13 @@ var SheetTableControlsShape = class extends Shape {
 const TABLE_CONTROLS_LAYER_INDEX = 5002;
 const TABLE_CONTROL_GAP_ROW = 0;
 const TABLE_RENDER_REFRESH_COMMANDS = /* @__PURE__ */ new Set([SetScrollOperation.id, SetZoomRatioOperation.id]);
+const SELECTION_ONLY_COMMANDS = /* @__PURE__ */ new Set([
+	MoveSelectionCommand.id,
+	MoveSelectionEnterAndTabCommand.id,
+	ExpandSelectionCommand.id,
+	SelectAllCommand.id,
+	SelectRangeCommand.id
+]);
 function isSameTopGap(left, right) {
 	if (left === null || right === null) return left === right;
 	return left.size === right.size && left.color === right.color && left.stripeColor === right.stripeColor;
@@ -2134,24 +2273,30 @@ let SheetTableControlsRenderController = class SheetTableControlsRenderControlle
 	}
 	_initRefresh() {
 		const commandExecuted$ = fromCallback(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(filter(([command]) => {
+			if (command.id.startsWith("doc.") || SELECTION_ONLY_COMMANDS.has(command.id)) return false;
 			if (command.type === CommandType.OPERATION && TABLE_RENDER_REFRESH_COMMANDS.has(command.id)) {
 				this._closeFloatingControls();
 				return true;
 			}
 			return command.type === CommandType.MUTATION || command.type === CommandType.COMMAND;
 		}));
-		this.disposeWithMe(merge$1(this._context.unit.activeSheet$, this._sheetSkeletonManagerService.currentSkeleton$, this._tableManager.tableAdd$, this._tableManager.tableDelete$, this._tableManager.tableNameChanged$, this._tableManager.tableRangeChanged$, this._tableManager.tableThemeChanged$, this._sheetTableThemeUIController.refreshTable$, this._workbookPermissionService.unitPermissionInitStateChange$, this._permissionService.permissionPointUpdate$, this._sheetsSelectionsService.selectionChanged$, commandExecuted$).subscribe(() => {
+		this.disposeWithMe(merge$1(this._context.unit.activeSheet$, this._sheetSkeletonManagerService.currentSkeleton$, this._tableManager.tableAdd$, this._tableManager.tableDelete$, this._tableManager.tableNameChanged$, this._tableManager.tableRangeChanged$, this._tableManager.tableThemeChanged$, this._sheetTableThemeUIController.refreshTable$, this._workbookPermissionService.unitPermissionInitStateChange$, this._permissionService.permissionPointUpdate$, commandExecuted$).subscribe(() => {
 			this._closeFloatingControls();
 			this._refresh();
 		}));
+		this.disposeWithMe(this._sheetsSelectionsService.selectionChanged$.subscribe(() => {
+			this._closeFloatingControls();
+			this._refresh(false);
+		}));
 	}
-	_refresh() {
+	_refresh(invalidateScene = true) {
 		const skeleton = this._sheetSkeletonManagerService.getCurrentSkeleton();
 		const worksheet = this._context.unit.getActiveSheet();
 		if (!skeleton || !worksheet || !this._canEditWorkbook()) {
 			this._shape.setItems([]);
 			this._shape.refreshBounds();
-			this._context.scene.makeDirty();
+			this._shape.makeDirty(true);
+			if (invalidateScene) this._context.scene.makeDirty();
 			return;
 		}
 		this._syncTopTableGap(skeleton);
@@ -2177,7 +2322,7 @@ let SheetTableControlsRenderController = class SheetTableControlsRenderControlle
 		this._shape.setItems(items);
 		this._shape.refreshBounds();
 		this._shape.makeDirty(true);
-		this._context.scene.makeDirty();
+		if (invalidateScene) this._context.scene.makeDirty();
 	}
 	_canEditWorkbook() {
 		var _this$_permissionServ;
@@ -2785,137 +2930,6 @@ SheetTableSelectionController = __decorate([
 	__decorateParam(2, Inject(TableManager))
 ], SheetTableSelectionController);
 
-//#endregion
-//#region src/menu/menu.ts
-const SHEET_TABLE_CONTEXT_INSERT_MENU_ID = "sheet.table.context-insert_menu-id";
-const SHEET_TABLE_CONTEXT_REMOVE_MENU_ID = "sheet.table.context-remove_menu-id";
-function sheetTableToolbarInsertMenuFactory(accessor) {
-	return {
-		id: OpenTableSelectorOperation.id,
-		type: MenuItemType.BUTTON,
-		icon: "TableIcon",
-		tooltip: "sheets-table-ui.title",
-		title: "sheets-table-ui.title",
-		hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
-		disabled$: getCurrentRangeDisable$(accessor, {}, true)
-	};
-}
-function SheetTableInsertContextMenuFactory(accessor) {
-	return {
-		id: SHEET_TABLE_CONTEXT_INSERT_MENU_ID,
-		type: MenuItemType.SUBITEMS,
-		icon: "InsertDoubleIcon",
-		title: "sheets-table-ui.insert.main",
-		hidden$: getSheetTableRowColOperationHidden$(accessor)
-	};
-}
-function SheetTableRemoveContextMenuFactory(accessor) {
-	return {
-		id: SHEET_TABLE_CONTEXT_REMOVE_MENU_ID,
-		type: MenuItemType.SUBITEMS,
-		icon: "ReduceDoubleIcon",
-		title: "sheets-table-ui.remove.main",
-		hidden$: getSheetTableRowColOperationHidden$(accessor)
-	};
-}
-function SheetTableInsertRowMenuFactory(accessor) {
-	return {
-		id: SheetTableInsertRowCommand.id,
-		type: MenuItemType.BUTTON,
-		title: "sheets-table-ui.insert.row",
-		hidden$: getSheetTableHeaderOperationHidden$(accessor)
-	};
-}
-function SheetTableInsertColMenuFactory() {
-	return {
-		id: SheetTableInsertColCommand.id,
-		title: "sheets-table-ui.insert.col",
-		type: MenuItemType.BUTTON
-	};
-}
-function SheetTableRemoveRowMenuFactory(accessor) {
-	return {
-		id: SheetTableRemoveRowCommand.id,
-		type: MenuItemType.BUTTON,
-		title: "sheets-table-ui.remove.row",
-		hidden$: getSheetTableHeaderOperationHidden$(accessor)
-	};
-}
-function SheetTableRemoveColMenuFactory() {
-	return {
-		id: SheetTableRemoveColCommand.id,
-		title: "sheets-table-ui.remove.col",
-		type: MenuItemType.BUTTON
-	};
-}
-function getSheetTableRowColOperationHidden$(accessor) {
-	const sheetsSelectionsService = accessor.get(SheetsSelectionsService);
-	return accessor.get(IUniverInstanceService).getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET).pipe(switchMap((workbook) => {
-		if (!workbook) return of(true);
-		return workbook.activeSheet$.pipe(switchMap((sheet) => {
-			if (!sheet) return of(true);
-			return sheetsSelectionsService.selectionMoveEnd$.pipe(switchMap((selections) => {
-				if (!selections.length || selections.length > 1) return of(true);
-				const range = selections[0].range;
-				return of(!accessor.get(SheetsTableController).getContainerTableWithRange(workbook.getUnitId(), sheet.getSheetId(), range));
-			}));
-		}));
-	}));
-}
-function getSheetTableHeaderOperationHidden$(accessor) {
-	const sheetsSelectionsService = accessor.get(SheetsSelectionsService);
-	return accessor.get(IUniverInstanceService).getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET).pipe(switchMap((workbook) => {
-		if (!workbook) return of(true);
-		return workbook.activeSheet$.pipe(switchMap((sheet) => {
-			if (!sheet) return of(true);
-			return sheetsSelectionsService.selectionMoveEnd$.pipe(switchMap((selections) => {
-				if (!selections.length || selections.length > 1) return of(true);
-				const range = selections[0].range;
-				const isInTable = accessor.get(SheetsTableController).getContainerTableWithRange(workbook.getUnitId(), sheet.getSheetId(), range);
-				if (!isInTable) return of(true);
-				const tableRange = isInTable.getRange();
-				if (range.startRow === tableRange.startRow) return of(true);
-				return of(false);
-			}));
-		}));
-	}));
-}
-
-//#endregion
-//#region src/menu/schema.ts
-const menuSchema = {
-	[RibbonDataGroup.ORGANIZATION]: { [OpenTableSelectorOperation.id]: {
-		order: 0,
-		menuItemFactory: sheetTableToolbarInsertMenuFactory
-	} },
-	[ContextMenuPosition.MAIN_AREA]: { [ContextMenuGroup.LAYOUT]: {
-		[SHEET_TABLE_CONTEXT_INSERT_MENU_ID]: {
-			order: 5,
-			menuItemFactory: SheetTableInsertContextMenuFactory,
-			[SheetTableInsertRowCommand.id]: {
-				order: 1,
-				menuItemFactory: SheetTableInsertRowMenuFactory
-			},
-			[SheetTableInsertColCommand.id]: {
-				order: 2,
-				menuItemFactory: SheetTableInsertColMenuFactory
-			}
-		},
-		[SHEET_TABLE_CONTEXT_REMOVE_MENU_ID]: {
-			order: 6,
-			menuItemFactory: SheetTableRemoveContextMenuFactory,
-			[SheetTableRemoveRowCommand.id]: {
-				order: 1,
-				menuItemFactory: SheetTableRemoveRowMenuFactory
-			},
-			[SheetTableRemoveColCommand.id]: {
-				order: 2,
-				menuItemFactory: SheetTableRemoveColMenuFactory
-			}
-		}
-	} }
-};
-
 //#endregion
 //#region src/menu/sheet-table-menu.controller.ts
 /**
@@ -2934,10 +2948,8 @@ const menuSchema = {
 * limitations under the License.
 */
 let SheetTableMenuController = class SheetTableMenuController extends Disposable {
-	constructor(_componentManager, _iconManager, _menuManagerService) {
+	constructor(_menuManagerService) {
 		super();
-		this._componentManager = _componentManager;
-		this._iconManager = _iconManager;
 		this._menuManagerService = _menuManagerService;
 		this._initMenu();
 	}
@@ -2945,11 +2957,7 @@ let SheetTableMenuController = class SheetTableMenuController extends Disposable
 		this._menuManagerService.mergeMenu(menuSchema);
 	}
 };
-SheetTableMenuController = __decorate([
-	__decorateParam(0, Inject(ComponentManager)),
-	__decorateParam(1, Inject(IconManager)),
-	__decorateParam(2, Inject(IMenuManagerService))
-], SheetTableMenuController);
+SheetTableMenuController = __decorate([__decorateParam(0, Inject(IMenuManagerService))], SheetTableMenuController);
 
 //#endregion
 //#region src/plugin.ts
@@ -3014,4 +3022,4 @@ UniverSheetsTableUIPlugin = __decorate([
 ], UniverSheetsTableUIPlugin);
 
 //#endregion
-export { UniverSheetsTableUIPlugin };
+export { menuSchema as SheetsTableUIMenuSchema, UniverSheetsTableUIPlugin };

package/lib/types/index.d.ts

@@ -15,4 +15,5 @@
  */
 import './global.css';
 export type { IUniverSheetsTableUIConfig } from './config/config';
+export { menuSchema as SheetsTableUIMenuSchema } from './menu/schema';
 export { UniverSheetsTableUIPlugin } from './plugin';

package/lib/types/menu/sheet-table-menu.controller.d.ts

@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 import { Disposable } from '@univerjs/core';
-import { ComponentManager, IconManager, IMenuManagerService } from '@univerjs/ui';
+import { IMenuManagerService } from '@univerjs/ui';
 export declare class SheetTableMenuController extends Disposable {
-    private _componentManager;
-    private _iconManager;
     private _menuManagerService;
-    constructor(_componentManager: ComponentManager, _iconManager: IconManager, _menuManagerService: IMenuManagerService);
+    constructor(_menuManagerService: IMenuManagerService);
     private _initMenu;
 }