Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

fix(sheets-ui): reorder tabs correctly with hidden sheets (#7259)

wpxp123456e2ece01f6136
diff --git a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/SheetBarTabs.tsx b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/SheetBarTabs.tsx
index 3d50fa0e75..b1f16de6f4 100644
--- a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/SheetBarTabs.tsx
+++ b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/SheetBarTabs.tsx
@@ -54,6 +54,7 @@ import { SheetSkeletonManagerService } from '../../../services/sheet-skeleton-ma
import { useActiveWorkbook } from '../../hook';
import { SheetBarItem } from './SheetBarItem';
import { SheetBarTabsContextMenu } from './SheetBarTabsContextMenu';
+import { getSheetTabTargetOrder } from './utils/sheet-tab-drag-sort';
import { SlideTabBar } from './utils/slide-tab-bar';
const SCROLL_SHADOW_NONE = '';
@@ -507,7 +508,12 @@ export function SheetBarTabs() {
});
},
onSlideEnd: async (event: Event, order: number) => {
- await commandService.executeCommand(SetWorksheetOrderCommand.id, { order });
+ const targetOrder = getSheetTabTargetOrder(
+ workbook.getSheetOrders(),
+ workbook.getUnhiddenWorksheets(),
+ order
+ );
+ await commandService.executeCommand(SetWorksheetOrderCommand.id, { order: targetOrder });
},
onChangeTab: (_event: MouseEvent, subUnitId: string) => {
// Do not use SetWorksheetActivateCommand, otherwise activation timing may be incorrect.
diff --git a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/utils/__tests__/sheet-tab-drag-sort.spec.ts b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/utils/__tests__/sheet-tab-drag-sort.spec.ts
index 3a83790452..84db777fd7 100644
--- a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/utils/__tests__/sheet-tab-drag-sort.spec.ts
+++ b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/utils/__tests__/sheet-tab-drag-sort.spec.ts
@@ -15,7 +15,7 @@
*/
import { describe, expect, it } from 'vitest';
-import { calculateSheetTabDragSort, reorderItems } from '../sheet-tab-drag-sort';
+import { calculateSheetTabDragSort, getSheetTabTargetOrder, reorderItems } from '../sheet-tab-drag-sort';
const layout = [
{ id: 'sheet-0', left: 0, width: 40 },
@@ -75,4 +75,19 @@ describe('sheet-tab-drag-sort', () => {
expect(reorderItems(['a', 'b', 'c', 'd'], 2, 0)).toEqual(['c', 'a', 'b', 'd']);
expect(reorderItems(['a', 'b', 'c', 'd'], 2, 2)).toEqual(['a', 'b', 'c', 'd']);
});
+
+ it('moves sheet 2 after sheet 6 when sheet 5 is hidden', () => {
+ const sheetOrder = ['sheet-1', 'sheet-2', 'sheet-3', 'sheet-4', 'sheet-5', 'sheet-6'];
+ const visibleSheetIds = ['sheet-1', 'sheet-2', 'sheet-3', 'sheet-4', 'sheet-6'];
+ const targetOrder = getSheetTabTargetOrder(sheetOrder, visibleSheetIds, 4);
+
+ expect(reorderItems(sheetOrder, 1, targetOrder)).toEqual([
+ 'sheet-1',
+ 'sheet-3',
+ 'sheet-4',
+ 'sheet-5',
+ 'sheet-6',
+ 'sheet-2',
+ ]);
+ });
});
diff --git a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/utils/sheet-tab-drag-sort.ts b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/utils/sheet-tab-drag-sort.ts
index 4295c15540..5a09b7d7d2 100644
--- a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/utils/sheet-tab-drag-sort.ts
+++ b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/utils/sheet-tab-drag-sort.ts
@@ -88,3 +88,7 @@ export function reorderItems<T>(items: T[], fromIndex: number, toIndex: number):
nextItems.splice(toIndex, 0, movedItem);
return nextItems;
}
+
+export function getSheetTabTargetOrder(sheetOrder: readonly string[], visibleSheetIds: string[], targetIndex: number): number {
+ return sheetOrder.indexOf(visibleSheetIds[targetIndex]);
+}