Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions packages/fleather/lib/src/widgets/editor.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1641,11 +1641,13 @@ class RawEditorState extends EditorState
return;
}

if (!widget.scrollable) {
final localRect = renderEditor
.getLocalRectForCaret(textEditingValue.selection.extent);
renderEditor.showOnScreen(rect: localRect);
} else {
final localRect =
renderEditor.getLocalRectForCaret(textEditingValue.selection.extent);
renderEditor.showOnScreen(
rect: localRect,
duration: withAnimation ? _caretAnimationDuration : Duration.zero);

if (widget.scrollable) {
final offset = renderEditor.getOffsetToRevealCursor(
_scrollController.position.viewportDimension,
_scrollController.offset);
Expand Down
52 changes: 50 additions & 2 deletions packages/fleather/test/widgets/editor_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1629,7 +1629,9 @@ void main() {
await tester.pump(throttleDuration);
});

testWidgets('shows cursor on screen with scroll parent', (tester) async {
testWidgets(
'shows cursor on screen when not scrollable with scroll parent',
(tester) async {
final scrollController = ScrollController();
final controller = FleatherController();
final widget = MaterialApp(
Expand Down Expand Up @@ -1670,7 +1672,53 @@ void main() {
final newInput = 'Line1\nLine2';
controller.replaceText(0, 0, newInput,
selection: TextSelection.collapsed(offset: newInput.length));
await tester.pump(throttleDuration);
await tester.pumpAndSettle(throttleDuration);
expect(scrollController.position.pixels,
greaterThan(initialScrollPosition));
});

testWidgets('shows cursor on screen when scrollable with scroll parent',
(tester) async {
final scrollController = ScrollController();
final controller = FleatherController();
final widget = MaterialApp(
home: SingleChildScrollView(
controller: scrollController,
child: SizedBox(
width: double.maxFinite,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
for (var i = 0; i < 20; i++) ...[
FleatherField(
key: Key('Field.Key.$i'),
focusNode: FocusNode(),
autofocus: true,
showCursor: true,
autocorrect: false,
enableSuggestions: false,
controller: i == 15 ? controller : FleatherController(),
)
]
],
),
),
),
);
await tester.pumpWidget(widget);
final field = tester.widget<FleatherField>(
find.byKey(Key('Field.Key.15'), skipOffstage: false));
field.focusNode!.requestFocus();
await tester.pumpAndSettle();
expect(scrollController.position.pixels,
greaterThan(scrollController.position.minScrollExtent));
expect(scrollController.position.pixels,
lessThan(scrollController.position.maxScrollExtent));
final initialScrollPosition = scrollController.position.pixels;
final newInput = 'Line1\nLine2';
controller.replaceText(0, 0, newInput,
selection: TextSelection.collapsed(offset: newInput.length));
await tester.pumpAndSettle(throttleDuration);
expect(scrollController.position.pixels,
greaterThan(initialScrollPosition));
});
Expand Down