@@ -257,13 +257,13 @@ mixin _WheelEventListenerMixin on _BaseAdapter {
257257 _pointerDataConverter.convert (
258258 data,
259259 change: ui.PointerChange .hover,
260- timeStamp: _BaseAdapter ._eventTimeStampToDuration (event.timeStamp),
260+ timeStamp: _BaseAdapter ._eventTimeStampToDuration (event.timeStamp! ),
261261 kind: ui.PointerDeviceKind .mouse,
262262 signalKind: ui.PointerSignalKind .scroll,
263263 device: _mouseDeviceId,
264264 physicalX: event.client.x * ui.window.devicePixelRatio as double ,
265265 physicalY: event.client.y * ui.window.devicePixelRatio as double ,
266- buttons: event.buttons,
266+ buttons: event.buttons! ,
267267 pressure: 1.0 ,
268268 pressureMin: 0.0 ,
269269 pressureMax: 1.0 ,
@@ -444,23 +444,23 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
444444 @override
445445 void setup () {
446446 _addPointerEventListener ('pointerdown' , (html.PointerEvent event) {
447- final int device = event.pointerId;
447+ final int device = event.pointerId! ;
448448 final List <ui.PointerData > pointerData = < ui.PointerData > [];
449449 final _SanitizedDetails details =
450450 _ensureSanitizer (device).sanitizeDownEvent (
451451 button: event.button,
452- buttons: event.buttons,
452+ buttons: event.buttons! ,
453453 );
454454 _convertEventsToPointerData (data: pointerData, event: event, details: details);
455455 _callback (pointerData);
456456 });
457457
458458 _addPointerEventListener ('pointermove' , (html.PointerEvent event) {
459- final int device = event.pointerId;
459+ final int device = event.pointerId! ;
460460 final _ButtonSanitizer sanitizer = _ensureSanitizer (device);
461461 final List <ui.PointerData > pointerData = < ui.PointerData > [];
462462 final Iterable <_SanitizedDetails > detailsList = _expandEvents (event).map (
463- (html.PointerEvent expandedEvent) => sanitizer.sanitizeMoveEvent (buttons: expandedEvent.buttons),
463+ (html.PointerEvent expandedEvent) => sanitizer.sanitizeMoveEvent (buttons: expandedEvent.buttons! ),
464464 );
465465 for (_SanitizedDetails details in detailsList) {
466466 _convertEventsToPointerData (data: pointerData, event: event, details: details);
@@ -469,7 +469,7 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
469469 }, acceptOutsideGlasspane: true );
470470
471471 _addPointerEventListener ('pointerup' , (html.PointerEvent event) {
472- final int device = event.pointerId;
472+ final int device = event.pointerId! ;
473473 final List <ui.PointerData > pointerData = < ui.PointerData > [];
474474 final _SanitizedDetails ? details = _getSanitizer (device).sanitizeUpEvent ();
475475 _removePointerIfUnhoverable (event);
@@ -482,7 +482,7 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
482482 // A browser fires cancel event if it concludes the pointer will no longer
483483 // be able to generate events (example: device is deactivated)
484484 _addPointerEventListener ('pointercancel' , (html.PointerEvent event) {
485- final int device = event.pointerId;
485+ final int device = event.pointerId! ;
486486 final List <ui.PointerData > pointerData = < ui.PointerData > [];
487487 final _SanitizedDetails details = _getSanitizer (device).sanitizeCancelEvent ();
488488 _removePointerIfUnhoverable (event);
@@ -512,13 +512,13 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
512512 assert (data != null ); // ignore: unnecessary_null_comparison
513513 assert (event != null ); // ignore: unnecessary_null_comparison
514514 assert (details != null ); // ignore: unnecessary_null_comparison
515- final ui.PointerDeviceKind kind = _pointerTypeToDeviceKind (event.pointerType);
515+ final ui.PointerDeviceKind kind = _pointerTypeToDeviceKind (event.pointerType! );
516516 // We force `device: _mouseDeviceId` on mouse pointers because Wheel events
517517 // might come before any PointerEvents, and since wheel events don't contain
518518 // pointerId we always assign `device: _mouseDeviceId` to them.
519- final int device = kind == ui.PointerDeviceKind .mouse ? _mouseDeviceId : event.pointerId;
519+ final int device = kind == ui.PointerDeviceKind .mouse ? _mouseDeviceId : event.pointerId! ;
520520 final double tilt = _computeHighestTilt (event);
521- final Duration timeStamp = _BaseAdapter ._eventTimeStampToDuration (event.timeStamp);
521+ final Duration timeStamp = _BaseAdapter ._eventTimeStampToDuration (event.timeStamp! );
522522 _pointerDataConverter.convert (
523523 data,
524524 change: details.change,
@@ -566,7 +566,7 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
566566
567567 /// Tilt angle is -90 to + 90. Take maximum deflection and convert to radians.
568568 double _computeHighestTilt (html.PointerEvent e) =>
569- (e.tiltX.abs () > e.tiltY.abs () ? e.tiltX : e.tiltY).toDouble () /
569+ (e.tiltX! .abs () > e.tiltY! .abs () ? e.tiltX : e.tiltY)! .toDouble () /
570570 180.0 *
571571 math.pi;
572572}
@@ -596,12 +596,12 @@ class _TouchAdapter extends _BaseAdapter {
596596 @override
597597 void setup () {
598598 _addTouchEventListener ('touchstart' , (html.TouchEvent event) {
599- final Duration timeStamp = _BaseAdapter ._eventTimeStampToDuration (event.timeStamp);
599+ final Duration timeStamp = _BaseAdapter ._eventTimeStampToDuration (event.timeStamp! );
600600 final List <ui.PointerData > pointerData = < ui.PointerData > [];
601- for (html.Touch touch in event.changedTouches) {
602- final nowPressed = _isTouchPressed (touch.identifier);
601+ for (html.Touch touch in event.changedTouches! ) {
602+ final nowPressed = _isTouchPressed (touch.identifier! );
603603 if (! nowPressed) {
604- _pressTouch (touch.identifier);
604+ _pressTouch (touch.identifier! );
605605 _convertEventToPointerData (
606606 data: pointerData,
607607 change: ui.PointerChange .down,
@@ -616,10 +616,10 @@ class _TouchAdapter extends _BaseAdapter {
616616
617617 _addTouchEventListener ('touchmove' , (html.TouchEvent event) {
618618 event.preventDefault (); // Prevents standard overscroll on iOS/Webkit.
619- final Duration timeStamp = _BaseAdapter ._eventTimeStampToDuration (event.timeStamp);
619+ final Duration timeStamp = _BaseAdapter ._eventTimeStampToDuration (event.timeStamp! );
620620 final List <ui.PointerData > pointerData = < ui.PointerData > [];
621- for (html.Touch touch in event.changedTouches) {
622- final nowPressed = _isTouchPressed (touch.identifier);
621+ for (html.Touch touch in event.changedTouches! ) {
622+ final nowPressed = _isTouchPressed (touch.identifier! );
623623 if (nowPressed) {
624624 _convertEventToPointerData (
625625 data: pointerData,
@@ -637,12 +637,12 @@ class _TouchAdapter extends _BaseAdapter {
637637 // On Safari Mobile, the keyboard does not show unless this line is
638638 // added.
639639 event.preventDefault ();
640- final Duration timeStamp = _BaseAdapter ._eventTimeStampToDuration (event.timeStamp);
640+ final Duration timeStamp = _BaseAdapter ._eventTimeStampToDuration (event.timeStamp! );
641641 final List <ui.PointerData > pointerData = < ui.PointerData > [];
642- for (html.Touch touch in event.changedTouches) {
643- final nowPressed = _isTouchPressed (touch.identifier);
642+ for (html.Touch touch in event.changedTouches! ) {
643+ final nowPressed = _isTouchPressed (touch.identifier! );
644644 if (nowPressed) {
645- _unpressTouch (touch.identifier);
645+ _unpressTouch (touch.identifier! );
646646 _convertEventToPointerData (
647647 data: pointerData,
648648 change: ui.PointerChange .up,
@@ -656,12 +656,12 @@ class _TouchAdapter extends _BaseAdapter {
656656 });
657657
658658 _addTouchEventListener ('touchcancel' , (html.TouchEvent event) {
659- final Duration timeStamp = _BaseAdapter ._eventTimeStampToDuration (event.timeStamp);
659+ final Duration timeStamp = _BaseAdapter ._eventTimeStampToDuration (event.timeStamp! );
660660 final List <ui.PointerData > pointerData = < ui.PointerData > [];
661- for (html.Touch touch in event.changedTouches) {
662- final nowPressed = _isTouchPressed (touch.identifier);
661+ for (html.Touch touch in event.changedTouches! ) {
662+ final nowPressed = _isTouchPressed (touch.identifier! );
663663 if (nowPressed) {
664- _unpressTouch (touch.identifier);
664+ _unpressTouch (touch.identifier! );
665665 _convertEventToPointerData (
666666 data: pointerData,
667667 change: ui.PointerChange .cancel,
@@ -688,7 +688,7 @@ class _TouchAdapter extends _BaseAdapter {
688688 timeStamp: timeStamp,
689689 kind: ui.PointerDeviceKind .touch,
690690 signalKind: ui.PointerSignalKind .none,
691- device: touch.identifier,
691+ device: touch.identifier! ,
692692 physicalX: touch.client.x * ui.window.devicePixelRatio as double ,
693693 physicalY: touch.client.y * ui.window.devicePixelRatio as double ,
694694 buttons: pressed ? _kPrimaryMouseButton : 0 ,
@@ -746,15 +746,15 @@ class _MouseAdapter extends _BaseAdapter with _WheelEventListenerMixin {
746746 final _SanitizedDetails sanitizedDetails =
747747 _sanitizer.sanitizeDownEvent (
748748 button: event.button,
749- buttons: event.buttons,
749+ buttons: event.buttons! ,
750750 );
751751 _convertEventsToPointerData (data: pointerData, event: event, details: sanitizedDetails);
752752 _callback (pointerData);
753753 });
754754
755755 _addMouseEventListener ('mousemove' , (html.MouseEvent event) {
756756 final List <ui.PointerData > pointerData = < ui.PointerData > [];
757- final _SanitizedDetails sanitizedDetails = _sanitizer.sanitizeMoveEvent (buttons: event.buttons);
757+ final _SanitizedDetails sanitizedDetails = _sanitizer.sanitizeMoveEvent (buttons: event.buttons! );
758758 _convertEventsToPointerData (data: pointerData, event: event, details: sanitizedDetails);
759759 _callback (pointerData);
760760 }, acceptOutsideGlasspane: true );
@@ -764,7 +764,7 @@ class _MouseAdapter extends _BaseAdapter with _WheelEventListenerMixin {
764764 final bool isEndOfDrag = event.buttons == 0 ;
765765 final _SanitizedDetails sanitizedDetails = isEndOfDrag ?
766766 _sanitizer.sanitizeUpEvent ()! :
767- _sanitizer.sanitizeMoveEvent (buttons: event.buttons);
767+ _sanitizer.sanitizeMoveEvent (buttons: event.buttons! );
768768 _convertEventsToPointerData (data: pointerData, event: event, details: sanitizedDetails);
769769 _callback (pointerData);
770770 }, acceptOutsideGlasspane: true );
@@ -794,7 +794,7 @@ class _MouseAdapter extends _BaseAdapter with _WheelEventListenerMixin {
794794 _pointerDataConverter.convert (
795795 data,
796796 change: details.change,
797- timeStamp: _BaseAdapter ._eventTimeStampToDuration (event.timeStamp),
797+ timeStamp: _BaseAdapter ._eventTimeStampToDuration (event.timeStamp! ),
798798 kind: ui.PointerDeviceKind .mouse,
799799 signalKind: ui.PointerSignalKind .none,
800800 device: _mouseDeviceId,
0 commit comments