Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2024-12-21 16:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Red Adaya 2024-12-10 15:29:56 +08:00
parent 0c8c75c187
commit 845e07807f
1 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
frontend/app/tab/tabbar.tsx
View File

@ -151,7 +151,6 @@ const TabBar = memo(({ workspace }: TabBarProps) => {
useEffect(() => { useEffect(() => {
if (workspace) { if (workspace) {
// Compare current tabIds with new workspace.tabids // Compare current tabIds with new workspace.tabids
// console.log("tabbar workspace", workspace);
const newTabIds = new Set([...(workspace.pinnedtabids ?? []), ...(workspace.tabids ?? [])]); const newTabIds = new Set([...(workspace.pinnedtabids ?? []), ...(workspace.tabids ?? [])]);
const newPinnedTabIds = workspace.pinnedtabids ?? []; const newPinnedTabIds = workspace.pinnedtabids ?? [];
@ -162,9 +161,7 @@ const TabBar = memo(({ workspace }: TabBarProps) => {
if (!areEqual) { if (!areEqual) {
const newPinnedTabIdSet = new Set(newPinnedTabIds); const newPinnedTabIdSet = new Set(newPinnedTabIds);
// console.log("newPinnedTabIds", newPinnedTabIds);
const newTabIdList = newPinnedTabIds.concat([...newTabIds].filter((id) => !newPinnedTabIdSet.has(id))); // Corrects for any duplicates between the two lists const newTabIdList = newPinnedTabIds.concat([...newTabIds].filter((id) => !newPinnedTabIdSet.has(id))); // Corrects for any duplicates between the two lists
// console.log("newTabIdList", newTabIdList);
setTabIds(newTabIdList); setTabIds(newTabIdList);
setPinnedTabIds(newPinnedTabIdSet); setPinnedTabIds(newPinnedTabIdSet);
} }
@ -315,9 +312,7 @@ const TabBar = memo(({ workspace }: TabBarProps) => {
for (let i = tabIndex + 1; i < tabIds.length; i++) { for (let i = tabIndex + 1; i < tabIds.length; i++) {
const otherTabStart = dragStartPositions[i]; const otherTabStart = dragStartPositions[i];
if (currentX + tabWidth > otherTabStart + tabWidth / 2) { if (currentX + tabWidth > otherTabStart + tabWidth / 2) {
// setTest("switching right");
newTabIndex = i; newTabIndex = i;
// console.log("newTabIndex===", newTabIndex, tabRefs.current);
} }
} }
} else { } else {
@ -325,7 +320,6 @@ const TabBar = memo(({ workspace }: TabBarProps) => {
for (let i = tabIndex - 1; i >= 0; i--) { for (let i = tabIndex - 1; i >= 0; i--) {
const otherTabEnd = dragStartPositions[i] + tabWidth; const otherTabEnd = dragStartPositions[i] + tabWidth;
if (currentX < otherTabEnd - tabWidth / 2) { if (currentX < otherTabEnd - tabWidth / 2) {
// setTest("switching left");
newTabIndex = i; newTabIndex = i;
} }
} }
@ -419,21 +413,11 @@ const TabBar = memo(({ workspace }: TabBarProps) => {
// Find current index of the dragged tab in tempTabs // Find current index of the dragged tab in tempTabs
const currentIndexOfDraggingTab = tabIds.indexOf(tabId); const currentIndexOfDraggingTab = tabIds.indexOf(tabId);
// console.log("currentIndexOfDraggingTab", currentIndexOfDraggingTab);
// console.log("tabIndex", tabIndex);
// Move the dragged tab to its new position // Move the dragged tab to its new position
if (currentIndexOfDraggingTab !== -1) { if (currentIndexOfDraggingTab !== -1) {
tabIds.splice(tabIndex, 1); tabIds.splice(tabIndex, 1);
} }
// Track indices that have been moved
// if (getDragDirection(currentX) === "+") {
// setTabIndicesMoved([tabIds[newTabIndex], tabIds[newTabIndex + 1]].filter(Boolean));
// } else if (getDragDirection(currentX) === "-") {
// setTabIndicesMoved([tabIds[newTabIndex - 1], tabIds[newTabIndex]].filter(Boolean));
// }
// Update to trigger in-tab re-render // Update to trigger in-tab re-render
setTabsSwapped(newTabIndex + 1); setTabsSwapped(newTabIndex + 1);
@ -452,17 +436,8 @@ const TabBar = memo(({ workspace }: TabBarProps) => {
} }
}; };
// } else if ((tabIndex > pinnedTabCount || (tabIndex === 1 && pinnedTabCount === 1)) && isPinned) {
const setUpdatedTabsDebounced = useCallback( const setUpdatedTabsDebounced = useCallback(
debounce(300, (tabIndex: number, tabIds: string[], pinnedTabIds: Set<string>) => { debounce(300, (tabIndex: number, tabIds: string[], pinnedTabIds: Set<string>) => {
// console.log(
// "setting updated tabs",
// tabIds,
// pinnedTabIds,
// tabIndex,
// draggingTabDataRef.current.tabStartIndex
// );
// Reset styles // Reset styles
tabRefs.current.forEach((ref) => { tabRefs.current.forEach((ref) => {
ref.current.style.zIndex = "0"; ref.current.style.zIndex = "0";
@ -477,7 +452,6 @@ const TabBar = memo(({ workspace }: TabBarProps) => {
pinnedTabIds.delete(draggedTabId); pinnedTabIds.delete(draggedTabId);
} }
if (pinnedTabCount != pinnedTabIds.size) { if (pinnedTabCount != pinnedTabIds.size) {
// console.log("updated pinnedTabIds", pinnedTabIds, tabIds);
setPinnedTabIds(pinnedTabIds); setPinnedTabIds(pinnedTabIds);
pinnedTabCount = pinnedTabIds.size; pinnedTabCount = pinnedTabIds.size;
} }
@ -535,9 +509,9 @@ const TabBar = memo(({ workspace }: TabBarProps) => {
const tabIndex = tabIds.indexOf(tabId); const tabIndex = tabIds.indexOf(tabId);
const tabStartX = dragStartPositions[tabIndex]; // Starting X position of the tab const tabStartX = dragStartPositions[tabIndex]; // Starting X position of the tab
// Trigger in-tab re-render when a tab is dragged
setTabsSwapped(tabIndex + 1); setTabsSwapped(tabIndex + 1);
// console.log("handleDragStart", tabId, tabIndex, tabStartX);
if (ref.current) { if (ref.current) {
draggingTabDataRef.current = { draggingTabDataRef.current = {
tabId, tabId,
@ -599,7 +573,6 @@ const TabBar = memo(({ workspace }: TabBarProps) => {
const handlePinChange = useCallback( const handlePinChange = useCallback(
(tabId: string, pinned: boolean) => { (tabId: string, pinned: boolean) => {
// console.log("handlePinChange", tabId, pinned);
fireAndForget(async () => { fireAndForget(async () => {
await WorkspaceService.ChangeTabPinning(workspace.oid, tabId, pinned); await WorkspaceService.ChangeTabPinning(workspace.oid, tabId, pinned);
}); });