mirror of
https://github.com/rustdesk/rustdesk.git
synced 2026-11-04 00:33:12 +00:00
fix(web): preserve peer card clicks with semantics enabled (#16709)
* fix(web): preserve peer card clicks with semantics enabled Give the More menu semantic tap and double-click actions, and expose multi-selection through separate checkboxes. Exclude redundant outer desktop web tap semantics while preserving card-body double-click connections. Cover mouse single/double clicks and semantic activation under the parent card gesture detector. Signed-off-by: fufesou <linlong1266@gmail.com> * fix(web): reuse accessible More control in portrait cards Signed-off-by: fufesou <linlong1266@gmail.com> * fix(web): keep peer More taps immediate and cancellable Signed-off-by: fufesou <linlong1266@gmail.com> * fix(web): keep keyboard wrapper out of accessibility focus Signed-off-by: fufesou <linlong1266@gmail.com> --------- Signed-off-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
1 parent
3cb027a372
commit
eba0a6e552
3 files changed
+128
-7
No files matched your search
@@ -0,0 +1,71 @@
|
||||
import 'dart:ui' show PointerDeviceKind, SemanticsAction;
|
||||
|
||||
import 'package:flutter/gestures.dart' show kSecondaryMouseButton;
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_hbb/common/widgets/peer_card.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
|
||||
void main() {
|
||||
const doubleClickInterval = Duration(milliseconds: 75);
|
||||
const dragOffset = Offset(150, 0);
|
||||
// Keep pointer cases semantics-off to cover parent/child gesture competition.
|
||||
// VM taps bypass browser click-to-semantics conversion; verify that in a browser.
|
||||
for (final action in ['physical clicks', 'semantic tap', 'keyboard']) {
|
||||
testWidgets('More $action opens once without connecting the card',
|
||||
(tester) async {
|
||||
var opened = 0;
|
||||
var connected = 0;
|
||||
await tester.pumpWidget(MaterialApp(
|
||||
home: Material(
|
||||
child: GestureDetector(
|
||||
excludeFromSemantics: true,
|
||||
onTap: () {},
|
||||
onDoubleTap: () => connected++,
|
||||
onLongPress: () {},
|
||||
child: Builder(builder: (context) {
|
||||
return Center(
|
||||
child: build_more(context, onTap: () {
|
||||
opened++;
|
||||
showMenu<void>(
|
||||
context: context,
|
||||
position: RelativeRect.fill,
|
||||
items: const [PopupMenuItem(child: Text('Connect'))],
|
||||
);
|
||||
}));
|
||||
}),
|
||||
),
|
||||
),
|
||||
));
|
||||
final button = find.byIcon(Icons.more_vert);
|
||||
final position = tester.getCenter(button);
|
||||
if (action == 'semantic tap') {
|
||||
final node = tester.getSemantics(button);
|
||||
node.owner!.performAction(node.id, SemanticsAction.tap);
|
||||
} else if (action == 'keyboard') {
|
||||
await tester.sendKeyEvent(LogicalKeyboardKey.tab);
|
||||
await tester.sendKeyEvent(LogicalKeyboardKey.enter);
|
||||
} else {
|
||||
await tester.tapAt(position,
|
||||
kind: PointerDeviceKind.mouse, buttons: kSecondaryMouseButton);
|
||||
await tester.pumpAndSettle();
|
||||
expect(opened, 0, reason: 'A secondary click must not open More');
|
||||
await tester.dragFrom(position, dragOffset,
|
||||
kind: PointerDeviceKind.mouse);
|
||||
await tester.pumpAndSettle();
|
||||
expect(opened, 0, reason: 'Dragging out must cancel the More tap');
|
||||
await tester.tapAt(position, kind: PointerDeviceKind.mouse);
|
||||
}
|
||||
expect(opened, 1,
|
||||
reason: 'More must not wait for a possible double click');
|
||||
await tester.pump();
|
||||
if (action == 'physical clicks') {
|
||||
await tester.pump(doubleClickInterval);
|
||||
await tester.tapAt(position, kind: PointerDeviceKind.mouse);
|
||||
}
|
||||
await tester.pumpAndSettle();
|
||||
expect({'menu': opened, 'connection': connected},
|
||||
{'menu': 1, 'connection': 0});
|
||||
}, semanticsEnabled: action != 'physical clicks');
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user