Merge branch 'singerdmx:master' into master

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## 9.3.7
+* Fix for keyboard jumping when switching focus from a TextField
+* Toolbar button styling to reflect cursor position when running on desktops with keyboard to move care
+
 ## 9.3.6
 * Add SK and update CS locales [#1796](https://github.com/singerdmx/flutter-quill/pull/1796)
 * Fixes:

dart_quill_delta/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## 9.3.7
+* Fix for keyboard jumping when switching focus from a TextField
+* Toolbar button styling to reflect cursor position when running on desktops with keyboard to move care
+
 ## 9.3.6
 * Add SK and update CS locales [#1796](https://github.com/singerdmx/flutter-quill/pull/1796)
 * Fixes:

dart_quill_delta/pubspec.yaml

@@ -1,6 +1,6 @@
 name: dart_quill_delta
 description: A port of quill-js-delta from typescript to dart
-version: 9.3.6
+version: 9.3.7
 homepage: https://github.com/singerdmx/flutter-quill/tree/master/dart_quill_delta/
 repository: https://github.com/singerdmx/flutter-quill/tree/master/dart_quill_delta/
 issue_tracker: https://github.com/singerdmx/flutter-quill/issues/

flutter_quill_extensions/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## 9.3.7
+* Fix for keyboard jumping when switching focus from a TextField
+* Toolbar button styling to reflect cursor position when running on desktops with keyboard to move care
+
 ## 9.3.6
 * Add SK and update CS locales [#1796](https://github.com/singerdmx/flutter-quill/pull/1796)
 * Fixes:

flutter_quill_extensions/pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_quill_extensions
 description: Embed extensions for flutter_quill including image, video, formula and etc.
-version: 9.3.6
+version: 9.3.7
 homepage: https://github.com/singerdmx/flutter-quill/tree/master/flutter_quill_extensions/
 repository: https://github.com/singerdmx/flutter-quill/tree/master/flutter_quill_extensions/
 issue_tracker: https://github.com/singerdmx/flutter-quill/issues/

flutter_quill_test/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## 9.3.7
+* Fix for keyboard jumping when switching focus from a TextField
+* Toolbar button styling to reflect cursor position when running on desktops with keyboard to move care
+
 ## 9.3.6
 * Add SK and update CS locales [#1796](https://github.com/singerdmx/flutter-quill/pull/1796)
 * Fixes:

flutter_quill_test/pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_quill_test
 description: Test utilities for flutter_quill which includes methods to simplify interacting with the editor in test cases.
-version: 9.3.6
+version: 9.3.7
 homepage: https://github.com/singerdmx/flutter-quill/tree/master/flutter_quill_test/
 repository: https://github.com/singerdmx/flutter-quill/tree/master/flutter_quill_test/
 issue_tracker: https://github.com/singerdmx/flutter-quill/issues/

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.removeAll({
-        for (final attr in rangeStyle.values)
-          if (attr.isInline) attr
-      });
+      return rangeStyle = (res.node as Line).collectStyle(res.offset, len);
     }
     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 as String).contains('\n')) {
+        (prev.data is String && (prev.data as String).endsWith('\n'))) {
+      prev = itr.next();
+    }
+
+    if (prev.data is! String) {
       return null;
     }
 

lib/src/widgets/quill/quill_controller.dart

@@ -327,20 +327,19 @@ class QuillController extends ChangeNotifier {
 
     if (textSelection != null) {
       if (delta == null || delta.isEmpty) {
-        _updateSelection(textSelection, ChangeSource.local);
+        _updateSelection(textSelection);
       } else {
         final user = Delta()
           ..retain(index)
           ..insert(data)
           ..delete(len);
         final positionDelta = getPositionDelta(user, delta);
         _updateSelection(
-          textSelection.copyWith(
-            baseOffset: textSelection.baseOffset + positionDelta,
-            extentOffset: textSelection.extentOffset + positionDelta,
-          ),
-          ChangeSource.local,
-        );
+            textSelection.copyWith(
+              baseOffset: textSelection.baseOffset + positionDelta,
+              extentOffset: textSelection.extentOffset + positionDelta,
+            ),
+            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();
-      final ignoredStyles = style.attributes.values.where(
-        (s) => !s.isInline || s.key == Attribute.link.key,
-      );
-      toggledStyle = style.removeAll(ignoredStyles.toSet());
+      if (insertNewline && selection.start > 0) {
+        final style = document.collectStyle(selection.start - 1, 0);
+        final ignoredStyles = style.attributes.values.where(
+          (s) => !s.isInline || s.key == Attribute.link.key,
+        );
+        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,

pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_quill
 description: A rich text editor built for the modern Android, iOS, web and desktop platforms. It is the WYSIWYG editor and a Quill component for Flutter.
-version: 9.3.6
+version: 9.3.7
 homepage: https://1o24bbs.com/c/bulletjournal/108/
 repository: https://github.com/singerdmx/flutter-quill/
 issue_tracker: https://github.com/singerdmx/flutter-quill/issues/

quill_html_converter/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## 9.3.7
+* Fix for keyboard jumping when switching focus from a TextField
+* Toolbar button styling to reflect cursor position when running on desktops with keyboard to move care
+
 ## 9.3.6
 * Add SK and update CS locales [#1796](https://github.com/singerdmx/flutter-quill/pull/1796)
 * Fixes:

quill_html_converter/pubspec.yaml

@@ -1,6 +1,6 @@
 name: quill_html_converter
 description: A extension for flutter_quill package to add support for dealing with conversion to/from html
-version: 9.3.6
+version: 9.3.7
 homepage: https://github.com/singerdmx/flutter-quill/tree/master/quill_html_converter/
 repository: https://github.com/singerdmx/flutter-quill/tree/master/quill_html_converter/
 issue_tracker: https://github.com/singerdmx/flutter-quill/issues/

quill_pdf_converter/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## 9.3.7
+* Fix for keyboard jumping when switching focus from a TextField
+* Toolbar button styling to reflect cursor position when running on desktops with keyboard to move care
+
 ## 9.3.6
 * Add SK and update CS locales [#1796](https://github.com/singerdmx/flutter-quill/pull/1796)
 * Fixes:

quill_pdf_converter/pubspec.yaml

@@ -1,6 +1,6 @@
 name: quill_pdf_converter
 description: A extension for flutter_quill package to add support for dealing with conversion to pdf
-version: 9.3.6
+version: 9.3.7
 homepage: https://github.com/singerdmx/flutter-quill/tree/master/quill_pdf_converter/
 repository: https://github.com/singerdmx/flutter-quill/tree/master/quill_pdf_converter/
 issue_tracker: https://github.com/singerdmx/flutter-quill/issues/

version.dart

@@ -1 +1 @@
-const version = '9.3.6';
+const version = '9.3.7';