Merge pull request #45 from MohamedRejeb/0.3x

Upgrade dependencies: Kotlin to 2.2.0, Compose to 1.8.2, AGP to 8.11.…

Author: MohamedRejeb

compose-dnd/build.gradle.kts

@@ -13,25 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:OptIn(ExperimentalWasmDsl::class)
+
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
-/*
- * Copyright 2023, Mohamed Ben Rejeb and the Compose Dnd project contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.androidLibrary)
@@ -62,7 +49,6 @@ kotlin {
         browser()
     }
 
-    @OptIn(ExperimentalWasmDsl::class)
     wasmJs {
         browser {
             testTask {
@@ -88,10 +74,14 @@ kotlin {
 
 android {
     namespace = "com.mohamedrejeb.compose.dnd"
-    compileSdk = libs.versions.android.compileSdk.get().toInt()
+    compileSdk = libs.versions.android.compileSdk
+        .get()
+        .toInt()
 
     defaultConfig {
-        minSdk = libs.versions.android.minSdk.get().toInt()
+        minSdk = libs.versions.android.minSdk
+            .get()
+            .toInt()
     }
 
     compileOptions {

compose-dnd/src/commonMain/kotlin/com/mohamedrejeb/compose/dnd/DragAndDropContainer.kt

@@ -63,8 +63,7 @@ fun <T> DragAndDropContainer(
         modifier = modifier
             .onPlaced {
                 positionInRoot.value = it.positionInRoot()
-            }
-            .pointerInput(enabled, state, state.pointerId) {
+            }.pointerInput(enabled, state, state.pointerId) {
                 if (!enabled) return@pointerInput
 
                 awaitEachGesture {

compose-dnd/src/commonMain/kotlin/com/mohamedrejeb/compose/dnd/DragAndDropState.kt

@@ -49,14 +49,12 @@ import kotlinx.coroutines.launch
 fun <T> rememberDragAndDropState(
     dragAfterLongPress: Boolean = false,
     requireFirstDownUnconsumed: Boolean = false,
-): DragAndDropState<T> {
-    return remember {
+): DragAndDropState<T> = remember {
         DragAndDropState(
             dragAfterLongPress = dragAfterLongPress,
             requireFirstDownUnconsumed = requireFirstDownUnconsumed,
         )
     }
-}
 
 /**
  * State of the drag and drop
@@ -131,6 +129,10 @@ class DragAndDropState<T>(
     internal fun addDraggableItem(
         state: DraggableItemState<T>
     ) {
+        if (draggableItemMap[state.key] == state) {
+            return
+        }
+
         draggableItemMap[state.key] = state
     }
 
@@ -202,8 +204,7 @@ class DragAndDropState<T>(
                         size2 = it.size,
                     ) &&
                         (dropTargetIds.isEmpty() || it.key in dropTargetIds)
-                }
-                .groupBy { it.zIndex }
+                }.groupBy { it.zIndex }
                 .maxByOrNull { it.key }
                 ?.value
                 .orEmpty()
@@ -220,7 +221,10 @@ class DragAndDropState<T>(
         )
 
         if (hoveredDropTarget?.key != hoveredDropTargetKey && newDraggedItemState != null) {
-            dropTargetMap.values.find { it.key == hoveredDropTargetKey }?.onDragExit?.invoke(newDraggedItemState)
+            dropTargetMap.values
+                .find { it.key == hoveredDropTargetKey }
+                ?.onDragExit
+                ?.invoke(newDraggedItemState)
             hoveredDropTarget?.onDragEnter?.invoke(newDraggedItemState)
         }
 

compose-dnd/src/commonMain/kotlin/com/mohamedrejeb/compose/dnd/drag/CoreDraggableItem.kt

@@ -127,11 +127,9 @@ internal fun <T> CoreDraggableItem(
         modifier = modifier
             .onPlaced {
                 draggableItemState.positionInRoot = it.positionInRoot()
-            }
-            .onSizeChanged {
+            }.onSizeChanged {
                 draggableItemState.size = it.toSize()
-            }
-            .pointerInput(
+            }.pointerInput(
                 key,
                 enabled,
                 state,

compose-dnd/src/commonMain/kotlin/com/mohamedrejeb/compose/dnd/drag/DraggableItemState.kt

@@ -35,8 +35,7 @@ internal class DraggableItemState<T>(
 
     var content: @Composable () -> Unit,
 ) {
-    fun copy(): DraggableItemState<T> {
-        return DraggableItemState(
+    fun copy(): DraggableItemState<T> = DraggableItemState(
             key = key,
             data = data,
             dropTargets = dropTargets,
@@ -47,5 +46,4 @@ internal class DraggableItemState<T>(
             size = size,
             content = content
         )
-    }
 }

compose-dnd/src/commonMain/kotlin/com/mohamedrejeb/compose/dnd/drag/DraggedItemShadow.kt

@@ -46,11 +46,9 @@ internal fun <T> DraggedItemShadow(
                 with(density) {
                     state.dragSizeAnimatable.value.toDpSize()
                 }
-            )
-            .onPlaced {
+            ).onPlaced {
                 draggedItemPositionInRoot.value = it.positionInRoot()
-            }
-            .graphicsLayer {
+            }.graphicsLayer {
                 val dragPositionX = state.dragPositionAnimatable.value.x + state.dragPosition.value.x
                 val dragPositionY = state.dragPositionAnimatable.value.y + state.dragPosition.value.y
                 translationX = dragPositionX - draggedItemPositionInRoot.value.x

compose-dnd/src/commonMain/kotlin/com/mohamedrejeb/compose/dnd/drag/DraggedItemState.kt

@@ -35,13 +35,11 @@ class DraggedItemState<T> internal constructor(
         key: Any = this.key,
         data: T = this.data,
         dragAmount: Offset = this.dragAmount,
-    ): DraggedItemState<T> {
-        return DraggedItemState(
+    ): DraggedItemState<T> = DraggedItemState(
             key = key,
             data = data,
             dragAmount = dragAmount,
         )
-    }
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true

compose-dnd/src/commonMain/kotlin/com/mohamedrejeb/compose/dnd/drop/DropTarget.kt

@@ -137,7 +137,9 @@ private data class DropTargetNodeElement<T>(
 private data class DropTargetNode<T>(
     val dropTargetState: DropTargetState<T>,
     var state: DragAndDropState<T>,
-) : Modifier.Node(), LayoutAwareModifierNode, CompositionLocalConsumerModifierNode {
+) : Modifier.Node(),
+    LayoutAwareModifierNode,
+    CompositionLocalConsumerModifierNode {
 
     private val key get() = dropTargetState.key
 

compose-dnd/src/commonMain/kotlin/com/mohamedrejeb/compose/dnd/reorder/ReorderState.kt

@@ -30,13 +30,11 @@ import com.mohamedrejeb.compose.dnd.annotation.ExperimentalDndApi
 @Composable
 fun <T> rememberReorderState(
     dragAfterLongPress: Boolean = false,
-): ReorderState<T> {
-    return remember {
+): ReorderState<T> = remember {
         ReorderState(
             dragAfterLongPress = dragAfterLongPress,
         )
     }
-}
 
 /**
  * State of the reorder

compose-dnd/src/commonMain/kotlin/com/mohamedrejeb/compose/dnd/utils/DragGestureUtils.kt

@@ -96,7 +96,8 @@ internal suspend inline fun AwaitPointerEventScope.awaitPointerSlopOrCancellatio
             val inDirection = if (triggerOnMainAxisSlop) {
                 abs(totalMainPositionChange)
             } else {
-                pointerDirectionConfig.offsetFromChanges(
+                pointerDirectionConfig
+                    .offsetFromChanges(
                     totalMainPositionChange,
                     totalCrossPositionChange
                 ).getDistance()
@@ -174,9 +175,7 @@ private val mouseToTouchSlopRatio = mouseSlop / defaultTouchSlop
 //  functions public (see the comment at the top of the file).
 //  After it will be a public API, we should get rid of `touchSlop / 144` and return absolute
 //  value 0.125.dp.toPx(). It is not possible right now, because we can't access density.
-internal fun ViewConfiguration.pointerSlop(pointerType: PointerType): Float {
-    return when (pointerType) {
+internal fun ViewConfiguration.pointerSlop(pointerType: PointerType): Float = when (pointerType) {
         PointerType.Mouse -> touchSlop * mouseToTouchSlopRatio
         else -> touchSlop
     }
-}