Evan Almloff 2 ani în urmă
părinte
comite
85fdc77880

+ 2 - 1
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;

+ 1 - 1
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<V: FromAnyValue>: Any {
+pub trait Pass<V: FromAnyValue = ()>: Any {
     /// This is a tuple of (T: Any, ..)
     type ParentDependencies: Dependancy;
     /// This is a tuple of (T: Any, ..)

+ 2 - 2
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",