chore: Reorganize callbacks and dispatchers internally

luanpotter · luanpotter · commit 9dc4af1c2b71 · 2026-06-27T14:53:01.000-04:00
diff --git a/packages/flame/lib/events.dart b/packages/flame/lib/events.dart
@@ -1,33 +1,32 @@
-export 'src/events/component_mixins/double_tap_callbacks.dart'
-    show DoubleTapCallbacks;
-export 'src/events/component_mixins/drag_callbacks.dart' show DragCallbacks;
-export 'src/events/component_mixins/hover_callbacks.dart' show HoverCallbacks;
-export 'src/events/component_mixins/long_press_callbacks.dart'
-    show LongPressCallbacks;
-export 'src/events/component_mixins/pointer_move_callbacks.dart'
+export 'src/events/callbacks/double_tap_callbacks.dart' show DoubleTapCallbacks;
+export 'src/events/callbacks/drag_callbacks.dart' show DragCallbacks;
+export 'src/events/callbacks/hover_callbacks.dart' show HoverCallbacks;
+export 'src/events/callbacks/long_press_callbacks.dart' show LongPressCallbacks;
+export 'src/events/callbacks/pointer_move_callbacks.dart'
     show PointerMoveCallbacks;
-export 'src/events/component_mixins/scale_callbacks.dart' show ScaleCallbacks;
-export 'src/events/component_mixins/scroll_callbacks.dart' show ScrollCallbacks;
-export 'src/events/component_mixins/secondary_tap_callbacks.dart'
+export 'src/events/callbacks/scale_callbacks.dart' show ScaleCallbacks;
+export 'src/events/callbacks/scroll_callbacks.dart' show ScrollCallbacks;
+export 'src/events/callbacks/secondary_tap_callbacks.dart'
     show SecondaryTapCallbacks;
-export 'src/events/component_mixins/tap_callbacks.dart' show TapCallbacks;
-export 'src/events/component_mixins/tertiary_tap_callbacks.dart'
+export 'src/events/callbacks/tap_callbacks.dart' show TapCallbacks;
+export 'src/events/callbacks/tertiary_tap_callbacks.dart'
     show TertiaryTapCallbacks;
 export 'src/events/deprecated.dart'
     show MultiDragDispatcher, MultiDragDispatcherKey;
-export 'src/events/flame_game_mixins/double_tap_dispatcher.dart'
+export 'src/events/dispatchers/dispatcher.dart' show Dispatcher;
+export 'src/events/dispatchers/double_tap_dispatcher.dart'
     show DoubleTapDispatcher, DoubleTapDispatcherKey;
-export 'src/events/flame_game_mixins/long_press_dispatcher.dart'
+export 'src/events/dispatchers/long_press_dispatcher.dart'
     show LongPressDispatcher, LongPressDispatcherKey;
-export 'src/events/flame_game_mixins/multi_tap_dispatcher.dart'
+export 'src/events/dispatchers/multi_drag_scale_dispatcher.dart'
+    show MultiDragScaleDispatcher, MultiDragScaleDispatcherKey;
+export 'src/events/dispatchers/multi_tap_dispatcher.dart'
     show MultiTapDispatcher, MultiTapDispatcherKey;
-export 'src/events/flame_game_mixins/non_primary_tap_dispatcher.dart'
+export 'src/events/dispatchers/non_primary_tap_dispatcher.dart'
     show NonPrimaryTapDispatcher, NonPrimaryTapDispatcherKey;
-export 'src/events/flame_game_mixins/pointer_move_dispatcher.dart'
+export 'src/events/dispatchers/pointer_move_dispatcher.dart'
     show PointerMoveDispatcher, MouseMoveDispatcherKey;
-export 'src/events/flame_game_mixins/scale_drag_dispatcher.dart'
-    show MultiDragScaleDispatcher, MultiDragScaleDispatcherKey;
-export 'src/events/flame_game_mixins/scroll_dispatcher.dart'
+export 'src/events/dispatchers/scroll_dispatcher.dart'
     show ScrollDispatcher, ScrollDispatcherKey;
 export 'src/events/game_mixins/multi_touch_drag_detector.dart'
     show MultiTouchDragDetector;
