Fix hit test issue in text line

fleather-editor · Jul 19, 2023 · 8cfe749 · 8cfe749
1 parent a45e30e
commit 8cfe749
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/packages/fleather/lib/src/rendering/editable_box.dart b/packages/fleather/lib/src/rendering/editable_box.dart
@@ -313,7 +313,7 @@ class RenderEditableContainerBox extends RenderBox
 
     var mainAxisExtent = _resolvedPadding!.top;
     var child = firstChild;
-    final innerConstraints = constraints.loosen().deflate(_resolvedPadding!);
+    final innerConstraints = constraints.deflate(_resolvedPadding!);
     while (child != null) {
       child.layout(innerConstraints, parentUsesSize: true);
       final childParentData = child.parentData as EditableContainerParentData;

diff --git a/packages/fleather/lib/src/rendering/editable_text_line.dart b/packages/fleather/lib/src/rendering/editable_text_line.dart
@@ -632,7 +632,7 @@ class RenderEditableTextLine extends RenderEditableBox {
       ));
       return;
     }
-    final innerConstraints = constraints.loosen().deflate(_resolvedPadding!);
+    final innerConstraints = constraints.deflate(_resolvedPadding!);
 
     final indentWidth = textDirection == TextDirection.ltr
         ? _resolvedPadding!.left
@@ -782,23 +782,30 @@ class RenderEditableTextLine extends RenderEditableBox {
     if (leading != null) {
       final childParentData = leading!.parentData as BoxParentData;
       final isHit = result.addWithPaintOffset(
-          offset: childParentData.offset,
-          position: position,
-          hitTest: (BoxHitTestResult result, Offset transformed) {
-            assert(transformed == position - childParentData.offset);
-            return leading!.hitTest(result, position: transformed);
-          });
+        offset: childParentData.offset,
+        position: position,
+        hitTest: (result, transformed) =>
+            leading!.hitTest(result, position: transformed),
+      );
       if (isHit) return true;
     }
     if (body == null) return false;
     final parentData = body!.parentData as BoxParentData;
-    return result.addWithPaintOffset(
+    final offset = position - parentData.offset;
+    final textBoxes = body!.getBoxesForSelection(
+        TextSelection(baseOffset: 0, extentOffset: node.toPlainText().length));
+    final isInTextBoxes = textBoxes.any((e) =>
+        Rect.fromLTRB(e.left, e.top, e.right, e.bottom).contains(offset));
+    if (isInTextBoxes) {
+      return result.addWithPaintOffset(
         offset: parentData.offset,
         position: position,
-        hitTest: (BoxHitTestResult result, Offset position) {
-          return body!.hitTest(result, position: position);
-        });
+        hitTest: (result, position) =>
+            body!.hitTest(result, position: position),
+      );
+    }
+    return false;
   }
 
 // End render box overrides
-}
+}