Add tests for PreserveInlineStylesRule and fix link editing. Other minor fixes. (singerdmx#2058)

* Value setting Stateful toolbar buttons derive from base class

* Removed deprecated functions

* Move clipboard actions to QuillController

* Add: Clipboard toolbar buttons

* Translation Justify

* Translation alignJustify

* Fix: Translation en-US

* Misc fixes

---------

Co-authored-by: Douglas Ward <[email protected]>

Author: AtlasAutocode

lib/src/controller/quill_controller.dart

@@ -8,6 +8,7 @@ import 'package:meta/meta.dart' show experimental;
 import '../../quill_delta.dart';
 import '../common/structs/image_url.dart';
 import '../common/structs/offset_value.dart';
+import '../common/utils/embeds.dart';
 import '../delta/delta_diff.dart';
 import '../delta/delta_x.dart';
 import '../document/attribute.dart';
@@ -515,6 +516,12 @@ class QuillController extends ChangeNotifier {
   Future<bool> clipboardPaste({void Function()? updateEditor}) async {
     if (readOnly || !selection.isValid) return true;
 
+    final pasteUsingInternalImageSuccess = await _pasteInternalImage();
+    if (pasteUsingInternalImageSuccess) {
+      updateEditor?.call();
+      return true;
+    }
+
     final pasteUsingHtmlSuccess = await _pasteHTML();
     if (pasteUsingHtmlSuccess) {
       updateEditor?.call();
@@ -574,6 +581,34 @@ class QuillController extends ChangeNotifier {
     );
   }
 
+  /// Return true if can paste internal image
+  Future<bool> _pasteInternalImage() async {
+    final copiedImageUrl = _copiedImageUrl;
+    if (copiedImageUrl != null) {
+      final index = selection.baseOffset;
+      final length = selection.extentOffset - index;
+      replaceText(
+        index,
+        length,
+        BlockEmbed.image(copiedImageUrl.url),
+        null,
+      );
+      if (copiedImageUrl.styleString.isNotEmpty) {
+        formatText(
+          getEmbedNode(this, index + 1).offset,
+          1,
+          StyleAttribute(copiedImageUrl.styleString),
+        );
+      }
+      _copiedImageUrl = null;
+      await Clipboard.setData(
+        const ClipboardData(text: ''),
+      );
+      return true;
+    }
+    return false;
+  }
+
   /// Return true if can paste using HTML
   Future<bool> _pasteHTML() async {
     final clipboardService = ClipboardServiceProvider.instance;

lib/src/editor/raw_editor/raw_editor_state.dart

@@ -11,7 +11,6 @@ import 'package:flutter/scheduler.dart' show SchedulerBinding;
 import 'package:flutter/services.dart'
     show
         Clipboard,
-        ClipboardData,
         HardwareKeyboard,
         KeyDownEvent,
         LogicalKeyboardKey,
@@ -24,7 +23,6 @@ import '../../common/structs/horizontal_spacing.dart';
 import '../../common/structs/offset_value.dart';
 import '../../common/structs/vertical_spacing.dart';
 import '../../common/utils/cast.dart';
-import '../../common/utils/embeds.dart';
 import '../../common/utils/platform.dart';
 import '../../controller/quill_controller.dart';
 import '../../delta/delta_diff.dart';
@@ -155,31 +153,6 @@ class QuillRawEditorState extends EditorState
       return;
     }
 
-    // When image copied internally in the editor
-    final copiedImageUrl = controller.copiedImageUrl;
-    if (copiedImageUrl != null) {
-      final index = textEditingValue.selection.baseOffset;
-      final length = textEditingValue.selection.extentOffset - index;
-      controller.replaceText(
-        index,
-        length,
-        BlockEmbed.image(copiedImageUrl.url),
-        null,
-      );
-      if (copiedImageUrl.styleString.isNotEmpty) {
-        controller.formatText(
-          getEmbedNode(controller, index + 1).offset,
-          1,
-          StyleAttribute(copiedImageUrl.styleString),
-        );
-      }
-      controller.copiedImageUrl = null;
-      await Clipboard.setData(
-        const ClipboardData(text: ''),
-      );
-      return;
-    }
-
     if (await controller.clipboardPaste()) {
       bringIntoView(textEditingValue.selection.extent);
       return;
@@ -909,6 +882,7 @@ class QuillRawEditorState extends EditorState
       for (final attr in style.values) {
         controller.formatSelection(attr);
       }
+      controller.formatSelection(attribute);
     }
   }
 

lib/src/editor/widgets/text/text_line.dart

@@ -931,10 +931,15 @@ class RenderEditableTextLine extends RenderEditableBox {
 
   @override
   TextPosition? getPositionAbove(TextPosition position) {
-    /// Move up by fraction of the default font height, larger font sizes need larger offset
-    for (var offset = -0.5;; offset -= 0.25) {
-      final pos = _getPosition(position, offset);
-      if (pos != position || offset <= -2.0) {
+    double? maxOffset;
+    double limit() => maxOffset ??=
+        _body!.semanticBounds.height / preferredLineHeight(position) + 1;
+    bool checkLimit(double offset) => offset < 4.0 ? false : offset > limit();
+
+    /// Move up by fraction of the default font height, larger font sizes need larger offset, embed images need larger offset
+    for (var offset = 0.5;; offset += offset < 4 ? 0.25 : 1.0) {
+      final pos = _getPosition(position, -offset);
+      if (pos?.offset != position.offset || checkLimit(offset)) {
         return pos;
       }
     }

lib/src/rules/insert.dart

@@ -558,35 +558,43 @@ class PreserveInlineStylesRule extends InsertRule {
 
     final documentDelta = document.toDelta();
     final itr = DeltaIterator(documentDelta);
+    len ??= 0;
     var prev = itr.skip(len == 0 ? index : index + 1);
+    var excludeLinkAtLineStart = false;
 
-    if (prev == null || prev.data is! String) return null;
-
-    /// Trap for simple insertions at start of line
+    /// Process simple insertions at start of line
     if (len == 0) {
-      final prevData = prev.data as String;
-      if (prevData.endsWith('\n')) {
-        /// If current line is empty get attributes from a prior line
-        final currLine = itr.next();
-        final currData =
-            currLine.data is String ? currLine.data as String : null;
-        if (currData?.isEmpty == true || currData?.startsWith('\n') == true) {
-          if (prevData.trimRight().isEmpty) {
-            final back =
-                DeltaIterator(documentDelta).skip(index - prevData.length);
-            if (back != null && back.data is String) {
-              prev = back;
+      final currLine = itr.next();
+
+      /// Trap for previous is not text with attributes
+      if (prev?.data is! String) {
+        prev = currLine;
+        excludeLinkAtLineStart = true;
+      } else {
+        final prevData = prev!.data as String;
+        if (prevData.endsWith('\n')) {
+          /// If current line is empty get attributes from a prior line
+          final currData =
+              currLine.data is String ? currLine.data as String : null;
+          if (currData?.startsWith('\n') == true) {
+            if (prevData.trimRight().isEmpty) {
+              final back =
+                  DeltaIterator(documentDelta).skip(index - prevData.length);
+              if (back != null && back.data is String) {
+                prev = back;
+              }
             }
+          } else {
+            prev = currLine;
+            excludeLinkAtLineStart = true;
           }
-        } else {
-          prev = currLine;
         }
       }
     }
 
     final attributes = <String, dynamic>{};
-    if (prev.attributes != null) {
-      for (final entry in prev.attributes!.entries) {
+    if (prev?.attributes != null) {
+      for (final entry in prev!.attributes!.entries) {
         if (Attribute.inlineKeys.contains(entry.key)) {
           attributes[entry.key] = entry.value;
         }
@@ -596,29 +604,12 @@ class PreserveInlineStylesRule extends InsertRule {
       return null;
     }
 
-    final text = data;
-    if (attributes.isEmpty || !attributes.containsKey(Attribute.link.key)) {
-      return Delta()
-        ..retain(index + (len ?? 0))
-        ..insert(text, attributes);
+    if (excludeLinkAtLineStart) {
+      attributes.remove(Attribute.link.key);
     }
-
-    attributes.remove(Attribute.link.key);
-    final delta = Delta()
-      ..retain(index + (len ?? 0))
-      ..insert(text, attributes.isEmpty ? null : attributes);
-    final next = itr.next();
-
-    final nextAttributes = next.attributes ?? const <String, dynamic>{};
-    if (!nextAttributes.containsKey(Attribute.link.key)) {
-      return delta;
-    }
-    if (attributes[Attribute.link.key] == nextAttributes[Attribute.link.key]) {
-      return Delta()
-        ..retain(index + (len ?? 0))
-        ..insert(text, attributes);
-    }
-    return delta;
+    return Delta()
+      ..retain(index + len)
+      ..insert(data, attributes.isEmpty ? null : attributes);
   }
 }