Merge pull request #70 from fluttercandies/dev

## [1.0.1]
fluttercandies · Jun 1, 2020 · 182c552 · 182c552
2 parents dc9de71 + 7786578
commit 182c552
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [1.0.1]
+
+* Fix wrong calculation about selection handles.
+
 ## [1.0.0]
 
 * Merge code from 1.17.0

diff --git a/lib/src/extended_render_editable.dart b/lib/src/extended_render_editable.dart
@@ -330,16 +330,17 @@ class ExtendedRenderEditable extends ExtendedTextSelectionRenderObject {
     ///
 
     final Rect visibleRegion = Offset(0.0, _visibleRegionMinY) & size;
-
+
+    //getCaretOffset ready has effectiveOffset
     final Offset startOffset = getCaretOffset(
-          TextPosition(
-            offset: selection.start,
-            affinity: selection.affinity,
-          ),
-          effectiveOffset: effectiveOffset,
-          caretPrototype: _caretPrototype,
-          handleSpecialText: handleSpecialText,
-        );
+      TextPosition(
+        offset: selection.start,
+        affinity: selection.affinity,
+      ),
+      effectiveOffset: effectiveOffset,
+      caretPrototype: _caretPrototype,
+      handleSpecialText: handleSpecialText,
+    );
 
     // (justinmc): https://github.com/flutter/flutter/issues/31495
     // Check if the selection is visible with an approximation because a
@@ -351,18 +352,19 @@ class ExtendedRenderEditable extends ExtendedTextSelectionRenderObject {
     const double visibleRegionSlop = 0.5;
     _selectionStartInViewport.value = visibleRegion
         .inflate(visibleRegionSlop)
-        .contains(startOffset + effectiveOffset);
-
+        .contains(startOffset);
+
+    //getCaretOffset ready has effectiveOffset
     final Offset endOffset = getCaretOffset(
-          TextPosition(offset: selection.end, affinity: selection.affinity),
-          effectiveOffset: effectiveOffset,
-          caretPrototype: _caretPrototype,
-          handleSpecialText: handleSpecialText,
-        );
+      TextPosition(offset: selection.end, affinity: selection.affinity),
+      effectiveOffset: effectiveOffset,
+      caretPrototype: _caretPrototype,
+      handleSpecialText: handleSpecialText,
+    );
 
     _selectionEndInViewport.value = visibleRegion
         .inflate(visibleRegionSlop)
-        .contains(endOffset + effectiveOffset);
+        .contains(endOffset);
   }
 
   ///some times _visibleRegionMinY will lower than 0.0;

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: extended_text_field
 description: Extended official text field to build special text like inline image, @somebody, custom background etc quickly.It also support to build custom seleciton toolbar and handles.
-version: 1.0.0
+version: 1.0.1
 author: zmtzawqlp <zmtzawqlp@live.com>
 homepage: https://github.com/fluttercandies/extended_text_field