DROID-2764 Editor | Fix | DND fixes (#1937)

anyproto · Dec 18, 2024 · 9cbe168 · 9cbe168
1 parent 72ae805
commit 9cbe168
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 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
@@ -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/...src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorScrollAndMoveTest.kt b/...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<Block.Content.Link>().target,
-                    targetId = b.id,
+                    targetId = "",
                     blockIds = listOf(a.id),
                     position = Position.INNER
                 )