Skip to content

fix: dispose owned scroll controllers and floating-cursor timer #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SebTardif wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: dispose owned scroll controllers and floating-cursor timer #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions lib/src/_code_input.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,10 @@ class _CodeInputController extends ChangeNotifier implements DeltaTextInputClien

@override
void dispose() {
if (_floatingCursorScrollTimer != null) {
_floatingCursorScrollTimer!.cancel();
_floatingCursorScrollTimer = null;
}
super.dispose();
_closeInputConnectionIfNeeded();
_controller.removeListener(_onCodeEditingChanged);
Expand Down
13 changes: 12 additions & 1 deletion lib/src/code_scroll.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@ class CodeScrollController {

final ScrollController verticalScroller;
final ScrollController horizontalScroller;
final bool _ownsVerticalScroller;
final bool _ownsHorizontalScroller;

GlobalKey? _editorKey;

CodeScrollController({
ScrollController? verticalScroller,
ScrollController? horizontalScroller,
}) : verticalScroller = verticalScroller ?? ScrollController(),
}) : _ownsVerticalScroller = verticalScroller == null,
_ownsHorizontalScroller = horizontalScroller == null,
verticalScroller = verticalScroller ?? ScrollController(),
horizontalScroller = horizontalScroller ?? ScrollController();

void makeCenterIfInvisible(CodeLinePosition position) {
Expand All @@ -31,6 +35,13 @@ class CodeScrollController {

void dispose() {
_editorKey = null;
// Only dispose controllers we allocated; caller-owned instances stay alive.
if (_ownsVerticalScroller) {
verticalScroller.dispose();
}
if (_ownsHorizontalScroller) {
horizontalScroller.dispose();
}
}

}