Fix title and description fields clearing on focus loss, closes #1101

Author: CodeDoctorDE

app/lib/selections/document.dart

@@ -50,6 +50,7 @@ class _UtilitiesViewState extends State<_UtilitiesView>
     with TickerProviderStateMixin {
   late final TabController _tabController;
   final TextEditingController _descriptionController = TextEditingController();
+  final FocusNode _descriptionFocusNode = FocusNode();
 
   @override
   void initState() {
@@ -62,10 +63,11 @@ class _UtilitiesViewState extends State<_UtilitiesView>
 
   @override
   void dispose() {
-    super.dispose();
-
     _tabController.dispose();
     _descriptionController.dispose();
+    _descriptionFocusNode.dispose();
+
+    super.dispose();
   }
 
   @override
@@ -84,7 +86,8 @@ class _UtilitiesViewState extends State<_UtilitiesView>
     final state = bloc.state;
     if (state is! DocumentLoadSuccess) return const SizedBox.shrink();
     final metadata = state.metadata;
-    if (_descriptionController.text != metadata.description) {
+    if (!_descriptionFocusNode.hasFocus &&
+        _descriptionController.text != metadata.description) {
       _descriptionController.text = metadata.description;
     }
     void submitDescription(String? value) {
@@ -130,16 +133,23 @@ class _UtilitiesViewState extends State<_UtilitiesView>
           builder: (context) => [
             Column(
               children: [
-                TextFormField(
-                  minLines: 3,
-                  maxLines: 5,
-                  controller: _descriptionController,
-                  decoration: InputDecoration(
-                    labelText: AppLocalizations.of(context).description,
-                    border: const OutlineInputBorder(),
+                Focus(
+                  onFocusChange: (hasFocus) {
+                    if (!hasFocus) submitDescription(null);
+                  },
+                  child: TextFormField(
+                    minLines: 3,
+                    maxLines: 5,
+                    controller: _descriptionController,
+                    focusNode: _descriptionFocusNode,
+                    decoration: InputDecoration(
+                      labelText: AppLocalizations.of(context).description,
+                      border: const OutlineInputBorder(),
+                    ),
+                    onTapOutside: (_) => submitDescription(null),
+                    onFieldSubmitted: submitDescription,
+                    onSaved: submitDescription,
                   ),
-                  onFieldSubmitted: submitDescription,
-                  onSaved: submitDescription,
                 ),
                 const SizedBox(height: 8),
                 ListTile(

app/lib/views/app_bar.dart

@@ -124,12 +124,15 @@ class _AppBarTitle extends StatefulWidget {
 class _AppBarTitleState extends State<_AppBarTitle> {
   final TextEditingController _nameController = TextEditingController(),
       _areaController = TextEditingController();
+  final FocusNode _nameFocusNode = FocusNode(), _areaFocusNode = FocusNode();
 
   @override
   void dispose() {
-    super.dispose();
     _nameController.dispose();
     _areaController.dispose();
+    _nameFocusNode.dispose();
+    _areaFocusNode.dispose();
+    super.dispose();
   }
 
   @override
@@ -167,10 +170,14 @@ class _AppBarTitleState extends State<_AppBarTitle> {
                   ? state.currentAreaName
                   : null;
               if (state is DocumentLoaded &&
+                  !_nameFocusNode.hasFocus &&
                   state.metadata.name != _nameController.text) {
                 _nameController.text = state.metadata.name;
               }
-              _areaController.text = area?.name ?? '';
+              if (!_areaFocusNode.hasFocus &&
+                  _areaController.text != (area?.name ?? '')) {
+                _areaController.text = area?.name ?? '';
+              }
               return BlocBuilder<SettingsCubit, ButterflySettings>(
                 buildWhen: (previous, current) =>
                     previous.flags != current.flags ||
@@ -295,10 +302,16 @@ class _AppBarTitleState extends State<_AppBarTitle> {
                   mainAxisSize: MainAxisSize.min,
                   children: [
                     Focus(
+                      onFocusChange: (hasFocus) {
+                        if (!hasFocus) submit(null);
+                      },
                       child: TextFormField(
                         controller: area == null
                             ? _nameController
                             : _areaController,
+                        focusNode: area == null
+                            ? _nameFocusNode
+                            : _areaFocusNode,
                         onFieldSubmitted: submit,
                         onSaved: submit,
                         readOnly: currentIndex.embedding?.editable == false,

app/pubspec.lock

@@ -413,10 +413,10 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: "0204695694b687b167fd497da5252e9f4aaa162e8d274d6fa1e757380f2a5f46"
+      sha256: fc83774ce5bd7ce08168333b5e53dbe9090ec04eb21e7aa7cd7bac921032c934
       url: "https://pub.dev"
     source: hosted
-    version: "12.0.0-beta.4"
+    version: "12.0.0-beta.5"
   fixnum:
     dependency: transitive
     description:
@@ -1065,10 +1065,10 @@ packages:
     dependency: transitive
     description:
       name: pdfium_dart
-      sha256: "07bba420737d88913773aacbaa3dd40b42d6119967816130fc381fbed8f34c92"
+      sha256: b536c19a10f8c86c160274a54ca6f29bc4c88001324ddcda4cca316033f2dc96
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.3"
+    version: "0.2.4"
   pdfium_flutter:
     dependency: transitive
     description:
@@ -1081,10 +1081,10 @@ packages:
     dependency: "direct main"
     description:
       name: pdfrx
-      sha256: d20b2826add5f26dbb0ee44d4828aafd255388c8a3d84b1e7f4d4dee00371ecd
+      sha256: "6b3571565fb412fb7d0a325a76154d0685bd0a0659c3f41ee007f408d48cfd46"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.4.3"
   pdfrx_engine:
     dependency: transitive
     description:
@@ -1641,10 +1641,10 @@ packages:
     dependency: transitive
     description:
       name: vector_graphics_compiler
-      sha256: b9b3f391857781aa96acacef96066f2f49b4cd03cf9fce3ca4d8da2ef5ea129e
+      sha256: "09854c7633b215e6f7bb2a9adb607bc525bae8655c7fc29db880c33e62f72230"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.3"
+    version: "1.2.4"
   vector_math:
     dependency: transitive
     description:

metadata/en-US/changelogs/183.txt

@@ -5,6 +5,7 @@
 * Fix texture tool configuration scrolling getting stuck ([#1092](https://github.com/LinwoodDev/Butterfly/issues/1092))
 * Fix temporary tools being cleared after canvas gestures ([#1093](https://github.com/LinwoodDev/Butterfly/issues/1093))
 * Fix image operations temporarily showing gray boxes ([#1097](https://github.com/LinwoodDev/Butterfly/issues/1097))
+* Fix title and description fields clearing on focus loss ([#1101](https://github.com/LinwoodDev/Butterfly/issues/1101))
 * Fix pressure not used for inverted stylus
 
 Read more here: https://linwood.dev/butterfly/2.5.3-rc.0