From 25a43c288c2233666838b0b10cc628c4d8146f19 Mon Sep 17 00:00:00 2001
From: "Lucas.Xu" <lucas.xu@appflowy.io>
Date: Tue, 30 Aug 2022 16:25:32 +0800
Subject: [PATCH] fix: in the case of multiple selections, the highlighted
 state does not meet expectations. #948

---
 .../src/extensions/text_node_extensions.dart  | 29 ++++++---
 .../test/service/toolbar_service_test.dart    | 61 +++++++++++++++++++
 2 files changed, 81 insertions(+), 9 deletions(-)

diff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/extensions/text_node_extensions.dart b/frontend/app_flowy/packages/appflowy_editor/lib/src/extensions/text_node_extensions.dart
index 9fd85fdb76..a07529cfdf 100644
--- a/frontend/app_flowy/packages/appflowy_editor/lib/src/extensions/text_node_extensions.dart
+++ b/frontend/app_flowy/packages/appflowy_editor/lib/src/extensions/text_node_extensions.dart
@@ -162,23 +162,34 @@ extension TextNodesExtension on List<TextNode> {
         final node = this[i];
         final Selection newSelection;
         if (i == 0 && pathEquals(node.path, selection.start.path)) {
-          newSelection = selection.copyWith(
-            end: Position(path: node.path, offset: node.toRawString().length),
-          );
+          if (selection.isBackward) {
+            newSelection = selection.copyWith(
+              end: Position(path: node.path, offset: node.toRawString().length),
+            );
+          } else {
+            newSelection = selection.copyWith(
+              end: Position(path: node.path, offset: 0),
+            );
+          }
         } else if (i == length - 1 &&
             pathEquals(node.path, selection.end.path)) {
-          newSelection = selection.copyWith(
-            start: Position(path: node.path, offset: 0),
-          );
+          if (selection.isBackward) {
+            newSelection = selection.copyWith(
+              start: Position(path: node.path, offset: 0),
+            );
+          } else {
+            newSelection = selection.copyWith(
+              start:
+                  Position(path: node.path, offset: node.toRawString().length),
+            );
+          }
         } else {
           newSelection = Selection(
             start: Position(path: node.path, offset: 0),
             end: Position(path: node.path, offset: node.toRawString().length),
           );
         }
-        if (!node.allSatisfyInSelection(newSelection, styleKey, (value) {
-          return test(value);
-        })) {
+        if (!node.allSatisfyInSelection(newSelection, styleKey, test)) {
           return false;
         }
       }
diff --git a/frontend/app_flowy/packages/appflowy_editor/test/service/toolbar_service_test.dart b/frontend/app_flowy/packages/appflowy_editor/test/service/toolbar_service_test.dart
index 418a333189..23759e449c 100644
--- a/frontend/app_flowy/packages/appflowy_editor/test/service/toolbar_service_test.dart
+++ b/frontend/app_flowy/packages/appflowy_editor/test/service/toolbar_service_test.dart
@@ -154,6 +154,67 @@ void main() async {
       itemWidget = _itemWidgetForId(tester, 'appflowy.toolbar.bulleted_list');
       expect(itemWidget.isHighlight, true);
     });
+
+    testWidgets('Test toolbar service in multi text selection', (tester) async {
+      const text = 'Welcome to Appflowy 😁';
+
+      /// [h1][bold] Welcome to Appflowy 😁
+      /// [EmptyLine]
+      /// Welcome to Appflowy 😁
+      final editor = tester.editor
+        ..insertTextNode(
+          null,
+          attributes: {
+            StyleKey.subtype: StyleKey.heading,
+            StyleKey.heading: StyleKey.h1,
+          },
+          delta: Delta([
+            TextInsert(text, {
+              StyleKey.bold: true,
+            })
+          ]),
+        )
+        ..insertTextNode(null)
+        ..insertTextNode(text);
+      await editor.startTesting();
+
+      await editor.updateSelection(
+        Selection.single(path: [2], startOffset: text.length, endOffset: 0),
+      );
+      expect(find.byType(ToolbarWidget), findsOneWidget);
+      expect(
+        _itemWidgetForId(tester, 'appflowy.toolbar.h1').isHighlight,
+        false,
+      );
+      expect(
+        _itemWidgetForId(tester, 'appflowy.toolbar.bold').isHighlight,
+        false,
+      );
+
+      await editor.updateSelection(
+        Selection(
+          start: Position(path: [2], offset: text.length),
+          end: Position(path: [1], offset: 0),
+        ),
+      );
+      expect(find.byType(ToolbarWidget), findsOneWidget);
+      expect(
+        _itemWidgetForId(tester, 'appflowy.toolbar.bold').isHighlight,
+        false,
+      );
+
+      await editor.updateSelection(
+        Selection(
+          start: Position(path: [2], offset: text.length),
+          end: Position(path: [0], offset: 0),
+        ),
+      );
+      expect(find.byType(ToolbarWidget), findsOneWidget);
+      expect(
+        _itemWidgetForId(tester, 'appflowy.toolbar.bold').isHighlight,
+        false,
+      );
+    });
   });
 }