avo 4.0.0.beta.4 → 4.0.0.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bc41072024aca335bb61ad71567c9654a2fa3efaa91cee5fa8ca97630fe352e
-  data.tar.gz: c1ee0a7f198c106a9ad0050698f248ccce32a3e684ab35b5cc9876aecd9fd6f6
+  metadata.gz: 78097e52553f1c4b182f2542a08a85379f1fb97804598c84e6efb48fc24ccc30
+  data.tar.gz: f372148210d4b8ac86b22117ab5222e67c449649d0f5e0045c504a8902ae3e40
 SHA512:
-  metadata.gz: 4e80b61da0c33adb3c3ec528e7541fdabf042645912cf87eac10b344061a4dff768120c5ec0845ce465b42824b994bb26763a02ed2b15fc8923d40b42601a37a
-  data.tar.gz: 3e0e5e9acca71e4b43764bf7f9c47ec3f337208ce65bf148be5cc12450ae2e7c19d6031399269416b4fa3dd343ff245dc5c584afbf1077303dbc7a07dda1801b
+  metadata.gz: 68fac9ebc6f6c49005b06f106e566308ad593d25232a56d36a2f54042dc877f6ed07e37e0da3d9fd33a5bbddd21d2220960fe24b3a0b97cc1042d13dc99e5eee
+  data.tar.gz: 5314103f75eef43decd2326a4cb1a1fab7fc7833a6a9ba000bafd117504af078d4d72a7356083ccfe7217a6d5501b0b906e07abf612222c0685ea2401adaf8c7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (4.0.0.beta.4)
+    avo (4.0.0.beta.5)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

data/app/assets/builds/avo/application.css

@@ -12078,6 +12078,9 @@
         --btn-color-accent-content: var(--color-rose-600);
         --btn-color-accent-foreground: var(--color-white);
       }
+      &>span >kbd {
+        margin-block: calc(var(--spacing) * -1);
+      }
     }
     .dark {
       .button--style-primary {

data/app/assets/stylesheets/css/components/button.css

@@ -141,6 +141,11 @@
       --btn-color-accent-content: var(--color-rose-600);
       --btn-color-accent-foreground: var(--color-white);
     }
+
+    /* The kbd element is taller than the button text, so we need to offset it */
+    &>span >kbd {
+      @apply -my-1;
+    }
   }
 
   .dark {

data/app/components/avo/base_component.rb

@@ -16,16 +16,45 @@ class Avo::BaseComponent < ViewComponent::Base
   def component_name = self.class.name.to_s.underscore
 
   # Renders a <kbd> badge for a hotkey string.
-  # Skips modifier combos like "Meta+Enter" — only renders simple keys.
+  # Supports modifier tokens rendered in a friendly OS-aware way.
   def hotkey_badge(hotkey, **html_options)
-    first_key = hotkey.to_s.split.first
-    return if first_key.blank? || first_key.include?("+")
-
-    tag.kbd(first_key.upcase, **html_options)
+    # `@github/hotkey` uses:
+    # - `+` for modifier combos (e.g. "Mod+Enter")
+    # - spaces for sequences/alternatives (e.g. "g n" or "Meta+Enter Control+Enter")
+    #
+    # Render key parts for the badge, mapping supported modifiers to OS-aware glyphs.
+    keys = hotkey.to_s.split(/[+\s]+/).reject(&:blank?)
+
+    first_key = keys.first
+    return if first_key.blank?
+
+    content_tag(:span, **html_options) do
+      # Render multiple keys (e.g. "g n") inside a wrapper so any provided
+      # classes (like `ms-auto`) are applied once.
+      safe_join(keys.map { |key| render_hotkey_badge_key(key) }, " ")
+    end
   end
 
   private
 
+  def render_hotkey_badge_key(key)
+    token = key.to_s.strip
+
+    case token.downcase
+    when "mod"
+      tag.kbd do
+        helpers.safe_join([
+          tag.abbr("⌘", title: "Command", class: "no-underline os-pc:hidden"),
+          tag.abbr("CTRL", title: "CTRL", class: "no-underline os-mac:hidden")
+        ])
+      end
+    when "enter", "return"
+      tag.kbd("↵")
+    else
+      tag.kbd(token.upcase)
+    end
+  end
+
   # Use the @parent_resource to fetch the field using the @reflection name.
   def field
     find_association_field(resource: @parent_resource, association: params[:related_name] || @reflection.name)

data/app/components/avo/sidebar/link_component.rb

@@ -82,6 +82,6 @@ class Avo::Sidebar::LinkComponent < Avo::BaseComponent
   def build_link_data(data, hotkey)
     return data if hotkey.blank?
 
-    data.merge(hotkey: hotkey.to_s.first)
+    data.merge(hotkey: hotkey)
   end
 end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "4.0.0.beta.4" unless const_defined?(:VERSION)
+  VERSION = "4.0.0.beta.5" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta.4
+  version: 4.0.0.beta.5
 platform: ruby
 authors:
 - Adrian Marin