From dad5c676cb9e8c300b5c370bac83aeff591d8b8f Mon Sep 17 00:00:00 2001
From: Xin Yao <singerdmx@gmail.com>
Date: Tue, 13 Jul 2021 09:12:47 -0700
Subject: [PATCH] collectAllStyles should return List<Style>

---
 lib/src/models/documents/document.dart           |  2 +-
 lib/src/models/documents/nodes/line.dart         | 14 +++++++-------
 lib/src/widgets/controller.dart                  |  9 +++++----
 lib/src/widgets/toolbar/clear_format_button.dart |  9 +++++++--
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/lib/src/models/documents/document.dart b/lib/src/models/documents/document.dart
index 71cdf487..37150870 100644
--- a/lib/src/models/documents/document.dart
+++ b/lib/src/models/documents/document.dart
@@ -127,7 +127,7 @@ class Document {
   }
 
   /// Returns all style for any character within the specified text range.
-  Style collectAllStyles(int index, int len) {
+  List<Style> collectAllStyles(int index, int len) {
     final res = queryChild(index);
     return (res.node as Line).collectAllStyles(res.offset, len);
   }
diff --git a/lib/src/models/documents/nodes/line.dart b/lib/src/models/documents/nodes/line.dart
index 0abbf920..a10aecb6 100644
--- a/lib/src/models/documents/nodes/line.dart
+++ b/lib/src/models/documents/nodes/line.dart
@@ -370,32 +370,32 @@ class Line extends Container<Leaf?> {
   }
 
   /// Returns all style for any character within the specified text range.
-  Style collectAllStyles(int offset, int len) {
+  List<Style> collectAllStyles(int offset, int len) {
     final local = math.min(length - offset, len);
-    var result = Style();
+    final result = <Style>[];
 
     final data = queryChild(offset, true);
     var node = data.node as Leaf?;
     if (node != null) {
-      result = result.mergeAll(node.style);
+      result.add(node.style);
       var pos = node.length - data.offset;
       while (!node!.isLast && pos < local) {
         node = node.next as Leaf?;
-        result = result.mergeAll(node!.style);
+        result.add(node!.style);
         pos += node.length;
       }
     }
 
-    result = result.mergeAll(style);
+    result.add(style);
     if (parent is Block) {
       final block = parent as Block;
-      result = result.mergeAll(block.style);
+      result.add(block.style);
     }
 
     final remaining = len - local;
     if (remaining > 0) {
       final rest = nextLine!.collectAllStyles(0, remaining);
-      result = result.mergeAll(rest);
+      result.addAll(rest);
     }
 
     return result;
diff --git a/lib/src/widgets/controller.dart b/lib/src/widgets/controller.dart
index bed27b90..88704b5b 100644
--- a/lib/src/widgets/controller.dart
+++ b/lib/src/widgets/controller.dart
@@ -64,10 +64,11 @@ class QuillController extends ChangeNotifier {
   }
 
   /// Returns all style for any character within the specified text range.
-  Style getAllSelectionStyles() {
-    return document
-        .collectAllStyles(selection.start, selection.end - selection.start)
-        .mergeAll(toggledStyle);
+  List<Style> getAllSelectionStyles() {
+    final styles = document.collectAllStyles(
+        selection.start, selection.end - selection.start)
+      ..add(toggledStyle);
+    return styles;
   }
 
   void undo() {
diff --git a/lib/src/widgets/toolbar/clear_format_button.dart b/lib/src/widgets/toolbar/clear_format_button.dart
index 597a211e..d5ecb8fb 100644
--- a/lib/src/widgets/toolbar/clear_format_button.dart
+++ b/lib/src/widgets/toolbar/clear_format_button.dart
@@ -33,8 +33,13 @@ class _ClearFormatButtonState extends State<ClearFormatButton> {
         icon: Icon(widget.icon, size: widget.iconSize, color: iconColor),
         fillColor: fillColor,
         onPressed: () {
-          for (final k
-              in widget.controller.getAllSelectionStyles().attributes.values) {
+          final keys = <Attribute>{};
+          for (final style in widget.controller.getAllSelectionStyles()) {
+            for (final k in style.attributes.values) {
+              keys.add(k);
+            }
+          }
+          for (final k in keys) {
             widget.controller.formatSelection(Attribute.clone(k, null));
           }
         });