Update isDataOnlyNewLines and add tests

Taskulu · Sep 20, 2023 · 19bd909 · 19bd909
1 parent 711a625
commit 19bd909
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/packages/fleather/lib/src/widgets/controller.dart b/packages/fleather/lib/src/widgets/controller.dart
@@ -78,12 +78,11 @@ class FleatherController extends ChangeNotifier {
       }
       // special case for AutoTextDirectionRule
       if (delta.length <= 3 && delta.last.isRetain) {
-        return delta.last.attributes
-                    ?.containsKey(ParchmentAttribute.direction.key) ==
-                true &&
-            delta.last.attributes
-                    ?.containsKey(ParchmentAttribute.alignment.key) ==
-                true;
+        return delta.last.attributes != null &&
+            delta.last.attributes!
+                .containsKey(ParchmentAttribute.direction.key) &&
+            delta.last.attributes!
+                .containsKey(ParchmentAttribute.alignment.key);
       }
     }
     return false;

diff --git a/packages/fleather/lib/util.dart b/packages/fleather/lib/util.dart
@@ -55,6 +55,6 @@ TextDirection getDirectionOfNode(StyledNode node) {
 }
 
 bool isDataOnlyNewLines(Object data) {
-  if (data is! String) return false;
-  return data.replaceAll('\n', '').isEmpty;
+  if (data is! String || data.isEmpty) return false;
+  return RegExp('^(\n)+\$').hasMatch(data);
 }
diff --git a/packages/fleather/test/util_test.dart b/packages/fleather/test/util_test.dart
@@ -40,4 +40,14 @@ void main() {
       expect(result, 1);
     });
   });
+
+  test('isDataOnlyNewLines', () {
+    expect(isDataOnlyNewLines(123), false);
+    expect(isDataOnlyNewLines(Object()), false);
+    expect(isDataOnlyNewLines(''), false);
+    expect(isDataOnlyNewLines('\nTest\nTest\n'), false);
+    expect(isDataOnlyNewLines('\n \n\n'), false);
+    expect(isDataOnlyNewLines('\n\t\n\n'), false);
+    expect(isDataOnlyNewLines('\n\n\n'), true);
+  });
 }