Skip to content

Use UserAvatar as avatar in the nav search results #1349

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 2 commits into from
Apr 28, 2021
Merged

Use UserAvatar as avatar in the nav search results #1349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14e6e51
Use UserAvatar as avatar in the nav search results
sunny-viktoryia Apr 28, 2021
3caa1e2
Merge branch 'staging' into fix/use-userAvatar-in-restyled-search-dro…
sunny-viktoryia Apr 28, 2021
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
2 changes: 1 addition & 1 deletion src/components/molecules/NavSearchBar/NavSearchBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ const NavSearchBar = () => {
key={`user-${user.id}`}
title={user.partyName ?? DEFAULT_PARTY_NAME}
image={user.pictureUrl}
isAvatar={true}
user={user}
onClick={() => {
openUserProfileModal(user);
clearSearchQuery();
Expand Down
2 changes: 1 addition & 1 deletion src/components/molecules/NavSearchBar/NavSearchResult.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
}

&__avatar {
border-radius: 50%;
margin-right: $search-result-image--right-margin;
}

&__description {
Expand Down
26 changes: 14 additions & 12 deletions src/components/molecules/NavSearchBar/NavSearchResult.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
import React, { useMemo } from "react";
import classNames from "classnames";

import { User } from "types/User";

import { WithId } from "utils/id";
import { isTruthy } from "utils/types";

import { UserAvatar } from "components/atoms/UserAvatar";

import "./NavSearchResult.scss";

export interface NavSearchResultProps {
title: string;
description?: string;
image?: string;
isAvatar?: boolean;
user?: WithId<User>;
onClick?: (e?: React.MouseEvent) => void;
}

export const NavSearchResult: React.FC<NavSearchResultProps> = ({
title,
description,
image,
isAvatar,
user,
onClick,
}) => {
const imageStyles = useMemo(
Expand All @@ -25,17 +31,13 @@ export const NavSearchResult: React.FC<NavSearchResultProps> = ({
[image]
);

const imageClasses = useMemo(
() =>
classNames("NavSearchResult__image", {
NavSearchResult__avatar: isAvatar,
}),
[isAvatar]
);

return (
<div className="NavSearchResult font-size--small" onClick={onClick}>
<div className={imageClasses} style={imageStyles} />
{isTruthy(user) ? (
<UserAvatar user={user} containerClassName="NavSearchResult__avatar" />
) : (
<div className="NavSearchResult__image" style={imageStyles} />
)}

<div className="NavSearchResult__content">
<div>{title}</div>
Expand Down