From 86b8895215ea27b9843aff5b492f231e88ed1a26 Mon Sep 17 00:00:00 2001 From: Evgenii Kozlov Date: Wed, 18 Dec 2024 11:58:16 +0100 Subject: [PATCH] DROID-2764 fix --- .../anytype/presentation/editor/EditorViewModel.kt | 6 +++--- .../presentation/editor/editor/EditorScrollAndMoveTest.kt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt index 81b6c99937..b05efe1daf 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt @@ -3688,14 +3688,14 @@ class EditorViewModel( mode = EditorMode.Edit - controlPanelInteractor.onEvent(ControlPanelMachine.Event.SAM.OnApply) + controlPanelInteractor.onEvent(OnApply) viewModelScope.launch { val blocks = (selected - exclude).sortedBy { id -> ordering[id] } orchestrator.proxies.intents.send( Intent.Document.Move( context = context, - target = moveTarget, + target = if (targetContext != vmParams.ctx) "" else target, targetContext = targetContext, blocks = blocks, position = position @@ -3723,7 +3723,7 @@ class EditorViewModel( mode = EditorMode.Edit - controlPanelInteractor.onEvent(ControlPanelMachine.Event.SAM.OnApply) + controlPanelInteractor.onEvent(OnApply) viewModelScope.launch { orchestrator.proxies.intents.send( diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorScrollAndMoveTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorScrollAndMoveTest.kt index 7f6e112505..66bb66eb87 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorScrollAndMoveTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorScrollAndMoveTest.kt @@ -578,7 +578,7 @@ class EditorScrollAndMoveTest : EditorPresentationTestSetup() { params = Move.Params( context = root, targetContext = b.content().target, - targetId = b.id, + targetId = "", blockIds = listOf(a.id), position = Position.INNER )