fix: focus issue in editor

matthiasn · Mar 8, 2025 · a56569f · a56569f
1 parent d10dc21
commit a56569f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/lib/features/journal/state/entry_controller.dart b/lib/features/journal/state/entry_controller.dart
@@ -321,11 +321,14 @@ class EntryController extends _$EntryController {
     }
   }
 
-  void setDirty({required bool value}) {
+  void setDirty({required bool value, bool requestFocus = true}) {
     if (_dirty == value) {
       return;
     }
     _dirty = value;
+    if (value && requestFocus) {
+      focusNode.requestFocus();
+    }
     emitState();
   }
 

diff --git a/lib/features/journal/ui/widgets/editor/editor_widget.dart b/lib/features/journal/ui/widgets/editor/editor_widget.dart
@@ -34,10 +34,6 @@ class EditorWidget extends ConsumerWidget {
     final shouldShowEditorToolBar =
         entryState.value?.shouldShowEditorToolBar ?? false;
 
-    if (shouldShowEditorToolBar) {
-      focusNode.requestFocus();
-    }
-
     return Card(
       color: shouldShowEditorToolBar
           ? context.colorScheme.surface.brighten()
@@ -75,7 +71,6 @@ class EditorWidget extends ConsumerWidget {
                     cursorColor: context.colorScheme.onSurface,
                     selectionColor: context.colorScheme.primary.withAlpha(127),
                   ),
-                  autoFocus: shouldShowEditorToolBar,
                   minHeight: minHeight,
                   placeholder: context.messages.editorPlaceholder,
                   padding: EdgeInsets.only(

diff --git a/lib/features/tasks/ui/task_form.dart b/lib/features/tasks/ui/task_form.dart
@@ -71,7 +71,10 @@ class _TaskFormState extends ConsumerState<TaskForm> {
                   maxLines: null,
                   style: Theme.of(context).textTheme.titleLarge,
                   name: 'title',
-                  onChanged: (_) => notifier.setDirty(value: true),
+                  onChanged: (_) => notifier.setDirty(
+                    value: true,
+                    requestFocus: false,
+                  ),
                 ),
                 inputSpacer,
                 Row(

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: lotti
 description: Achieve your goals and keep your data private with Lotti.
 publish_to: 'none'
-version: 0.9.576+2912
+version: 0.9.576+2913
 
 msix_config:
   display_name: LottiApp

diff --git a/test/features/journal/ui/widgets/editor/editor_widget_test.dart b/test/features/journal/ui/widgets/editor/editor_widget_test.dart
@@ -73,6 +73,7 @@ void main() {
           EditorWidget(entryId: testTextEntry.meta.id),
         ),
       );
+
       await tester.pumpAndSettle();
 
       final boldIconFinder = find.byIcon(Icons.format_bold);
-Original file line number
+Diff line change
@@ Expand Up / @@ -73,6 +73,7 @@ void main() { @@
               EditorWidget(entryId: testTextEntry.meta.id),
             ),
           );
           await tester.pumpAndSettle();
           final boldIconFinder = find.byIcon(Icons.format_bold);
@@ Expand Down @@