[Desktop] Initial support for the new context menu API #2196

m-sasha · 2025-06-25T10:56:12Z

There are still several subtasks remaining, but this provides basic support for the new context menu API on the desktop.

I don't think we should enable this by default until the subtasks have been completed.

Testing

Tested manually.
Note that you need to set ComposeFoundationFlags.isNewContextMenuEnabled = true to use this.

This should be tested by QA

Release Notes

Features - Desktop

Basic support for new context menu API

MatkovIvan · 2025-06-26T07:53:12Z

...c/commonMain/kotlin/androidx/compose/foundation/text/contextmenu/data/TextContextMenuData.kt


 /** A [TextContextMenuComponent] separator in a text context menu. */
-object TextContextMenuSeparator : TextContextMenuComponent(TextContextMenuSeparator)
+object TextContextMenuSeparator : TextContextMenuComponent(Any())


Can we avoid changing commonMain here? Do you already have AOSP CL with this change?

It's taken from upstream: https://android-review.git.corp.google.com/c/platform/frameworks/support/+/3651634

Please do explicit cherry pick then

It would unnecessarily take more time.
It'll just be resolved with no conflicts (or identical code in both branches) in the next merge, which will definitely happen before release.

MatkovIvan · 2025-06-26T07:54:35Z

...src/desktopMain/kotlin/androidx/compose/foundation/BasicContextMenuRepresentation.desktop.kt

