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
14 changes: 13 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,13 @@ function useScrollActiveTabIntoView(tabs: Tab[]) {
}

function useTabsShortcuts() {
const { tabs, currentTab, close, select } = useTabs(
const { tabs, currentTab, close, select, restoreLastClosedTab } = useTabs(
useShallow((state) => ({
tabs: state.tabs,
currentTab: state.currentTab,
close: state.close,
select: state.select,
restoreLastClosedTab: state.restoreLastClosedTab,
})),
);
const newNote = useNewNote({ behavior: "new" });
Expand Down Expand Up @@ -688,6 +689,17 @@ function useTabsShortcuts() {
[tabs, select],
);

useHotkeys(
"mod+shift+t",
() => restoreLastClosedTab(),
{
preventDefault: true,
enableOnFormTags: true,
enableOnContentEditable: true,
},
[restoreLastClosedTab],
);

return {};
}

Expand Down
28 changes: 19 additions & 9 deletions apps/desktop/src/store/zustand/tabs/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,35 @@ import {
navigationMiddleware,
type NavigationState,
} from "./navigation";
import {
createRestoreSlice,
type RestoreActions,
restoreMiddleware,
type RestoreState,
} from "./restore";
import { createStateUpdaterSlice, type StateBasicActions } from "./state";

export type { Tab, TabInput } from "./schema";
export { isSameTab, rowIdfromTab, uniqueIdfromTab } from "./schema";

type State = BasicState & NavigationState & LifecycleState;
type State = BasicState & NavigationState & LifecycleState & RestoreState;
type Actions = BasicActions &
StateBasicActions &
NavigationActions &
LifecycleActions;
LifecycleActions &
RestoreActions;
type Store = State & Actions;

export const useTabs = create<Store>()(
lifecycleMiddleware(
navigationMiddleware((set, get) => ({
...wrapSliceWithLogging("basic", createBasicSlice(set, get)),
...wrapSliceWithLogging("state", createStateUpdaterSlice(set, get)),
...wrapSliceWithLogging("navigation", createNavigationSlice(set, get)),
...wrapSliceWithLogging("lifecycle", createLifecycleSlice(set, get)),
})),
restoreMiddleware(
lifecycleMiddleware(
navigationMiddleware((set, get) => ({
...wrapSliceWithLogging("basic", createBasicSlice(set, get)),
...wrapSliceWithLogging("state", createStateUpdaterSlice(set, get)),
...wrapSliceWithLogging("navigation", createNavigationSlice(set, get)),
...wrapSliceWithLogging("lifecycle", createLifecycleSlice(set, get)),
...wrapSliceWithLogging("restore", createRestoreSlice(set, get)),
})),
),
),
);
91 changes: 91 additions & 0 deletions apps/desktop/src/store/zustand/tabs/restore.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
import type { StoreApi } from "zustand";

import type { Tab, TabInput } from "./schema";

const MAX_CLOSED_TABS = 10;

export type RestoreState = {
closedTabs: Tab[];
};

export type RestoreActions = {
restoreLastClosedTab: () => void;
};

const tabToTabInput = (tab: Tab): TabInput => {
const { active, slotId, pinned, ...rest } = tab as Tab & {
active: boolean;
slotId: string;
pinned: boolean;
};
return rest as TabInput;
};

export const createRestoreSlice = <
T extends RestoreState & { tabs: Tab[]; openNew: (tab: TabInput) => void },
>(
set: StoreApi<T>["setState"],
get: StoreApi<T>["getState"],
): RestoreState & RestoreActions => ({
closedTabs: [],
restoreLastClosedTab: () => {
const { closedTabs, openNew } = get();
if (closedTabs.length === 0) return;

const lastClosed = closedTabs[closedTabs.length - 1];
const remainingClosedTabs = closedTabs.slice(0, -1);

openNew(tabToTabInput(lastClosed));
set({ closedTabs: remainingClosedTabs } as Partial<T>);
},
});

type RestoreMiddleware = <
T extends {
tabs: Tab[];
closedTabs: Tab[];
},
>(
f: (
set: StoreApi<T>["setState"],
get: StoreApi<T>["getState"],
api: StoreApi<T>,
) => T,
) => (
set: StoreApi<T>["setState"],
get: StoreApi<T>["getState"],
api: StoreApi<T>,
) => T;

const restoreMiddlewareImpl: RestoreMiddleware =
(config) => (set, get, api) => {
return config(
(args) => {
const prevState = get();
const prevTabs = prevState.tabs;

set(args);

const nextState = get();
const nextTabs = nextState.tabs;

const closedTabs = prevTabs.filter(
(prevTab) =>
!nextTabs.some((nextTab) => nextTab.slotId === prevTab.slotId),
);

if (closedTabs.length > 0) {
const updatedClosedTabs = [
...nextState.closedTabs,
...closedTabs,
].slice(-MAX_CLOSED_TABS);
// eslint-disable-next-line @typescript-eslint/no-explicit-any
set({ closedTabs: updatedClosedTabs } as any);
}
},
get,
api,
);
};

export const restoreMiddleware = restoreMiddlewareImpl;
Loading