From 85fdc778806ba2411d322dc8e876f46b0d795705 Mon Sep 17 00:00:00 2001 From: Evan Almloff Date: Sun, 8 Jan 2023 15:26:30 -0600 Subject: [PATCH] fix tui --- packages/native-core/src/lib.rs | 3 ++- packages/native-core/src/passes.rs | 2 +- packages/tui/src/hooks.rs | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/native-core/src/lib.rs b/packages/native-core/src/lib.rs index f136fcfa5..c264155af 100644 --- a/packages/native-core/src/lib.rs +++ b/packages/native-core/src/lib.rs @@ -5,7 +5,8 @@ pub use node_ref::NodeMask; pub use passes::AnyMapLike; pub use passes::{Dependancy, Pass, TypeErasedPass}; use rustc_hash::FxHasher; -use tree::NodeId; +pub use state::State; +pub use tree::NodeId; pub mod layout_attributes; pub mod node; diff --git a/packages/native-core/src/passes.rs b/packages/native-core/src/passes.rs index c5c055aef..ee43310c9 100644 --- a/packages/native-core/src/passes.rs +++ b/packages/native-core/src/passes.rs @@ -12,7 +12,7 @@ use crate::tree::{Tree, TreeView}; use crate::{FxDashMap, FxDashSet, SendAnyMap}; use crate::{NodeId, NodeMask}; -pub trait Pass: Any { +pub trait Pass: Any { /// This is a tuple of (T: Any, ..) type ParentDependencies: Dependancy; /// This is a tuple of (T: Any, ..) diff --git a/packages/tui/src/hooks.rs b/packages/tui/src/hooks.rs index d627ac3e0..ab5064bc7 100644 --- a/packages/tui/src/hooks.rs +++ b/packages/tui/src/hooks.rs @@ -200,7 +200,7 @@ impl InnerInputState { if old_focus != self.focus_state.last_focused_id { // elements with listeners will always have a element id if let Some(id) = self.focus_state.last_focused_id { - let element = dom.tree.get(id).unwrap(); + let element = dom.get(id).unwrap(); if let Some(id) = element.node_data.element_id { resolved_events.push(Event { name: "focus", @@ -217,7 +217,7 @@ impl InnerInputState { } } if let Some(id) = old_focus { - let element = dom.tree.get(id).unwrap(); + let element = dom.get(id).unwrap(); if let Some(id) = element.node_data.element_id { resolved_events.push(Event { name: "focusout",