+        onKeyEvent = {
+            if (it.type == KeyEventType.KeyDown) {
+                when (it.key.nativeKeyCode) {
+                    java.awt.event.KeyEvent.VK_DOWN  -> {


Do we have common/compose wrappers for these code?

This is not new code. I'd rather not touch it in this PR.

MatkovIvan · 2025-06-26T07:59:30Z

.../androidx/compose/foundation/text/contextmenu/builder/TextContextMenuBuilderScope.desktop.kt

+ * @param leadingIcon Icon that precedes the label in the context menu.
+ * @param onClick Action to perform upon the item being clicked/pressed.
+ */
+fun TextContextMenuBuilderScope.item(


If it's popup/canvas based, why it's desktop-only? Are we sure that it will be popup/canvas based long term?
I mean defining leadingIcon as composable assumes some implementation details and expectations

If it's popup/canvas based, why it's desktop-only?

I'm doing the desktop part and I don't know the capabilities on other platforms. If it turns out we can move this to skikoMain, I will be in favor of that.

Are we sure that it will be popup/canvas based long term?
I mean defining leadingIcon as composable assumes some implementation details and expectations

I don't see why we shouldn't support a composable leading icon on the desktop.
In fact, I plan to add another extension which allows the entire item to be composable.

we need this code in desktop browsers. there are no differences between desktop and desktop browsers

We can't put it in skikoMain unless it's also supported by ios. And I don't think we have a desktopWeb source set.

And I don't think we have a desktopWeb source set

And we shouldn't! Anther reminder that compilation target != platform

In theory "desktop" logic should be in common - Chrome OS (desktop) uses androidMain sourceset

For logic, that's correct. But this is API. We can't put this in common because it's not supported on android or ios.

terrakok · 2025-06-26T10:30:45Z

Could we have the Desktop context menu UI code in the skiko source set? Because we need the same logic for desktop browsers

m-sasha · 2025-06-26T10:55:35Z

I'm not sure how to share code between desktop and web.
Internal code we can put in skikoMain, but for public API it's a problem.

m-sasha · 2025-06-29T13:22:26Z

@terrakok @MatkovIvan
I moved what made sense to skikoMain.

...on/foundation/src/desktopMain/kotlin/androidx/compose/foundation/text/ContextMenu.desktop.kt

MatkovIvan · 2025-06-30T09:36:34Z

compose/foundation/foundation/api/desktop/foundation.api

 }

+public final class androidx/compose/foundation/text/contextmenu/builder/TextContextMenuBuilderScope_desktopKt {
+	public static final fun item (Landroidx/compose/foundation/text/contextmenu/builder/TextContextMenuBuilderScope;Ljava/lang/Object;Ljava/lang/String;ZLkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;)V


Are we sure that it's a final, desktop/jvm-only shape?

We can't put this in common because it's not supported on android or ios.

What exactly is not supported? Does it really depend on a "compilation target" but not on capabilities of underlaying platform ui toolkit or device type?

Well. I don't think that it's a question. I'm sure that we should NOT introduce any public API for specific compilation targets at foundation level

Are we sure that it's a final, desktop/jvm-only shape?

Do you want me to mark it at experimental? Corresponding function in androidMain is not experimental.

What exactly is not supported?

A composable leadingIcon.

Does it really depend on a "compilation target" but not on capabilities of underlaying platform ui toolkit or device type?

I don't understand the question, but what difference does it make? If on any platform we will not be able to support this API, then we can't have it in the corresponding compilation target.

Well. I don't think that it's a question. I'm sure that we should NOT introduce any public API for specific compilation targets at foundation level

I'm just replicating what Android does. See https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/text/contextmenu/builder/TextContextMenuBuilderScope.android.kt;l=38?q=TextContextMenuBuilderScope.item&sq=&ss=androidx%2Fplatform%2Fframeworks%2Fsupport

If on any platform we will not be able to support this API, then we can't have it in the corresponding compilation target.

It's not always the case

I'm just replicating what Android does

Android is always a special case in AOSP

Well. I don't think that it's a question. I'm sure that we should NOT introduce any public API for specific compilation targets at foundation level

We also have this. For example, desktop-only LocalTextContextMenu.

It's not always the case

What happens when a developer uses this API and then runs the app on a platform that doesn't support it?

Android is always a special case in AOSP

We can't live in a world where we are not allowed to do the things Android is allowed. Especially when Android does the reference implementation...

TextContextMenuBuilderScope.addComponent is internal. So we can't put this extension function in ui.

Talked to Ivan, agreed that we should consult with the web and iOS implementors, and if they're ok, we can move this function to skikoMain.
Implementations which don't support composables can just ignore the leading icon, but we will need to document it in the kdoc of the function.

MatkovIvan

LGTM as not-final-shape

.../androidx/compose/foundation/text/contextmenu/builder/TextContextMenuBuilderScope.desktop.kt

m-sasha requested review from mazunin-v-jb and terrakok June 25, 2025 12:47

MatkovIvan reviewed Jun 26, 2025

View reviewed changes

m-sasha force-pushed the m-sasha/desktop-new-context-menu-api branch from b693dc5 to 50e30f9 Compare June 26, 2025 21:32

MatkovIvan reviewed Jun 30, 2025

View reviewed changes

m-sasha force-pushed the m-sasha/desktop-new-context-menu-api branch 3 times, most recently from 9e0fd27 to 7346f5c Compare June 30, 2025 11:41

MatkovIvan approved these changes Jun 30, 2025

View reviewed changes

m-sasha requested a review from ASalavei June 30, 2025 13:16

m-sasha mentioned this pull request Jun 30, 2025

Support text context menus in web targets #2207

Merged

ASalavei approved these changes Jul 3, 2025

View reviewed changes

.../androidx/compose/foundation/text/contextmenu/builder/TextContextMenuBuilderScope.desktop.kt Outdated Show resolved Hide resolved

m-sasha force-pushed the m-sasha/desktop-new-context-menu-api branch from 7346f5c to 02815d3 Compare July 3, 2025 13:19

mazunin-v-jb approved these changes Jul 3, 2025

View reviewed changes

m-sasha force-pushed the m-sasha/desktop-new-context-menu-api branch from 02815d3 to 419c686 Compare July 3, 2025 14:09

m-sasha added 3 commits July 3, 2025 17:12

[Desktop] Initial support for the new context menu API

3cc2c22

Move useful functions from desktopMain to skikoMain

2871628

Fix compilation errors

de65e08

m-sasha force-pushed the m-sasha/desktop-new-context-menu-api branch from 419c686 to de65e08 Compare July 3, 2025 14:13

m-sasha merged commit a7e3fbf into jb-main Jul 4, 2025
10 checks passed

m-sasha deleted the m-sasha/desktop-new-context-menu-api branch July 4, 2025 08:59

[Desktop] Initial support for the new context menu API #2196

[Desktop] Initial support for the new context menu API #2196

Uh oh!

Conversation

m-sasha commented Jun 25, 2025

Testing

Release Notes

Features - Desktop

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

terrakok commented Jun 26, 2025

Uh oh!

m-sasha commented Jun 26, 2025

Uh oh!

m-sasha commented Jun 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

MatkovIvan Jun 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

m-sasha Jun 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MatkovIvan left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

m-sasha commented Jun 29, 2025 •

edited

Loading

MatkovIvan Jun 30, 2025 •

edited

Loading

m-sasha Jun 30, 2025 •

edited

Loading