Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 33 additions & 1 deletion apps/desktop/src/components/main/body/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -614,12 +614,22 @@ function useScrollActiveTabIntoView(tabs: Tab[]) {
}

function useTabsShortcuts() {
const { tabs, currentTab, close, select, restoreLastClosedTab } = useTabs(
const {
tabs,
currentTab,
close,
select,
selectNext,
selectPrev,
restoreLastClosedTab,
} = useTabs(
useShallow((state) => ({
tabs: state.tabs,
currentTab: state.currentTab,
close: state.close,
select: state.select,
selectNext: state.selectNext,
selectPrev: state.selectPrev,
restoreLastClosedTab: state.restoreLastClosedTab,
})),
);
Expand Down Expand Up @@ -689,6 +699,28 @@ function useTabsShortcuts() {
[tabs, select],
);

useHotkeys(
"mod+alt+left",
() => selectPrev(),
{
preventDefault: true,
enableOnFormTags: true,
enableOnContentEditable: true,
},
[selectPrev],
);

useHotkeys(
"mod+alt+right",
() => selectNext(),
{
preventDefault: true,
enableOnFormTags: true,
enableOnContentEditable: true,
},
[selectNext],
);

useHotkeys(
"mod+shift+t",
() => restoreLastClosedTab(),
Expand Down
30 changes: 30 additions & 0 deletions apps/desktop/src/store/zustand/tabs/basic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ export type BasicActions = {
openCurrent: (tab: TabInput) => void;
openNew: (tab: TabInput) => void;
select: (tab: Tab) => void;
selectNext: () => void;
selectPrev: () => void;
close: (tab: Tab) => void;
reorder: (tabs: Tab[]) => void;
closeOthers: (tab: Tab) => void;
Expand Down Expand Up @@ -43,6 +45,34 @@ export const createBasicSlice = <
const currentTab = nextTabs.find((t) => t.active) || null;
set({ tabs: nextTabs, currentTab } as Partial<T>);
},
selectNext: () => {
const { tabs, currentTab } = get();
if (tabs.length === 0 || !currentTab) return;

const currentIndex = tabs.findIndex((t) => isSameTab(t, currentTab));
const nextIndex = (currentIndex + 1) % tabs.length;
const nextTab = tabs[nextIndex];

const nextTabs = setActiveFlags(tabs, nextTab);
set({
tabs: nextTabs,
currentTab: { ...nextTab, active: true },
} as Partial<T>);
},
selectPrev: () => {
const { tabs, currentTab } = get();
if (tabs.length === 0 || !currentTab) return;

const currentIndex = tabs.findIndex((t) => isSameTab(t, currentTab));
const prevIndex = (currentIndex - 1 + tabs.length) % tabs.length;
const prevTab = tabs[prevIndex];

const nextTabs = setActiveFlags(tabs, prevTab);
set({
tabs: nextTabs,
currentTab: { ...prevTab, active: true },
} as Partial<T>);
},
close: (tab) => {
const { tabs, history, canClose } = get();
const tabToClose = tabs.find((t) => isSameTab(t, tab));
Expand Down
Loading