luulam/AFFiNE
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(electron): allow close pinned tab (#7732)

Browse Source
This commit is contained in:
pengx17
2024-08-05 08:03:12 +00:00
parent 5f52547d9e
commit 51848ff6c3
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/frontend/electron/src/main/windows-manager/context-menu.ts
View File

@@ -10,7 +10,6 @@ import {
export const showTabContextMenu = async (tabId: string, viewIndex: number) => { export const showTabContextMenu = async (tabId: string, viewIndex: number) => {
const workbenches = WebContentViewsManager.instance.tabViewsMeta.workbenches; const workbenches = WebContentViewsManager.instance.tabViewsMeta.workbenches;
const unpinned = workbenches.filter(w => !w.pinned);
const tabMeta = workbenches.find(w => w.id === tabId); const tabMeta = workbenches.find(w => w.id === tabId);
if (!tabMeta) { if (!tabMeta) {
return; return;
@@ -63,7 +62,7 @@ export const showTabContextMenu = async (tabId: string, viewIndex: number) => {
}, },
}, },
...(unpinned.length > 0 ...(workbenches.length > 0
? ([ ? ([
{ type: 'separator' }, { type: 'separator' },
{ {

9
packages/frontend/electron/src/main/windows-manager/tab-views.ts
View File

@@ -125,6 +125,7 @@ export type AddTabOption = {
* Whether to show the tab after adding. * Whether to show the tab after adding.
*/ */
show?: boolean; show?: boolean;
pinned?: boolean;
}; };
export class WebContentViewsManager { export class WebContentViewsManager {
@@ -328,11 +329,6 @@ export class WebContentViewsManager {
return; return;
} }
const targetWorkbench = this.tabViewsMeta.workbenches[index]; const targetWorkbench = this.tabViewsMeta.workbenches[index];
if (targetWorkbench.pinned) {
return;
}
const workbenches = this.tabViewsMeta.workbenches.toSpliced(index, 1); const workbenches = this.tabViewsMeta.workbenches.toSpliced(index, 1);
// if the active view is closed, switch to the next view (index unchanged) // if the active view is closed, switch to the next view (index unchanged)
// if the new index is out of bound, switch to the last view // if the new index is out of bound, switch to the last view
@@ -398,6 +394,7 @@ export class WebContentViewsManager {
} }
: undefined, : undefined,
}; };
option.pinned ??= false;
const workbenches = this.tabViewsMeta.workbenches; const workbenches = this.tabViewsMeta.workbenches;
const newKey = this.generateViewId('app'); const newKey = this.generateViewId('app');
@@ -422,7 +419,7 @@ export class WebContentViewsManager {
activeViewIndex: 0, activeViewIndex: 0,
views: views, views: views,
id: newKey, id: newKey,
pinned: targetItem?.pinned ?? false, pinned: option.pinned,
}; };
this.patchTabViewsMeta({ this.patchTabViewsMeta({