remove ui feature (#730)

* remove ui feature

* add release notes

* fix RELEASES.md

Author: it-me-joda

Cargo.toml

@@ -18,7 +18,7 @@ opt-level = 3
 members = ["./", "tools/ci", "macros"]
 
 [features]
-default = ["asset", "ui", "mouse", "keyboard", "gamepad", "picking"]
+default = ["asset", "mouse", "keyboard", "gamepad", "picking"]
 
 # Allow support for tracking timing information about actions (how long a button was pressed, etc.)
 timing = []
@@ -35,10 +35,6 @@ gamepad = ["bevy/bevy_gilrs"]
 # Allow using the `InputMap` as `bevy::asset::Asset`.
 asset = ['bevy/bevy_asset']
 
-# Add support for 'bevy::ui' integration:
-# - Allow 'bevy::ui' to take priority over actions when processing inputs.
-ui = ['bevy/bevy_ui']
-
 # Add support for 'bevy::picking' integration:
 # - Order systems to allow picking observers to modify action state.
 picking = ['bevy/bevy_picking']
@@ -71,7 +67,6 @@ bevy = { version = "0.18.0-rc.2", default-features = false, features = [
   "bevy_asset",
   "bevy_sprite",
   "bevy_text",
-  "bevy_ui",
   "bevy_render",
   "bevy_core_pipeline",
   "bevy_state",

RELEASES.md

@@ -2,6 +2,10 @@
 
 ## Version 0.21.0 (Unreleased)
 
+### Breaking Changes (0.21.0)
+
+- Removed the `ui` feature. This was a default feature. The `ui` feature would attempt to filter out mouse clicks captured by `bevy::ui::Interaction`s. This can be handled by temporarily disabling mouse click actions or entire action status during UI heavy scenes or interactions.
+
 ### Bugs (0.21.0)
 
 - `ActionDiff`s generated will no longer include entries from disabled `ActionState`s or disabled `Action`s 

src/plugin.rs

@@ -10,8 +10,6 @@ use bevy::input::InputSystems;
 use bevy::picking::PickingSystems;
 use bevy::prelude::*;
 use bevy::reflect::TypePath;
-#[cfg(feature = "ui")]
-use bevy::ui::UiSystems;
 use updating::CentralInputStore;
 
 use crate::Actionlike;
@@ -137,32 +135,6 @@ impl<A: Actionlike + TypePath + bevy::reflect::GetTypeRegistration> Plugin
                         .after(InputManagerSystem::Unify),
                 );
 
-                #[cfg(feature = "ui")]
-                app.add_systems(
-                    PreUpdate,
-                    filter_captured_input
-                        .before(update_action_state::<A>)
-                        .in_set(InputManagerSystem::Filter),
-                );
-
-                #[cfg(feature = "ui")]
-                app.configure_sets(
-                    PreUpdate,
-                    InputManagerSystem::Filter.after(UiSystems::Focus),
-                );
-
-                #[cfg(feature = "ui")]
-                app.configure_sets(
-                    PreUpdate,
-                    InputManagerSystem::ManualControl
-                        .after(InputManagerSystem::Tick)
-                        // Must run after the system is updated from inputs, or it will be forcibly released due to the inputs
-                        // not being pressed
-                        .after(InputManagerSystem::Update)
-                        .after(UiSystems::Focus)
-                        .after(InputSystems),
-                );
-
                 #[cfg(feature = "picking")]
                 app.configure_sets(
                     PreUpdate,

src/systems.rs

@@ -104,22 +104,6 @@ pub fn update_action_state<A: Actionlike>(
     }
 }
 
-#[cfg(feature = "ui")]
-/// Filters out all inputs that are captured by the UI.
-pub fn filter_captured_input(
-    mut mouse_buttons: ResMut<bevy::input::ButtonInput<bevy::input::mouse::MouseButton>>,
-    #[cfg(feature = "ui")] interactions: Query<&bevy::ui::Interaction>,
-) {
-    // If the user clicks on a button, do not apply it to the game state
-    #[cfg(feature = "ui")]
-    if interactions
-        .iter()
-        .any(|&interaction| interaction != bevy::ui::Interaction::None)
-    {
-        mouse_buttons.clear();
-    }
-}
-
 /// Generates an [`Messages`] stream of [`ActionDiff`s](crate::action_diff::ActionDiff) from every [`ActionState`].
 ///
 /// This system is not part of the [`InputManagerPlugin`](crate::plugin::InputManagerPlugin) and must be added manually.

tools/ci/src/main.rs

@@ -78,7 +78,7 @@ fn main() {
     }
 
     // The features the lib offers
-    let lib_features = ["asset", "timing", "ui"];
+    let lib_features = ["asset", "timing"];
 
     // Generate all possible combinations of lib features
     // and convert them into '--features=<FEATURE_A,FEATURE_B,...>'