@univerjs/sheets-sort-ui 0.25.0 → 1.0.0-alpha.0

package/lib/es/index.js

@@ -3,29 +3,14 @@ import { RangeProtectionPermissionEditPoint, SetSelectionsOperation, SheetsSelec
 import { SheetsSortService, SortRangeCommand, SortType, UniverSheetsSortPlugin } from "@univerjs/sheets-sort";
 import { BehaviorSubject, takeUntil } from "rxjs";
 import { Button, ButtonGroup, Checkbox, DraggableList, Dropdown, Radio, RadioGroup, clsx, scrollbarClassName } from "@univerjs/design";
-import { ComponentManager, ContextMenuGroup, ContextMenuPosition, IDialogService, ILayoutService, IMenuManagerService, IUIPartsService, MenuItemType, RibbonDataGroup, connectInjector, getMenuHiddenObservable, useDependency, useObservable } from "@univerjs/ui";
+import { ComponentManager, ContextMenuGroup, ContextMenuPosition, IDialogService, ILayoutService, IMenuManagerService, IUIPartsService, IconManager, MenuItemType, RibbonDataGroup, connectInjector, getMenuHiddenObservable, useDependency, useObservable } from "@univerjs/ui";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
+import { AscendingIcon, CheckMarkIcon, CustomSortIcon, DeleteEmptyIcon, DescendingIcon, ExpandAscendingIcon, ExpandDescendingIcon, GripVerticalIcon, IncreaseIcon, MoreDownIcon } from "@univerjs/icons";
 import { serializeRange } from "@univerjs/engine-formula";
-import { AscendingIcon, CheckMarkIcon, CustomSortIcon, DeleteEmptyIcon, DescendingIcon, ExpandAscendingIcon, ExpandDescendingIcon, IncreaseIcon, MoreDownIcon, SequenceIcon } from "@univerjs/icons";
 import { SheetsRenderService, SheetsUIPart, getCurrentExclusiveRangeInterest$, getCurrentRangeDisable$ } from "@univerjs/sheets-ui";
 
 //#region src/views/ExtendConfirm.tsx
-/**
-* 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.
-*/
 const ExtendConfirm = (props) => {
 	const [extend, setExtend] = useState("0");
 	const localeService = useDependency(LocaleService);
@@ -52,9 +37,21 @@ const ExtendConfirm = (props) => {
 		})]
 	});
 };
+function createExtendConfirm(onChange) {
+	return /* @__PURE__ */ jsx(ExtendConfirm, { onChange });
+}
+
+//#endregion
+//#region src/views/SortCheckError.tsx
+const SortCheckError = (props) => {
+	return /* @__PURE__ */ jsx("div", { children: props.message });
+};
+function createSortCheckError(message) {
+	return /* @__PURE__ */ jsx(SortCheckError, { message });
+}
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -65,7 +62,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -78,14 +75,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -96,7 +93,7 @@ function _defineProperty(e, r, t) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -104,7 +101,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -113,7 +110,7 @@ function __decorate(decorators, target, key, desc) {
 }
 
 //#endregion