@@ -37,6 +36,8 @@ export 'src/events/hardware_keyboard_detector.dart'
     show HardwareKeyboardDetector;
 export 'src/events/interfaces/multi_drag_listener.dart' show MultiDragListener;
 export 'src/events/interfaces/multi_tap_listener.dart' show MultiTapListener;
+export 'src/events/interfaces/scale_listener.dart' show ScaleListener;
+export 'src/events/messages/displacement_event.dart' show DisplacementEvent;
 export 'src/events/messages/double_tap_cancel_event.dart'
     show DoubleTapCancelEvent;
 export 'src/events/messages/double_tap_down_event.dart' show DoubleTapDownEvent;
@@ -45,6 +46,9 @@ export 'src/events/messages/drag_cancel_event.dart' show DragCancelEvent;
 export 'src/events/messages/drag_end_event.dart' show DragEndEvent;
 export 'src/events/messages/drag_start_event.dart' show DragStartEvent;
 export 'src/events/messages/drag_update_event.dart' show DragUpdateEvent;
+export 'src/events/messages/event.dart' show Event;
+export 'src/events/messages/location_context_event.dart'
+    show LocationContextEvent;
 export 'src/events/messages/long_press_cancel_event.dart'
     show LongPressCancelEvent;
 export 'src/events/messages/long_press_end_event.dart' show LongPressEndEvent;
@@ -53,6 +57,7 @@ export 'src/events/messages/long_press_move_update_event.dart'
 export 'src/events/messages/long_press_start_event.dart'
     show LongPressStartEvent;
 export 'src/events/messages/pointer_move_event.dart' show PointerMoveEvent;
+export 'src/events/messages/position_event.dart' show PositionEvent;
 export 'src/events/messages/scale_end_event.dart' show ScaleEndEvent;
 export 'src/events/messages/scale_start_event.dart' show ScaleStartEvent;
 export 'src/events/messages/scale_update_event.dart' show ScaleUpdateEvent;
@@ -71,6 +76,8 @@ export 'src/events/messages/tertiary_tap_cancel_event.dart'
 export 'src/events/messages/tertiary_tap_down_event.dart'
     show TertiaryTapDownEvent;
 export 'src/events/messages/tertiary_tap_up_event.dart' show TertiaryTapUpEvent;
+export 'src/events/multi_drag_scale_recognizer.dart'
+    show MultiDragScaleGestureRecognizer;
 export 'src/game/mixins/keyboard.dart'
     show HasKeyboardHandlerComponents, KeyboardEvents;
 export 'src/gestures/detectors.dart'
diff --git a/packages/flame/lib/src/events/callbacks/double_tap_callbacks.dart b/packages/flame/lib/src/events/callbacks/double_tap_callbacks.dart
diff --git a/packages/flame/lib/src/events/callbacks/drag_callbacks.dart b/packages/flame/lib/src/events/callbacks/drag_callbacks.dart
diff --git a/packages/flame/lib/src/events/callbacks/hover_callbacks.dart b/packages/flame/lib/src/events/callbacks/hover_callbacks.dart
diff --git a/packages/flame/lib/src/events/callbacks/long_press_callbacks.dart b/packages/flame/lib/src/events/callbacks/long_press_callbacks.dart
@@ -1,9 +1,5 @@
 import 'package:flame/components.dart';
-import 'package:flame/src/events/flame_game_mixins/long_press_dispatcher.dart';
-import 'package:flame/src/events/messages/long_press_cancel_event.dart';
-import 'package:flame/src/events/messages/long_press_end_event.dart';
-import 'package:flame/src/events/messages/long_press_move_update_event.dart';
-import 'package:flame/src/events/messages/long_press_start_event.dart';
+import 'package:flame/events.dart';
 import 'package:flutter/foundation.dart';
 
 /// This mixin can be added to a [Component] allowing it to receive
diff --git a/packages/flame/lib/src/events/callbacks/pointer_move_callbacks.dart b/packages/flame/lib/src/events/callbacks/pointer_move_callbacks.dart
diff --git a/packages/flame/lib/src/events/callbacks/scale_callbacks.dart b/packages/flame/lib/src/events/callbacks/scale_callbacks.dart
diff --git a/packages/flame/lib/src/events/callbacks/scroll_callbacks.dart b/packages/flame/lib/src/events/callbacks/scroll_callbacks.dart
@@ -1,6 +1,5 @@
 import 'package:flame/components.dart';
