fix: fix bug with table and avatar (#410)

* fix(avatar): remove background if image has src * fix(table): fix nodata view at table with groupBy * chore: reivew fix
8base · Apr 15, 2022 · a4f3e69 · a4f3e69
1 parent f67ae8a
commit a4f3e69
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/components/Avatar/Avatar.js b/src/components/Avatar/Avatar.js
@@ -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
       }

diff --git a/src/components/Avatar/Avatar.theme.js b/src/components/Avatar/Avatar.theme.js
@@ -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,
   }),

diff --git a/src/components/Table/TableBuilder.js b/src/components/Table/TableBuilder.js
@@ -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 (