Skip to content

fix: fix bug with table and avatar #410

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
Selnapenek merged 3 commits into from
Apr 15, 2022
Merged

fix: fix bug with table and avatar #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3f6cda
fix(avatar): remove background if image has src
Selnapenek Apr 15, 2022
a163253
fix(table): fix nodata view at table with groupBy
Selnapenek Apr 15, 2022
3c1e285
chore: reivew fix
Selnapenek Apr 15, 2022
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/Avatar/Avatar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function Avatar({
const initials = getInitials(firstName, lastName);

return (
<AvatarTag pickVariant={ pickVariant } { ...rest } firstName={ firstName } tagName="div">
<AvatarTag transparent={ !!src } pickVariant={ pickVariant } { ...rest } firstName={ firstName } tagName="div">
{
src ? <AvatarImgTag modifiers={ rest } tagName="img" src={ src } /> : initials
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Avatar/Avatar.theme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const [AvatarTag, themeAvatar] = createThemeTag(name, ({ COLORS }: *) => ({
justifyContent: 'center',
alignItems: 'center',
position: 'relative',
backgroundColor: getBackgroundColorByName(props.firstName),
backgroundColor: props.transparent ? 'transparent' : getBackgroundColorByName(props.firstName),
color: COLORS.WHITE,
fontWeight: 600,
}),
Expand Down
2 changes: 1 addition & 1 deletion src/components/Table/TableBuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ class TableBuilder extends PureComponent<TableBulderProps, TableBuilderState> {
renderContent = () => {
const { groupBy, data, renderGroupTitle } = this.props;

if (groupBy && typeof groupBy === 'function') {
if (data && data.length !== 0 && groupBy && typeof groupBy === 'function') {

const groupedData = groupBy(data) || {};
return (
Expand Down