-import 'package:flame/src/events/flame_game_mixins/scroll_dispatcher.dart';
-import 'package:flame/src/events/messages/scroll_event.dart';
+import 'package:flame/events.dart';
 import 'package:meta/meta.dart';
 
 /// This mixin can be added to a [Component] allowing it to receive
diff --git a/packages/flame/lib/src/events/callbacks/secondary_tap_callbacks.dart b/packages/flame/lib/src/events/callbacks/secondary_tap_callbacks.dart
diff --git a/packages/flame/lib/src/events/callbacks/tap_callbacks.dart b/packages/flame/lib/src/events/callbacks/tap_callbacks.dart
diff --git a/packages/flame/lib/src/events/callbacks/tertiary_tap_callbacks.dart b/packages/flame/lib/src/events/callbacks/tertiary_tap_callbacks.dart
diff --git a/packages/flame/lib/src/events/deprecated.dart b/packages/flame/lib/src/events/deprecated.dart
@@ -1,4 +1,4 @@
-import 'package:flame/src/events/flame_game_mixins/scale_drag_dispatcher.dart';
+import 'package:flame/src/events/dispatchers/multi_drag_scale_dispatcher.dart';
 
 @Deprecated('Use MultiDragScaleDispatcher instead.')
 typedef MultiDragDispatcher = MultiDragScaleDispatcher;
diff --git a/packages/flame/lib/src/events/dispatchers/dispatcher.dart b/packages/flame/lib/src/events/dispatchers/dispatcher.dart
diff --git a/packages/flame/lib/src/events/dispatchers/double_tap_dispatcher.dart b/packages/flame/lib/src/events/dispatchers/double_tap_dispatcher.dart
@@ -1,7 +1,6 @@
 import 'package:flame/components.dart';
 import 'package:flame/events.dart';
 import 'package:flame/game.dart';
