More state driven entity disabling components

crates/bevy_state/src/app.rs

@@ -14,6 +14,10 @@ use crate::{
         despawn_entities_when_state, disable_entities_on_enter_state,
         disable_entities_on_exit_state, disable_entities_when_state,
         enable_entities_on_enter_state, enable_entities_on_exit_state, enable_entities_when_state,
+        on_disabled_if_insert, on_disabled_in_insert, on_enabled_if_insert, on_enabled_in_insert,
+        on_state_disabled_component_remove, update_disabled_if_state, update_disabled_in_state,
+        update_enabled_if_state, update_enabled_in_state, DisabledIf, DisabledIn, EnabledIf,
+        EnabledIn,
     },
 };
 
@@ -280,9 +284,21 @@ fn enable_state_scoped_entities<S: States>(app: &mut SubApp) {
             despawn_entities_when_state::<S>,
             disable_entities_when_state::<S>,
             enable_entities_when_state::<S>,
+            update_enabled_in_state::<S>,
+            update_disabled_in_state::<S>,
+            update_enabled_if_state::<S>,
+            update_disabled_if_state::<S>,
         )
             .in_set(StateTransitionSystems::TransitionSchedules),
     );
+    app.add_observer(on_enabled_in_insert::<S>)
+        .add_observer(on_disabled_in_insert::<S>)
+        .add_observer(on_enabled_if_insert::<S>)
+        .add_observer(on_disabled_if_insert::<S>)
+        .add_observer(on_state_disabled_component_remove::<EnabledIn<S>>)
+        .add_observer(on_state_disabled_component_remove::<DisabledIn<S>>)
+        .add_observer(on_state_disabled_component_remove::<EnabledIf<S>>)
+        .add_observer(on_state_disabled_component_remove::<DisabledIf<S>>);
 }
 
 impl AppExtStates for App {

crates/bevy_state/src/lib.rs

@@ -94,7 +94,8 @@ pub mod prelude {
         },
         state_scoped::{
             DespawnOnEnter, DespawnOnExit, DespawnWhen, DisableOnEnter, DisableOnExit, DisableWhen,
-            EnableOnEnter, EnableOnExit, EnableWhen,
+            DisabledControl, DisabledIf, DisabledIn, EnableOnEnter, EnableOnExit, EnableWhen,
+            EnabledIf, EnabledIn,
         },
     };
 }