@@ -199,7 +199,13 @@ abstract class _BaseAdapter {
199199 }
200200
201201 if (_debugLogPointerEvents) {
202- print (event.type);
202+ if (event is html.PointerEvent ) {
203+ print ('${event .type } '
204+ '${event .client .x .toStringAsFixed (1 )},'
205+ '${event .client .y .toStringAsFixed (1 )}' );
206+ } else {
207+ print (event.type);
208+ }
203209 }
204210 // Report the event to semantics. This information is used to debounce
205211 // browser gestures. Semantics tells us whether it is safe to forward
@@ -381,6 +387,7 @@ class _ButtonSanitizer {
381387 }
382388
383389 _pressedButtons = _inferDownFlutterButtons (button, buttons);
390+
384391 return _SanitizedDetails (
385392 change: ui.PointerChange .down,
386393 buttons: _pressedButtons,
@@ -389,18 +396,6 @@ class _ButtonSanitizer {
389396
390397 _SanitizedDetails sanitizeMoveEvent ({required int buttons}) {
391398 final int newPressedButtons = _htmlButtonsToFlutterButtons (buttons);
392- // This could happen when the context menu is active and the user clicks
393- // RMB somewhere else. The browser sends a down event with `buttons:0`.
394- //
395- // In this case, we keep the old `buttons` value so we don't confuse the
396- // framework.
397- if (_pressedButtons != 0 && newPressedButtons == 0 ) {
398- return _SanitizedDetails (
399- change: ui.PointerChange .move,
400- buttons: _pressedButtons,
401- );
402- }
403-
404399 // This could happen when the user clicks RMB then moves the mouse quickly.
405400 // The brower sends a move event with `buttons:2` even though there's no
406401 // buttons down yet.
@@ -434,6 +429,30 @@ class _ButtonSanitizer {
434429 );
435430 }
436431
432+ _SanitizedDetails ? sanitizeUpEventWithButtons ({required int buttons}) {
433+ final int newPressedButtons = _htmlButtonsToFlutterButtons (buttons);
434+ // This could happen when the context menu is active and the user clicks
435+ // RMB somewhere else. The browser sends a down event with `buttons:0`.
436+ //
437+ // In this case, we keep the old `buttons` value so we don't confuse the
438+ // framework.
439+ if (_pressedButtons != 0 && newPressedButtons == 0 ) {
440+ return _SanitizedDetails (
441+ change: ui.PointerChange .move,
442+ buttons: _pressedButtons,
443+ );
444+ }
445+
446+ _pressedButtons = newPressedButtons;
447+
448+ return _SanitizedDetails (
449+ change: _pressedButtons == 0
450+ ? ui.PointerChange .hover
451+ : ui.PointerChange .move,
452+ buttons: _pressedButtons,
453+ );
454+ }
455+
437456 _SanitizedDetails sanitizeCancelEvent () {
438457 _pressedButtons = 0 ;
439458 return _SanitizedDetails (
@@ -444,6 +463,7 @@ class _ButtonSanitizer {
444463}
445464
446465typedef _PointerEventListener = dynamic Function (html.PointerEvent event);
466+ const int kContextMenuButton = 2 ;
447467
448468/// Adapter class to be used with browsers that support native pointer events.
449469///
@@ -492,8 +512,16 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
492512 _addPointerEventListener ('pointerdown' , (html.PointerEvent event) {
493513 final int device = event.pointerId! ;
494514 final List <ui.PointerData > pointerData = < ui.PointerData > [];
515+ final _ButtonSanitizer sanitizer = _ensureSanitizer (device);
516+ if (event.button == kContextMenuButton) {
517+ _handleMissingRightMouseUpEvent (sanitizer,
518+ sanitizer._pressedButtons,
519+ sanitizer._pressedButtons & ~ kContextMenuButton,
520+ event,
521+ pointerData);
522+ }
495523 final _SanitizedDetails details =
496- _ensureSanitizer (device) .sanitizeDownEvent (
524+ sanitizer .sanitizeDownEvent (
497525 button: event.button,
498526 buttons: event.buttons! ,
499527 );
@@ -505,9 +533,19 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
505533 final int device = event.pointerId! ;
506534 final _ButtonSanitizer sanitizer = _ensureSanitizer (device);
507535 final List <ui.PointerData > pointerData = < ui.PointerData > [];
536+ final int buttonsBeforeEvent = sanitizer._pressedButtons;
508537 final Iterable <_SanitizedDetails > detailsList = _expandEvents (event).map (
509- (html.PointerEvent expandedEvent) => sanitizer.sanitizeMoveEvent (buttons: expandedEvent.buttons! ),
538+ (html.PointerEvent expandedEvent) {
539+ return sanitizer.sanitizeMoveEvent (buttons: expandedEvent.buttons! );
540+ },
510541 );
542+ _handleMissingRightMouseUpEvent (
543+ sanitizer,
544+ buttonsBeforeEvent,
545+ (sanitizer._inferDownFlutterButtons (event.button, event.buttons! )
546+ & kContextMenuButton),
547+ event,
548+ pointerData);
511549 for (_SanitizedDetails details in detailsList) {
512550 _convertEventsToPointerData (data: pointerData, event: event, details: details);
513551 }
@@ -541,6 +579,39 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
541579 });
542580 }
543581
582+ // Handle special case where right mouse button no longer is pressed.
583+ // We need to synthesize right mouse up, otherwise drag gesture will fail
584+ // to complete or multiple RMB down events will lead to wrong state.
585+ void _handleMissingRightMouseUpEvent (_ButtonSanitizer sanitizer,
586+ int buttonsBeforeEvent, int buttonsAfterEvent, html.PointerEvent event,
587+ List <ui.PointerData > pointerData) {
588+ if ((buttonsBeforeEvent & kContextMenuButton) != 0 &&
589+ buttonsAfterEvent == 0 ) {
590+ final ui.PointerDeviceKind kind =
591+ _pointerTypeToDeviceKind (event.pointerType! );
592+ final int device = kind == ui.PointerDeviceKind .mouse
593+ ? _mouseDeviceId : event.pointerId! ;
594+ final double tilt = _computeHighestTilt (event);
595+ final Duration timeStamp = _BaseAdapter ._eventTimeStampToDuration (event.timeStamp! );
596+ sanitizer._pressedButtons & = ~ kContextMenuButton;
597+ _pointerDataConverter.convert (
598+ pointerData,
599+ change: ui.PointerChange .up,
600+ timeStamp: timeStamp,
601+ kind: kind,
602+ signalKind: ui.PointerSignalKind .none,
603+ device: device,
604+ physicalX: event.client.x.toDouble () * ui.window.devicePixelRatio,
605+ physicalY: event.client.y.toDouble () * ui.window.devicePixelRatio,
606+ buttons: sanitizer._pressedButtons,
607+ pressure: event.pressure as double ,
608+ pressureMin: 0.0 ,
609+ pressureMax: 1.0 ,
610+ tilt: tilt,
611+ );
612+ }
613+ }
614+
544615 // For each event that is de-coalesced from `event` and described in
545616 // `details`, convert it to pointer data and store in `data`.
546617 void _convertEventsToPointerData ({
@@ -782,6 +853,13 @@ class _MouseAdapter extends _BaseAdapter with _WheelEventListenerMixin {
782853 void setup () {
783854 _addMouseEventListener ('mousedown' , (html.MouseEvent event) {
784855 final List <ui.PointerData > pointerData = < ui.PointerData > [];
856+ if (event.button == kContextMenuButton) {
857+ _handleMissingRightMouseUpEvent (_sanitizer,
858+ _sanitizer._pressedButtons,
859+ _sanitizer._pressedButtons & ~ kContextMenuButton,
860+ event,
861+ pointerData);
862+ }
785863 final _SanitizedDetails sanitizedDetails =
786864 _sanitizer.sanitizeDownEvent (
787865 button: event.button,
@@ -793,6 +871,14 @@ class _MouseAdapter extends _BaseAdapter with _WheelEventListenerMixin {
793871
794872 _addMouseEventListener ('mousemove' , (html.MouseEvent event) {
795873 final List <ui.PointerData > pointerData = < ui.PointerData > [];
874+ final int buttonsBeforeEvent = _sanitizer._pressedButtons;
875+ _handleMissingRightMouseUpEvent (
876+ _sanitizer,
877+ buttonsBeforeEvent,
878+ (_sanitizer._inferDownFlutterButtons (event.button, event.buttons! )
879+ & kContextMenuButton),
880+ event,
881+ pointerData);
796882 final _SanitizedDetails sanitizedDetails = _sanitizer.sanitizeMoveEvent (buttons: event.buttons! );
797883 _convertEventsToPointerData (data: pointerData, event: event, details: sanitizedDetails);
798884 _callback (pointerData);
@@ -803,7 +889,7 @@ class _MouseAdapter extends _BaseAdapter with _WheelEventListenerMixin {
803889 final bool isEndOfDrag = event.buttons == 0 ;
804890 final _SanitizedDetails sanitizedDetails = isEndOfDrag ?
805891 _sanitizer.sanitizeUpEvent ()! :
806- _sanitizer.sanitizeMoveEvent (buttons: event.buttons! );
892+ _sanitizer.sanitizeUpEventWithButtons (buttons: event.buttons! )! ;
807893 _convertEventsToPointerData (data: pointerData, event: event, details: sanitizedDetails);
808894 _callback (pointerData);
809895 }, acceptOutsideGlasspane: true );
@@ -813,6 +899,32 @@ class _MouseAdapter extends _BaseAdapter with _WheelEventListenerMixin {
813899 });
814900 }
815901
902+ // Handle special case where right mouse button no longer is pressed.
903+ // We need to synthesize right mouse up, otherwise drag gesture will fail
904+ // to complete or multiple RMB down events will lead to wrong state.
905+ void _handleMissingRightMouseUpEvent (_ButtonSanitizer sanitizer,
906+ int buttonsBeforeEvent, int buttonsAfterEvent, html.MouseEvent event,
907+ List <ui.PointerData > pointerData) {
908+ if ((buttonsBeforeEvent & kContextMenuButton) != 0 &&
909+ buttonsAfterEvent == 0 ) {
910+ sanitizer._pressedButtons & = ~ 2 ;
911+ _pointerDataConverter.convert (
912+ pointerData,
913+ change: ui.PointerChange .up,
914+ timeStamp: _BaseAdapter ._eventTimeStampToDuration (event.timeStamp! ),
915+ kind: ui.PointerDeviceKind .mouse,
916+ signalKind: ui.PointerSignalKind .none,
917+ device: _mouseDeviceId,
918+ physicalX: event.client.x.toDouble () * ui.window.devicePixelRatio,
919+ physicalY: event.client.y.toDouble () * ui.window.devicePixelRatio,
920+ buttons: _sanitizer._pressedButtons,
921+ pressure: 1.0 ,
922+ pressureMin: 0.0 ,
923+ pressureMax: 1.0 ,
924+ );
925+ }
926+ }
927+
816928 // For each event that is de-coalesced from `event` and described in
817929 // `detailsList`, convert it to pointer data and store in `data`.
818930 void _convertEventsToPointerData ({
0 commit comments