瀏覽代碼

fix: tui values

Jonathan Kelley 3 年之前
父節點
當前提交
9c9928d226
共有 3 個文件被更改,包括 10 次插入6 次删除
  1. 1 1
      packages/tui/src/hooks.rs
  2. 5 3
      packages/tui/src/layout.rs
  3. 4 2
      packages/tui/src/style_attributes.rs

+ 1 - 1
packages/tui/src/hooks.rs

@@ -320,7 +320,7 @@ impl InnerInputState {
                     let node_layout = layout.layout(node.state.layout.node.unwrap()).unwrap();
                     let currently_contains = layout_contains_point(node_layout, new_pos);
 
-                    if currently_contains && clicked {
+                    if currently_contains {
                         try_create_event(
                             "mousedown",
                             Arc::new(prepare_mouse_data(mouse_data, node_layout)),

+ 5 - 3
packages/tui/src/layout.rs

@@ -79,9 +79,11 @@ impl ChildDepState for StretchLayout {
             }
         } else {
             // gather up all the styles from the attribute list
-            for &Attribute { name, value, .. } in node.attributes() {
-                assert!(SORTED_LAYOUT_ATTRS.binary_search(&name).is_ok());
-                apply_layout_attributes(name, value, &mut style);
+            for Attribute { name, value, .. } in node.attributes() {
+                assert!(SORTED_LAYOUT_ATTRS.binary_search(name).is_ok());
+                if let Some(text) = value.as_text() {
+                    apply_layout_attributes(name, text, &mut style);
+                }
             }
 
             // the root node fills the entire area

+ 4 - 2
packages/tui/src/style_attributes.rs

@@ -78,8 +78,10 @@ impl ParentDepState for StyleModifier {
         }
 
         // gather up all the styles from the attribute list
-        for &Attribute { name, value, .. } in node.attributes() {
-            apply_style_attributes(name, value, &mut new);
+        for Attribute { name, value, .. } in node.attributes() {
+            if let Some(text) = value.as_text() {
+                apply_style_attributes(name, text, &mut new);
+            }
         }
 
         // keep the text styling from the parent element