Skip to content

PasteFerry (隔空贴): clipboard and file sync across macOS, Windows and Linux. Direct-first, end-to-end encrypted. Optional official access: no server to host. Independent self-hosting remains available.

fix(ui): keep quick paste results while a new search is pending

baiyuze60465633e579
diff --git a/ui/lib/picker/picker_state.dart b/ui/lib/picker/picker_state.dart
index 4ebf8bc..08ca2bd 100644
--- a/ui/lib/picker/picker_state.dart
+++ b/ui/lib/picker/picker_state.dart
@@ -67,6 +67,9 @@ class PickerState extends ChangeNotifier implements RecordDetails {
int _selected = 0;
bool _byPointer = false;
List<ClipRecord>? _results;
+ // 上一个搜索词的结果:新的结果回来之前,在已加载的记录里又找不到时接着显示它。
+ // 按拼音搜(huiyi 找「会议」)只有后台服务做得到,不然每打一个字母列表都会闪一下「没有找到」
+ List<ClipRecord>? _previous;
Timer? _searchTimer;
int _searchSeq = 0;
String? _error;
@@ -105,8 +108,10 @@ class PickerState extends ChangeNotifier implements RecordDetails {
final f = _tab.filter;
final base = f == null ? _favorites : _records.where(f.matches).toList();
if (_query.trim().isEmpty) return base;
+ if (_results != null) return _results!;
// 后台服务的结果回来之前,先在已加载的里面找,打字时列表立刻有反应
- return _results ?? base.where((r) => matchesSearch(r, _query.trim())).toList();
+ final local = base.where((r) => matchesSearch(r, _query.trim())).toList();
+ return local.isEmpty && _previous != null ? _previous! : local;
}
// ─────────────────────────── 启动与连接 ───────────────────────────
@@ -330,6 +335,7 @@ class PickerState extends ChangeNotifier implements RecordDetails {
_selected = 0;
_byPointer = false;
_results = null;
+ _previous = null;
_searchTimer?.cancel();
_searchSeq++;
_error = null;
@@ -350,6 +356,7 @@ class PickerState extends ChangeNotifier implements RecordDetails {
_selected = 0;
_byPointer = false;
_results = null;
+ _previous = null;
_scheduleSearch(Duration.zero);
notifyListeners();
}
@@ -363,6 +370,7 @@ class PickerState extends ChangeNotifier implements RecordDetails {
_query = q;
_selected = 0;
_byPointer = false;
+ _previous = q.trim().isEmpty ? null : _results ?? _previous;
_results = null;
_error = null;
_scheduleSearch(const Duration(milliseconds: 150));
diff --git a/ui/test/picker_test.dart b/ui/test/picker_test.dart
index a3bf006..a8c8479 100644
--- a/ui/test/picker_test.dart
+++ b/ui/test/picker_test.dart
@@ -26,6 +26,9 @@ class _TestPicker extends PickerState {
final favorited = <(String, bool)>[];
final searches = <(String, PickerTab)>[];
+ /// 后台服务对这些搜索词给出的结果(比如按拼音找到的);不在这里的当作不支持搜索的旧版后台服务
+ final answers = <String, List<ClipRecord>>{};
+
@override
Future<void> requestApply(String id, bool plain) async => applied.add((id, plain));
@@ -38,7 +41,8 @@ class _TestPicker extends PickerState {
@override
Future<ListHistoryResponse> requestSearch(String query, PickerTab tab) async {
searches.add((query, tab));
- return ListHistoryResponse(searched: false);
+ final found = answers[query];
+ return found == null ? ListHistoryResponse(searched: false) : ListHistoryResponse(records: found, searched: true);
}
@override
@@ -251,6 +255,29 @@ void main() {
expect(calls.map((c) => c.method), contains('requestPermission'));
});
+ testWidgets('按拼音搜:只有后台服务找得到,结果回来之前列表接着显示上一次的结果,不闪「没有找到」', (tester) async {
+ final s = await open(tester);
+ s.answers['huiyi'] = [_records[0]];
+ s.answers['huiyix'] = [];
+ await tester.enterText(find.byType(TextField), 'huiyi');
+ await tester.pump(const Duration(milliseconds: 200));
+ await tester.pump();
+ expect(s.visible.map((r) => r.id), ['a']);
+ expect(find.textContaining('会议改到周四'), findsOneWidget);
+
+ // 多打一个字母:本地找不到,后台服务还没回话,列表不变
+ await tester.enterText(find.byType(TextField), 'huiyix');
+ await tester.pump();
+ expect(s.visible.map((r) => r.id), ['a']);
+ expect(find.textContaining('没有找到'), findsNothing);
+
+ // 后台服务说没有,这才显示「没有找到」
+ await tester.pump(const Duration(milliseconds: 200));
+ await tester.pump();
+ expect(s.visible, isEmpty);
+ expect(find.textContaining('没有找到'), findsOneWidget);
+ });
+
group('滚动', () {
final many = [for (var i = 0; i < 40; i++) _text('m$i', '第 $i 条', ago: i * 60)];