Skip to content

DROID-2764 Editor | Fix | DND fixes #1937

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
uburoiubu merged 1 commit into from
Dec 18, 2024
Merged

DROID-2764 Editor | Fix | DND fixes #1937

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: 3 additions & 3 deletions presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -3723,7 +3723,7 @@ class EditorViewModel(

mode = EditorMode.Edit

controlPanelInteractor.onEvent(ControlPanelMachine.Event.SAM.OnApply)
controlPanelInteractor.onEvent(OnApply)

viewModelScope.launch {
orchestrator.proxies.intents.send(
Expand Down
2 changes: 1 addition & 1 deletion ...src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorScrollAndMoveTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
Loading