From b25580051132a3ea6e52d066115eed4b183e8320 Mon Sep 17 00:00:00 2001
From: Evan Almloff <ealmlof1@stumail.jccc.edu>
Date: Mon, 13 Mar 2023 18:09:20 -0500
Subject: [PATCH] fix TUI and tests building

---
 packages/dioxus-tui/examples/colorpicker.rs             | 2 +-
 packages/dioxus-tui/src/lib.rs                          | 4 ++--
 packages/native-core/src/lib.rs                         | 2 ++
 packages/native-core/tests/called_minimally_on_build.rs | 6 ------
 packages/native-core/tests/fuzzing.rs                   | 8 +-------
 packages/native-core/tests/miri_native.rs               | 8 +-------
 6 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/packages/dioxus-tui/examples/colorpicker.rs b/packages/dioxus-tui/examples/colorpicker.rs
index 7b7730173..1de6b8209 100644
--- a/packages/dioxus-tui/examples/colorpicker.rs
+++ b/packages/dioxus-tui/examples/colorpicker.rs
@@ -1,7 +1,7 @@
 use dioxus::core::RenderReturn;
 use dioxus::prelude::*;
-use dioxus_tui::query::Query;
 use dioxus_tui::DioxusElementToNodeId;
+use dioxus_tui::Query;
 use dioxus_tui::Size;
 
 fn main() {
diff --git a/packages/dioxus-tui/src/lib.rs b/packages/dioxus-tui/src/lib.rs
index ece97b673..a0f016147 100644
--- a/packages/dioxus-tui/src/lib.rs
+++ b/packages/dioxus-tui/src/lib.rs
@@ -12,8 +12,8 @@ use dioxus_html::EventData;
 use dioxus_native_core::dioxus::{DioxusState, NodeImmutableDioxusExt};
 use dioxus_native_core::prelude::*;
 
-pub use rink::Config;
-use rink::{query::Query, render, Renderer, TuiContext};
+pub use rink::{query::Query, Config, Size, TuiContext, RenderingMode};
+use rink::{render, Renderer};
 
 pub fn launch(app: Component<()>) {
     launch_cfg(app, Config::default())
diff --git a/packages/native-core/src/lib.rs b/packages/native-core/src/lib.rs
index b57cf57c9..ca8e8e5ee 100644
--- a/packages/native-core/src/lib.rs
+++ b/packages/native-core/src/lib.rs
@@ -30,6 +30,8 @@ pub mod exports {
 
 /// A prelude of commonly used items
 pub mod prelude {
+    #[cfg(feature = "dioxus")]
+    pub use crate::dioxus::*;
     pub use crate::node::{ElementNode, FromAnyValue, NodeType, OwnedAttributeView, TextNode};
     pub use crate::node_ref::{AttributeMaskBuilder, NodeMaskBuilder, NodeView};
     pub use crate::passes::{run_pass, PassDirection, RunPassView, TypeErasedState};
diff --git a/packages/native-core/tests/called_minimally_on_build.rs b/packages/native-core/tests/called_minimally_on_build.rs
index feebc1ea6..a55d8adfa 100644
--- a/packages/native-core/tests/called_minimally_on_build.rs
+++ b/packages/native-core/tests/called_minimally_on_build.rs
@@ -1,11 +1,5 @@
 use dioxus::prelude::*;
 use dioxus_native_core::prelude::*;
-use dioxus_native_core::{
-    dioxus::DioxusState,
-    node_ref::{NodeMaskBuilder, NodeView},
-    real_dom::RealDom,
-    Dependancy, SendAnyMap, State,
-};
 use dioxus_native_core_macro::partial_derive_state;
 use shipyard::Component;
 
diff --git a/packages/native-core/tests/fuzzing.rs b/packages/native-core/tests/fuzzing.rs
index 38b23587a..e34a953c7 100644
--- a/packages/native-core/tests/fuzzing.rs
+++ b/packages/native-core/tests/fuzzing.rs
@@ -1,12 +1,6 @@
 use dioxus::prelude::Props;
 use dioxus_core::*;
-use dioxus_native_core::{
-    dioxus::DioxusState,
-    node_ref::{AttributeMaskBuilder, NodeMaskBuilder, NodeView},
-    prelude::*,
-    real_dom::RealDom,
-    Dependancy, SendAnyMap, State,
-};
+use dioxus_native_core::prelude::*;
 use dioxus_native_core_macro::partial_derive_state;
 use shipyard::Component;
 use std::cell::Cell;
diff --git a/packages/native-core/tests/miri_native.rs b/packages/native-core/tests/miri_native.rs
index 8e05fe934..87888d188 100644
--- a/packages/native-core/tests/miri_native.rs
+++ b/packages/native-core/tests/miri_native.rs
@@ -1,11 +1,5 @@
 use dioxus::prelude::*;
-use dioxus_native_core::{
-    dioxus::DioxusState,
-    node_ref::{AttributeMaskBuilder, NodeMaskBuilder, NodeView},
-    prelude::*,
-    real_dom::RealDom,
-    Dependancy, SendAnyMap, State,
-};
+use dioxus_native_core::prelude::*;
 use dioxus_native_core_macro::partial_derive_state;
 use shipyard::Component;
 use tokio::time::sleep;