Skip to content

Fix stale drag callbacks in draggable modifier #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
saadkhalidkhan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix stale drag callbacks in draggable modifier #120

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions reorderable/src/commonMain/kotlin/sh/calvin/reorderable/draggable.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.composed
Expand All @@ -27,6 +28,9 @@ internal fun Modifier.draggable(
val coroutineScope = rememberCoroutineScope()
var dragInteractionStart by remember { mutableStateOf<DragInteraction.Start?>(null) }
var dragStarted by remember { mutableStateOf(false) }
val onDragStartedState by rememberUpdatedState(onDragStarted)
val onDragStoppedState by rememberUpdatedState(onDragStopped)
val onDragState by rememberUpdatedState(onDrag)

DisposableEffect(key1) {
onDispose {
Expand All @@ -38,7 +42,7 @@ internal fun Modifier.draggable(
}

if (dragStarted) {
onDragStopped()
onDragStoppedState()
}

dragStarted = false
Expand All @@ -61,7 +65,7 @@ internal fun Modifier.draggable(
}
}

onDragStarted(it)
onDragStartedState(it)
},
onDragEnd = {
dragInteractionStart?.also {
Expand All @@ -71,7 +75,7 @@ internal fun Modifier.draggable(
}

if (dragStarted) {
onDragStopped()
onDragStoppedState()
}

dragStarted = false
Expand All @@ -84,12 +88,12 @@ internal fun Modifier.draggable(
}

if (dragStarted) {
onDragStopped()
onDragStoppedState()
}

dragStarted = false
},
onDrag = onDrag,
onDrag = { change, dragAmount -> onDragState(change, dragAmount) },
)
}
}
Expand Down