diff --git a/Cargo.toml b/Cargo.toml index a85f72f..c85312c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "osui-element" -version = "0.1.7" +version = "0.1.8" edition = "2021" description = "The element attribute for defining elements in OSUI" license = "Apache-2.0" diff --git a/lib.rs b/lib.rs index 1c5b099..7a1e1d6 100644 --- a/lib.rs +++ b/lib.rs @@ -81,12 +81,11 @@ pub fn element(_args: TokenStream, input: TokenStream) -> TokenStream { } } fn get_element_by_id(&mut self, id: &str) -> Option<&mut Element> { - if self.id == id { - return Some(self); - } if let Children::Children(children, _) = &mut self.children { for elem in children { - if let Some(e) = elem.get_element_by_id(id) { + if elem.get_data().2 == id { + return Some(elem); + } else if let Some(e) = elem.get_element_by_id(id) { return Some(e); } }