safer data typing for rowa

Codecademy · Jan 24, 2025 · 0e23544 · 0e23544
1 parent 31b31c7
commit 0e23544
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/packages/gamut/src/DataList/Tables/Rows/TableRow.tsx b/packages/gamut/src/DataList/Tables/Rows/TableRow.tsx
@@ -6,7 +6,7 @@ import {
   useMemo,
 } from 'react';
 
-import { Box, Text } from '../../..';
+import { Text } from '../../..';
 import { ListCol, ListRow } from '../../../List';
 import { ColProps } from '../../../List/elements';
 import { Shimmer } from '../../../Loading/Shimmer';
@@ -115,22 +115,22 @@ export const TableRow: DataRow = ({
 
         return (
           <ListCol {...colProps} key={newKey}>
-            {!row ? (
-              ''
-            ) : render ? (
+            {render ? (
               render(row)
             ) : typeof row[key] === 'string' || typeof row[key] === 'number' ? (
               <Text
                 truncate="ellipsis"
                 truncateLines={1}
                 textAlign={justify ?? 'left'}
               >
-                {row[key]}
+                {row[key] as string}
               </Text>
             ) : isValidElement(row[key]) ? (
-              row[key]
+              (row[key] as ReactElement)
+            ) : !row[key] ? (
+              ''
             ) : (
-              'Data type error'
+              'Invalid data type'
             )}
           </ListCol>
         );