refactor(useDatagrid): implement typescript types (carbon-design-syst…

…em#5439)
amal-k-joy · Jun 11, 2024 · 70a353c · 70a353c
1 parent 73ee632
commit 70a353c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/packages/ibm-products/src/components/Datagrid/Datagrid/DatagridSimpleBody.tsx b/packages/ibm-products/src/components/Datagrid/Datagrid/DatagridSimpleBody.tsx
@@ -18,7 +18,7 @@ const DatagridSimpleBody = (datagridState: DataGridState) => {
   return (
     <TableBody
       {...getTableBodyProps({ role: undefined })}
-      aria-live={null}
+      aria-live={undefined}
       className={cx(
         `${blockClass}__simple-body`,
         getTableBodyProps().className

diff --git a/packages/ibm-products/src/components/Datagrid/Datagrid/DatagridVirtualBody.tsx b/packages/ibm-products/src/components/Datagrid/Datagrid/DatagridVirtualBody.tsx
@@ -107,7 +107,10 @@ const DatagridVirtualBody = (datagridState: DataGridState) => {
       >
         <DatagridHead {...datagridState} />
       </div>
-      <TableBody {...getTableBodyProps({ role: undefined })} aria-live={null}>
+      <TableBody
+        {...getTableBodyProps({ role: undefined })}
+        aria-live={undefined}
+      >
         <VariableSizeList
           height={virtualHeight || tableHeight}
           itemCount={visibleRows.length}

diff --git a/...ts/src/components/Datagrid/useDatagrid.js → ...ts/src/components/Datagrid/useDatagrid.ts b/...ts/src/components/Datagrid/useDatagrid.js → ...ts/src/components/Datagrid/useDatagrid.ts
@@ -16,6 +16,7 @@ import {
   useGlobalFilter,
   useFilters,
   usePagination,
+  TableInstance,
 } from 'react-table';
 import uniqueId from 'lodash/uniqueId';
 import useSkeletonRows from './useSkeletonRows';
@@ -27,7 +28,7 @@ import useFlexResize from './useFlexResize';
 import useFloatingScroll from './useFloatingScroll';
 import { stateReducer } from './Datagrid/addons/stateReducer';
 
-const useDatagrid = (params, ...plugins) => {
+const useDatagrid = (params, ...plugins): TableInstance => {
   const defaultPlugins = [
     useFlexLayout,
     useHeaderRow,
@@ -45,7 +46,7 @@ const useDatagrid = (params, ...plugins) => {
   // Disable resizing
   if (params.disableResizing) {
     const resizeIndex = defaultPlugins.findIndex(
-      (p) => p.pluginName === 'useResizeColumns'
+      (p) => p?.['pluginName'] === 'useResizeColumns'
     );
     defaultPlugins.splice(resizeIndex, 1);
   }
@@ -69,6 +70,7 @@ const useDatagrid = (params, ...plugins) => {
     ...defaultEndPlugins,
     ...clientEndPlugins
   );
+
   return tableState;
 };