fix selection link

packages/notus/lib/src/heuristics/insert_rules.dart

@@ -156,13 +156,11 @@ class PreserveInlineStylesRule extends InsertRule {
     if (previous == null || previous.data.contains('\n')) return null;
 
     final attributes = previous.attributes;
+    final hasHighLight = (attributes != null && attributes.containsKey(NotusAttribute.highlight.key));
+    
     final hasLink =
         (attributes != null && attributes.containsKey(NotusAttribute.link.key));
-    final hasHighLight = (attributes != null && attributes.containsKey(NotusAttribute.highlight.key));
-    if (hasHighLight) {
-      attributes.remove(NotusAttribute.highlight.key);
-    }
-    if (!hasLink) {
+    if (!hasLink && !hasHighLight) {
       return Delta()
         ..retain(index)
         ..insert(text, attributes);
@@ -172,28 +170,32 @@ class PreserveInlineStylesRule extends InsertRule {
     // Link style should NOT be preserved on the boundaries.
     var noLinkAttributes = previous.attributes;
     noLinkAttributes.remove(NotusAttribute.link.key);
+    noLinkAttributes.remove(NotusAttribute.highlight.key);
+    
     final noLinkResult = Delta()
       ..retain(index)
       ..insert(text, noLinkAttributes.isEmpty ? null : noLinkAttributes);
-    final next = iter.next();
-    if (next == null) {
-      // Nothing after us, we are not inside link-styled fragment.
-      return noLinkResult;
-    }
-    final nextAttributes = next.attributes ?? <String, dynamic>{};
-    if (!nextAttributes.containsKey(NotusAttribute.link.key)) {
-      // Next fragment is not styled as link.
-      return noLinkResult;
-    }
-    // We must make sure links are identical in previous and next operations.
-    if (attributes[NotusAttribute.link.key] ==
-        nextAttributes[NotusAttribute.link.key]) {
-      return Delta()
-        ..retain(index)
-        ..insert(text, attributes);
-    } else {
-      return noLinkResult;
-    }
+    return noLinkResult;
+
+    // final next = iter.next();
+    // if (next == null) {
+    //   // Nothing after us, we are not inside link-styled fragment.
+    //   return noLinkResult;
+    // }
+    // final nextAttributes = next.attributes ?? <String, dynamic>{};
+    // if (!nextAttributes.containsKey(NotusAttribute.link.key)) {
+    //   // Next fragment is not styled as link.
+    //   return noLinkResult;
+    // }
+    // // We must make sure links are identical in previous and next operations.
+    // if (attributes[NotusAttribute.link.key] ==
+    //     nextAttributes[NotusAttribute.link.key]) {
+    //   return Delta()
+    //     ..retain(index)
+    //     ..insert(text, attributes);
+    // } else {
+    //   return noLinkResult;
+    // }
   }
 }
 

packages/zefyr/example/lib/src/images.dart

@@ -111,9 +111,8 @@ class CustomLinkDelegate implements ZefyrLinkDelegate {
                         Navigator.pop(
                             buildContext,
                             ZefyrLinkEntity(
-                              text:
-                                  '测试用测试用测试用测试用测试用测试用测试用测试用测试用测试用测试用测试用测试用测试用测试用测试用测试用测试用测试用测试用测试用测试用测试用测试用测试用',
-                              url: _controller.text,
+                              text: _controller.text,
+                              url: _controller2.text,
                             ));
                       },
                       child: Text('确定'),

packages/zefyr/lib/src/widgets/rich_text.dart

@@ -115,10 +115,33 @@ class RenderZefyrParagraph extends RenderParagraph
     return super.getPositionForOffset(offset);
   }
 
-  TextRange getRenderBoxWordBoundary(int length) {
+  bool getPositionHasRenderBox(TextPosition position, int length) {
+    if (node.length == position.offset + 1) {
+      return false;
+    }
+    return true;
+  }
+
+  int getLinkWordBoundaryStart(TextPosition position, int length) {
+    var wordStart = position.offset;
+    var hasLink = node.length < (position.offset + length) ? true : false;
+    if (position.offset == 0 || !hasLink) {
+      return wordStart;
+    } else {
+      var newPosition = TextPosition(
+        offset: position.offset - 1,
+        affinity: position.affinity,
+      );
+      return getLinkWordBoundaryStart(newPosition, length);
+    }
+  }
+
+  TextRange getLinkWordBoundary(TextPosition position, int length) {
+    final localRange = super.getWordBoundary(position);
+    int start = getLinkWordBoundaryStart(position, length);
     return TextRange(
-      start: node.documentOffset + node.length - length - 1,
-      end: node.documentOffset + node.length - 1,
+      start: node.documentOffset + localRange.start,
+      end: node.documentOffset + localRange.end,
     );
   }
 

packages/zefyr/lib/src/widgets/selection.dart

@@ -269,17 +269,21 @@ class _ZefyrSelectionOverlayState extends State<ZefyrSelectionOverlay>
         var spanPosition = paragraph.getRenderBoxPositionForOffset(localPoint);
         // // 第一个字符和最后一个字符将不触发onTap
         final TextSpan span = paragraph.text.getSpanForPosition(TextPosition(
-          offset: spanPosition.offset == 0 ? spanPosition.offset - 1 : spanPosition.offset + 1,
+          offset: spanPosition.offset,
           affinity: spanPosition.affinity,
         ));
-        final recognizer = (span?.recognizer as TapGestureRecognizer);
-        if (recognizer != null) {
-          print('当前点击的是link');
-          // 关闭键盘 触发tap，改变光标，但不弹出键盘
-          _scope.closeKeyboard();
-          recognizer.onTap();
-          _scope.controller.updateSelection(selection, source: ChangeSource.remote);
-          return;
+        if (span != null) {
+          if (paragraph.getPositionHasRenderBox(spanPosition, span.text.length)) {
+            final recognizer = (span?.recognizer as TapGestureRecognizer);
+            if (recognizer != null) {
+              print('当前点击的是link');
+              // 关闭键盘 触发tap，改变光标，但不弹出键盘
+              _scope.closeKeyboard();
+              recognizer.onTap();
+              _scope.controller.updateSelection(selection, source: ChangeSource.remote);
+              return;
+            }
+          }
         }
       }
     } else if (box?.child is RenderEditableImage) {
@@ -328,11 +332,11 @@ class _ZefyrSelectionOverlayState extends State<ZefyrSelectionOverlay>
     //     var spanPosition = paragraph.getRenderBoxPositionForOffset(localPoint);
     //     // // 第一个字符和最后一个字符将不触发onTap
     //     final TextSpan span = paragraph.text.getSpanForPosition(TextPosition(
-    //       offset: spanPosition.offset == 0 ? spanPosition.offset - 1 : spanPosition.offset + 1,
+    //       offset: spanPosition.offset,
     //       affinity: spanPosition.affinity,
     //     ));
     //     if (span != null) {
-    //       word = paragraph.getRenderBoxWordBoundary(span.text.length);
+    //       word = paragraph.getLinkWordBoundary(spanPosition, span.text.length);
     //     }
     //   }
     // }