fix: tab item context menu key bindings

CyanSalt · CyanSalt · commit 57ced5a75a4b · 2024-07-19T11:54:30.000+08:00
diff --git a/addons/launcher/src/renderer/LauncherList.vue b/addons/launcher/src/renderer/LauncherList.vue
@@ -193,7 +193,7 @@ function handleDrop(args: DraggableElementEventPayload<LauncherDraggableElementD
 
 function openLauncherMenu(launcher: Launcher, tab: TerminalTab | undefined, event: MouseEvent) {
   const scripts = launcher.scripts ?? []
-  const { updatingItems, deletingItems } = commas.workspace.createTerminalTabContextMenu()
+  const { updatingItems, deletingItems } = commas.workspace.createTerminalTabContextMenu(tab)
   commas.ui.openContextMenu([
     ...commas.ui.withContextMenuSeparator([
       {
diff --git a/src/renderer/components/TabList.vue b/src/renderer/components/TabList.vue
@@ -166,8 +166,8 @@ function handleGroupSeparating(args: DraggableElementEventPayload<DraggableEleme
   }
 }
 
-function openTabItemMenu(event: MouseEvent) {
-  const { updatingItems, deletingItems } = createTerminalTabContextMenu()
+function openTabItemMenu(event: MouseEvent, tab: TerminalTab) {
+  const { updatingItems, deletingItems } = createTerminalTabContextMenu(tab)
   openContextMenu([
     ...withContextMenuSeparator(updatingItems, []),
     ...deletingItems,
@@ -212,7 +212,7 @@ function openTabItemMenu(event: MouseEvent) {
                     :tab="tab"
                     :character="tab.character"
                     @click="activateTerminalTab(tab)"
-                    @contextmenu="openTabItemMenu"
+                    @contextmenu="openTabItemMenu($event, tab)"
                   />
                 </div>
               </DropTarget>
diff --git a/src/renderer/compositions/terminal.ts b/src/renderer/compositions/terminal.ts
@@ -40,9 +40,9 @@ declare module '@commas/api/modules/app' {
 declare module '@commas/electron-ipc' {
   export interface RendererEvents {
     'open-tab': (context?: Partial<TerminalContext>, options?: CreateTerminalTabOptions) => void,
-    'duplicate-tab': () => void,
-    'split-tab': () => void,
-    'close-tab': () => void,
+    'duplicate-tab': (data?: Pick<TerminalTab, 'pid'>) => void,
+    'split-tab': (data?: Pick<TerminalTab, 'pid'>) => void,
+    'close-tab': (data?: Pick<TerminalTab, 'pid'>) => void,
     'input-terminal': (data: Pick<TerminalTab, 'pid' | 'process'> & { data: string }) => void,
     'exit-terminal': (data: Pick<TerminalTab, 'pid'>) => void,
     'clear-terminal': () => void,
@@ -480,19 +480,20 @@ export function handleTerminalMessages() {
   ipcRenderer.on('open-tab', (event, context, options) => {
     createTerminalTab(context, options)
   })
-  ipcRenderer.on('duplicate-tab', event => {
-    if (currentTerminal) {
-      createTerminalTab(currentTerminal)
-    }
+  ipcRenderer.on('duplicate-tab', (event, data) => {
+    const tab = data ? tabs.find(item => item.pid === data.pid) : currentTerminal
+    if (!tab) return
+    createTerminalTab(tab)
   })
-  ipcRenderer.on('split-tab', () => {
-    if (currentTerminal) {
-      splitTerminalTab(currentTerminal)
-    }
+  ipcRenderer.on('split-tab', (event, data) => {
+    const tab = data ? tabs.find(item => item.pid === data.pid) : currentTerminal
+    if (!tab) return
+    splitTerminalTab(tab)
   })
-  ipcRenderer.on('close-tab', () => {
-    if (currentTerminal) {
-      closeTerminalTab(currentTerminal)
+  ipcRenderer.on('close-tab', (event, data) => {
+    const tab = data ? tabs.find(item => item.pid === data.pid) : currentTerminal
+    if (tab) {
+      closeTerminalTab(tab)
     }
   })
   ipcRenderer.on('input-terminal', (event, data) => {
diff --git a/src/renderer/utils/terminal.ts b/src/renderer/utils/terminal.ts
@@ -101,24 +101,27 @@ export function getReadableSignal(code: number) {
       ?.[0]
   }
 }
-export function createTerminalTabContextMenu() {
+export function createTerminalTabContextMenu(tab?: TerminalTab) {
   let updatingItems: MenuItem[] = [
     {
       label: 'Duplicate Tab#!menu.duplicatetab',
       accelerator: 'CmdOrCtrl+D',
       command: 'duplicate-tab',
+      args: tab ? [{ pid: tab.pid }] : undefined,
     },
     {
       label: 'Split Tab#!menu.splittab',
       accelerator: 'CmdOrCtrl+Shift+D',
       command: 'split-tab',
+      args: tab ? [{ pid: tab.pid }] : undefined,
     },
   ]
   const deletingItems: MenuItem[] = [
     {
       label: 'Close Tab#!menu.closetab',
       accelerator: 'CmdOrCtrl+W',
       command: 'close-tab',
+      args: tab ? [{ pid: tab.pid }] : undefined,
     },
   ]
   return {

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ function handleDrop(args: DraggableElementEventPayload<LauncherDraggableElementD`
`193`	`193`
`194`	`194`	`function openLauncherMenu(launcher: Launcher, tab: TerminalTab \| undefined, event: MouseEvent) {`
`195`	`195`	`const scripts = launcher.scripts ?? []`
`196`		`- const { updatingItems, deletingItems } = commas.workspace.createTerminalTabContextMenu()`
	`196`	`+ const { updatingItems, deletingItems } = commas.workspace.createTerminalTabContextMenu(tab)`
`197`	`197`	`commas.ui.openContextMenu([`
`198`	`198`	`...commas.ui.withContextMenuSeparator([`
`199`	`199`	`{`
Original file line number	Diff line number	Diff line change
`@@ -101,24 +101,27 @@ export function getReadableSignal(code: number) {`
`101`	`101`	`?.[0]`
`102`	`102`	`}`
`103`	`103`	`}`
`104`		`-export function createTerminalTabContextMenu() {`
	`104`	`+export function createTerminalTabContextMenu(tab?: TerminalTab) {`
`105`	`105`	`let updatingItems: MenuItem[] = [`
`106`	`106`	`{`
`107`	`107`	`label: 'Duplicate Tab#!menu.duplicatetab',`
`108`	`108`	`accelerator: 'CmdOrCtrl+D',`
`109`	`109`	`command: 'duplicate-tab',`
	`110`	`+ args: tab ? [{ pid: tab.pid }] : undefined,`
`110`	`111`	`},`
`111`	`112`	`{`
`112`	`113`	`label: 'Split Tab#!menu.splittab',`
`113`	`114`	`accelerator: 'CmdOrCtrl+Shift+D',`
`114`	`115`	`command: 'split-tab',`
	`116`	`+ args: tab ? [{ pid: tab.pid }] : undefined,`
`115`	`117`	`},`
`116`	`118`	`]`
`117`	`119`	`const deletingItems: MenuItem[] = [`
`118`	`120`	`{`
`119`	`121`	`label: 'Close Tab#!menu.closetab',`
`120`	`122`	`accelerator: 'CmdOrCtrl+W',`
`121`	`123`	`command: 'close-tab',`
	`124`	`+ args: tab ? [{ pid: tab.pid }] : undefined,`
`122`	`125`	`},`
`123`	`126`	`]`
`124`	`127`	`return {`