Skip to content

Commit 50275c2

Browse files
committed
Fixed crash when using rebase interactive due to focus stack overflow
Fixes #258
1 parent 018ce7b commit 50275c2

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/main/kotlin/com/jetpackduba/gitnuro/ui/RebaseInteractive.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import androidx.compose.ui.Modifier
1515
import androidx.compose.ui.draw.clip
1616
import androidx.compose.ui.focus.FocusRequester
1717
import androidx.compose.ui.focus.focusRequester
18+
import androidx.compose.ui.focus.onFocusChanged
1819
import androidx.compose.ui.focus.onFocusEvent
1920
import androidx.compose.ui.graphics.Color
2021
import androidx.compose.ui.res.painterResource
@@ -194,12 +195,6 @@ fun RebaseCommit(
194195
modifier = Modifier
195196
.height(IntrinsicSize.Min)
196197
.fillMaxWidth()
197-
.onFocusEvent {
198-
if (it.hasFocus && !isSelected) {
199-
onFocusLine()
200-
focusRequester.requestFocus()
201-
}
202-
}
203198
.clickable {
204199
onFocusLine()
205200
}
@@ -219,7 +214,12 @@ fun RebaseCommit(
219214
.padding(start = 8.dp)
220215
.weight(1f)
221216
.heightIn(min = 40.dp)
222-
.focusRequester(focusRequester),
217+
.focusRequester(focusRequester)
218+
.onFocusChanged {
219+
if (it.hasFocus && !isSelected) {
220+
onFocusLine()
221+
}
222+
},
223223
enabled = action == RebaseAction.REWORD,
224224
value = newMessage,
225225
onValueChange = {

0 commit comments

Comments
 (0)