Skip to content

Bugfix: Disable Context Menu When No Items Are Present #467

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

Open
fhasse95 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bugfix: Disable Context Menu When No Items Are Present #467

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions Sources/SkipUI/SkipUI/Commands/ContextMenu.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ class ContextMenuModifier: RenderModifier {
let nestedMenu = remember { mutableStateOf<Menu?>(nil) }
let coroutineScope = rememberCoroutineScope()
let contentContext = context.content()
let isContextMenuEnabled = EnvironmentValues.shared.isEnabled && EnvironmentValues.shared._isHitTestingEnabled
let primaryMenuItems = menuItems.Evaluate(context: contentContext, options: 0).filter { !$0.isSwiftUIEmptyView }
let isContextMenuEnabled = EnvironmentValues.shared.isEnabled && EnvironmentValues.shared._isHitTestingEnabled && primaryMenuItems.size > 0
let replaceMenu: (Menu?) -> Void = { menu in
coroutineScope.launch {
delay(200)
Expand Down Expand Up @@ -105,7 +106,7 @@ class ContextMenuModifier: RenderModifier {
$0.set_placement(placement)
return ComposeResult.ok
} in: {
let renderables = (nestedMenu.value?.content ?? menuItems).Evaluate(context: contentContext, options: 0)
let renderables = nestedMenu.value?.content.Evaluate(context: contentContext, options: 0) ?? primaryMenuItems
Menu.RenderDropdownMenuItems(for: renderables, context: contentContext, replaceMenu: replaceMenu)
}
}
Expand Down
Loading