Add event for clicks

crates/bevy_ui/src/focus.rs

@@ -4,7 +4,7 @@ use bevy_ecs::{
     change_detection::DetectChangesMut,
     entity::Entity,
     event,
-    prelude::{Changed, Component, Event, With},
+    prelude::{Component, Event, With},
     query::WorldQuery,
     reflect::ReflectComponent,
     system::{Local, Query, Res},
@@ -159,6 +159,7 @@ pub fn ui_focus_system(
     ui_stack: Res<UiStack>,
     mut node_query: Query<NodeQuery>,
     primary_window: Query<Entity, With<PrimaryWindow>>,
+    mut click_events: event::EventWriter<Click>,
 ) {
     let primary_window = primary_window.iter().next();
 
@@ -176,6 +177,7 @@ pub fn ui_focus_system(
             if let Some(mut interaction) = node.interaction {
                 if *interaction == Interaction::Pressed {
                     *interaction = Interaction::None;
+                    click_events.send(Click(node.entity));
                 }
             }
         }
@@ -317,21 +319,3 @@ pub fn ui_focus_system(
         }
     }
 }
-
-/// The system that sends a click event to publish which entities where clicked
-/// for all UI nodes that contain the [`LastInteraction`] component
-///
-/// Included by default with `UiPlugin`.
-pub fn ui_click(
-    mut click_events: event::EventWriter<Click>,
-    mut buttons: Query<(Entity, &Interaction, &mut LastInteraction), Changed<Interaction>>,
-) {
-    for (entity, &interaction, mut last_interaction) in &mut buttons {
-        // Publish a click event for every entity that has changed in one cycle from
-        // `Interaction::Hovered` to `Interaction::Pressed`
-        if interaction == Interaction::Hovered && last_interaction.0 == Interaction::Pressed {
-            click_events.send(Click(entity));
-        }
-        last_interaction.0 = interaction;
-    }
-}

crates/bevy_ui/src/lib.rs

@@ -121,11 +121,7 @@ impl Plugin for UiPlugin {
             .add_event::<Click>()
             .add_systems(
                 PreUpdate,
-                (
-                    ui_focus_system.in_set(UiSystem::Focus).after(InputSystem),
-                    ui_click,
-                )
-                    .chain(),
+                ui_focus_system.in_set(UiSystem::Focus).after(InputSystem),
             );
         // add these systems to front because these must run before transform update systems
         #[cfg(feature = "bevy_text")]

crates/bevy_ui/src/node_bundles.rs

@@ -4,8 +4,8 @@
 use crate::widget::TextFlags;
 use crate::{
     widget::{Button, UiImageSize},
-    BackgroundColor, BorderColor, ContentSize, FocusPolicy, Interaction, LastInteraction, Node,
-    Style, UiImage, UiTextureAtlasImage, ZIndex,
+    BackgroundColor, BorderColor, ContentSize, FocusPolicy, Interaction, Node, Style, UiImage,
+    UiTextureAtlasImage, ZIndex,
 };
 use bevy_asset::Handle;
 use bevy_ecs::bundle::Bundle;
@@ -307,8 +307,6 @@ pub struct ButtonBundle {
     pub view_visibility: ViewVisibility,
     /// Indicates the depth at which the node should appear in the UI
     pub z_index: ZIndex,
-    /// Holds the previous Interation
-    pub last_interaction: LastInteraction,
 }
 
 impl Default for ButtonBundle {
@@ -328,7 +326,6 @@ impl Default for ButtonBundle {
             inherited_visibility: Default::default(),
             view_visibility: Default::default(),
             z_index: Default::default(),
-            last_interaction: Default::default(),
         }
     }
 }