From b101098598cf8a5fb3c1225a936e606f2261280b Mon Sep 17 00:00:00 2001
From: Miles Johnson <milesj@users.noreply.github.com>
Date: Thu, 26 Dec 2024 16:41:47 -0800
Subject: [PATCH] fix: Some UI fixes/improvements. (#119)

* Add tag.

* Update deps.
---
 Cargo.lock                                   | 60 +++++++++++++-------
 Cargo.toml                                   |  8 +--
 crates/console/src/components/input_field.rs |  1 +
 crates/console/src/components/styled_text.rs | 29 +---------
 crates/console/src/components/table.rs       |  4 +-
 crates/console/src/theme.rs                  | 37 ++++++++++--
 crates/styles/src/color.rs                   |  5 +-
 7 files changed, 87 insertions(+), 57 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a80c99f..a02cb08 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -516,7 +516,7 @@ dependencies = [
  "starbase",
  "starbase_shell",
  "starbase_utils",
- "thiserror 2.0.8",
+ "thiserror 2.0.9",
  "tokio",
  "tracing",
 ]
@@ -539,7 +539,7 @@ dependencies = [
  "miette",
  "starbase",
  "starbase_console",
- "thiserror 2.0.8",
+ "thiserror 2.0.9",
  "tokio",
  "tracing",
 ]
@@ -1067,21 +1067,19 @@ dependencies = [
 
 [[package]]
 name = "iocraft"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aa17731846833a741c47f7c4c7b319c8174f69c2c558dd916fe70495f804de7"
+checksum = "b9f5ac7cf1a16f1ba24ac908b41c2f2dcdcf1b5e5f24c0f922517f140173c4a0"
 dependencies = [
  "any_key",
  "bitflags",
  "crossterm",
  "futures",
  "generational-box",
- "indexmap",
  "iocraft-macros",
  "taffy",
  "textwrap",
  "unicode-width",
- "uuid",
 ]
 
 [[package]]
@@ -1667,9 +1665,9 @@ checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
 
 [[package]]
 name = "reqwest"
-version = "0.12.9"
+version = "0.12.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
+checksum = "3d3536321cfc54baa8cf3e273d5e1f63f889067829c4b410fcdbac8ca7b80994"
 dependencies = [
  "base64",
  "bytes",
@@ -1699,6 +1697,7 @@ dependencies = [
  "sync_wrapper",
  "tokio",
  "tokio-rustls",
+ "tower",
  "tower-service",
  "url",
  "wasm-bindgen",
@@ -1890,9 +1889,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.133"
+version = "1.0.134"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
+checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d"
 dependencies = [
  "itoa",
  "memchr",
@@ -2096,7 +2095,7 @@ dependencies = [
  "starbase_sandbox",
  "starbase_styles",
  "starbase_utils",
- "thiserror 2.0.8",
+ "thiserror 2.0.9",
  "tracing",
  "xz2",
  "zip",
@@ -2124,7 +2123,7 @@ dependencies = [
  "async-trait",
  "miette",
  "starbase_macros",
- "thiserror 2.0.8",
+ "thiserror 2.0.9",
  "tokio",
 ]
 
@@ -2160,7 +2159,7 @@ dependencies = [
  "serial_test",
  "starbase_sandbox",
  "sysinfo",
- "thiserror 2.0.8",
+ "thiserror 2.0.9",
  "tracing",
 ]
 
@@ -2193,7 +2192,7 @@ dependencies = [
  "starbase_sandbox",
  "starbase_styles",
  "starbase_utils",
- "thiserror 2.0.8",
+ "thiserror 2.0.9",
  "tokio",
  "toml",
  "tracing",
@@ -2342,11 +2341,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.8"
+version = "2.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f5383f3e0071702bf93ab5ee99b52d26936be9dedd9413067cbdcddcb6141a"
+checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc"
 dependencies = [
- "thiserror-impl 2.0.8",
+ "thiserror-impl 2.0.9",
 ]
 
 [[package]]
@@ -2362,9 +2361,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.8"
+version = "2.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f357fcec90b3caef6623a099691be676d033b40a058ac95d2a6ade6fa0c943"
+checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2481,6 +2480,27 @@ dependencies = [
  "winnow",
 ]
 
+[[package]]
+name = "tower"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+
 [[package]]
 name = "tower-service"
 version = "0.3.3"
@@ -3202,7 +3222,7 @@ dependencies = [
  "flate2",
  "indexmap",
  "memchr",
- "thiserror 2.0.8",
+ "thiserror 2.0.9",
  "zopfli",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 93eb9da..af8b752 100644
--- 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
index 55454f1..1f7de17 100644
--- 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
index 5141d45..eac0b9e 100644
--- 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
index e98a159..b072700 100644
--- 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
index a992b78..2e8f600 100644
--- 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
index e49fbc9..aa53ade 100644
--- 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,
         }
     }
 }