-import 'package:flame/src/events/flame_game_mixins/dispatcher.dart';
 import 'package:flutter/gestures.dart';
 
 class DoubleTapDispatcherKey implements ComponentKey {
diff --git a/packages/flame/lib/src/events/dispatchers/long_press_dispatcher.dart b/packages/flame/lib/src/events/dispatchers/long_press_dispatcher.dart
@@ -1,12 +1,7 @@
 import 'package:flame/components.dart';
-import 'package:flame/src/events/component_mixins/long_press_callbacks.dart';
-import 'package:flame/src/events/flame_game_mixins/dispatcher.dart';
-import 'package:flame/src/events/messages/long_press_cancel_event.dart';
-import 'package:flame/src/events/messages/long_press_end_event.dart';
-import 'package:flame/src/events/messages/long_press_move_update_event.dart';
-import 'package:flame/src/events/messages/long_press_start_event.dart';
+import 'package:flame/events.dart';
+import 'package:flame/game.dart';
 import 'package:flame/src/events/tagged_component.dart';
-import 'package:flame/src/game/flame_game.dart';
 import 'package:flutter/gestures.dart';
 import 'package:meta/meta.dart';
 
diff --git a/packages/flame/lib/src/events/dispatchers/multi_drag_scale_dispatcher.dart b/packages/flame/lib/src/events/dispatchers/multi_drag_scale_dispatcher.dart
@@ -1,11 +1,8 @@
 import 'package:flame/components.dart';
 import 'package:flame/events.dart';
+import 'package:flame/game.dart';
 import 'package:flame/src/events/flame_drag_adapter.dart';
-import 'package:flame/src/events/flame_game_mixins/dispatcher.dart';
-import 'package:flame/src/events/interfaces/scale_listener.dart';
-import 'package:flame/src/events/multi_drag_scale_recognizer.dart';
 import 'package:flame/src/events/tagged_component.dart';
-import 'package:flame/src/game/flame_game.dart';
 import 'package:flame/src/game/game_render_box.dart';
 import 'package:flutter/gestures.dart';
 import 'package:meta/meta.dart';
diff --git a/packages/flame/lib/src/events/dispatchers/multi_tap_dispatcher.dart b/packages/flame/lib/src/events/dispatchers/multi_tap_dispatcher.dart
@@ -1,7 +1,6 @@
 import 'package:flame/components.dart';
 import 'package:flame/events.dart';
 import 'package:flame/input.dart';
-import 'package:flame/src/events/flame_game_mixins/dispatcher.dart';
 import 'package:flame/src/events/tagged_component.dart';
 import 'package:flame/src/game/flame_game.dart';
 import 'package:flame/src/game/game_render_box.dart';
diff --git a/packages/flame/lib/src/events/dispatchers/non_primary_tap_dispatcher.dart b/packages/flame/lib/src/events/dispatchers/non_primary_tap_dispatcher.dart
@@ -1,7 +1,6 @@
 import 'package:flame/components.dart';
 import 'package:flame/events.dart';
 import 'package:flame/game.dart';
-import 'package:flame/src/events/flame_game_mixins/dispatcher.dart';
 import 'package:flutter/gestures.dart';
 
 class NonPrimaryTapDispatcherKey implements ComponentKey {
diff --git a/packages/flame/lib/src/events/dispatchers/pointer_move_dispatcher.dart b/packages/flame/lib/src/events/dispatchers/pointer_move_dispatcher.dart
@@ -1,6 +1,5 @@
 import 'package:flame/components.dart';
 import 'package:flame/events.dart';
-import 'package:flame/src/events/flame_game_mixins/dispatcher.dart';
 import 'package:flame/src/events/tagged_component.dart';
 import 'package:flame/src/game/flame_game.dart';
 import 'package:flutter/gestures.dart' as flutter;
diff --git a/packages/flame/lib/src/events/dispatchers/scroll_dispatcher.dart b/packages/flame/lib/src/events/dispatchers/scroll_dispatcher.dart
@@ -1,8 +1,6 @@
 import 'package:flame/components.dart';
-import 'package:flame/src/events/component_mixins/scroll_callbacks.dart';
-import 'package:flame/src/events/flame_game_mixins/dispatcher.dart';
-import 'package:flame/src/events/messages/scroll_event.dart';
-import 'package:flame/src/game/flame_game.dart';
+import 'package:flame/events.dart';
+import 'package:flame/game.dart';
 import 'package:flutter/gestures.dart' as flutter;
 import 'package:meta/meta.dart';
 
diff --git a/packages/flame/lib/src/events/flame_drag_adapter.dart b/packages/flame/lib/src/events/flame_drag_adapter.dart
@@ -1,4 +1,4 @@
-import 'package:flame/src/events/interfaces/multi_drag_listener.dart';
+import 'package:flame/events.dart';
 import 'package:flutter/gestures.dart';
 import 'package:meta/meta.dart';
 
diff --git a/packages/flame/lib/src/events/messages/displacement_event.dart b/packages/flame/lib/src/events/messages/displacement_event.dart
@@ -1,5 +1,5 @@
 import 'package:flame/components.dart';
-import 'package:flame/src/events/messages/location_context_event.dart';
+import 'package:flame/events.dart';
 import 'package:flame/src/game/game.dart';
 
 /// Location context for the Displacement Event.
diff --git a/packages/flame/lib/src/events/messages/double_tap_cancel_event.dart b/packages/flame/lib/src/events/messages/double_tap_cancel_event.dart
@@ -1,4 +1,4 @@
-import 'package:flame/src/events/messages/event.dart';
+import 'package:flame/events.dart';
 
 class DoubleTapCancelEvent extends Event<void> {
   DoubleTapCancelEvent() : super(raw: null);
diff --git a/packages/flame/lib/src/events/messages/double_tap_down_event.dart b/packages/flame/lib/src/events/messages/double_tap_down_event.dart
@@ -1,5 +1,5 @@
+import 'package:flame/events.dart';
 import 'package:flame/extensions.dart';
-import 'package:flame/src/events/messages/position_event.dart';
 import 'package:flutter/gestures.dart';
 
 class DoubleTapDownEvent extends PositionEvent<TapDownDetails> {
diff --git a/packages/flame/lib/src/events/messages/double_tap_event.dart b/packages/flame/lib/src/events/messages/double_tap_event.dart
@@ -1,4 +1,4 @@
-import 'package:flame/src/events/messages/event.dart';
+import 'package:flame/events.dart';
 
 class DoubleTapEvent extends Event<void> {
   DoubleTapEvent() : super(raw: null);
diff --git a/packages/flame/lib/src/events/messages/drag_cancel_event.dart b/packages/flame/lib/src/events/messages/drag_cancel_event.dart
@@ -1,6 +1,4 @@
-import 'package:flame/src/events/messages/drag_end_event.dart';
-import 'package:flame/src/events/messages/drag_start_event.dart';
-import 'package:flame/src/events/messages/event.dart';
+import 'package:flame/events.dart';
 import 'package:flutter/gestures.dart';
 
 class DragCancelEvent extends Event<void> {
diff --git a/packages/flame/lib/src/events/messages/drag_end_event.dart b/packages/flame/lib/src/events/messages/drag_end_event.dart
@@ -1,5 +1,5 @@
+import 'package:flame/events.dart';
 import 'package:flame/extensions.dart';
-import 'package:flame/src/events/messages/event.dart';
 import 'package:flutter/gestures.dart';
 
 class DragEndEvent extends Event<DragEndDetails> {
diff --git a/packages/flame/lib/src/events/messages/drag_start_event.dart b/packages/flame/lib/src/events/messages/drag_start_event.dart
@@ -1,7 +1,5 @@
+import 'package:flame/events.dart';
 import 'package:flame/extensions.dart';
-import 'package:flame/src/events/messages/drag_end_event.dart';
-import 'package:flame/src/events/messages/drag_update_event.dart';
-import 'package:flame/src/events/messages/position_event.dart';
 import 'package:flutter/gestures.dart';
 
 /// The event propagated through the Flame engine when the user starts a drag
diff --git a/packages/flame/lib/src/events/messages/drag_update_event.dart b/packages/flame/lib/src/events/messages/drag_update_event.dart
@@ -1,5 +1,5 @@
+import 'package:flame/events.dart';
 import 'package:flame/extensions.dart';
-import 'package:flame/src/events/messages/displacement_event.dart';
 import 'package:flutter/gestures.dart';
 
 class DragUpdateEvent extends DisplacementEvent<DragUpdateDetails> {
diff --git a/packages/flame/lib/src/events/messages/event.dart b/packages/flame/lib/src/events/messages/event.dart
@@ -1,4 +1,4 @@
-import 'package:flame/src/components/core/component.dart';
+import 'package:flame/components.dart';
 import 'package:meta/meta.dart';
 
 /// Base class for a variety of input events, such as tap events, drag events,
diff --git a/packages/flame/lib/src/events/messages/location_context_event.dart b/packages/flame/lib/src/events/messages/location_context_event.dart
@@ -1,5 +1,5 @@
 import 'package:flame/components.dart';
-import 'package:flame/src/events/messages/event.dart';
+import 'package:flame/events.dart';
 import 'package:meta/meta.dart';
 
 /// A base event that includes a location context, i.e. a position or set of
diff --git a/packages/flame/lib/src/events/messages/long_press_cancel_event.dart b/packages/flame/lib/src/events/messages/long_press_cancel_event.dart
@@ -1,4 +1,4 @@
-import 'package:flame/src/events/messages/event.dart';
+import 'package:flame/events.dart';
 
 /// The event propagated through the Flame engine when a long press gesture
 /// is cancelled before completing.
diff --git a/packages/flame/lib/src/events/messages/long_press_end_event.dart b/packages/flame/lib/src/events/messages/long_press_end_event.dart
@@ -1,5 +1,5 @@
+import 'package:flame/events.dart';
 import 'package:flame/extensions.dart';
-import 'package:flame/src/events/messages/position_event.dart';
 import 'package:flutter/gestures.dart';
 
 /// The event propagated through the Flame engine when a long press gesture
diff --git a/packages/flame/lib/src/events/messages/long_press_move_update_event.dart b/packages/flame/lib/src/events/messages/long_press_move_update_event.dart
@@ -1,5 +1,5 @@
+import 'package:flame/events.dart';
 import 'package:flame/extensions.dart';
-import 'package:flame/src/events/messages/displacement_event.dart';
 import 'package:flutter/gestures.dart';
 
 /// The event propagated through the Flame engine when the user moves their
diff --git a/packages/flame/lib/src/events/messages/long_press_start_event.dart b/packages/flame/lib/src/events/messages/long_press_start_event.dart
@@ -1,5 +1,5 @@
+import 'package:flame/events.dart';
 import 'package:flame/extensions.dart';
-import 'package:flame/src/events/messages/position_event.dart';
 import 'package:flutter/gestures.dart';
 
 /// The event propagated through the Flame engine when the user completes
diff --git a/packages/flame/lib/src/events/messages/pointer_move_event.dart b/packages/flame/lib/src/events/messages/pointer_move_event.dart
@@ -1,6 +1,6 @@
+import 'package:flame/events.dart';
 import 'package:flame/extensions.dart';
 import 'package:flame/game.dart';
-import 'package:flame/src/events/messages/position_event.dart';
 import 'package:flutter/services.dart';
 
 class PointerMoveEvent extends PositionEvent<PointerHoverEvent> {
diff --git a/packages/flame/lib/src/events/messages/position_event.dart b/packages/flame/lib/src/events/messages/position_event.dart
@@ -1,6 +1,6 @@
 import 'package:flame/components.dart';
-import 'package:flame/src/events/messages/location_context_event.dart';
-import 'package:flame/src/game/game.dart';
+import 'package:flame/events.dart';
+import 'package:flame/game.dart';
 
 /// Base class for events that originate at some point on the screen. These
 /// include: tap events, scale events, etc.
diff --git a/packages/flame/lib/src/events/messages/scale_end_event.dart b/packages/flame/lib/src/events/messages/scale_end_event.dart
@@ -1,5 +1,5 @@
+import 'package:flame/events.dart';
 import 'package:flame/extensions.dart';
-import 'package:flame/src/events/messages/event.dart';
 import 'package:flutter/gestures.dart';
 
 /// Event propagated through the Flame engine when a scale gesture ends.
diff --git a/packages/flame/lib/src/events/messages/scale_start_event.dart b/packages/flame/lib/src/events/messages/scale_start_event.dart
@@ -1,6 +1,5 @@
 import 'package:flame/events.dart';
 import 'package:flame/extensions.dart';
-import 'package:flame/src/events/messages/position_event.dart';
 import 'package:flutter/gestures.dart';
 
 /// The event propagated through the Flame engine when the user starts a scale
diff --git a/packages/flame/lib/src/events/messages/scale_update_event.dart b/packages/flame/lib/src/events/messages/scale_update_event.dart
@@ -1,5 +1,5 @@
+import 'package:flame/events.dart';
 import 'package:flame/extensions.dart';
-import 'package:flame/src/events/messages/displacement_event.dart';
 import 'package:flutter/gestures.dart';
 
 /// Event propagated through the Flame engine when the user updates a scale
diff --git a/packages/flame/lib/src/events/messages/scroll_event.dart b/packages/flame/lib/src/events/messages/scroll_event.dart
@@ -1,6 +1,6 @@
+import 'package:flame/events.dart';
 import 'package:flame/extensions.dart';
 import 'package:flame/game.dart';
-import 'package:flame/src/events/messages/position_event.dart';
 import 'package:flutter/gestures.dart' as flutter;
 
 /// Event fired when a pointer scroll (mouse wheel) occurs.
diff --git a/packages/flame/lib/src/events/messages/secondary_tap_cancel_event.dart b/packages/flame/lib/src/events/messages/secondary_tap_cancel_event.dart
@@ -1,5 +1,4 @@
-import 'package:flame/src/events/messages/event.dart';
-import 'package:flame/src/events/messages/secondary_tap_down_event.dart';
+import 'package:flame/events.dart';
 
 /// The event propagated through the Flame engine when a secondary tap
 /// (i.e. right mouse button click) on a component is cancelled.
diff --git a/packages/flame/lib/src/events/messages/secondary_tap_down_event.dart b/packages/flame/lib/src/events/messages/secondary_tap_down_event.dart
@@ -1,6 +1,5 @@
 import 'package:flame/events.dart';
 import 'package:flame/extensions.dart';
-import 'package:flame/src/events/messages/position_event.dart';
 import 'package:flutter/gestures.dart';
 
 /// The event propagated through the Flame engine when the user starts a
diff --git a/packages/flame/lib/src/events/messages/secondary_tap_up_event.dart b/packages/flame/lib/src/events/messages/secondary_tap_up_event.dart
@@ -1,6 +1,5 @@
+import 'package:flame/events.dart';
 import 'package:flame/extensions.dart';
-import 'package:flame/src/events/messages/position_event.dart';
-import 'package:flame/src/events/messages/secondary_tap_down_event.dart';
 import 'package:flutter/gestures.dart';
 
 /// The event propagated through the Flame engine when the user stops secondary
diff --git a/packages/flame/lib/src/events/messages/tap_cancel_event.dart b/packages/flame/lib/src/events/messages/tap_cancel_event.dart
@@ -1,5 +1,4 @@
-import 'package:flame/src/events/messages/event.dart';
-import 'package:flame/src/events/messages/tap_down_event.dart';
+import 'package:flame/events.dart';
 
 /// The event propagated through the Flame engine when a tap on a component is
 /// cancelled.
diff --git a/packages/flame/lib/src/events/messages/tap_down_event.dart b/packages/flame/lib/src/events/messages/tap_down_event.dart
@@ -1,8 +1,5 @@
+import 'package:flame/events.dart';
 import 'package:flame/extensions.dart';
-import 'package:flame/src/events/component_mixins/tap_callbacks.dart';
-import 'package:flame/src/events/messages/position_event.dart';
-import 'package:flame/src/events/messages/tap_cancel_event.dart';
-import 'package:flame/src/events/messages/tap_up_event.dart';
 import 'package:flutter/gestures.dart';
 
 /// The event propagated through the Flame engine when the user starts a touch
diff --git a/packages/flame/lib/src/events/messages/tap_up_event.dart b/packages/flame/lib/src/events/messages/tap_up_event.dart
@@ -1,7 +1,5 @@
+import 'package:flame/events.dart';
 import 'package:flame/extensions.dart';
-import 'package:flame/src/events/messages/position_event.dart';
-import 'package:flame/src/events/messages/tap_cancel_event.dart';
-import 'package:flame/src/events/messages/tap_down_event.dart';
 import 'package:flutter/gestures.dart';
 
 /// The event propagated through the Flame engine when the user stops touching
diff --git a/packages/flame/lib/src/events/messages/tertiary_tap_cancel_event.dart b/packages/flame/lib/src/events/messages/tertiary_tap_cancel_event.dart
@@ -1,5 +1,4 @@
-import 'package:flame/src/events/messages/event.dart';
-import 'package:flame/src/events/messages/tertiary_tap_down_event.dart';
+import 'package:flame/events.dart';
 
 /// The event propagated through the Flame engine when a tertiary tap
 /// (i.e. middle mouse button click) on a component is cancelled.
diff --git a/packages/flame/lib/src/events/messages/tertiary_tap_down_event.dart b/packages/flame/lib/src/events/messages/tertiary_tap_down_event.dart
@@ -1,6 +1,5 @@
 import 'package:flame/events.dart';
 import 'package:flame/extensions.dart';
-import 'package:flame/src/events/messages/position_event.dart';
 import 'package:flutter/gestures.dart';
 
 /// The event propagated through the Flame engine when the user starts a
diff --git a/packages/flame/lib/src/events/messages/tertiary_tap_up_event.dart b/packages/flame/lib/src/events/messages/tertiary_tap_up_event.dart
diff --git a/packages/flame/lib/src/events/tagged_component.dart b/packages/flame/lib/src/events/tagged_component.dart
diff --git a/packages/flame/test/components/advanced_button_component_test.dart b/packages/flame/test/components/advanced_button_component_test.dart
diff --git a/packages/flame/test/components/button_component_test.dart b/packages/flame/test/components/button_component_test.dart
diff --git a/packages/flame/test/components/hud_button_component_test.dart b/packages/flame/test/components/hud_button_component_test.dart
diff --git a/packages/flame/test/components/input/sprite_button_component_test.dart b/packages/flame/test/components/input/sprite_button_component_test.dart
diff --git a/packages/flame/test/components/toogle_button_component_test.dart b/packages/flame/test/components/toogle_button_component_test.dart
