Fix "Context menu on desktop shows incorrect items after the second showing" #1693
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…howing" Fixes https://youtrack.jetbrains.com/issue/CMP-7083/Context-menu-on-desktop-shows-incorrect-items-after-second-showing The issue was that after the first click we remembered context items, but they are constructed dynamically depending on the selected text. ## Testing - the snippet from the issue - a new unit test ## Release Notes ### Fixes - Desktop - Fix "Context menu on desktop shows incorrect items after the second showing"
m-sasha
approved these changes
Nov 15, 2024
|
|
||
| internal val allItemsSeq: Sequence<ContextMenuItem> | ||
| private val allItemsSeq: Sequence<ContextMenuItem> |
There was a problem hiding this comment.
Not really related to the change in this PR, but why do we need a sequence here? We could do the same with
internal val allItems: List<ContextMenuItem>
get() = buildList {
var current: ContextMenuData? = this@ContextMenuData
while (current != null) {
addAll(current.items())
current = current.next
}
}
There was a problem hiding this comment.
Your code is better
| val Current get() = overriddenCurrent ?: _current | ||
|
|
||
| @VisibleForTesting | ||
| fun withOverriddenCurrent(newCurrent: DesktopPlatform, body: () -> Unit) { |
There was a problem hiding this comment.
Not crucial, but such functions are more useful if they're inline, and return what body returns.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes https://youtrack.jetbrains.com/issue/CMP-7083/Context-menu-on-desktop-shows-incorrect-items-after-second-showing
The issue was that after the first click we remembered context items, but they are constructed dynamically depending on the selected text.
Testing
Release Notes
Fixes - Desktop