zu: Remove some attributes in ButtonBase

RustVis · Jul 21, 2023 · 4ae8451 · 4ae8451
1 parent 0757c0c
commit 4ae8451
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 14 deletions.
diff --git a/crates/zu-docs/src/views/inputs/button_page.rs b/crates/zu-docs/src/views/inputs/button_page.rs
@@ -23,17 +23,17 @@ pub fn button_page() -> Html {
         <h2>{"Basic button"}</h2>
         <p>{"The Button comes with three variants: text (default), contained, and outlined."}</p>
         <DemoBox>
-        <Button variant={ButtonVariant::Text}>{"Text"}</Button>
-        <Button variant={ButtonVariant::Contained}>{"Contained"}</Button>
-        <Button variant={ButtonVariant::Outlined}>{"Outlined"}</Button>
+            <Button variant={ButtonVariant::Text}>{"Text"}</Button>
+            <Button variant={ButtonVariant::Contained}>{"Contained"}</Button>
+            <Button variant={ButtonVariant::Outlined}>{"Outlined"}</Button>
         </DemoBox>
 
         <h3>{"Text button"}</h3>
         <p>{"Text buttons are typically used for less-pronounced actions, including those located: in dialogs, in cards."}</p>
         <DemoBox>
-        <Button>{"Primary"}</Button>
-        <Button disabled={true}>{"Disabled"}</Button>
-        <Button href="#text-buttons">{"Link"}</Button>
+            <Button>{"Primary"}</Button>
+            <Button disabled={true}>{"Disabled"}</Button>
+            <Button href="#text-buttons">{"Link"}</Button>
         </DemoBox>
 
         <h3>{"Contained button"}</h3>

diff --git a/crates/zu/src/button/mod.rs b/crates/zu/src/button/mod.rs
@@ -123,7 +123,8 @@ pub struct Props {
     #[prop_or_default]
     pub style: AttrValue,
 
-    #[prop_or(-1)]
+    // TODO(Shaohua): Remove tab_index from properties.
+    #[prop_or_default]
     pub tab_index: i32,
 
     /// Default value is `Text`.
@@ -181,8 +182,6 @@ pub fn button(props: &Props) -> Html {
         props.classes.clone(),
     );
 
-    //let label_cls = "ZuButton-label";
-
     html! {
         <ButtonBase
             classes={root_cls}

diff --git a/crates/zu/src/button_base/mod.rs b/crates/zu/src/button_base/mod.rs
@@ -149,8 +149,6 @@ pub fn button_base(props: &Props) -> Html {
             String::new()
         },
         props.classes.clone(),
-        // TODO(Shaohua): Merge into Typography.
-        "ZuTypography-button",
     );
 
     // TODO(Shaohua): Handle mouse events.

diff --git a/crates/zu/src/button_base/style.scss b/crates/zu/src/button_base/style.scss
@@ -14,8 +14,8 @@
     outline: none;
     border: none;
     margin: 0;
-    padding: 0;
-    border-radius: 0;
+    //padding: 0;
+    //border-radius: 0;
     cursor: pointer;
     user-select: none;
     appearance: none;

diff --git a/crates/zu/src/link/style.scss b/crates/zu/src/link/style.scss
@@ -29,6 +29,7 @@
     }
 }
 
+// TODO(Shaohua): Merge into button_base ZuButtonBase-root
 // Styles applied to the root element if component="button".
 .ZuLink-button {
     position: relative;

diff --git a/crates/zu/src/typography/style.scss b/crates/zu/src/typography/style.scss
@@ -34,7 +34,6 @@
   line-height: $zu-typography-button-lineHeight;
   letter-spacing: $zu-typography-button-letterSpacing;
   text-transform: $zu-typography-button-textTransform;
-
 }
 
 // Styles applied to the root element if variant="caption".