fix: Some UI fixes/improvements. (#119)

* Add tag. * Update deps.
moonrepo · Dec 27, 2024 · b101098 · b101098
1 parent e33246f
commit b101098
Show file tree

Hide file tree

Showing 7 changed files with 87 additions and 57 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,18 +6,18 @@ members = ["crates/*", "examples/*"]
 async-trait = "0.1.83"
 crossterm = "0.28.1"
 dirs = "5.0.1"
-iocraft = "0.5.1"
+iocraft = "0.5.2"
 # iocraft = { git = "https://github.com/ccbrown/iocraft", branch = "main" }
 miette = "7.4.0"
 regex = { version = "1.11.1", default-features = false }
 relative-path = "1.9.3"
-reqwest = { version = "0.12.9", default-features = false }
+reqwest = { version = "0.12.10", default-features = false }
 rustc-hash = "2.1.0"
 serial_test = "3.2.0"
 serde = { version = "1.0.216", features = ["derive"] }
-serde_json = "1.0.133"
+serde_json = "1.0.134"
 serde_yaml = "0.9.34"
-thiserror = "2.0.8"
+thiserror = "2.0.9"
 tokio = { version = "1.42.0", default-features = false, features = [
     "io-util",
     "rt",

diff --git a/crates/console/src/components/input_field.rs b/crates/console/src/components/input_field.rs
@@ -27,6 +27,7 @@ pub fn InputField<'a>(props: &mut InputFieldProps<'a>, hooks: Hooks) -> impl Int
             border_edges: Edges::Left,
             border_style: BorderStyle::Round,
             padding_left: 1,
+            margin_top: 1,
         ) {
             StyledText(
                 content: &props.label,

diff --git a/crates/console/src/components/styled_text.rs b/crates/console/src/components/styled_text.rs
@@ -30,9 +30,9 @@ pub fn StyledText<'a>(props: &StyledTextProps, hooks: Hooks) -> impl Into<AnyEle
                 element! {
                     Text(
                         color: if theme.supports_color {
-                            tag.and_then(tag_to_style)
-                                .or(props.style)
-                                .map(|style| theme.style(style))
+                            tag.as_ref()
+                                .and_then(|tag| theme.tag_to_color(tag))
+                                .or_else(|| props.style.as_ref().and_then(|style| theme.style_to_color(style)))
                                 .or(props.color)
                         } else {
                             None
@@ -48,26 +48,3 @@ pub fn StyledText<'a>(props: &StyledTextProps, hooks: Hooks) -> impl Into<AnyEle
         }
     }
 }
-
-fn tag_to_style(tag: String) -> Option<Style> {
-    let style = match tag.as_str() {
-        "caution" => Style::Caution,
-        "failure" => Style::Failure,
-        "invalid" => Style::Invalid,
-        "muted" => Style::Muted,
-        "mutedlight" | "muted_light" => Style::MutedLight,
-        "success" => Style::Success,
-        "file" => Style::File,
-        "hash" | "version" => Style::Hash,
-        "id" => Style::Id,
-        "label" => Style::Label,
-        "path" => Style::Path,
-        "property" => Style::Property,
-        "shell" => Style::Shell,
-        "symbol" => Style::Symbol,
-        "url" => Style::Url,
-        _ => return None,
-    };
-
-    Some(style)
-}
diff --git a/crates/console/src/components/table.rs b/crates/console/src/components/table.rs
@@ -123,8 +123,8 @@ pub fn TableCol<'a>(props: &mut TableColProps<'a>, hooks: Hooks) -> impl Into<An
     element! {
         Box(
             justify_content: align_to_justify(attrs.align),
-            padding_left: 1,
-            // padding_right: 1,
+            margin_left: 1,
+            margin_right: 1,
             width: attrs.width,
         ) {
             #(&mut props.children)

diff --git a/crates/console/src/theme.rs b/crates/console/src/theme.rs
@@ -1,11 +1,11 @@
 use crate::ui::style_to_color;
 use iocraft::Color;
 use starbase_styles::{color::Color as NativeColor, Style};
+use std::collections::HashMap;
 
 // https://www.ditig.com/publications/256-colors-cheat-sheet
 #[derive(Clone, Debug)]
 pub struct ConsoleTheme {
-    pub supports_color: bool,
     pub brand_color: Color,
 
     // Backgrounds
@@ -60,6 +60,10 @@ pub struct ConsoleTheme {
     pub style_shell_color: Color,
     pub style_symbol_color: Color,
     pub style_url_color: Color,
+
+    // Misc
+    pub supports_color: bool,
+    pub custom_tags: HashMap<String, Color>,
 }
 
 impl Default for ConsoleTheme {
@@ -104,6 +108,7 @@ impl Default for ConsoleTheme {
             style_symbol_color: style_to_color(Style::Symbol),
             style_url_color: style_to_color(Style::Url),
             supports_color: true,
+            custom_tags: HashMap::new(),
         }
     }
 }
@@ -119,8 +124,8 @@ impl ConsoleTheme {
         }
     }
 
-    pub fn style(&self, style: Style) -> Color {
-        match style {
+    pub fn style_to_color(&self, style: &Style) -> Option<Color> {
+        let color = match style {
             Style::Caution => self.style_caution_color,
             Style::Failure => self.style_failure_color,
             Style::Invalid => self.style_invalid_color,
@@ -136,7 +141,31 @@ impl ConsoleTheme {
             Style::Shell => self.style_shell_color,
             Style::Symbol => self.style_symbol_color,
             Style::Url => self.style_url_color,
-        }
+            Style::Tag(tag) => return self.custom_tags.get(tag).cloned(),
+        };
+
+        Some(color)
+    }
+
+    pub fn tag_to_color(&self, tag: &str) -> Option<Color> {
+        self.style_to_color(&match tag {
+            "caution" => Style::Caution,
+            "failure" => Style::Failure,
+            "invalid" => Style::Invalid,
+            "muted" => Style::Muted,
+            "mutedlight" => Style::MutedLight,
+            "success" => Style::Success,
+            "file" => Style::File,
+            "hash" => Style::Hash,
+            "id" => Style::Id,
+            "label" => Style::Label,
+            "path" => Style::Path,
+            "property" => Style::Property,
+            "shell" => Style::Shell,
+            "symbol" => Style::Symbol,
+            "url" => Style::Url,
+            tag => Style::Tag(tag.to_owned()),
+        })
     }
 
     pub fn variant(&self, variant: Variant) -> Color {

diff --git a/crates/styles/src/color.rs b/crates/styles/src/color.rs
@@ -29,8 +29,10 @@ pub enum Color {
     GrayLight = 246,
 }
 
-#[derive(Copy, Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq)]
 pub enum Style {
+    Tag(String),
+
     // States
     Caution,
     Failure,
@@ -70,6 +72,7 @@ impl Style {
             Style::Shell => Color::Pink,
             Style::Symbol => Color::Lime,
             Style::Url => Color::Blue,
+            Style::Tag(_) => Color::White,
         }
     }
 }