Skip to content

Add onDragStart callback #4

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

Merged
bpappin merged 1 commit into from
Feb 2, 2024
+10 −3
Merged

Add onDragStart callback #4

Show file tree
Hide file tree
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
6 changes: 4 additions & 2 deletions reorderable/src/commonMain/kotlin/org/burnoutcrew/reorderable/ReorderableLazyGridState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,15 @@ fun rememberReorderableLazyGridState(
onMove: (ItemPosition, ItemPosition) -> Unit,
gridState: LazyGridState = rememberLazyGridState(),
canDragOver: ((draggedOver: ItemPosition, dragging: ItemPosition) -> Boolean)? = null,
onDragStart: ((startIndex: Int, x: Int, y: Int) -> (Unit))? = null,
onDragEnd: ((startIndex: Int, endIndex: Int) -> (Unit))? = null,
maxScrollPerFrame: Dp = 20.dp,
dragCancelledAnimation: DragCancelledAnimation = SpringDragCancelledAnimation()
): ReorderableLazyGridState {
val maxScroll = with(LocalDensity.current) { maxScrollPerFrame.toPx() }
val scope = rememberCoroutineScope()
val state = remember(gridState) {
ReorderableLazyGridState(gridState, scope, maxScroll, onMove, canDragOver, onDragEnd, dragCancelledAnimation)
ReorderableLazyGridState(gridState, scope, maxScroll, onMove, canDragOver, onDragStart, onDragEnd, dragCancelledAnimation)
}
LaunchedEffect(state) {
state.visibleItemsChanged()
Expand All @@ -63,9 +64,10 @@ class ReorderableLazyGridState(
maxScrollPerFrame: Float,
onMove: (fromIndex: ItemPosition, toIndex: ItemPosition) -> (Unit),
canDragOver: ((draggedOver: ItemPosition, dragging: ItemPosition) -> Boolean)? = null,
onDragStart: ((startIndex: Int, x: Int, y: Int) -> (Unit))? = null,
onDragEnd: ((startIndex: Int, endIndex: Int) -> (Unit))? = null,
dragCancelledAnimation: DragCancelledAnimation = SpringDragCancelledAnimation()
) : ReorderableState<LazyGridItemInfo>(scope, maxScrollPerFrame, onMove, canDragOver, onDragEnd, dragCancelledAnimation) {
) : ReorderableState<LazyGridItemInfo>(scope, maxScrollPerFrame, onMove, canDragOver, onDragStart, onDragEnd, dragCancelledAnimation) {
override val isVerticalScroll: Boolean
get() = gridState.layoutInfo.orientation == Orientation.Vertical
override val LazyGridItemInfo.left: Int
Expand Down
5 changes: 4 additions & 1 deletion reorderable/src/commonMain/kotlin/org/burnoutcrew/reorderable/ReorderableLazyListState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,15 @@ fun rememberReorderableLazyListState(
onMove: (ItemPosition, ItemPosition) -> Unit,
listState: LazyListState = rememberLazyListState(),
canDragOver: ((draggedOver: ItemPosition, dragging: ItemPosition) -> Boolean)? = null,
onDragStart: ((startIndex: Int, x: Int, y: Int) -> (Unit))? = null,
onDragEnd: ((startIndex: Int, endIndex: Int) -> (Unit))? = null,
maxScrollPerFrame: Dp = 20.dp,
dragCancelledAnimation: DragCancelledAnimation = SpringDragCancelledAnimation()
): ReorderableLazyListState {
val maxScroll = with(LocalDensity.current) { maxScrollPerFrame.toPx() }
val scope = rememberCoroutineScope()
val state = remember(listState) {
ReorderableLazyListState(listState, scope, maxScroll, onMove, canDragOver, onDragEnd, dragCancelledAnimation)
ReorderableLazyListState(listState, scope, maxScroll, onMove, canDragOver, onDragStart, onDragEnd, dragCancelledAnimation)
}
val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl
LaunchedEffect(state) {
Expand Down Expand Up @@ -73,13 +74,15 @@ class ReorderableLazyListState(
maxScrollPerFrame: Float,
onMove: (fromIndex: ItemPosition, toIndex: ItemPosition) -> (Unit),
canDragOver: ((draggedOver: ItemPosition, dragging: ItemPosition) -> Boolean)? = null,
onDragStart: ((startIndex: Int, x: Int, y: Int) -> (Unit))? = null,
onDragEnd: ((startIndex: Int, endIndex: Int) -> (Unit))? = null,
dragCancelledAnimation: DragCancelledAnimation = SpringDragCancelledAnimation()
) : ReorderableState<LazyListItemInfo>(
scope,
maxScrollPerFrame,
onMove,
canDragOver,
onDragStart,
onDragEnd,
dragCancelledAnimation
) {
Expand Down
2 changes: 2 additions & 0 deletions reorderable/src/commonMain/kotlin/org/burnoutcrew/reorderable/ReorderableState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ abstract class ReorderableState<T>(
private val maxScrollPerFrame: Float,
private val onMove: (fromIndex: ItemPosition, toIndex: ItemPosition) -> (Unit),
private val canDragOver: ((draggedOver: ItemPosition, dragging: ItemPosition) -> Boolean)?,
private val onDragStart: ((startIndex: Int, x: Int, y: Int) -> (Unit))? = null,
private val onDragEnd: ((startIndex: Int, endIndex: Int) -> (Unit))?,
val dragCancelledAnimation: DragCancelledAnimation
) {
Expand Down Expand Up @@ -105,6 +106,7 @@ abstract class ReorderableState<T>(
?.also {
selected = it
draggingItemIndex = it.itemIndex
onDragStart?.invoke(it.itemIndex, offsetX, offsetY)
} != null
}

Expand Down