Toolbar button styling to reflect cursor position when running on desktops with keyboard to move caret. (#1801)

* toggle_style_button : calls to options.afterButtonPressed replaced by call to class function afterButtonPressed to allow default call to base button settings
quill_icon_button: L26 build for isSelected updated to call afterButtonPressed = same as if not selected
QuillController _updateSelection removed param=source because not used; added new param insertNewline when true set tog to style of preceding char (last entered); updated replaceText to call _updateSelection for NL
document collectStyle:  Selecting the start of a line, user expects the style to be the visible style of the line including inline styles

* color_button calls afterButtonPressed
insert at start of line uses style for line

* Remove comments

* Fix formatting issue

---------

Co-authored-by: Douglas Ward <dward@scied.com>

lib/src/models/documents/document.dart

@@ -184,11 +184,7 @@ class Document {
       return (res.node as Line).collectStyle(res.offset, len);
     }
     if (res.offset == 0) {
-      rangeStyle = (res.node as Line).collectStyle(res.offset, len);
+      return rangeStyle = (res.node as Line).collectStyle(res.offset, len);
-      return rangeStyle.removeAll({
-        for (final attr in rangeStyle.values)
-          if (attr.isInline) attr
-      });
     }
     rangeStyle = (res.node as Line).collectStyle(res.offset - 1, len);
     final linkAttribute = rangeStyle.attributes[Attribute.link.key];

lib/src/models/rules/insert.dart

@@ -559,10 +559,13 @@ class PreserveInlineStylesRule extends InsertRule {
     }
 
     final itr = DeltaIterator(document);
-    final prev = itr.skip(len == 0 ? index : index + 1);
+    var prev = itr.skip(len == 0 ? index : index + 1);
     if (prev == null ||
-        prev.data is! String ||
+        (prev.data is String && (prev.data as String).endsWith('\n'))) {
-        (prev.data as String).contains('\n')) {
+      prev = itr.next();
+    }
+
+    if (prev.data is! String) {
       return null;
     }
 

lib/src/widgets/quill/quill_controller.dart

@@ -327,7 +327,7 @@ class QuillController extends ChangeNotifier {
 
     if (textSelection != null) {
       if (delta == null || delta.isEmpty) {
-        _updateSelection(textSelection, ChangeSource.local);
+        _updateSelection(textSelection);
       } else {
         final user = Delta()
           ..retain(index)
@@ -335,12 +335,11 @@ class QuillController extends ChangeNotifier {
           ..delete(len);
         final positionDelta = getPositionDelta(user, delta);
         _updateSelection(
-          textSelection.copyWith(
+            textSelection.copyWith(
-            baseOffset: textSelection.baseOffset + positionDelta,
+              baseOffset: textSelection.baseOffset + positionDelta,
-            extentOffset: textSelection.extentOffset + positionDelta,
+              extentOffset: textSelection.extentOffset + positionDelta,
-          ),
+            ),
-          ChangeSource.local,
+            insertNewline: data == '\n');
-        );
       }
     }
 
@@ -389,7 +388,7 @@ class QuillController extends ChangeNotifier {
         baseOffset: change.transformPosition(selection.baseOffset),
         extentOffset: change.transformPosition(selection.extentOffset));
     if (selection != adjustedSelection) {
-      _updateSelection(adjustedSelection, ChangeSource.local);
+      _updateSelection(adjustedSelection);
     }
     if (shouldNotifyListeners) {
       notifyListeners();
@@ -428,7 +427,7 @@ class QuillController extends ChangeNotifier {
   }
 
   void updateSelection(TextSelection textSelection, ChangeSource source) {
-    _updateSelection(textSelection, source);
+    _updateSelection(textSelection);
     notifyListeners();
   }
 
@@ -445,7 +444,7 @@ class QuillController extends ChangeNotifier {
       ),
     );
     if (selection != textSelection) {
-      _updateSelection(textSelection, source);
+      _updateSelection(textSelection);
     }
 
     notifyListeners();
@@ -479,18 +478,23 @@ class QuillController extends ChangeNotifier {
     super.dispose();
   }
 
-  void _updateSelection(TextSelection textSelection, ChangeSource source) {
+  void _updateSelection(TextSelection textSelection,
+      {bool insertNewline = false}) {
     _selection = textSelection;
     final end = document.length - 1;
     _selection = selection.copyWith(
         baseOffset: math.min(selection.baseOffset, end),
         extentOffset: math.min(selection.extentOffset, end));
     if (keepStyleOnNewLine) {
-      final style = getSelectionStyle();
+      if (insertNewline && selection.start > 0) {
-      final ignoredStyles = style.attributes.values.where(
+        final style = document.collectStyle(selection.start - 1, 0);
-        (s) => !s.isInline || s.key == Attribute.link.key,
+        final ignoredStyles = style.attributes.values.where(
-      );
+          (s) => !s.isInline || s.key == Attribute.link.key,
-      toggledStyle = style.removeAll(ignoredStyles.toSet());
+        );
+        toggledStyle = style.removeAll(ignoredStyles.toSet());
+      } else {
+        toggledStyle = const Style();
+      }
     } else {
       toggledStyle = const Style();
     }

lib/src/widgets/toolbar/buttons/color/color_button.dart

@@ -191,6 +191,7 @@ class QuillToolbarColorButtonState extends State<QuillToolbarColorButton> {
         size: iconSize * iconButtonFactor,
       ),
       onPressed: _showColorPicker,
+      afterPressed: afterButtonPressed,
     );
   }
 

lib/src/widgets/toolbar/buttons/quill_icon_button.dart

@@ -26,7 +26,12 @@ class QuillToolbarIconButton extends StatelessWidget {
     if (isSelected) {
       return IconButton.filled(
         tooltip: tooltip,
-        onPressed: onPressed,
+        onPressed: onPressed != null
+            ? () {
+                onPressed?.call();
+                afterPressed?.call();
+              }
+            : null,
         icon: icon,
         style: iconTheme?.iconButtonSelectedData?.style,
         visualDensity: iconTheme?.iconButtonSelectedData?.visualDensity,

lib/src/widgets/toolbar/buttons/toggle_style_button.dart

@@ -148,7 +148,7 @@ class QuillToolbarToggleStyleButtonState
 
   void _onPressed() {
     _toggleAttribute();
-    options.afterButtonPressed?.call();
+    afterButtonPressed?.call();
   }
 
   @override
@@ -175,7 +175,7 @@ class QuillToolbarToggleStyleButtonState
         options.fillColor,
         _isToggled,
         _toggleAttribute,
-        options.afterButtonPressed,
+        afterButtonPressed,
         iconSize,
         iconButtonFactor,
         iconTheme,