From aa8b53e80b8af6219b26e6811d785db5f3b3b1b8 Mon Sep 17 00:00:00 2001
From: fhasse95 <49185957+fhasse95@users.noreply.github.com>
Date: Mon, 22 Jun 2026 02:11:08 +0200
Subject: [PATCH] Update ContextMenu.swift

---
 Sources/SkipUI/SkipUI/Commands/ContextMenu.swift | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Sources/SkipUI/SkipUI/Commands/ContextMenu.swift b/Sources/SkipUI/SkipUI/Commands/ContextMenu.swift
index c267f3dd..a927f02b 100644
--- a/Sources/SkipUI/SkipUI/Commands/ContextMenu.swift
+++ b/Sources/SkipUI/SkipUI/Commands/ContextMenu.swift
@@ -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)
@@ -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)
                 }
             }