Skip to content

Finish tab close ghosts on animation completion #246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
YakiHugo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Finish tab close ghosts on animation completion #246

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions src/components/layout/TabBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,12 +472,14 @@ export function TabBar() {
const tabNodeRefs = useRef<Map<string, HTMLDivElement>>(new Map());
const previousTabIdsRef = useRef<Set<string>>(new Set(tabs.map((tab) => tab.id)));
const timeouts = useRef<Set<ReturnType<typeof setTimeout>>>(new Set());
const closeGhostTimeouts = useRef<Map<string, ReturnType<typeof setTimeout>>>(new Map());
const releaseFrozenWidthsTimeout = useRef<ReturnType<typeof setTimeout> | null>(null);

useEffect(() => {
return () => {
for (const t of timeouts.current) clearTimeout(t);
timeouts.current.clear();
closeGhostTimeouts.current.clear();
// 卸载兜底：万一拖拽中组件被销毁，确保 body class 被清掉
document.body.classList.remove("lumina-tab-dragging");
};
Expand Down Expand Up @@ -634,6 +636,22 @@ export function TabBar() {
[closingIds, reorderTabs, tabLayouts, tabs],
);

const finishClosingGhost = useCallback((tabId: string) => {
const timeout = closeGhostTimeouts.current.get(tabId);
if (timeout) {
clearTimeout(timeout);
timeouts.current.delete(timeout);
closeGhostTimeouts.current.delete(tabId);
}

setClosingGhosts((prev) => {
if (!prev.has(tabId)) return prev;
const next = new Map(prev);
next.delete(tabId);
return next;
});
}, []);

const animateClose = useCallback((tabId: string) => {
freezeTabWidthsForCloseBatch();
const closeIndex = tabsRef.current.findIndex((tab) => tab.id === tabId);
Expand All @@ -655,26 +673,16 @@ export function TabBar() {
error,
context: { tabId },
});
setClosingGhosts((prev) => {
if (!prev.has(tabId)) return prev;
const next = new Map(prev);
next.delete(tabId);
return next;
});
finishClosingGhost(tabId);
});
}

const timeout = setTimeout(() => {
timeouts.current.delete(timeout);
setClosingGhosts((prev) => {
if (!prev.has(tabId)) return prev;
const next = new Map(prev);
next.delete(tabId);
return next;
});
finishClosingGhost(tabId);
}, TAB_BOUNDS_ANIMATION_MS + 80);
closeGhostTimeouts.current.set(tabId, timeout);
timeouts.current.add(timeout);
}, [closeTab, freezeTabWidthsForCloseBatch]);
}, [closeTab, finishClosingGhost, freezeTabWidthsForCloseBatch]);

const handleContextMenu = useCallback((e: React.MouseEvent, index: number) => {
e.preventDefault();
Expand Down Expand Up @@ -833,6 +841,9 @@ export function TabBar() {
duration: reduceMotion ? 0 : TAB_BOUNDS_ANIMATION_MS / 1000,
ease: [0.2, 0, 0, 1],
}}
onAnimationComplete={() => {
if (isClosing) finishClosingGhost(tab.id);
}}
style={tabStyle}
className={cn(
"absolute bottom-0 top-0 overflow-hidden",
Expand Down