External drag and drop support for compose application #391

Walingar · 2023-01-31T21:37:41Z

Proposed Changes

Introduce drag and drop support from external resources to compose application.
For now, for desktop only.

Testing

It can be tested by introduced androidx.compose.ui.dnd.ExternalDragTest or manually by androidx.compose.desktop.examples.dnd.Main_jvmKt#main

Issues Fixed

Fixes: JetBrains/compose-multiplatform#222

compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/dnd/ExternalDrag.desktop.kt

Walingar · 2023-03-02T10:31:00Z

Made few force-pushes with rebasing on up-to-date main branch and removed links to the issues in commit messages, since it spams there :(

m-sasha

Mostly nitpicks. A great PR overall.

compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/dnd/ExternalDrag.desktop.kt

m-sasha · 2023-03-07T20:38:04Z

compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/dnd/ExternalDrag.desktop.kt

+ * @param onDragStart will be called when the pointer with external content entered the component.
+ * @param onDrag will be called for all drag events inside the component.
+ * @param onDrop is called when the pointer is released with [DropData] the pointer held.
+ * @param onDragCancel is called if the pointer exited the component bounds or unknown data was dropped.


Style guide says we're supposed to fit into 100 columns.

Hm, weird that IDEA doesn't move it to the new line. Where do you see this into styleguide?

Not sure; @igordmn told me.

This was worked perfectly in Android Studio in AOSP, but we have bugs in our fork, and this limit doesn't always apply.

There is an idea to increase it for our fork. It will complicate upstreaming into AOSP, but that is another discussion.

Should I manually controll this length and change it here or it is ok?

Check your settings in IDEA, if you will find that you don't use Project, switch to it, and then comply to it:

I use the project one, weird

compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/dnd/ExternalDrag.desktop.kt

…pport

igordmn

Thanks!

I reviewed only API and behavior. Let's m-sasha do a full review.

compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/dnd/ExternalDrag.desktop.kt

…ponent bounds change

…e new component bounds to Swing

Walingar · 2023-03-08T15:32:52Z

@m-sasha thank you for your review! I've fixed most of your comments, most importantly, I've rewritten the code that handles component bounds changes, please take a look at it.
Igor send review about API, I'll handle it a bit later, it won't affect implementation a lot (only API + AwtWindowDragTargetListener)

compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/dnd/ExternalDrag.desktop.kt

Walingar · 2023-03-09T10:28:49Z

@m-sasha thank you for your comments, fixed most of them (except code style, since don't get what to do better)
Also, I continue investigation of better DropData API regarding Igor's comments, looking at other UI frameworks as well.

* don't use sealed interface and data classes * provide mimeTypes for all drop data * provide methods to read drop data content instead of having properties

Walingar · 2023-03-10T14:28:58Z

@igordmn I've updated the pull request with changes in API, please take a look at it. I'd keep it experimental, since there are a few things that can be improved, but we can decide how to do that only according to the feedback.

compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/ExternalDrag.desktop.kt

igordmn

Thanks! API looks good now.

Left one small comment, and we good to merge

compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/ExternalDrag.desktop.kt

…nalDrag.desktop.kt Co-authored-by: Igor Demin <igordmn@users.noreply.github.com>

Walingar commented Jan 31, 2023

View reviewed changes

compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/dnd/ExternalDrag.desktop.kt Outdated Show resolved Hide resolved

igordmn self-requested a review February 1, 2023 08:09

Walingar force-pushed the nr/dnd-support-222 branch from 048229e to b57d9bd Compare March 2, 2023 10:23

Walingar added 7 commits March 2, 2023 11:24

Introduce external file drag and drop support for desktop

d0de9fd

Introduce more drop data types for external drag support

c67d3e2

Add docs to external drag API

2cf9055

Add offset to dragStart callback like in onDrag function

e07fa23

Move awt point -> offset logic closer to drag event

b62ff6f

Introduce tests for external drag support

decc04a

Mark external drop API as experimental

6614da1

Walingar force-pushed the nr/dnd-support-222 branch from b57d9bd to 6614da1 Compare March 2, 2023 10:25

dima-avdeev-jb requested a review from m-sasha March 7, 2023 14:59

m-sasha approved these changes Mar 7, 2023

View reviewed changes

Walingar added 2 commits March 8, 2023 11:39

Use handlers.values

bae882e

Use componentBounds instead of LayoutCoordinates for external drag su…

c4945f4

…pport

igordmn reviewed Mar 8, 2023

View reviewed changes

compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/dnd/ExternalDrag.desktop.kt Outdated Show resolved Hide resolved

m-sasha reviewed Mar 8, 2023

View reviewed changes

compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/dnd/ExternalDrag.desktop.kt Outdated Show resolved Hide resolved

Walingar added 8 commits March 8, 2023 14:56

Wrap lambdas in rememberUpdatedState

bec5531

Add experimental compose api opt in

b6150fe

Introduce test to check that drag enter/cancel are not spammed on com…

79dc947

…ponent bounds change

Don't reinstall component drag handlers on recomposition, just provid…

27b7493

…e new component bounds to Swing

Extract common code for drag event handling

fe62f4f

Update idsCounter immediately and use current handleId

850ba62

Change doc

b802866

Update tests: don't notify onDrag if onDragEntered notified

33470de

Walingar requested a review from m-sasha March 8, 2023 15:33

m-sasha requested changes Mar 8, 2023

View reviewed changes

m-sasha reviewed Mar 8, 2023

View reviewed changes

compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/dnd/ExternalDrag.desktop.kt Outdated Show resolved Hide resolved

m-sasha reviewed Mar 8, 2023

View reviewed changes

compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/dnd/ExternalDrag.desktop.kt Outdated Show resolved Hide resolved

Walingar added 5 commits March 9, 2023 11:07

Remove VisibleForTesting, can be added in the future if needed

c2f82de

Move external drag support to androidx.compose.ui package

d068e92

Rename forAll -> forEach

56f0cff

Merge value acquiring and remove

095c3a2

Take changed callbacks into account in AwtWindowDropTarget

21943c6

Walingar requested a review from m-sasha March 9, 2023 10:29

m-sasha approved these changes Mar 9, 2023

View reviewed changes

Walingar added 4 commits March 10, 2023 12:36

Modify DropData API

80eee0d

* don't use sealed interface and data classes * provide mimeTypes for all drop data * provide methods to read drop data content instead of having properties

Always provide offset and drop data to external drag feature

c0b992c

Rename onDragCancel -> onDragExit

5f650fb

Rename DropData -> DragData and update javadocs

60e7b65

Walingar requested a review from igordmn March 10, 2023 14:36

igordmn reviewed Mar 10, 2023

View reviewed changes

compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/ExternalDrag.desktop.kt Outdated Show resolved Hide resolved

compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/ExternalDrag.desktop.kt Outdated Show resolved Hide resolved

Walingar added 2 commits March 13, 2023 10:47

Don't provide mimeTypes, it is not needed

6a9c42b

Rename State -> Value

5b2dac4

Walingar requested a review from igordmn March 13, 2023 10:08

Walingar added 2 commits March 13, 2023 12:14

Convert interface to class for current drag state

2c31a2e

Add immutable annotation

b44a3b1

igordmn approved these changes Mar 13, 2023

View reviewed changes

compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/ExternalDrag.desktop.kt Outdated Show resolved Hide resolved

Update compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/Exter…

62cec60

…nalDrag.desktop.kt Co-authored-by: Igor Demin <igordmn@users.noreply.github.com>

Walingar merged commit 5869a7f into JetBrains:jb-main Mar 13, 2023

Walingar deleted the nr/dnd-support-222 branch March 13, 2023 16:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

External drag and drop support for compose application #391

External drag and drop support for compose application #391

Walingar commented Jan 31, 2023

Walingar commented Mar 2, 2023

m-sasha left a comment

m-sasha Mar 7, 2023

Walingar Mar 8, 2023

m-sasha Mar 8, 2023

igordmn Mar 9, 2023 •

edited

Walingar Mar 9, 2023

igordmn Mar 10, 2023 •

edited

Walingar Mar 10, 2023

igordmn left a comment

Walingar commented Mar 8, 2023

Walingar commented Mar 9, 2023

Walingar commented Mar 10, 2023

igordmn left a comment

External drag and drop support for compose application #391

External drag and drop support for compose application #391

Conversation

Walingar commented Jan 31, 2023

Proposed Changes

Testing

Issues Fixed

Walingar commented Mar 2, 2023

m-sasha left a comment

Choose a reason for hiding this comment

m-sasha Mar 7, 2023

Choose a reason for hiding this comment

Walingar Mar 8, 2023

Choose a reason for hiding this comment

m-sasha Mar 8, 2023

Choose a reason for hiding this comment

igordmn Mar 9, 2023 • edited

Choose a reason for hiding this comment

Walingar Mar 9, 2023

Choose a reason for hiding this comment

igordmn Mar 10, 2023 • edited

Choose a reason for hiding this comment

Walingar Mar 10, 2023

Choose a reason for hiding this comment

igordmn left a comment

Choose a reason for hiding this comment

Walingar commented Mar 8, 2023

Walingar commented Mar 9, 2023

Walingar commented Mar 10, 2023

igordmn left a comment

Choose a reason for hiding this comment

igordmn Mar 9, 2023 •

edited

igordmn Mar 10, 2023 •

edited