Merge pull request #9 from kaleidot725/fix_perfomance_bug

Fix perfomance bug

Author: kaleidot725

.github/workflows/pull_request_check.yaml

@@ -15,7 +15,7 @@ jobs:
           java-version: '17'
       - uses: actions/setup-ruby@v1
         with:
-          ruby-version: '3.0'
+          ruby-version: '3'
       - name: Install danger
         run: |
           gem install danger danger-junit danger-android_lint danger-checkstyle_format

.idea/misc.xml

@@ -3,6 +3,5 @@ warn("Big PR") if git.lines_of_code > 500
 
 # Notify ktlint warning
 checkstyle_format.base_path = Dir.pwd
-checkstyle_format.report 'app/build/reports/ktlint/ktlintMainSourceSetCheck/ktlintMainSourceSetCheck.xml'
 checkstyle_format.report 'texteditor/build/reports/ktlint/ktlintMainSourceSetCheck/ktlintMainSourceSetCheck.xml'
 

Dangerfile

@@ -1,5 +1,6 @@
 package jp.kaleidot725.texteditor.controller
 
+import android.util.Log
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -44,6 +45,10 @@ internal class EditorController(
 
     fun splitNewLine(targetIndex: Int, textFieldValue: TextFieldValue) {
         lock.withLock {
+            if (_fields.count { it.isSelected } > 1) {
+                Log.v("TEST", "NEWLINE ERROR")
+            }
+
             if (targetIndex < 0 || fields.count() <= targetIndex) {
                 throw InvalidParameterException("targetIndex out of range($targetIndex)")
             }
@@ -228,9 +233,9 @@ internal class EditorController(
     }
 
     private fun clearSelectedIndicesInternal() {
-        _selectedIndices
-            .filter { _fields.getOrNull(it) != null }
-            .forEach { index -> _fields[index] = _fields[index].copy(isSelected = false) }
+        val copyFields = _fields.toList().map { it.copy(isSelected = false) }
+        _fields.clear()
+        _fields.addAll(copyFields)
         _selectedIndices.clear()
     }
 
@@ -266,9 +271,8 @@ internal class EditorController(
                 targetIndex
             )
         } else {
-            val isSelected = true
             val copyTarget = target.copy(
-                isSelected = isSelected,
+                isSelected = true,
                 value = target.value.copy(selection = selection)
             )
             this.clearSelectedIndicesInternal()

texteditor/src/main/java/jp/kaleidot725/texteditor/controller/EditorController.kt

@@ -1,6 +1,5 @@
 package jp.kaleidot725.texteditor.view
 
-import android.util.Log
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
@@ -20,6 +19,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import jp.kaleidot725.texteditor.controller.rememberTextEditorController
 import jp.kaleidot725.texteditor.state.TextEditorState
+import java.util.Date
 
 typealias DecorationBoxComposable = @Composable (
     index: Int,
@@ -37,37 +37,13 @@ fun TextEditor(
 ) {
     val textEditorState by rememberUpdatedState(newValue = textEditorState)
     val editableController by rememberTextEditorController(textEditorState, onChanged = { onChanged(it) })
-    var lastEvent by remember { mutableStateOf(null as Event?) }
+    var lastScrollEvent by remember { mutableStateOf(null as ScrollEvent?) }
     val lazyColumnState = rememberLazyListState()
     val focusRequesters by remember { mutableStateOf(mutableMapOf<Int, FocusRequester>()) }
-
     editableController.syncState(textEditorState)
 
-    LaunchedEffect(lastEvent) {
-        when (val event = lastEvent) {
-            is Event.AddNewLine -> {
-                lazyColumnState.animateScrollToItem(event.index)
-            }
-            is Event.DeleteNewLine -> {
-                lazyColumnState.animateScrollToItem(event.index)
-            }
-            is Event.Down -> {
-                lazyColumnState.animateScrollToItem(event.index)
-            }
-            is Event.Up -> {
-                lazyColumnState.animateScrollToItem(event.index)
-            }
-            else -> {}
-        }
-    }
-
-    LaunchedEffect(textEditorState.selectedIndices) {
-        val targetIndex = textEditorState.selectedIndices.firstOrNull() ?: return@LaunchedEffect
-        try {
-            focusRequesters[targetIndex]?.requestFocus()
-        } catch (e: Exception) {
-            Log.d("TextEditor", "Warning $e")
-        }
+    LaunchedEffect(lastScrollEvent) {
+        lastScrollEvent?.index?.let { lazyColumnState.scrollToItem(it) }
     }
 
     LazyColumn(
@@ -118,28 +94,34 @@ fun TextEditor(
                                 editableController.updateField(targetIndex = index, textFieldValue = newText)
                             },
                             onContainNewLine = { newText ->
+                                if (lastScrollEvent != null && lastScrollEvent?.isConsumed != true) return@TextField
                                 editableController.splitNewLine(targetIndex = index, textFieldValue = newText)
-                                lastEvent = Event.AddNewLine(index + 1)
+                                lastScrollEvent = ScrollEvent(index + 1)
                             },
                             onAddNewLine = { newText ->
+                                if (lastScrollEvent != null && lastScrollEvent?.isConsumed != true) return@TextField
                                 editableController.splitAtCursor(targetIndex = index, textFieldValue = newText)
-                                lastEvent = Event.AddNewLine(index + 1)
+                                lastScrollEvent = ScrollEvent(index + 1)
                             },
                             onDeleteNewLine = {
+                                if (lastScrollEvent != null && lastScrollEvent?.isConsumed != true) return@TextField
                                 editableController.deleteField(targetIndex = index)
-                                if (index != 0) lastEvent = Event.DeleteNewLine(index - 1)
+                                if (index != 0) lastScrollEvent = ScrollEvent(index - 1)
                             },
                             onFocus = {
                                 editableController.selectField(index)
                             },
                             onUpFocus = {
+                                if (lastScrollEvent != null && lastScrollEvent?.isConsumed != true) return@TextField
                                 editableController.selectPreviousField()
-                                if (index != 0) lastEvent = Event.DeleteNewLine(index - 1)
+                                if (index != 0) lastScrollEvent = ScrollEvent(index - 1)
                             },
                             onDownFocus = {
+                                if (lastScrollEvent != null && lastScrollEvent?.isConsumed != true) return@TextField
                                 editableController.selectNextField()
-                                lastEvent = Event.AddNewLine(index + 1)
-                            }
+                                if (index != textEditorState.fields.lastIndex) lastScrollEvent = ScrollEvent(index + 1)
+                            },
+                            scrollEvent = if (lastScrollEvent?.index == index) lastScrollEvent else null
                         )
                     }
                 }
@@ -148,9 +130,11 @@ fun TextEditor(
     }
 }
 
-sealed class Event(val time: Long, val index: Int = -1) {
-    class Up(index: Int) : Event(System.currentTimeMillis(), index)
-    class Down(index: Int) : Event(System.currentTimeMillis(), index)
-    class AddNewLine(index: Int) : Event(System.currentTimeMillis(), index)
-    class DeleteNewLine(index: Int) : Event(System.currentTimeMillis(), index)
+data class ScrollEvent(val index: Int = -1, val time: Long = Date().time) {
+    var isConsumed: Boolean = false
+        private set
+
+    fun consume() {
+        isConsumed = true
+    }
 }

texteditor/src/main/java/jp/kaleidot725/texteditor/view/TextEditor.kt

@@ -4,7 +4,6 @@ import android.view.KeyEvent.KEYCODE_DEL
 import android.view.KeyEvent.KEYCODE_DPAD_DOWN
 import android.view.KeyEvent.KEYCODE_DPAD_UP
 import android.view.KeyEvent.KEYCODE_ENTER
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.text.BasicTextField
@@ -37,18 +36,28 @@ internal fun TextField(
     onFocus: () -> Unit,
     onUpFocus: () -> Unit,
     onDownFocus: () -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
+    scrollEvent: ScrollEvent? = null
 ) {
     val currentTextField by rememberUpdatedState(newValue = textFieldState.value)
 
     LaunchedEffect(textFieldState.isSelected) {
         if (textFieldState.isSelected) {
+            scrollEvent?.consume()
             focusRequester.requestFocus()
         }
     }
 
-    Box(
+    BasicTextField(
+        value = textFieldState.value,
+        enabled = enabled,
+        onValueChange = {
+            if (currentTextField == it) return@BasicTextField
+            if (it.text.contains('\n')) onContainNewLine(it) else onUpdateText(it)
+        },
         modifier = modifier
+            .fillMaxWidth()
+            .wrapContentHeight()
             .focusTarget()
             .focusRequester(focusRequester)
             .onFocusChanged { if (it.isFocused) onFocus() }
@@ -70,19 +79,7 @@ internal fun TextField(
 
                 false
             }
-    ) {
-        BasicTextField(
-            value = textFieldState.value,
-            enabled = enabled,
-            onValueChange = {
-                if (currentTextField == it) return@BasicTextField
-                if (it.text.contains('\n')) onContainNewLine(it) else onUpdateText(it)
-            },
-            modifier = Modifier
-                .fillMaxWidth()
-                .wrapContentHeight()
-        )
-    }
+    )
 }
 
 private fun onPreviewDelKeyEvent(