Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

[web] Fix regression of pointer events on mobile browsers #17595

Merged
merged 1 commit into from
Apr 8, 2020
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
2 changes: 1 addition & 1 deletion lib/web_ui/lib/src/engine/pointer_binding.dart
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ abstract class _BaseAdapter {
bool acceptOutsideGlasspane = false,
}) {
final html.EventListener loggedHandler = (html.Event event) {
if (!acceptOutsideGlasspane && event.target != glassPaneElement) {
if (!acceptOutsideGlasspane && !glassPaneElement.contains(event.target)) {
return;
}

Expand Down
69 changes: 69 additions & 0 deletions lib/web_ui/test/engine/pointer_binding_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,75 @@ void main() {
},
);

_testEach<_ButtonedEventMixin>(
[_PointerEventContext(), _MouseEventContext()],
'correctly detects events on the semantics placeholder',
(_ButtonedEventMixin context) {
PointerBinding.instance.debugOverrideDetector(context);
List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
packets.add(packet);
};

final html.Element semanticsPlaceholder =
html.Element.tag('flt-semantics-placeholder');
glassPane.append(semanticsPlaceholder);

// Press on the semantics placeholder.
semanticsPlaceholder.dispatchEvent(context.primaryDown(
clientX: 10.0,
clientY: 10.0,
));
expect(packets, hasLength(1));
expect(packets[0].data, hasLength(2));
expect(packets[0].data[0].change, equals(ui.PointerChange.add));
expect(packets[0].data[1].change, equals(ui.PointerChange.down));
expect(packets[0].data[1].physicalX, equals(10.0));
expect(packets[0].data[1].physicalY, equals(10.0));
packets.clear();

// Drag on the semantics placeholder.
semanticsPlaceholder.dispatchEvent(context.primaryMove(
clientX: 12.0,
clientY: 10.0,
));
expect(packets, hasLength(1));
expect(packets[0].data, hasLength(1));
expect(packets[0].data[0].change, equals(ui.PointerChange.move));
expect(packets[0].data[0].physicalX, equals(12.0));
expect(packets[0].data[0].physicalY, equals(10.0));
packets.clear();

// Keep dragging.
semanticsPlaceholder.dispatchEvent(context.primaryMove(
clientX: 15.0,
clientY: 10.0,
));
expect(packets[0].data, hasLength(1));
expect(packets[0].data[0].change, equals(ui.PointerChange.move));
expect(packets[0].data[0].physicalX, equals(15.0));
expect(packets[0].data[0].physicalY, equals(10.0));
packets.clear();

// Release the pointer on the semantics placeholder.
html.window.dispatchEvent(context.primaryUp(
clientX: 100.0,
clientY: 200.0,
));
expect(packets, hasLength(1));
expect(packets[0].data, hasLength(2));
expect(packets[0].data[0].change, equals(ui.PointerChange.move));
expect(packets[0].data[0].physicalX, equals(100.0));
expect(packets[0].data[0].physicalY, equals(200.0));
expect(packets[0].data[1].change, equals(ui.PointerChange.up));
expect(packets[0].data[1].physicalX, equals(100.0));
expect(packets[0].data[1].physicalY, equals(200.0));
packets.clear();

semanticsPlaceholder.remove();
},
);

// BUTTONED ADAPTERS

_testEach<_ButtonedEventMixin>(
Expand Down