more commands

Eugeny · Mar 1, 2024 · c12b445 · c12b445
1 parent 5d8ff72
commit c12b445
Show file tree

Hide file tree

Showing 24 changed files with 846 additions and 812 deletions.
diff --git a/tabby-core/src/api/commands.ts b/tabby-core/src/api/commands.ts
@@ -1,3 +1,4 @@
+import slugify from 'slugify'
 import { BaseTabComponent } from '../components/baseTab.component'
 import { MenuItemOptions } from './menu'
 import { ToolbarButton } from './toolbarButtonProvider'
@@ -6,34 +7,33 @@ export enum CommandLocation {
     LeftToolbar = 'left-toolbar',
     RightToolbar = 'right-toolbar',
     StartPage = 'start-page',
+    TabHeaderMenu = 'tab-header-menu',
+    TabBodyMenu = 'tab-body-menu',
 }
 
 export class Command {
-    id?: string
+    id: string
     label: string
-    sublabel?: string
-    locations?: CommandLocation[]
-    run: () => Promise<void>
+    fullLabel?: string
+    locations: CommandLocation[]
+    run?: () => Promise<any>
 
     /**
      * Raw SVG icon code
      */
     icon?: string
 
-    /**
-     * Optional Touch Bar icon ID
-     */
-    touchBarNSImage?: string
+    weight?: number
 
-    /**
-     * Optional Touch Bar button label
-     */
-    touchBarTitle?: string
+    parent?: string
 
-    weight?: number
+    group?: string
+
+    checked?: boolean
 
     static fromToolbarButton (button: ToolbarButton): Command {
         const command = new Command()
+        command.id = `legacy:${slugify(button.title)}`
         command.label = button.title
         command.run = async () => button.click?.()
         command.icon = button.icon
@@ -44,18 +44,29 @@ export class Command {
         if ((button.weight ?? 0) > 0) {
             command.locations.push(CommandLocation.RightToolbar)
         }
-        command.touchBarNSImage = button.touchBarNSImage
-        command.touchBarTitle = button.touchBarTitle
         command.weight = button.weight
         return command
     }
 
-    static fromMenuItem (item: MenuItemOptions): Command {
-        const command = new Command()
-        command.label = item.commandLabel ?? item.label ?? ''
-        command.sublabel = item.sublabel
-        command.run = async () => item.click?.()
-        return command
+    static fromMenuItem (item: MenuItemOptions): Command[] {
+        if (item.type === 'separator') {
+            return []
+        }
+        const commands: Command[] = [{
+            id: `legacy:${slugify(item.commandLabel ?? item.label).toLowerCase()}`,
+            label: item.commandLabel ?? item.label,
+            run: async () => item.click?.(),
+            locations: [CommandLocation.TabBodyMenu, CommandLocation.TabHeaderMenu],
+            checked: item.checked,
+        }]
+        for (const submenu of item.submenu ?? []) {
+            commands.push(...Command.fromMenuItem(submenu).map(x => ({
+                ...x,
+                id: `${commands[0].id}:${slugify(x.label).toLowerCase()}`,
+                parent: commands[0].id,
+            })))
+        }
+        return commands
     }
 }
 

diff --git a/tabby-core/src/api/index.ts b/tabby-core/src/api/index.ts
@@ -37,6 +37,7 @@ export { UpdaterService } from '../services/updater.service'
 export { VaultService, Vault, VaultSecret, VaultFileSecret, VAULT_SECRET_TYPE_FILE, StoredVault, VaultSecretKey } from '../services/vault.service'
 export { FileProvidersService } from '../services/fileProviders.service'
 export { LocaleService } from '../services/locale.service'
+export { CommandService } from '../services/commands.service'
 export { TranslateService } from '@ngx-translate/core'
 export * from '../utils'
 export { UTF8Splitter } from '../utfSplitter'
diff --git a/tabby-core/src/api/menu.ts b/tabby-core/src/api/menu.ts
@@ -1,6 +1,4 @@
-export interface MenuItemOptions {
-    type?: 'normal' | 'separator' | 'submenu' | 'checkbox' | 'radio'
-    label?: string
+export type MenuItemOptions = {
     sublabel?: string
     enabled?: boolean
     checked?: boolean
@@ -9,4 +7,10 @@ export interface MenuItemOptions {
 
     /** @hidden */
     commandLabel?: string
-}
+} & ({
+    type: 'separator',
+    label?: string,
+} | {
+    type?: 'normal' | 'submenu' | 'checkbox' | 'radio',
+    label: string,
+})
diff --git a/tabby-core/src/api/toolbarButtonProvider.ts b/tabby-core/src/api/toolbarButtonProvider.ts
@@ -9,16 +9,6 @@ export interface ToolbarButton {
 
     title: string
 
-    /**
-     * Optional Touch Bar icon ID
-     */
-    touchBarNSImage?: string
-
-    /**
-     * Optional Touch Bar button label
-     */
-    touchBarTitle?: string
-
     weight?: number
 
     click?: () => void