Skip to content

Fix tooltip in AvatarStack #3676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 22, 2025
Merged

Fix tooltip in AvatarStack #3676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0ab4ea7
Fix tooltip in n `AvatarStack`
TylerJDev Sep 9, 2025
73614db
Fix direction
TylerJDev Sep 9, 2025
72afe35
Add to ternary
TylerJDev Sep 11, 2025
f00eea2
Utilize `aria-label`
TylerJDev Sep 22, 2025
bcbc5c3
Add changeset
TylerJDev Sep 22, 2025
d1c6064
Apply suggestion from @Copilot
TylerJDev Sep 22, 2025
d0c4da1
Apply suggestion from @Copilot
TylerJDev Sep 22, 2025
3313d6f
Remove `href` from playground example
TylerJDev Sep 22, 2025
d6e09a3
Remove `label` attr if `tooltipped` is true
TylerJDev Sep 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/blue-phones-boil.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@primer/view-components': minor
---

Utilize modern `Tooltip` component for `AvatarStack`
3 changes: 3 additions & 0 deletions app/components/primer/beta/avatar_stack.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,7 @@
<%= avatar %>
<% end %>
<% end %>
<% if @tooltipped %>
<%= render Primer::Alpha::Tooltip.new(**@tooltip_arguments) %>
<% end %>
<% end %>
24 changes: 19 additions & 5 deletions app/components/primer/beta/avatar_stack.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ def initialize(tag: DEFAULT_TAG, align: ALIGN_DEFAULT, tooltipped: false, body_a
@system_arguments = system_arguments
@tooltipped = tooltipped
@body_arguments = body_arguments
@direction = @body_arguments[:direction]

body_tag = @body_arguments[:tag] || DEFAULT_BODY_TAG
@body_arguments[:tag] = fetch_or_fallback(BODY_TAG_OPTIONS, body_tag, DEFAULT_BODY_TAG)
Expand All @@ -45,14 +46,27 @@ def initialize(tag: DEFAULT_TAG, align: ALIGN_DEFAULT, tooltipped: false, body_a
system_arguments[:classes],
"AvatarStack--right" => @align == :right
)

@body_arguments[:tabindex] = tooltipped ? 0 : nil
@body_arguments[:id] = tooltipped ? @body_arguments[:id] ||= self.class.generate_id : @body_arguments[:id]

@tooltip_arguments = {
for_id: @body_arguments[:id],
}

@tooltip_arguments[:direction] = @direction || Primer::Alpha::Tooltip::DIRECTION_DEFAULT
@tooltip_arguments[:text] = @body_arguments[:label]
@tooltip_arguments[:type] = :description

@body_arguments[:aria] ||= {}
if tooltipped && @body_arguments[:label].present?
@body_arguments[:aria][:label] = @body_arguments[:label]
@body_arguments[:label] = nil
end
end

def body_component
if @tooltipped
Primer::Tooltip.new(**@body_arguments) # rubocop:disable Primer/ComponentNameMigration
else
Primer::BaseComponent.new(**@body_arguments)
end
Primer::BaseComponent.new(**@body_arguments)
end

def before_render
Expand Down
6 changes: 3 additions & 3 deletions previews/primer/beta/avatar_stack_preview.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ def align_right
# @label With tooltip
def with_tooltip
render(Primer::Beta::AvatarStack.new(tooltipped: true, body_arguments: { label: "This is a tooltip!" })) do |component|
component.with_avatar(src: Primer::ExampleImage::BASE64_SRC, alt: "@kittenuser")
component.with_avatar(src: Primer::ExampleImage::BASE64_SRC, alt: "@kittenuser")
component.with_avatar(src: Primer::ExampleImage::BASE64_SRC, alt: "@kittenuser")
component.with_avatar(src: Primer::ExampleImage::BASE64_SRC, alt: "@kittenuser", href: "primer.style")
component.with_avatar(src: Primer::ExampleImage::BASE64_SRC, alt: "@kittenuser", href: "primer.style")
component.with_avatar(src: Primer::ExampleImage::BASE64_SRC, alt: "@kittenuser", href: "primer.style")
end
end
#
Expand Down
2 changes: 1 addition & 1 deletion test/components/beta/avatar_stack_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def test_renders_tooltipped_body
end

assert_selector(".AvatarStack") do
assert_selector("div[aria-label=\"Tooltip\"].AvatarStack-body.tooltipped") do
assert_selector("div[aria-label=\"Tooltip\"]") do
assert_selector("img.avatar", count: 1)
end
end
Expand Down
Loading