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
16 changes: 10 additions & 6 deletions lib/screens/components/controllers/tag_controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ class TagController {
final NoteEditController noteEditController;
OverlayEntry? _tagListOverlay;
Timer? _tagListTimer;
bool _disposed = false;

TagController({required this.noteTagService, required this.noteEditController});

Expand All @@ -23,11 +24,7 @@ class TagController {
showTagList(noteModel, text, cursorPosition, context);
});
} else {
_tagListTimer?.cancel();
if (_tagListOverlay != null) {
_tagListOverlay?.remove();
_tagListOverlay = null;
}
closeOverlay();
}
}

Expand Down Expand Up @@ -66,9 +63,16 @@ class TagController {
return TextSelection.fromPosition(TextPosition(offset: newCursorPosition));
}

void dispose() {
void closeOverlay() {
_tagListTimer?.cancel();
_tagListOverlay?.remove();
_tagListOverlay = null;
}

// assert fires in debug builds only; use closeOverlay() for runtime close operations.
void dispose() {
assert(!_disposed, 'TagController.dispose() called more than once');
_disposed = true;
closeOverlay();
}
}
2 changes: 1 addition & 1 deletion lib/screens/components/note_edit.dart
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ class NoteEditState extends State<NoteEdit> {
},
child: Listener(
onPointerDown: (event) {
tagController.dispose(); // Close tag overlay if open
tagController.closeOverlay();
},
child: AnimatedBuilder(
animation: noteModel.focusNode,
Expand Down
68 changes: 68 additions & 0 deletions test/controllers/tag_controller_test.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import 'package:dio/dio.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:happy_notes/apis/file_uploader_api.dart';
import 'package:happy_notes/apis/note_tag_api.dart';
import 'package:happy_notes/screens/components/controllers/html_to_markdown_converter.dart';
import 'package:happy_notes/screens/components/controllers/note_edit_controller.dart';
import 'package:happy_notes/screens/components/controllers/tag_controller.dart';
import 'package:happy_notes/services/clipboard_service.dart';
import 'package:happy_notes/services/image_service.dart';
import 'package:happy_notes/services/note_tag_service.dart';

class _FakeNoteTagApi extends NoteTagApi {
@override
Future<Response<dynamic>> getMyTagCloud() async =>
Response(requestOptions: RequestOptions(), data: {'successful': true, 'data': []});
}

class _FakeImageService extends ImageService {
_FakeImageService() : super(fileUploaderApi: FileUploaderApi());
}

TagController _makeTagController(NoteEditController noteEditController) {
return TagController(
noteTagService: NoteTagService(noteTagApi: _FakeNoteTagApi()),
noteEditController: noteEditController,
);
}

NoteEditController _makeNoteEditController() {
return NoteEditController(
imageService: _FakeImageService(),
clipboardService: ClipboardService(),
htmlToMarkdownConverter: HtmlToMarkdownConverter(),
);
}

void main() {
group('TagController.closeOverlay', () {
late NoteEditController noteEditController;
late TagController tagController;

setUp(() {
noteEditController = _makeNoteEditController();
tagController = _makeTagController(noteEditController);
});

tearDown(() {
tagController.dispose();
noteEditController.dispose();
});

test('closeOverlay is a no-op when no overlay is open', () {
expect(() => tagController.closeOverlay(), returnsNormally);
});

test('closeOverlay can be called multiple times without throwing', () {
tagController.closeOverlay();
tagController.closeOverlay();
tagController.closeOverlay();
});

test('dispose throws AssertionError if called a second time', () {
final ctrl = _makeTagController(noteEditController);
ctrl.dispose();
expect(() => ctrl.dispose(), throwsA(isA<AssertionError>()));
});
});
}
Loading