-//#region src/services/sheets-sort-ui.service.tsx
+//#region src/services/sheets-sort-ui.service.ts
 const SORT_ERROR_MESSAGE = {
 	MERGE_ERROR: "sheets-sort-ui.error.merge-size",
 	EMPTY_ERROR: "sheets-sort-ui.error.empty",
@@ -192,7 +189,7 @@ let SheetsSortUIService = class SheetsSortUIService extends Disposable {
 		return await this._confirmService.confirm({
 			id: "sort-range-check-error",
 			title: { title: this._localeService.t("sheets-sort-ui.info.tooltip") },
-			children: { title: /* @__PURE__ */ jsx("div", { children: this._localeService.t(content) }) },
+			children: { title: createSortCheckError(this._localeService.t(content)) },
 			cancelText: this._localeService.t("sheets-sort-ui.dialog.cancel"),
 			confirmText: this._localeService.t("sheets-sort-ui.dialog.confirm")
 		});
@@ -202,9 +199,9 @@ let SheetsSortUIService = class SheetsSortUIService extends Disposable {
 		if (await this._confirmService.confirm({
 			id: "extend-sort-range-dialog",
 			title: { title: this._localeService.t("sheets-sort-ui.dialog.sort-reminder") },
-			children: { title: /* @__PURE__ */ jsx(ExtendConfirm, { onChange: (value) => {
+			children: { title: createExtendConfirm((value) => {
 				shouldExtend = value === "1";
-			} }) },
+			}) },
 			width: 400,
 			cancelText: this._localeService.t("sheets-sort-ui.dialog.cancel"),
 			confirmText: this._localeService.t("sheets-sort-ui.dialog.confirm")
@@ -373,7 +370,7 @@ const SortRangeCustomInCtxMenuCommand = {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-sort-ui";
-var version = "0.25.0";
+var version = "1.0.0-alpha.0";
 
 //#endregion
 //#region src/config/config.ts
@@ -381,203 +378,6 @@ const SHEETS_SORT_UI_PLUGIN_CONFIG_KEY = "sheets-sort-ui.config";
 const configSymbol = Symbol(SHEETS_SORT_UI_PLUGIN_CONFIG_KEY);
 const defaultPluginConfig = {};
 
-//#endregion
-//#region src/menu/sheets-sort.menu.ts
-const SHEETS_SORT_MENU_ID = "sheet.menu.sheets-sort";
-const SHEETS_SORT_CTX_MENU_ID = "sheet.menu.sheets-sort-ctx";
-const SHEETS_SORT_ASC_ICON = "AscendingIcon";
-const SHEETS_SORT_ASC_EXT_ICON = "ExpandAscendingIcon";
-const SHEETS_SORT_DESC_ICON = "DescendingIcon";
-const SHEETS_SORT_DESC_EXT_ICON = "ExpandDescendingIcon";
-const SHEETS_SORT_CUSTOM_ICON = "CustomSortIcon";
-function sortRangeMenuFactory(accessor) {
-	return {
-		id: SHEETS_SORT_MENU_ID,
-		type: MenuItemType.SUBITEMS,
-		icon: SHEETS_SORT_ASC_ICON,
-		tooltip: "sheets-sort-ui.general.sort",
-		hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
-		disabled$: getCurrentRangeDisable$(accessor, {
-			workbookTypes: [WorkbookEditablePermission],
-			worksheetTypes: [WorksheetSortPermission, WorksheetEditPermission],
-			rangeTypes: [RangeProtectionPermissionEditPoint]
-		})
-	};
-}
-function sortRangeAscMenuFactory(_accessor) {
-	return {
-		id: SortRangeAscCommand.id,
-		icon: SHEETS_SORT_ASC_ICON,
-		title: "sheets-sort-ui.general.sort-asc-cur",
-		type: MenuItemType.BUTTON,
-		hidden$: getCurrentExclusiveRangeInterest$(_accessor)
-	};
-}
-function sortRangeAscExtMenuFactory(_accessor) {
-	return {
-		id: SortRangeAscExtCommand.id,
-		title: "sheets-sort-ui.general.sort-asc-ext",
-		icon: SHEETS_SORT_ASC_EXT_ICON,
-		type: MenuItemType.BUTTON
-	};
-}
-function sortRangeDescMenuFactory(_accessor) {
-	return {
-		id: SortRangeDescCommand.id,
-		title: "sheets-sort-ui.general.sort-desc-cur",
-		icon: SHEETS_SORT_DESC_ICON,
-		type: MenuItemType.BUTTON
-	};
-}
-function sortRangeDescExtMenuFactory(_accessor) {
-	return {
-		id: SortRangeDescExtCommand.id,
-		title: "sheets-sort-ui.general.sort-desc-ext",
-		icon: SHEETS_SORT_DESC_EXT_ICON,
-		type: MenuItemType.BUTTON
-	};
-}
-function sortRangeCustomMenuFactory(_accessor) {
-	return {
-		id: SortRangeCustomCommand.id,
-		title: "sheets-sort-ui.general.sort-custom",
-		type: MenuItemType.BUTTON,
-		icon: SHEETS_SORT_CUSTOM_ICON
-	};
-}
-function sortRangeCtxMenuFactory(accessor) {
-	return {
-		id: SHEETS_SORT_CTX_MENU_ID,
-		title: "sheets-sort-ui.general.sort",
-		type: MenuItemType.SUBITEMS,
-		icon: SHEETS_SORT_ASC_ICON,
-		hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
-		disabled$: getCurrentRangeDisable$(accessor, {
-			workbookTypes: [WorkbookEditablePermission],
-			worksheetTypes: [WorksheetSortPermission, WorksheetEditPermission],
-			rangeTypes: [RangeProtectionPermissionEditPoint]
-		})
-	};
-}
-function sortRangeAscCtxMenuFactory(_accessor) {
-	return {
-		id: SortRangeAscInCtxMenuCommand.id,
-		title: "sheets-sort-ui.general.sort-asc-cur",
-		type: MenuItemType.BUTTON,
-		icon: SHEETS_SORT_ASC_ICON,
-		disabled$: getCurrentRangeDisable$(_accessor, {
-			workbookTypes: [WorkbookEditablePermission],
-			worksheetTypes: [WorksheetSortPermission, WorksheetEditPermission],
-			rangeTypes: [RangeProtectionPermissionEditPoint]
-		})
-	};
-}
-function sortRangeAscExtCtxMenuFactory(_accessor) {
-	return {
-		id: SortRangeAscExtInCtxMenuCommand.id,
-		title: "sheets-sort-ui.general.sort-asc-ext",
-		type: MenuItemType.BUTTON,
-		icon: SHEETS_SORT_ASC_EXT_ICON,
-		disabled$: getCurrentRangeDisable$(_accessor, {
-			workbookTypes: [WorkbookEditablePermission],
-			worksheetTypes: [WorksheetSortPermission, WorksheetEditPermission],
-			rangeTypes: [RangeProtectionPermissionEditPoint]
-		})
-	};
-}
-function sortRangeDescCtxMenuFactory(_accessor) {
-	return {
-		id: SortRangeDescInCtxMenuCommand.id,
-		title: "sheets-sort-ui.general.sort-desc-cur",
-		type: MenuItemType.BUTTON,
-		icon: SHEETS_SORT_DESC_ICON,
-		disabled$: getCurrentRangeDisable$(_accessor, {
-			workbookTypes: [WorkbookEditablePermission],
-			worksheetTypes: [WorksheetSortPermission, WorksheetEditPermission],
-			rangeTypes: [RangeProtectionPermissionEditPoint]
-		})
-	};
-}
-function sortRangeDescExtCtxMenuFactory(_accessor) {
-	return {
-		id: SortRangeDescExtInCtxMenuCommand.id,
-		title: "sheets-sort-ui.general.sort-desc-ext",
-		type: MenuItemType.BUTTON,
-		icon: SHEETS_SORT_DESC_EXT_ICON,
-		disabled$: getCurrentRangeDisable$(_accessor, {
-			workbookTypes: [WorkbookEditablePermission],
-			worksheetTypes: [WorksheetSortPermission, WorksheetEditPermission],
-			rangeTypes: [RangeProtectionPermissionEditPoint]
-		})
-	};
-}
-function sortRangeCustomCtxMenuFactory(_accessor) {
-	return {
-		id: SortRangeCustomInCtxMenuCommand.id,
-		title: "sheets-sort-ui.general.sort-custom",
-		type: MenuItemType.BUTTON,
-		icon: SHEETS_SORT_CUSTOM_ICON,
-		disabled$: getCurrentRangeDisable$(_accessor, {
-			workbookTypes: [WorkbookEditablePermission],
-			worksheetTypes: [WorksheetSortPermission, WorksheetEditPermission],
-			rangeTypes: [RangeProtectionPermissionEditPoint]
-		})
-	};
-}
-
-//#endregion
-//#region src/menu/schema.ts
-const menuSchema = {
-	[RibbonDataGroup.ORGANIZATION]: { [SHEETS_SORT_MENU_ID]: {
-		order: 3,
-		menuItemFactory: sortRangeMenuFactory,
-		[SortRangeAscCommand.id]: {
-			order: 0,
-			menuItemFactory: sortRangeAscMenuFactory
-		},
-		[SortRangeAscExtCommand.id]: {
-			order: 1,
-			menuItemFactory: sortRangeAscExtMenuFactory
-		},
-		[SortRangeDescCommand.id]: {
-			order: 2,
-			menuItemFactory: sortRangeDescMenuFactory
-		},
-		[SortRangeDescExtCommand.id]: {
-			order: 3,
-			menuItemFactory: sortRangeDescExtMenuFactory
-		},
-		[SortRangeCustomCommand.id]: {
-			order: 4,
-			menuItemFactory: sortRangeCustomMenuFactory
-		}
-	} },
-	[ContextMenuPosition.MAIN_AREA]: { [ContextMenuGroup.DATA]: { [SHEETS_SORT_CTX_MENU_ID]: {
-		order: 0,
-		menuItemFactory: sortRangeCtxMenuFactory,
-		[SortRangeAscInCtxMenuCommand.id]: {
-			order: 0,
-			menuItemFactory: sortRangeAscCtxMenuFactory
-		},
-		[SortRangeAscExtInCtxMenuCommand.id]: {
-			order: 1,
-			menuItemFactory: sortRangeAscExtCtxMenuFactory
-		},
-		[SortRangeDescInCtxMenuCommand.id]: {
-			order: 2,
-			menuItemFactory: sortRangeDescCtxMenuFactory
-		},
-		[SortRangeDescExtInCtxMenuCommand.id]: {
-			order: 3,
-			menuItemFactory: sortRangeDescExtCtxMenuFactory
-		},
-		[SortRangeCustomInCtxMenuCommand.id]: {
-			order: 4,
-			menuItemFactory: sortRangeCustomCtxMenuFactory
-		}
-	} } }
-};
-
 //#endregion
 //#region src/views/CustomSortPanel.tsx
 function CustomSortPanel() {
@@ -745,7 +545,7 @@ function SortOptionItem(props) {
 			children: [/* @__PURE__ */ jsx("div", {
 				"data-u-comp": "sort-panel-item-handler",
 				className: "univer-flex univer-cursor-pointer univer-items-center univer-justify-center univer-text-base univer-text-gray-700",
-				children: /* @__PURE__ */ jsx(SequenceIcon, {})
+				children: /* @__PURE__ */ jsx(GripVerticalIcon, {})
 			}), /* @__PURE__ */ jsx(Dropdown, {
 				overlay: /* @__PURE__ */ jsx("ul", {
 					className: clsx("univer-my-0 univer-box-border univer-grid univer-max-h-[310px] univer-w-[--radix-popper-anchor-width] univer-items-center univer-gap-1 univer-overflow-y-auto univer-overflow-x-hidden univer-rounded-lg univer-border univer-bg-white univer-p-1 univer-text-base univer-shadow-lg", scrollbarClassName),
@@ -800,6 +600,240 @@ function findNextColIndex(range, list) {
 	return null;
 }
 
+//#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._registerIcons();
+		this._registerComponents();
+	}
+	_registerIcons() {
+		this.disposeWithMe(this._iconManager.register({
+			AscendingIcon,
+			ExpandAscendingIcon,
+			DescendingIcon,
+			ExpandDescendingIcon,
+			CustomSortIcon
+		}));
+	}
+	_registerComponents() {
+		[["CustomSortPanel", CustomSortPanel]].forEach(([key, comp]) => {
+			this.disposeWithMe(this._componentManager.register(key, comp));
+		});
+	}
+};
+ComponentsController = __decorate([__decorateParam(0, Inject(ComponentManager)), __decorateParam(1, Inject(IconManager))], ComponentsController);
+
+//#endregion
+//#region src/menu/sheets-sort.menu.ts
+const SHEETS_SORT_MENU_ID = "sheet.menu.sheets-sort";
+const SHEETS_SORT_CTX_MENU_ID = "sheet.menu.sheets-sort-ctx";
+function sortRangeMenuFactory(accessor) {
+	return {
+		id: SHEETS_SORT_MENU_ID,
+		type: MenuItemType.SUBITEMS,
+		icon: "AscendingIcon",
+		tooltip: "sheets-sort-ui.general.sort",
+		hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+		disabled$: getCurrentRangeDisable$(accessor, {
+			workbookTypes: [WorkbookEditablePermission],
+			worksheetTypes: [WorksheetSortPermission, WorksheetEditPermission],
+			rangeTypes: [RangeProtectionPermissionEditPoint]
+		})
+	};
+}
+function sortRangeAscMenuFactory(accessor) {
+	return {
+		id: SortRangeAscCommand.id,
+		icon: "AscendingIcon",
+		title: "sheets-sort-ui.general.sort-asc-cur",
+		type: MenuItemType.BUTTON,
+		hidden$: getCurrentExclusiveRangeInterest$(accessor)
+	};
+}
+function sortRangeAscExtMenuFactory() {
+	return {
+		id: SortRangeAscExtCommand.id,
+		title: "sheets-sort-ui.general.sort-asc-ext",
+		icon: "ExpandAscendingIcon",
+		type: MenuItemType.BUTTON
+	};
+}
+function sortRangeDescMenuFactory() {
+	return {
+		id: SortRangeDescCommand.id,
+		title: "sheets-sort-ui.general.sort-desc-cur",
+		icon: "DescendingIcon",
+		type: MenuItemType.BUTTON
+	};
+}
+function sortRangeDescExtMenuFactory() {
+	return {
+		id: SortRangeDescExtCommand.id,
+		title: "sheets-sort-ui.general.sort-desc-ext",
+		icon: "ExpandDescendingIcon",
+		type: MenuItemType.BUTTON
+	};
+}
+function sortRangeCustomMenuFactory() {
+	return {
+		id: SortRangeCustomCommand.id,
+		title: "sheets-sort-ui.general.sort-custom",
+		type: MenuItemType.BUTTON,
+		icon: "CustomSortIcon"
+	};
+}
+function sortRangeCtxMenuFactory(accessor) {
+	return {
+		id: SHEETS_SORT_CTX_MENU_ID,
+		title: "sheets-sort-ui.general.sort",
+		type: MenuItemType.SUBITEMS,
+		icon: "AscendingIcon",
+		hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+		disabled$: getCurrentRangeDisable$(accessor, {
+			workbookTypes: [WorkbookEditablePermission],
+			worksheetTypes: [WorksheetSortPermission, WorksheetEditPermission],
+			rangeTypes: [RangeProtectionPermissionEditPoint]
+		})
+	};
+}
+function sortRangeAscCtxMenuFactory(accessor) {
+	return {
+		id: SortRangeAscInCtxMenuCommand.id,
+		title: "sheets-sort-ui.general.sort-asc-cur",
+		type: MenuItemType.BUTTON,
+		icon: "AscendingIcon",
+		disabled$: getCurrentRangeDisable$(accessor, {
+			workbookTypes: [WorkbookEditablePermission],
+			worksheetTypes: [WorksheetSortPermission, WorksheetEditPermission],
+			rangeTypes: [RangeProtectionPermissionEditPoint]
+		})
+	};
+}
+function sortRangeAscExtCtxMenuFactory(accessor) {
+	return {
+		id: SortRangeAscExtInCtxMenuCommand.id,
+		title: "sheets-sort-ui.general.sort-asc-ext",
+		type: MenuItemType.BUTTON,
+		icon: "ExpandAscendingIcon",
+		disabled$: getCurrentRangeDisable$(accessor, {
+			workbookTypes: [WorkbookEditablePermission],
+			worksheetTypes: [WorksheetSortPermission, WorksheetEditPermission],
+			rangeTypes: [RangeProtectionPermissionEditPoint]
+		})
+	};
+}
+function sortRangeDescCtxMenuFactory(accessor) {
+	return {
+		id: SortRangeDescInCtxMenuCommand.id,
+		title: "sheets-sort-ui.general.sort-desc-cur",
+		type: MenuItemType.BUTTON,
+		icon: "DescendingIcon",
+		disabled$: getCurrentRangeDisable$(accessor, {
+			workbookTypes: [WorkbookEditablePermission],
+			worksheetTypes: [WorksheetSortPermission, WorksheetEditPermission],
+			rangeTypes: [RangeProtectionPermissionEditPoint]
+		})
+	};
+}
+function sortRangeDescExtCtxMenuFactory(accessor) {
+	return {
+		id: SortRangeDescExtInCtxMenuCommand.id,
+		title: "sheets-sort-ui.general.sort-desc-ext",
+		type: MenuItemType.BUTTON,
+		icon: "ExpandDescendingIcon",
+		disabled$: getCurrentRangeDisable$(accessor, {
+			workbookTypes: [WorkbookEditablePermission],
+			worksheetTypes: [WorksheetSortPermission, WorksheetEditPermission],
+			rangeTypes: [RangeProtectionPermissionEditPoint]
+		})
+	};
+}
+function sortRangeCustomCtxMenuFactory(accessor) {
+	return {
+		id: SortRangeCustomInCtxMenuCommand.id,
+		title: "sheets-sort-ui.general.sort-custom",
+		type: MenuItemType.BUTTON,
+		icon: "CustomSortIcon",
+		disabled$: getCurrentRangeDisable$(accessor, {
+			workbookTypes: [WorkbookEditablePermission],
+			worksheetTypes: [WorksheetSortPermission, WorksheetEditPermission],
+			rangeTypes: [RangeProtectionPermissionEditPoint]
+		})
+	};
+}
+
+//#endregion
+//#region src/menu/schema.ts
+const menuSchema = {
+	[RibbonDataGroup.ORGANIZATION]: { [SHEETS_SORT_MENU_ID]: {
+		order: 3,
+		menuItemFactory: sortRangeMenuFactory,
+		[SortRangeAscCommand.id]: {
+			order: 0,
+			menuItemFactory: sortRangeAscMenuFactory
+		},
+		[SortRangeAscExtCommand.id]: {
+			order: 1,
+			menuItemFactory: sortRangeAscExtMenuFactory
+		},
+		[SortRangeDescCommand.id]: {
+			order: 2,
+			menuItemFactory: sortRangeDescMenuFactory
+		},
+		[SortRangeDescExtCommand.id]: {
+			order: 3,
+			menuItemFactory: sortRangeDescExtMenuFactory
+		},
+		[SortRangeCustomCommand.id]: {
+			order: 4,
+			menuItemFactory: sortRangeCustomMenuFactory
+		}
+	} },
+	[ContextMenuPosition.MAIN_AREA]: { [ContextMenuGroup.DATA]: { [SHEETS_SORT_CTX_MENU_ID]: {
+		order: 0,
+		menuItemFactory: sortRangeCtxMenuFactory,
+		[SortRangeAscInCtxMenuCommand.id]: {
+			order: 0,
+			menuItemFactory: sortRangeAscCtxMenuFactory
+		},
+		[SortRangeAscExtInCtxMenuCommand.id]: {
+			order: 1,
+			menuItemFactory: sortRangeAscExtCtxMenuFactory
+		},
+		[SortRangeDescInCtxMenuCommand.id]: {
+			order: 2,
+			menuItemFactory: sortRangeDescCtxMenuFactory
+		},
+		[SortRangeDescExtInCtxMenuCommand.id]: {
+			order: 3,
+			menuItemFactory: sortRangeDescExtCtxMenuFactory
+		},
+		[SortRangeCustomInCtxMenuCommand.id]: {
+			order: 4,
+			menuItemFactory: sortRangeCustomCtxMenuFactory
+		}
+	} } }
+};
+
 //#endregion
 //#region src/views/EmbedSortBtn.tsx
 function EmbedSortBtn(props) {
@@ -842,12 +876,12 @@ function EmbedSortBtn(props) {
 }
 
 //#endregion
-//#region src/controllers/sheets-sort-ui.controller.ts
+//#region src/controllers/ui.controller.ts
 const CUSTOM_SORT_DIALOG_ID = "custom-sort-dialog";
 const CUSTOM_SORT_PANEL_WIDTH = 560;
 const CUSTOM_SORT_PANEL_TOP = 128;
 let SheetsSortUIController = class SheetsSortUIController extends RxDisposable {
-	constructor(_commandService, _menuManagerService, _dialogService, _layoutService, _uiPartsService, _sheetRenderService, _localeService, _sheetsSortUIService, _injector, _componentManager) {
+	constructor(_commandService, _menuManagerService, _dialogService, _layoutService, _uiPartsService, _sheetRenderService, _localeService, _sheetsSortUIService, _injector) {
 		super();
 		this._commandService = _commandService;
 		this._menuManagerService = _menuManagerService;
@@ -858,7 +892,6 @@ let SheetsSortUIController = class SheetsSortUIController extends RxDisposable {
 		this._localeService = _localeService;
 		this._sheetsSortUIService = _sheetsSortUIService;
 		this._injector = _injector;
-		this._componentManager = _componentManager;
 		this._initCommands();
 		this._initMenu();
 		this._initUI();
@@ -883,16 +916,6 @@ let SheetsSortUIController = class SheetsSortUIController extends RxDisposable {
 	}
 	_initUI() {
 		this.disposeWithMe(this._uiPartsService.registerComponent(SheetsUIPart.FILTER_PANEL_EMBED_POINT, () => connectInjector(EmbedSortBtn, this._injector)));
-		[
-			["CustomSortPanel", CustomSortPanel],
-			[SHEETS_SORT_ASC_ICON, AscendingIcon],
-			[SHEETS_SORT_ASC_EXT_ICON, ExpandAscendingIcon],
-			[SHEETS_SORT_DESC_ICON, DescendingIcon],
-			[SHEETS_SORT_DESC_EXT_ICON, ExpandDescendingIcon],
-			[SHEETS_SORT_CUSTOM_ICON, CustomSortIcon]
-		].forEach(([key, comp]) => {
-			this.disposeWithMe(this._componentManager.register(key, comp));
-		});
 		this._sheetsSortUIService.customSortState$.pipe(takeUntil(this.dispose$)).subscribe((newState) => {
 			if (newState && newState.show && newState.location) this._openCustomSortPanel(newState.location);
 			else if (newState && !(newState === null || newState === void 0 ? void 0 : newState.show)) this._closePanel();
@@ -926,8 +949,7 @@ SheetsSortUIController = __decorate([
 	__decorateParam(5, Inject(SheetsRenderService)),
 	__decorateParam(6, Inject(LocaleService)),
 	__decorateParam(7, Inject(SheetsSortUIService)),
-	__decorateParam(8, Inject(Injector)),
-	__decorateParam(9, Inject(ComponentManager))
+	__decorateParam(8, Inject(Injector))
 ], SheetsSortUIController);
 function getCustomSortDialogDefaultPosition() {
 	return {
@@ -948,6 +970,8 @@ let UniverSheetsSortUIPlugin = class UniverSheetsSortUIPlugin extends Plugin {
 		this._configService.setConfig(SHEETS_SORT_UI_PLUGIN_CONFIG_KEY, rest);
 	}
 	onStarting() {
+		this._injector.add([ComponentsController]);
+		this._injector.get(ComponentsController);
 		[[SheetsSortUIService], [SheetsSortUIController]].forEach((d) => this._injector.add(d));
 	}
 	onRendered() {