From d96aca59af6a46ae931ccb0e3314dc0509c7b4be Mon Sep 17 00:00:00 2001
From: JMS55 <47158642+JMS55@users.noreply.github.com>
Date: Sun, 10 Dec 2023 15:53:50 -0800
Subject: [PATCH] Change hook APIs

---
 src/hooks.rs | 76 +++++++++++++++++++---------------------------------
 src/lib.rs   |  7 ++---
 2 files changed, 30 insertions(+), 53 deletions(-)

diff --git a/src/hooks.rs b/src/hooks.rs
index 491f7a7..dd88b78 100644
--- a/src/hooks.rs
+++ b/src/hooks.rs
@@ -9,61 +9,41 @@ use bevy::ecs::{
 };
 use dioxus::core::ScopeState;
 
-pub trait DioxusUiHooks {
-    fn use_world<'a>(&'a self) -> &'a World;
+// TODO: Hooks need to schedule future updates
 
-    fn use_resource<'a, T: Resource>(&'a self) -> &'a T;
-
-    fn use_query<'a, Q>(&'a self) -> DioxusUiQuery<'a, Q, ()>
-    where
-        Q: ReadOnlyWorldQuery;
-
-    fn use_query_filtered<'a, Q, F>(&'a self) -> DioxusUiQuery<'a, Q, F>
-    where
-        Q: ReadOnlyWorldQuery,
-        F: ReadOnlyWorldQuery;
-
-    fn use_system<S>(&self, system: S) -> DeferredSystem
-    where
-        S: IntoSystem<(), (), ()> + 'static;
+pub fn use_world<'a>(cx: &'a ScopeState) -> &'a World {
+    EcsContext::get_world(cx)
 }
 
-// TODO: Hooks need to schedule future updates
-impl DioxusUiHooks for ScopeState {
-    fn use_world<'a>(&'a self) -> &'a World {
-        EcsContext::get_world(self)
-    }
+pub fn use_resource<'a, T: Resource>(cx: &'a ScopeState) -> &'a T {
+    EcsContext::get_world(cx).resource()
+}
 
-    fn use_resource<'a, T: Resource>(&'a self) -> &'a T {
-        EcsContext::get_world(self).resource()
-    }
+pub fn use_query<'a, Q>(cx: &'a ScopeState) -> DioxusUiQuery<'a, Q, ()>
+where
+    Q: ReadOnlyWorldQuery,
+{
+    use_query_filtered(cx)
+}
 
-    fn use_query<'a, Q>(&'a self) -> DioxusUiQuery<'a, Q, ()>
-    where
-        Q: ReadOnlyWorldQuery,
-    {
-        Self::use_query_filtered(self)
+pub fn use_query_filtered<'a, Q, F>(cx: &'a ScopeState) -> DioxusUiQuery<'a, Q, F>
+where
+    Q: ReadOnlyWorldQuery,
+    F: ReadOnlyWorldQuery,
+{
+    let world = EcsContext::get_world(cx);
+    DioxusUiQuery {
+        query_state: QueryState::new(world),
+        world_cell: world.as_unsafe_world_cell(),
     }
+}
 
-    fn use_query_filtered<'a, Q, F>(&'a self) -> DioxusUiQuery<'a, Q, F>
-    where
-        Q: ReadOnlyWorldQuery,
-        F: ReadOnlyWorldQuery,
-    {
-        let world = EcsContext::get_world(self);
-        DioxusUiQuery {
-            query_state: QueryState::new(world),
-            world_cell: world.as_unsafe_world_cell(),
-        }
-    }
-
-    fn use_system<S>(&self, system: S) -> DeferredSystem
-    where
-        S: IntoSystem<(), (), ()> + 'static,
-    {
-        self.use_hook(|| new_deferred_system(system, EcsContext::get_world(self)))
-            .0
-    }
+pub fn use_system<S>(cx: &ScopeState, system: S) -> DeferredSystem
+where
+    S: IntoSystem<(), (), ()> + 'static,
+{
+    cx.use_hook(|| new_deferred_system(system, EcsContext::get_world(cx)))
+        .0
 }
 
 pub struct DioxusUiQuery<'a, Q: ReadOnlyWorldQuery, F: ReadOnlyWorldQuery> {
diff --git a/src/lib.rs b/src/lib.rs
index ed1d918..9eab704 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,6 +1,6 @@
 mod apply_mutations;
 mod deferred_system;
-mod hooks;
+pub mod hooks;
 mod tick;
 
 use self::{
@@ -16,10 +16,7 @@ use bevy::{
 };
 use dioxus::core::{Element, ElementId, Scope};
 
-pub use self::{
-    deferred_system::DeferredSystem,
-    hooks::{DioxusUiHooks, DioxusUiQuery},
-};
+pub use self::deferred_system::DeferredSystem;
 pub use bevy_mod_picking;
 pub use dioxus;