From 6dcf25dd69c7547ef23a03c1f223d8d07b9c7bc8 Mon Sep 17 00:00:00 2001
From: = <david.aparicio@dhis2.org>
Date: Wed, 31 Jan 2024 10:21:44 +0100
Subject: [PATCH] update: [ANDROAPP-4826]  focus next restored

---
 form/src/main/java/org/dhis2/form/ui/Form.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/form/src/main/java/org/dhis2/form/ui/Form.kt b/form/src/main/java/org/dhis2/form/ui/Form.kt
index 1c2db8a75c..1428b8c811 100644
--- a/form/src/main/java/org/dhis2/form/ui/Form.kt
+++ b/form/src/main/java/org/dhis2/form/ui/Form.kt
@@ -68,6 +68,7 @@ fun Form(
         }
     }
     if (sections.isNotEmpty()) {
+        val focusNext = remember { mutableStateOf(false) }
         LazyColumn(
             modifier = Modifier
                 .fillMaxSize()
@@ -136,6 +137,7 @@ fun Form(
                                     onNextClicked = {
                                         if (index == section.fields.size - 1) {
                                             onNextSection()
+                                            focusNext.value = true
                                         } else {
                                             focusManager.moveFocus(FocusDirection.Down)
                                         }