Skip to content

Commit 854b303

Browse files
authored
Merge pull request #759 from supabase-community/jan-tennert-patch-1
Update Compose to 1.7.0
2 parents ffb0ab2 + 4acdd8f commit 854b303

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ moshi = "1.15.1"
2121
jackson = "2.18.0"
2222
browser = "1.8.0"
2323
googleid = "1.1.1"
24-
compose = "1.6.11"
24+
compose = "1.7.0"
2525
androidsvg = "1.4"
2626
imageloader = "1.9.0"
2727
coil2 = "2.7.0"

sample/file-upload/common/src/desktopMain/kotlin/io/github/jan/supabase/common/ui/utils/applyDragging.kt

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
11
package io.github.jan.supabase.common.ui.utils
22

3+
import androidx.compose.foundation.ExperimentalFoundationApi
4+
import androidx.compose.foundation.draganddrop.dragAndDropTarget
35
import androidx.compose.runtime.MutableState
4-
import androidx.compose.ui.DragData
56
import androidx.compose.ui.ExperimentalComposeUiApi
67
import androidx.compose.ui.Modifier
78
import androidx.compose.ui.composed
8-
import androidx.compose.ui.onExternalDrag
9+
import androidx.compose.ui.draganddrop.DragAndDropEvent
10+
import androidx.compose.ui.draganddrop.DragAndDropTarget
11+
import androidx.compose.ui.draganddrop.DragData
12+
import androidx.compose.ui.draganddrop.dragData
913

10-
@OptIn(ExperimentalComposeUiApi::class)
14+
@OptIn(ExperimentalComposeUiApi::class, ExperimentalFoundationApi::class)
1115
actual fun Modifier.applyDragging(isDragging: MutableState<Boolean>, onSuccess: (List<String>) -> Unit): Modifier {
1216
return composed {
13-
onExternalDrag(
14-
onDragStart = {
15-
isDragging.value = true
17+
dragAndDropTarget(
18+
shouldStartDragAndDrop = {
19+
it.dragData() is DragData.FilesList
1620
},
17-
onDragExit = {
18-
isDragging.value = false
19-
},
20-
onDrop = {
21-
isDragging.value = false
22-
if(it.dragData is DragData.FilesList) {
23-
onSuccess((it.dragData as DragData.FilesList).readFiles())
21+
target = object : DragAndDropTarget {
22+
override fun onDrop(event: DragAndDropEvent): Boolean {
23+
isDragging.value = false
24+
val dragData = event.dragData() as DragData.FilesList
25+
onSuccess(dragData.readFiles())
26+
return true;
2427
}
2528
}
2629
)

0 commit comments

Comments
 (0)