From caa5662de4f3b44830b6ed5b40cd4802631cf808 Mon Sep 17 00:00:00 2001 From: AtlasAutocode <165201146+AtlasAutocode@users.noreply.github.com> Date: Sat, 13 Apr 2024 15:34:58 -0600 Subject: [PATCH] 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 --- lib/src/models/documents/document.dart | 6 +--- lib/src/models/rules/insert.dart | 9 +++-- lib/src/widgets/quill/quill_controller.dart | 36 ++++++++++--------- .../toolbar/buttons/color/color_button.dart | 1 + .../toolbar/buttons/quill_icon_button.dart | 7 +++- .../toolbar/buttons/toggle_style_button.dart | 4 +-- 6 files changed, 36 insertions(+), 27 deletions(-) diff --git a/lib/src/models/documents/document.dart b/lib/src/models/documents/document.dart index 82c6ebd5..99a72e7a 100644 --- a/lib/src/models/documents/document.dart +++ b/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]; diff --git a/lib/src/models/rules/insert.dart b/lib/src/models/rules/insert.dart index 7f8686c4..731be9cf 100644 --- a/lib/src/models/rules/insert.dart +++ b/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; } diff --git a/lib/src/widgets/quill/quill_controller.dart b/lib/src/widgets/quill/quill_controller.dart index 7f95a6cf..ebbaa7d6 100644 --- a/lib/src/widgets/quill/quill_controller.dart +++ b/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( - 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(); } diff --git a/lib/src/widgets/toolbar/buttons/color/color_button.dart b/lib/src/widgets/toolbar/buttons/color/color_button.dart index eec85be1..77fa424c 100644 --- a/lib/src/widgets/toolbar/buttons/color/color_button.dart +++ b/lib/src/widgets/toolbar/buttons/color/color_button.dart @@ -191,6 +191,7 @@ class QuillToolbarColorButtonState extends State { size: iconSize * iconButtonFactor, ), onPressed: _showColorPicker, + afterPressed: afterButtonPressed, ); } diff --git a/lib/src/widgets/toolbar/buttons/quill_icon_button.dart b/lib/src/widgets/toolbar/buttons/quill_icon_button.dart index 2bf75ebe..5cc759e0 100644 --- a/lib/src/widgets/toolbar/buttons/quill_icon_button.dart +++ b/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, diff --git a/lib/src/widgets/toolbar/buttons/toggle_style_button.dart b/lib/src/widgets/toolbar/buttons/toggle_style_button.dart index b02e627f..f93e79a1 100644 --- a/lib/src/widgets/toolbar/buttons/toggle_style_button.dart +++ b/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,