Scrolling to active search result (#514)

leandroBorgesFerreira · Leandro Ferreira · web-flow · commit 0ee02f15d61b · 2025-10-29T22:17:03.000+01:00
* Scrolling to active search result

* increasing bottom margin

---------

Co-authored-by: Leandro Ferreira &lt;email@email.com&gt;
diff --git a/application/features/editor/src/commonMain/kotlin/io/writeopia/editor/features/editor/ui/TextEditor.kt b/application/features/editor/src/commonMain/kotlin/io/writeopia/editor/features/editor/ui/TextEditor.kt
@@ -38,8 +38,12 @@ internal fun TextEditor(
 
     if (position != null) {
         LaunchedEffect(position, block = {
-            noteEditorViewModel.scrollToPosition.collectLatest {
-                listState.animateScrollBy(70F)
+            noteEditorViewModel.scrollToPosition.collectLatest { position ->
+                if (position == -1) {
+                    listState.animateScrollBy(70F)
+                } else if (position != null) {
+                    listState.scrollToItem(position, scrollOffset = -100)
+                }
             }
         })
     }
diff --git a/application/features/editor/src/commonMain/kotlin/io/writeopia/editor/features/editor/ui/desktop/DesktopNoteEditorScreen.kt b/application/features/editor/src/commonMain/kotlin/io/writeopia/editor/features/editor/ui/desktop/DesktopNoteEditorScreen.kt
@@ -36,6 +36,11 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.input.key.Key
+import androidx.compose.ui.input.key.KeyEventType
+import androidx.compose.ui.input.key.key
+import androidx.compose.ui.input.key.onPreviewKeyEvent
+import androidx.compose.ui.input.key.type
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import io.writeopia.common.utils.icons.WrIcons
@@ -128,7 +133,17 @@ fun DesktopNoteEditorScreen(
                         onValueChange = noteEditorViewModel::searchInDocument,
                         modifier = Modifier.defaultMinSize(minWidth = 160.dp)
                             .focusRequester(focusRequester)
-                            .padding(8.dp),
+                            .padding(8.dp)
+                            .onPreviewKeyEvent { keyEvent ->
+                                if (keyEvent.type == KeyEventType.KeyUp &&
+                                    keyEvent.key.keyCode == Key.Enter.keyCode
+                                ) {
+                                    noteEditorViewModel.nextSearchResult()
+                                    true
+                                }
+
+                                false
+                            },
                         singleLine = true,
                         textStyle = MaterialTheme.typography.bodySmall.copy(
                             color = MaterialTheme.colorScheme.onBackground
diff --git a/application/features/editor/src/commonMain/kotlin/io/writeopia/editor/features/editor/viewmodel/NoteEditorKmpViewModel.kt b/application/features/editor/src/commonMain/kotlin/io/writeopia/editor/features/editor/viewmodel/NoteEditorKmpViewModel.kt
@@ -284,9 +284,14 @@ class NoteEditorKmpViewModel(
             if (finds.isEmpty()) return@combine drawState
 
             val mutableStories = drawState.stories.toMutableList()
-            val activeFindPosition = if (finds.size > currentSearchIndex) finds.elementAt(currentSearchIndex) else null
+            val activeFindPosition =
+                if (finds.size > currentSearchIndex) finds.elementAt(currentSearchIndex) else null
             _totalSearchResults.value = finds.size
 
+            if (activeFindPosition != null) {
+                writeopiaManager.scrollToPosition(activeFindPosition)
+            }
+
             finds.forEach { position ->
                 val realPosition = minOf(position * 2, mutableStories.lastIndex)
                 val toDraw = mutableStories[realPosition]
@@ -745,7 +750,8 @@ class NoteEditorKmpViewModel(
                 return@launch
             }
 
-            val currentPosition = writeopiaManager.currentStory.value.focus ?: writeopiaManager.currentStory.value.selection.position
+            val currentPosition = writeopiaManager.currentStory.value.focus
+                ?: writeopiaManager.currentStory.value.selection.position
             val newIndex = finds.indexOfFirst { it >= currentPosition }
 
             _currentSearchIndex.value = if (newIndex != -1) newIndex else 0
diff --git a/writeopia_ui/src/commonMain/kotlin/io/writeopia/ui/manager/WriteopiaStateManager.kt b/writeopia_ui/src/commonMain/kotlin/io/writeopia/ui/manager/WriteopiaStateManager.kt
@@ -648,7 +648,7 @@ class WriteopiaStateManager(
                 // Todo: Fix this when the inner position are completed
                 //  backStackManager.addAction(BackstackAction.Add(newStory, newPosition))
                 _currentStory.value = newState.copy(selection = Selection.start())
-                _scrollToPosition.value = newPosition
+                _scrollToPosition.value = -1
             }
         }
     }
@@ -660,6 +660,10 @@ class WriteopiaStateManager(
         _currentStory.value = story.copy(focus = position)
     }
 
+    fun scrollToPosition(position: Int) {
+        _scrollToPosition.value = position
+    }
+
     private fun selected(isSelected: Boolean, position: Int) {
         if (!isEditable) return
         if (_currentStory.value.stories[position] != null) {
diff --git a/writeopia_ui/src/jvmMain/kotlin/io/writeopia/ui/drawer/factory/DefaultDrawersDesktop.kt b/writeopia_ui/src/jvmMain/kotlin/io/writeopia/ui/drawer/factory/DefaultDrawersDesktop.kt
@@ -57,7 +57,7 @@ object DefaultDrawersDesktop : DrawersFactory {
 
         return CommonDrawers.create(
             manager,
-            30.dp,
+            300.dp,
             aiExplanation,
             editable,
             onHeaderClick,

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,12 @@ internal fun TextEditor(`
`38`	`38`
`39`	`39`	`if (position != null) {`
`40`	`40`	`LaunchedEffect(position, block = {`
`41`		`- noteEditorViewModel.scrollToPosition.collectLatest {`
`42`		`- listState.animateScrollBy(70F)`
	`41`	`+ noteEditorViewModel.scrollToPosition.collectLatest { position ->`
	`42`	`+ if (position == -1) {`
	`43`	`+ listState.animateScrollBy(70F)`
	`44`	`+ } else if (position != null) {`
	`45`	`+ listState.scrollToItem(position, scrollOffset = -100)`
	`46`	`+ }`
`43`	`47`	`}`
`44`	`48`	`})`
`45`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -648,7 +648,7 @@ class WriteopiaStateManager(`
`648`	`648`	`// Todo: Fix this when the inner position are completed`
`649`	`649`	`// backStackManager.addAction(BackstackAction.Add(newStory, newPosition))`
`650`	`650`	`_currentStory.value = newState.copy(selection = Selection.start())`
`651`		`- _scrollToPosition.value = newPosition`
	`651`	`+ _scrollToPosition.value = -1`
`652`	`652`	`}`
`653`	`653`	`}`
`654`	`654`	`}`
`@@ -660,6 +660,10 @@ class WriteopiaStateManager(`
`660`	`660`	`_currentStory.value = story.copy(focus = position)`
`661`	`661`	`}`
`662`	`662`
	`663`	`+ fun scrollToPosition(position: Int) {`
	`664`	`+ _scrollToPosition.value = position`
	`665`	`+ }`
	`666`	`+`
`663`	`667`	`private fun selected(isSelected: Boolean, position: Int) {`
`664`	`668`	`if (!isEditable) return`
`665`	`669`	`if (_currentStory.value.stories[position] != null) {`