-
Notifications
You must be signed in to change notification settings - Fork 122
fix(UI): avatars problem & button style #1277
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.
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
benjamin-747
merged 1 commit into
gitmono-dev:main
from
liuyangjuncong20202570:feat-lyjc
Jul 29, 2025
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,80 @@ | ||||||
| import React from 'react' | ||||||
| import { Avatar, AvatarStack } from '@primer/react' | ||||||
| import { useQueries } from '@tanstack/react-query' | ||||||
|
|
||||||
| import { OrganizationMember } from '@gitmono/types/generated' | ||||||
|
|
||||||
| import { useScope } from '@/contexts/scope' | ||||||
| import { apiClient } from '@/utils/queryClient' | ||||||
|
|
||||||
| import { ItemsType } from './IssuesContent' | ||||||
| import { MemberHovercard } from './MemberHoverCardNE' | ||||||
|
|
||||||
| export const MemberHoverAvatarList = ({ users }: { users: ItemsType[number] }) => { | ||||||
| const shouldFetch = users.assignees.length > 0 | ||||||
| const query = apiClient.organizations.getMembersByUsername() | ||||||
|
|
||||||
| const { scope } = useScope() | ||||||
|
|
||||||
| const queries = useQueries({ | ||||||
| queries: users.assignees.map((u) => ({ | ||||||
| queryKey: query.requestKey(`${scope}`, `${u}`), | ||||||
| queryFn: () => query.request(`${scope}`, `${u}`), | ||||||
| enabled: shouldFetch | ||||||
| })), | ||||||
| combine: (res) => { | ||||||
| return { | ||||||
| data: res.map((r) => r.data), | ||||||
| pending: res.some((r) => r.isPending) | ||||||
| } | ||||||
| } | ||||||
| }) | ||||||
|
|
||||||
| return ( | ||||||
| <> | ||||||
| <AvatarStack alignRight> | ||||||
| {queries.pending | ||||||
| ? Array.from({ length: users.assignees.length }).map((_, i) => ( | ||||||
| // eslint-disable-next-line react/no-array-index-key | ||||||
| <div className='h-[48px] w-[48px] rounded-full bg-[#f3f4f5]' key={i} /> | ||||||
|
liuyangjuncong20202570 marked this conversation as resolved.
|
||||||
| )) | ||||||
| : queries.data.map( | ||||||
| (q) => | ||||||
| q && ( | ||||||
| <AvatarwithHover | ||||||
| key={q.id} | ||||||
| src={q?.user.avatar_url} | ||||||
| hoverProps={{ username: q.user.username, userData: q }} | ||||||
| /> | ||||||
| ) | ||||||
| )} | ||||||
| </AvatarStack> | ||||||
| </> | ||||||
| ) | ||||||
| } | ||||||
|
|
||||||
| interface HoverProps { | ||||||
| username: string | ||||||
| userData: OrganizationMember | ||||||
| } | ||||||
| const AvatarwithHover = ({ | ||||||
| src, | ||||||
| hoverProps, | ||||||
| className, | ||||||
| style | ||||||
| }: { | ||||||
| src: string | ||||||
| hoverProps: HoverProps | ||||||
| className?: string | ||||||
| style?: React.CSSProperties | ||||||
| }) => { | ||||||
| return ( | ||||||
| <> | ||||||
| <MemberHovercard username={hoverProps.username} side='top' align='end' member={hoverProps.userData}> | ||||||
| <div className={className} style={style}> | ||||||
| <Avatar src={src} /> | ||||||
|
||||||
| <Avatar src={src} /> | |
| <Avatar src={src} alt={`Avatar of ${hoverProps.username}`} /> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using inline styles with hardcoded values when you already have the equivalent Tailwind class 'mt-4' (which is 16px) creates redundancy. Consider removing either the inline style or the Tailwind class.