diff --git a/Cargo.lock b/Cargo.lock index 0d329cd..2cc6d60 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7,6 +7,7 @@ name = "action" version = "0.0.1" dependencies = [ "keymap", + "serde", ] [[package]] @@ -1070,9 +1071,9 @@ dependencies = [ [[package]] name = "keymap" -version = "1.0.0-rc.3" +version = "1.0.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28201c593f9ddadde577e1349d975dbedc3ff024ea3f2c090faef784b2c1f2e3" +checksum = "73a8d4a6af2efde4fe0d3c9a129fbd6d2d56f9fc202004e09daea1ef5db575ff" dependencies = [ "crossterm 0.29.0", "keymap_derive", @@ -1084,9 +1085,9 @@ dependencies = [ [[package]] name = "keymap_derive" -version = "1.0.0-rc.3" +version = "1.0.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7132f53df5e1d203cdfa4dcdab2f7f9007c6e4f41656d5a59a729bea10593889" +checksum = "40efa7b99355606cd561d33bd989e5a62f8f8e79e0c5bcbde268255a8914cb2c" dependencies = [ "keymap_parser", "proc-macro2", @@ -1096,13 +1097,13 @@ dependencies = [ [[package]] name = "keymap_parser" -version = "1.0.0-rc.3" +version = "1.0.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e10c0e198477a350c85aa57bd3dd1f191d6cd5d71625492671f4c988b6c4e42c" +checksum = "d8c84a5e79d8de27f23148770db706954c252b8a8f6c7c0c70d8f0a451d9812f" dependencies = [ "serde", - "strum 0.27.2", - "strum_macros 0.27.2", + "strum 0.28.0", + "strum_macros 0.28.0", ] [[package]] @@ -1676,9 +1677,9 @@ dependencies = [ [[package]] name = "strum" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" +checksum = "9628de9b8791db39ceda2b119bbe13134770b56c138ec1d3af810d045c04f9bd" [[package]] name = "strum_macros" @@ -1695,9 +1696,9 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" +checksum = "ab85eea0270ee17587ed4156089e10b9e6880ee688791d45a905f5b1ca36f664" dependencies = [ "heck", "proc-macro2", diff --git a/platforms/action/Cargo.toml b/platforms/action/Cargo.toml index 515567d..1cbcb6e 100644 --- a/platforms/action/Cargo.toml +++ b/platforms/action/Cargo.toml @@ -6,4 +6,5 @@ edition.workspace = true license.workspace = true [dependencies] -keymap = { version = "1.0.0-rc.3" } +serde = { version = "1.0", features = ["derive"] } +keymap = "1.0.0-rc.5" diff --git a/platforms/tui/Cargo.toml b/platforms/tui/Cargo.toml index b6744b8..d03365a 100644 --- a/platforms/tui/Cargo.toml +++ b/platforms/tui/Cargo.toml @@ -19,6 +19,6 @@ tur = { path = "../../", version = "0.1.0" } action = { path = "../action/", version = "0.0.1" } crossterm = "0.29" ratatui = "0.29.0" -keymap = { version = "1.0.0-rc.3", features = ["crossterm"] } +keymap = { version = "1.0.0-rc.5", features = ["crossterm"] } atty = "0.2" clap = { version = "4.0", features = ["derive"] } diff --git a/platforms/tui/src/app.rs b/platforms/tui/src/app.rs index 7b232a6..7f0df9c 100644 --- a/platforms/tui/src/app.rs +++ b/platforms/tui/src/app.rs @@ -448,7 +448,7 @@ fn section<'a>(title: &'a str, content: Vec>) -> Paragraph<'a> { Paragraph::new(content).block(block(title)) } -fn block(title: &str) -> Block { +fn block(title: &str) -> Block<'_> { Block::default() .borders(Borders::ALL) .border_type(BorderType::Rounded) diff --git a/platforms/web/Cargo.toml b/platforms/web/Cargo.toml index c115ad1..1ae9347 100644 --- a/platforms/web/Cargo.toml +++ b/platforms/web/Cargo.toml @@ -22,7 +22,7 @@ wasm-logger = "0.2" gloo-timers = { version = "0.3", features = ["futures"] } gloo-events = "0.2" regex = "1.10" -keymap = { version = "1.0.0-rc.3", features = ["wasm"] } +keymap = { version = "1.0.0-rc.5", features = ["wasm"] } [features] default = ["console_error_panic_hook"] diff --git a/platforms/web/src/app.rs b/platforms/web/src/app.rs index 61f4f10..7e38c97 100644 --- a/platforms/web/src/app.rs +++ b/platforms/web/src/app.rs @@ -342,7 +342,7 @@ impl Component for App { fn view(&self, ctx: &Context) -> Html { let link = ctx.link(); let help_text_items = self.keymap.items.iter().filter(|(_, item)| !item.description.contains("Quit")).map(|(_, item)| { - html! {
  • { item.keys.join(", ") }{ format!(": {}", item.description) }
  • } + html! {
  • { item.keys.join(", ") }{ format!(" {}", item.description) }
  • } }).collect::(); html! { diff --git a/platforms/web/styles.css b/platforms/web/styles.css index 31c3e3b..8ed23ee 100644 --- a/platforms/web/styles.css +++ b/platforms/web/styles.css @@ -612,9 +612,12 @@ body { color: #333; } -.help-kbd { - display: inline-block; +.help-section .kbd { + display: inline-flex; + justify-content: center; + align-items: center; padding: 0.1em 0.6em; + margin-right: 0.5em; font-family: var(--font-family-mono); font-size: 0.85em; line-height: 1; @@ -624,6 +627,7 @@ body { border-radius: 3px; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px #fff inset; white-space: nowrap; + min-width: 4.5em; } /* Graph View */