Skip to content

feat(menu): support declarative hierarchical tree menu via JSON #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wflixu merged 2 commits into from
Sep 13, 2026
Merged

feat(menu): support declarative hierarchical tree menu via JSON #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c763a2
feat(menu): support declarative hierarchical tree menu via JSON
Juns-g Sep 12, 2026
175d3a2
feat(settings): add Advanced Menu Layout section with config actions …
Juns-g Sep 12, 2026
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
100 changes: 60 additions & 40 deletions FinderSyncExt/FinderSyncExt.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,11 @@ class FinderSyncExt: FIFinderSync, @unchecked Sendable {
if let appURL = app.appURL {
let cacheKey = "app:\(appURL)"
if let cached = iconCache[cacheKey] { return cached }
let icon: NSImage = DispatchQueue.main.sync {
NSWorkspace.shared.icon(forFile: appURL)
let icon: NSImage
if Thread.isMainThread {
icon = MainActor.assumeIsolated { NSWorkspace.shared.icon(forFile: appURL) }
} else {
icon = DispatchQueue.main.sync { NSWorkspace.shared.icon(forFile: appURL) }
}
if icon.size.width > 0 {
iconCache[cacheKey] = icon
Expand Down Expand Up @@ -342,19 +345,26 @@ class FinderSyncExt: FIFinderSync, @unchecked Sendable {
return menu
}

if let nodes = config.customMenu {
CustomMenu.render(nodes, into: menu, makeItem: { type, id in
switch type {
case .action: return config.actions.first { $0.id == id }.map(self.makeActionItem)
case .app: return config.apps.first { $0.id == id }.map(self.makeAppItem)
case .newFile: return config.newFiles.first { $0.id == id }.map(self.makeNewFileItem)
case .commonDir: return config.commonDirs.first { $0.id == id }.map(self.makeCommonDirItem)
}
}, loadIcon: { self.loadIcon(named: $0, accessibilityDescription: $0) })
return menu
}

// 构建动作菜单
if !config.actions.isEmpty {
if config.actionsCollapsed {
// 折叠：使用子菜单
let actionsTitle = AppLocalization.localized("Actions")
let actionsSubMenu = NSMenu(title: actionsTitle)
for action in config.actions {
let item = NSMenuItem(title: action.name, action: #selector(handleActionClick(_:)), keyEquivalent: "")
item.tag = hashForAction(action)
item.target = self
if let icon = templateSymbol(action.icon) {
item.image = icon
}
let item = makeActionItem(action)
actionsSubMenu.addItem(item)
}
let actionsItem = NSMenuItem(title: actionsTitle, action: nil, keyEquivalent: "")
Expand All @@ -364,12 +374,7 @@ class FinderSyncExt: FIFinderSync, @unchecked Sendable {
} else {
// 不折叠：直接显示菜单项
for action in config.actions {
let item = NSMenuItem(title: action.name, action: #selector(handleActionClick(_:)), keyEquivalent: "")
item.tag = hashForAction(action)
item.target = self
if let icon = templateSymbol(action.icon) {
item.image = icon
}
let item = makeActionItem(action)
menu.addItem(item)
}
}
Expand All @@ -382,10 +387,7 @@ class FinderSyncExt: FIFinderSync, @unchecked Sendable {
let appsTitle = AppLocalization.localized("Open With")
let appsSubMenu = NSMenu(title: appsTitle)
for app in config.apps {
let item = NSMenuItem(title: app.name, action: #selector(handleAppClick(_:)), keyEquivalent: "")
item.tag = hashForApp(app)
item.target = self
item.image = cachedAppIcon(app: app)
let item = makeAppItem(app)
appsSubMenu.addItem(item)
}
let appsItem = NSMenuItem(title: appsTitle, action: nil, keyEquivalent: "")
Expand All @@ -395,10 +397,7 @@ class FinderSyncExt: FIFinderSync, @unchecked Sendable {
} else {
// 不折叠：直接显示菜单项
for app in config.apps {
let item = NSMenuItem(title: app.name, action: #selector(handleAppClick(_:)), keyEquivalent: "")
item.tag = hashForApp(app)
item.target = self
item.image = cachedAppIcon(app: app)
let item = makeAppItem(app)
menu.addItem(item)
}
}
Expand All @@ -411,11 +410,7 @@ class FinderSyncExt: FIFinderSync, @unchecked Sendable {
let newFilesTitle = AppLocalization.localized("New File")
let newFilesSubMenu = NSMenu(title: newFilesTitle)
for newFile in config.newFiles {
let item = NSMenuItem(title: newFile.name, action: #selector(handleNewFileClick(_:)), keyEquivalent: "")
item.tag = hashForNewFile(newFile)
item.target = self
item.image = iconProvider.icon(for: newFile.ext, fallbackSymbol: newFile.icon)
item.image?.accessibilityDescription = newFile.name
let item = makeNewFileItem(newFile)
newFilesSubMenu.addItem(item)
}
let newFilesItem = NSMenuItem(title: newFilesTitle, action: nil, keyEquivalent: "")
Expand All @@ -425,11 +420,7 @@ class FinderSyncExt: FIFinderSync, @unchecked Sendable {
} else {
// 不折叠：直接显示菜单项
for newFile in config.newFiles {
let item = NSMenuItem(title: newFile.name, action: #selector(handleNewFileClick(_:)), keyEquivalent: "")
item.tag = hashForNewFile(newFile)
item.target = self
item.image = iconProvider.icon(for: newFile.ext, fallbackSymbol: newFile.icon)
item.image?.accessibilityDescription = newFile.name
let item = makeNewFileItem(newFile)
menu.addItem(item)
}
}
Expand All @@ -442,10 +433,7 @@ class FinderSyncExt: FIFinderSync, @unchecked Sendable {
let commonDirsTitle = AppLocalization.localized("Common Dirs")
let commonDirsSubMenu = NSMenu(title: commonDirsTitle)
for commonDir in config.commonDirs {
let item = NSMenuItem(title: commonDir.name, action: #selector(handleCommonDirClick(_:)), keyEquivalent: "")
item.tag = hashForCommonDir(commonDir)
item.target = self
item.image = loadIcon(named: commonDir.icon, accessibilityDescription: commonDir.name)
let item = makeCommonDirItem(commonDir)
commonDirsSubMenu.addItem(item)
}
let commonDirsItem = NSMenuItem(title: commonDirsTitle, action: nil, keyEquivalent: "")
Expand All @@ -455,10 +443,7 @@ class FinderSyncExt: FIFinderSync, @unchecked Sendable {
} else {
// 不折叠：直接显示菜单项
for commonDir in config.commonDirs {
let item = NSMenuItem(title: commonDir.name, action: #selector(handleCommonDirClick(_:)), keyEquivalent: "")
item.tag = hashForCommonDir(commonDir)
item.target = self
item.image = loadIcon(named: commonDir.icon, accessibilityDescription: commonDir.name)
let item = makeCommonDirItem(commonDir)
menu.addItem(item)
}
}
Expand All @@ -467,6 +452,41 @@ class FinderSyncExt: FIFinderSync, @unchecked Sendable {
return menu
}

private func makeActionItem(_ action: ActionMenuItem) -> NSMenuItem {
let item = NSMenuItem(title: action.name, action: #selector(handleActionClick(_:)), keyEquivalent: "")
item.tag = hashForAction(action)
item.target = self
if let icon = templateSymbol(action.icon) {
item.image = icon
}
return item
}

private func makeAppItem(_ app: AppMenuItem) -> NSMenuItem {
let item = NSMenuItem(title: app.name, action: #selector(handleAppClick(_:)), keyEquivalent: "")
item.tag = hashForApp(app)
item.target = self
item.image = cachedAppIcon(app: app)
return item
}

private func makeNewFileItem(_ newFile: NewFileMenuItem) -> NSMenuItem {
let item = NSMenuItem(title: newFile.name, action: #selector(handleNewFileClick(_:)), keyEquivalent: "")
item.tag = hashForNewFile(newFile)
item.target = self
item.image = iconProvider.icon(for: newFile.ext, fallbackSymbol: newFile.icon)
item.image?.accessibilityDescription = newFile.name
return item
}

private func makeCommonDirItem(_ commonDir: CommonDirMenuItem) -> NSMenuItem {
let item = NSMenuItem(title: commonDir.name, action: #selector(handleCommonDirClick(_:)), keyEquivalent: "")
item.tag = hashForCommonDir(commonDir)
item.target = self
item.image = loadIcon(named: commonDir.icon, accessibilityDescription: commonDir.name)
return item
}

// MARK: - Menu Item Hash Functions

private func hashForAction(_ action: ActionMenuItem) -> Int {
Expand Down
2 changes: 1 addition & 1 deletion RClick/AppState.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class AppState: ObservableObject, ActionStateProviding {
}

func getAppItem(rid: String) -> OpenWithApp? {
return apps.first { rid.contains($0.id) }
return apps.first { rid == $0.id }
}

func getFileType(rid: String) -> NewFile? {
Expand Down
Loading