From 9d99d447ee4c5f53db290920d07d201ee1d8f630 Mon Sep 17 00:00:00 2001 From: Taras Haidar Date: Fri, 5 Apr 2024 10:58:38 +0300 Subject: [PATCH] Fixed comment --- src/components/avatar/Avatar.tsx | 6 ++++++ src/components/data-grid/DataGrid.tsx | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/avatar/Avatar.tsx b/src/components/avatar/Avatar.tsx index bfdc3f0e4..bc0fcbdc4 100755 --- a/src/components/avatar/Avatar.tsx +++ b/src/components/avatar/Avatar.tsx @@ -13,6 +13,7 @@ export interface AvatarProps extends BaseAvatarProps { borderColor?: string; color?: string; height?: string; + filter?: string; } export const Avatar = ({ @@ -24,6 +25,7 @@ export const Avatar = ({ borderColor, size, color, + filter, ...rest }: AvatarProps) => { const { @@ -58,6 +60,7 @@ export const Avatar = ({ backgroundColor: backgroundColor ?? primary, height: height ?? scale800, width: height ?? scale800, + filter: filter, }, props: { [DATA_TEST_ID]: testId, @@ -67,6 +70,7 @@ export const Avatar = ({ style: { fontSize: getFontSize(), color: color ?? light4, + width: size, }, }, }; @@ -77,6 +81,7 @@ export const Avatar = ({ backgroundColor: backgroundColor ?? light3, height: height ?? scale800, width: height ?? scale800, + filter: filter, ...borderRadius('50%'), ...border({ ...border300, @@ -92,6 +97,7 @@ export const Avatar = ({ style: { fontSize: getFontSize(), color: color ?? dark1, + width: size, }, }, }; diff --git a/src/components/data-grid/DataGrid.tsx b/src/components/data-grid/DataGrid.tsx index 5c66ed7c0..4b3856272 100755 --- a/src/components/data-grid/DataGrid.tsx +++ b/src/components/data-grid/DataGrid.tsx @@ -443,9 +443,8 @@ export const DataGrid = ({ if (selectedGroupOption && item[selectedGroupOption.field] === EMPTY_GROUP) { item[selectedGroupOption?.field] = translations?.emptyGroup[selectedGroupOption?.field]; return item; - } else { - return item; } + return item; }); return params.success({