diff --git a/change/@fluentui-react-table-44e1732b-738d-495e-ac5b-8af6d9ab148b.json b/change/@fluentui-react-table-44e1732b-738d-495e-ac5b-8af6d9ab148b.json
new file mode 100644
index 00000000000000..11dc088176d8f7
--- /dev/null
+++ b/change/@fluentui-react-table-44e1732b-738d-495e-ac5b-8af6d9ab148b.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "refactor: Cleanup unused code",
+  "packageName": "@fluentui/react-table",
+  "email": "lingfangao@hotmail.com",
+  "dependentChangeType": "patch"
+}
diff --git a/packages/react-components/react-table/etc/react-table.api.md b/packages/react-components/react-table/etc/react-table.api.md
index 47ff982dd4a83b..91f2eab30c7464 100644
--- a/packages/react-components/react-table/etc/react-table.api.md
+++ b/packages/react-components/react-table/etc/react-table.api.md
@@ -436,7 +436,9 @@ export type TableRowSlots = {
 };
 
 // @public
-export type TableRowState = ComponentState<TableRowSlots> & Pick<TableContextValue, 'noNativeElements' | 'size'> & Pick<Required<TableRowProps>, 'appearance'>;
+export type TableRowState = ComponentState<TableRowSlots> & Pick<TableContextValue, 'noNativeElements' | 'size'> & Pick<Required<TableRowProps>, 'appearance'> & {
+    isHeaderRow: boolean;
+};
 
 // @public
 export const TableSelectionCell: ForwardRefComponent<TableSelectionCellProps>;
@@ -445,7 +447,7 @@ export const TableSelectionCell: ForwardRefComponent<TableSelectionCellProps>;
 export const tableSelectionCellClassNames: SlotClassNames<TableSelectionCellSlots>;
 
 // @public
-export type TableSelectionCellProps = ComponentProps<Partial<Omit<TableSelectionCellSlots, 'media'>>> & {
+export type TableSelectionCellProps = ComponentProps<Partial<TableSelectionCellSlots>> & {
     type?: 'checkbox' | 'radio';
     checked?: CheckboxProps['checked'];
     subtle?: boolean;
diff --git a/packages/react-components/react-table/src/components/DataGrid/DataGrid.tsx b/packages/react-components/react-table/src/components/DataGrid/DataGrid.tsx
index 45b5e4a4dfeade..778a2ad351a2cf 100644
--- a/packages/react-components/react-table/src/components/DataGrid/DataGrid.tsx
+++ b/packages/react-components/react-table/src/components/DataGrid/DataGrid.tsx
@@ -7,7 +7,7 @@ import type { ForwardRefComponent } from '@fluentui/react-utilities';
 import { useDataGridContextValues_unstable } from './useDataGridContextValues';
 
 /**
- * DataGrid component - TODO: add more docs
+ * DataGrid component
  */
 export const DataGrid: ForwardRefComponent<DataGridProps> = React.forwardRef((props, ref) => {
   const state = useDataGrid_unstable(props, ref);
diff --git a/packages/react-components/react-table/src/components/DataGridBody/DataGridBody.tsx b/packages/react-components/react-table/src/components/DataGridBody/DataGridBody.tsx
index b21ff3d98ff2ed..35b2022006c053 100644
--- a/packages/react-components/react-table/src/components/DataGridBody/DataGridBody.tsx
+++ b/packages/react-components/react-table/src/components/DataGridBody/DataGridBody.tsx
@@ -6,7 +6,7 @@ import type { DataGridBodyProps } from './DataGridBody.types';
 import type { ForwardRefComponent } from '@fluentui/react-utilities';
 
 /**
- * DataGridBody component - TODO: add more docs
+ * DataGridBody component
  */
 export const DataGridBody: ForwardRefComponent<DataGridBodyProps> = React.forwardRef((props, ref) => {
   const state = useDataGridBody_unstable(props, ref);
diff --git a/packages/react-components/react-table/src/components/DataGridCell/DataGridCell.tsx b/packages/react-components/react-table/src/components/DataGridCell/DataGridCell.tsx
index 6a97ccc5efb8e1..c525fbbded3736 100644
--- a/packages/react-components/react-table/src/components/DataGridCell/DataGridCell.tsx
+++ b/packages/react-components/react-table/src/components/DataGridCell/DataGridCell.tsx
@@ -6,7 +6,7 @@ import type { DataGridCellProps } from './DataGridCell.types';
 import type { ForwardRefComponent } from '@fluentui/react-utilities';
 
 /**
- * DataGridCell component - TODO: add more docs
+ * DataGridCell component
  */
 export const DataGridCell: ForwardRefComponent<DataGridCellProps> = React.forwardRef((props, ref) => {
   const state = useDataGridCell_unstable(props, ref);
diff --git a/packages/react-components/react-table/src/components/DataGridHeader/DataGridHeader.test.tsx b/packages/react-components/react-table/src/components/DataGridHeader/DataGridHeader.test.tsx
index 093aae96fa7f8e..c1fec0697321a2 100644
--- a/packages/react-components/react-table/src/components/DataGridHeader/DataGridHeader.test.tsx
+++ b/packages/react-components/react-table/src/components/DataGridHeader/DataGridHeader.test.tsx
@@ -10,8 +10,6 @@ describe('DataGridHeader', () => {
     displayName: 'DataGridHeader',
   });
 
-  // TODO add more tests here, and create visual regression tests in /apps/vr-tests
-
   it('renders a default state', () => {
     const result = render(<DataGridHeader>Default DataGridHeader</DataGridHeader>);
     expect(result.container).toMatchSnapshot();
diff --git a/packages/react-components/react-table/src/components/DataGridHeader/DataGridHeader.tsx b/packages/react-components/react-table/src/components/DataGridHeader/DataGridHeader.tsx
index 1c81cd84f82262..9a4520caf87a57 100644
--- a/packages/react-components/react-table/src/components/DataGridHeader/DataGridHeader.tsx
+++ b/packages/react-components/react-table/src/components/DataGridHeader/DataGridHeader.tsx
@@ -6,7 +6,7 @@ import type { DataGridHeaderProps } from './DataGridHeader.types';
 import type { ForwardRefComponent } from '@fluentui/react-utilities';
 
 /**
- * DataGridHeader component - TODO: add more docs
+ * DataGridHeader component
  */
 export const DataGridHeader: ForwardRefComponent<DataGridHeaderProps> = React.forwardRef((props, ref) => {
   const state = useDataGridHeader_unstable(props, ref);
diff --git a/packages/react-components/react-table/src/components/DataGridHeaderCell/DataGridHeaderCell.test.tsx b/packages/react-components/react-table/src/components/DataGridHeaderCell/DataGridHeaderCell.test.tsx
index 3510ae70a97104..30165e85743612 100644
--- a/packages/react-components/react-table/src/components/DataGridHeaderCell/DataGridHeaderCell.test.tsx
+++ b/packages/react-components/react-table/src/components/DataGridHeaderCell/DataGridHeaderCell.test.tsx
@@ -22,8 +22,6 @@ describe('DataGridHeaderCell', () => {
     },
   });
 
-  // TODO add more tests here, and create visual regression tests in /apps/vr-tests
-
   it('renders a default state', () => {
     const result = render(<DataGridHeaderCell>Default DataGridHeaderCell</DataGridHeaderCell>);
     expect(result.container).toMatchSnapshot();
diff --git a/packages/react-components/react-table/src/components/DataGridHeaderCell/DataGridHeaderCell.tsx b/packages/react-components/react-table/src/components/DataGridHeaderCell/DataGridHeaderCell.tsx
index 573c7418a54abb..9c5ab92fc18e19 100644
--- a/packages/react-components/react-table/src/components/DataGridHeaderCell/DataGridHeaderCell.tsx
+++ b/packages/react-components/react-table/src/components/DataGridHeaderCell/DataGridHeaderCell.tsx
@@ -6,7 +6,7 @@ import type { DataGridHeaderCellProps } from './DataGridHeaderCell.types';
 import type { ForwardRefComponent } from '@fluentui/react-utilities';
 
 /**
- * DataGridHeaderCell component - TODO: add more docs
+ * DataGridHeaderCell component
  */
 export const DataGridHeaderCell: ForwardRefComponent<DataGridHeaderCellProps> = React.forwardRef((props, ref) => {
   const state = useDataGridHeaderCell_unstable(props, ref);
diff --git a/packages/react-components/react-table/src/components/DataGridRow/DataGridRow.tsx b/packages/react-components/react-table/src/components/DataGridRow/DataGridRow.tsx
index 51a060c4b7266e..688326d3652d73 100644
--- a/packages/react-components/react-table/src/components/DataGridRow/DataGridRow.tsx
+++ b/packages/react-components/react-table/src/components/DataGridRow/DataGridRow.tsx
@@ -6,7 +6,7 @@ import type { DataGridRowProps } from './DataGridRow.types';
 import type { ForwardRefComponent } from '@fluentui/react-utilities';
 
 /**
- * DataGridRow component - TODO: add more docs
+ * DataGridRow component
  */
 export const DataGridRow: ForwardRefComponent<DataGridRowProps> = React.forwardRef((props, ref) => {
   const state = useDataGridRow_unstable(props, ref);
diff --git a/packages/react-components/react-table/src/components/DataGridSelectionCell/DataGridSelectionCell.tsx b/packages/react-components/react-table/src/components/DataGridSelectionCell/DataGridSelectionCell.tsx
index 0af80f438a7d02..3ef7106f6c82cc 100644
--- a/packages/react-components/react-table/src/components/DataGridSelectionCell/DataGridSelectionCell.tsx
+++ b/packages/react-components/react-table/src/components/DataGridSelectionCell/DataGridSelectionCell.tsx
@@ -6,7 +6,7 @@ import type { DataGridSelectionCellProps } from './DataGridSelectionCell.types';
 import type { ForwardRefComponent } from '@fluentui/react-utilities';
 
 /**
- * DataGridSelectionCell component - TODO: add more docs
+ * DataGridSelectionCell component
  */
 export const DataGridSelectionCell: ForwardRefComponent<DataGridSelectionCellProps> = React.forwardRef((props, ref) => {
   const state = useDataGridSelectionCell_unstable(props, ref);
diff --git a/packages/react-components/react-table/src/components/Table/Table.test.tsx b/packages/react-components/react-table/src/components/Table/Table.test.tsx
index 459be4451ee9ac..24331f7f7c5310 100644
--- a/packages/react-components/react-table/src/components/Table/Table.test.tsx
+++ b/packages/react-components/react-table/src/components/Table/Table.test.tsx
@@ -13,8 +13,6 @@ describe('Table', () => {
     displayName: 'Table',
   });
 
-  // TODO add more tests here, and create visual regression tests in /apps/vr-tests
-
   it('renders a default state', () => {
     const result = render(
       <Table>
diff --git a/packages/react-components/react-table/src/components/Table/Table.tsx b/packages/react-components/react-table/src/components/Table/Table.tsx
index e32b6fd1d24e42..2424f60896dd08 100644
--- a/packages/react-components/react-table/src/components/Table/Table.tsx
+++ b/packages/react-components/react-table/src/components/Table/Table.tsx
@@ -7,7 +7,7 @@ import type { ForwardRefComponent } from '@fluentui/react-utilities';
 import { useTableContextValues_unstable } from './useTableContextValues';
 
 /**
- * Table component - TODO: add more docs
+ * Table component
  */
 export const Table: ForwardRefComponent<TableProps> = React.forwardRef((props, ref) => {
   const state = useTable_unstable(props, ref);
diff --git a/packages/react-components/react-table/src/components/TableBody/TableBody.test.tsx b/packages/react-components/react-table/src/components/TableBody/TableBody.test.tsx
index adc39f28805c1d..b94ea852510602 100644
--- a/packages/react-components/react-table/src/components/TableBody/TableBody.test.tsx
+++ b/packages/react-components/react-table/src/components/TableBody/TableBody.test.tsx
@@ -18,8 +18,6 @@ describe('TableBody', () => {
     },
   });
 
-  // TODO add more tests here, and create visual regression tests in /apps/vr-tests
-
   it('renders a default state', () => {
     const result = render(
       <TableBody>
diff --git a/packages/react-components/react-table/src/components/TableBody/TableBody.tsx b/packages/react-components/react-table/src/components/TableBody/TableBody.tsx
index 5744576992e686..8ab285d083231c 100644
--- a/packages/react-components/react-table/src/components/TableBody/TableBody.tsx
+++ b/packages/react-components/react-table/src/components/TableBody/TableBody.tsx
@@ -6,7 +6,7 @@ import type { TableBodyProps } from './TableBody.types';
 import type { ForwardRefComponent } from '@fluentui/react-utilities';
 
 /**
- * TableBody component - TODO: add more docs
+ * TableBody component
  */
 export const TableBody: ForwardRefComponent<TableBodyProps> = React.forwardRef((props, ref) => {
   const state = useTableBody_unstable(props, ref);
diff --git a/packages/react-components/react-table/src/components/TableBody/renderTableBody.tsx b/packages/react-components/react-table/src/components/TableBody/renderTableBody.tsx
index 37cd35733d0ed2..4a956ca6a0803d 100644
--- a/packages/react-components/react-table/src/components/TableBody/renderTableBody.tsx
+++ b/packages/react-components/react-table/src/components/TableBody/renderTableBody.tsx
@@ -8,6 +8,5 @@ import type { TableBodyState, TableBodySlots } from './TableBody.types';
 export const renderTableBody_unstable = (state: TableBodyState) => {
   const { slots, slotProps } = getSlots<TableBodySlots>(state);
 
-  // TODO Add additional slots in the appropriate place
   return <slots.root {...slotProps.root} />;
 };
diff --git a/packages/react-components/react-table/src/components/TableCell/TableCell.test.tsx b/packages/react-components/react-table/src/components/TableCell/TableCell.test.tsx
index 5adaeedafc352f..181b27748ac5a7 100644
--- a/packages/react-components/react-table/src/components/TableCell/TableCell.test.tsx
+++ b/packages/react-components/react-table/src/components/TableCell/TableCell.test.tsx
@@ -19,8 +19,6 @@ describe('TableCell', () => {
     displayName: 'TableCell',
   });
 
-  // TODO add more tests here, and create visual regression tests in /apps/vr-tests
-
   it('renders a default state', () => {
     const result = render(<TableCell>Default TableCell</TableCell>, { container: tr });
     expect(result.container).toMatchSnapshot();
diff --git a/packages/react-components/react-table/src/components/TableCell/TableCell.tsx b/packages/react-components/react-table/src/components/TableCell/TableCell.tsx
index 7f9521023cdd67..ef07842059bfd0 100644
--- a/packages/react-components/react-table/src/components/TableCell/TableCell.tsx
+++ b/packages/react-components/react-table/src/components/TableCell/TableCell.tsx
@@ -6,7 +6,7 @@ import type { TableCellProps } from './TableCell.types';
 import type { ForwardRefComponent } from '@fluentui/react-utilities';
 
 /**
- * TableCell component - TODO: add more docs
+ * TableCell component
  */
 export const TableCell: ForwardRefComponent<TableCellProps> = React.forwardRef((props, ref) => {
   const state = useTableCell_unstable(props, ref);
diff --git a/packages/react-components/react-table/src/components/TableCellActions/TableCellActions.test.tsx b/packages/react-components/react-table/src/components/TableCellActions/TableCellActions.test.tsx
index 1308c68022a0c4..1bdc8407d69c6a 100644
--- a/packages/react-components/react-table/src/components/TableCellActions/TableCellActions.test.tsx
+++ b/packages/react-components/react-table/src/components/TableCellActions/TableCellActions.test.tsx
@@ -9,8 +9,6 @@ describe('TableCellActions', () => {
     displayName: 'TableCellActions',
   });
 
-  // TODO add more tests here, and create visual regression tests in /apps/vr-tests
-
   it('renders a default state', () => {
     const result = render(<TableCellActions>Default TableCellActions</TableCellActions>);
     expect(result.container).toMatchSnapshot();
diff --git a/packages/react-components/react-table/src/components/TableCellActions/TableCellActions.tsx b/packages/react-components/react-table/src/components/TableCellActions/TableCellActions.tsx
index c9e4b8e644a96a..833e98a50d1e6a 100644
--- a/packages/react-components/react-table/src/components/TableCellActions/TableCellActions.tsx
+++ b/packages/react-components/react-table/src/components/TableCellActions/TableCellActions.tsx
@@ -6,7 +6,7 @@ import type { TableCellActionsProps } from './TableCellActions.types';
 import type { ForwardRefComponent } from '@fluentui/react-utilities';
 
 /**
- * TableCellActions component - TODO: add more docs
+ * TableCellActions component
  */
 export const TableCellActions: ForwardRefComponent<TableCellActionsProps> = React.forwardRef((props, ref) => {
   const state = useTableCellActions_unstable(props, ref);
diff --git a/packages/react-components/react-table/src/components/TableCellActions/renderTableCellActions.tsx b/packages/react-components/react-table/src/components/TableCellActions/renderTableCellActions.tsx
index 9ac7264ff869a8..dbc8dc61307603 100644
--- a/packages/react-components/react-table/src/components/TableCellActions/renderTableCellActions.tsx
+++ b/packages/react-components/react-table/src/components/TableCellActions/renderTableCellActions.tsx
@@ -8,6 +8,5 @@ import type { TableCellActionsState, TableCellActionsSlots } from './TableCellAc
 export const renderTableCellActions_unstable = (state: TableCellActionsState) => {
   const { slots, slotProps } = getSlots<TableCellActionsSlots>(state);
 
-  // TODO Add additional slots in the appropriate place
   return <slots.root {...slotProps.root} />;
 };
diff --git a/packages/react-components/react-table/src/components/TableCellLayout/TableCellLayout.tsx b/packages/react-components/react-table/src/components/TableCellLayout/TableCellLayout.tsx
index 59c7638e1afc12..8c1489123eefbd 100644
--- a/packages/react-components/react-table/src/components/TableCellLayout/TableCellLayout.tsx
+++ b/packages/react-components/react-table/src/components/TableCellLayout/TableCellLayout.tsx
@@ -7,7 +7,7 @@ import type { TableCellLayoutProps } from './TableCellLayout.types';
 import type { ForwardRefComponent } from '@fluentui/react-utilities';
 
 /**
- * TableCellLayout component - TODO: add more docs
+ * TableCellLayout component
  */
 export const TableCellLayout: ForwardRefComponent<TableCellLayoutProps> = React.forwardRef((props, ref) => {
   const state = useTableCellLayout_unstable(props, ref);
diff --git a/packages/react-components/react-table/src/components/TableHeader/TableHeader.test.tsx b/packages/react-components/react-table/src/components/TableHeader/TableHeader.test.tsx
index ed69a6190a688c..18ec788b39814d 100644
--- a/packages/react-components/react-table/src/components/TableHeader/TableHeader.test.tsx
+++ b/packages/react-components/react-table/src/components/TableHeader/TableHeader.test.tsx
@@ -18,8 +18,6 @@ describe('TableHeader', () => {
     },
   });
 
-  // TODO add more tests here, and create visual regression tests in /apps/vr-tests
-
   it('renders a default state', () => {
     const result = render(
       <TableHeader>
diff --git a/packages/react-components/react-table/src/components/TableHeader/TableHeader.tsx b/packages/react-components/react-table/src/components/TableHeader/TableHeader.tsx
index 1f0575836ca8c3..90de354f498435 100644
--- a/packages/react-components/react-table/src/components/TableHeader/TableHeader.tsx
+++ b/packages/react-components/react-table/src/components/TableHeader/TableHeader.tsx
@@ -6,7 +6,7 @@ import type { TableHeaderProps } from './TableHeader.types';
 import type { ForwardRefComponent } from '@fluentui/react-utilities';
 
 /**
- * TableHeader component - TODO: add more docs
+ * TableHeader component
  */
 export const TableHeader: ForwardRefComponent<TableHeaderProps> = React.forwardRef((props, ref) => {
   const state = useTableHeader_unstable(props, ref);
diff --git a/packages/react-components/react-table/src/components/TableHeader/useTableHeaderStyles.ts b/packages/react-components/react-table/src/components/TableHeader/useTableHeaderStyles.ts
index 155f6e6a6ee4ce..2b50d32e7ffb1c 100644
--- a/packages/react-components/react-table/src/components/TableHeader/useTableHeaderStyles.ts
+++ b/packages/react-components/react-table/src/components/TableHeader/useTableHeaderStyles.ts
@@ -11,14 +11,6 @@ const useFlexLayoutStyles = makeStyles({
   root: {
     display: 'block',
   },
-
-  roottable: {
-    display: 'table-row-group',
-  },
-
-  rootFlex: {
-    display: 'block',
-  },
 });
 
 const useTableLayoutStyles = makeStyles({
diff --git a/packages/react-components/react-table/src/components/TableHeaderCell/TableHeaderCell.tsx b/packages/react-components/react-table/src/components/TableHeaderCell/TableHeaderCell.tsx
index 7eb0dcca563081..328e91f4436a2d 100644
--- a/packages/react-components/react-table/src/components/TableHeaderCell/TableHeaderCell.tsx
+++ b/packages/react-components/react-table/src/components/TableHeaderCell/TableHeaderCell.tsx
@@ -6,7 +6,7 @@ import type { TableHeaderCellProps } from './TableHeaderCell.types';
 import type { ForwardRefComponent } from '@fluentui/react-utilities';
 
 /**
- * TableHeaderCell component - TODO: add more docs
+ * TableHeaderCell component
  */
 export const TableHeaderCell: ForwardRefComponent<TableHeaderCellProps> = React.forwardRef((props, ref) => {
   const state = useTableHeaderCell_unstable(props, ref);
diff --git a/packages/react-components/react-table/src/components/TableRow/TableRow.test.tsx b/packages/react-components/react-table/src/components/TableRow/TableRow.test.tsx
index 84c9998fbc1844..2e82a0a45242e9 100644
--- a/packages/react-components/react-table/src/components/TableRow/TableRow.test.tsx
+++ b/packages/react-components/react-table/src/components/TableRow/TableRow.test.tsx
@@ -20,8 +20,6 @@ describe('TableRow', () => {
     displayName: 'TableRow',
   });
 
-  // TODO add more tests here, and create visual regression tests in /apps/vr-tests
-
   it('renders a default state', () => {
     const result = render(
       <TableRow>
diff --git a/packages/react-components/react-table/src/components/TableRow/TableRow.tsx b/packages/react-components/react-table/src/components/TableRow/TableRow.tsx
index b6e38ec40e1cd4..5c115582e06118 100644
--- a/packages/react-components/react-table/src/components/TableRow/TableRow.tsx
+++ b/packages/react-components/react-table/src/components/TableRow/TableRow.tsx
@@ -6,7 +6,7 @@ import type { TableRowProps } from './TableRow.types';
 import type { ForwardRefComponent } from '@fluentui/react-utilities';
 
 /**
- * TableRow component - TODO: add more docs
+ * TableRow component
  */
 export const TableRow: ForwardRefComponent<TableRowProps> = React.forwardRef((props, ref) => {
   const state = useTableRow_unstable(props, ref);
diff --git a/packages/react-components/react-table/src/components/TableRow/TableRow.types.ts b/packages/react-components/react-table/src/components/TableRow/TableRow.types.ts
index 9965025e3096f9..83373b933e5e26 100644
--- a/packages/react-components/react-table/src/components/TableRow/TableRow.types.ts
+++ b/packages/react-components/react-table/src/components/TableRow/TableRow.types.ts
@@ -22,4 +22,6 @@ export type TableRowProps = ComponentProps<TableRowSlots> & {
  */
 export type TableRowState = ComponentState<TableRowSlots> &
   Pick<TableContextValue, 'noNativeElements' | 'size'> &
-  Pick<Required<TableRowProps>, 'appearance'>;
+  Pick<Required<TableRowProps>, 'appearance'> & {
+    isHeaderRow: boolean;
+  };
diff --git a/packages/react-components/react-table/src/components/TableRow/renderTableRow.tsx b/packages/react-components/react-table/src/components/TableRow/renderTableRow.tsx
index 9e6a7a33f76d54..d89b87d07b55c3 100644
--- a/packages/react-components/react-table/src/components/TableRow/renderTableRow.tsx
+++ b/packages/react-components/react-table/src/components/TableRow/renderTableRow.tsx
@@ -8,6 +8,5 @@ import type { TableRowState, TableRowSlots } from './TableRow.types';
 export const renderTableRow_unstable = (state: TableRowState) => {
   const { slots, slotProps } = getSlots<TableRowSlots>(state);
 
-  // TODO Add additional slots in the appropriate place
   return <slots.root {...slotProps.root} />;
 };
diff --git a/packages/react-components/react-table/src/components/TableRow/useTableRow.ts b/packages/react-components/react-table/src/components/TableRow/useTableRow.ts
index 2707d66c523eee..8bd052fe8fe345 100644
--- a/packages/react-components/react-table/src/components/TableRow/useTableRow.ts
+++ b/packages/react-components/react-table/src/components/TableRow/useTableRow.ts
@@ -1,8 +1,9 @@
 import * as React from 'react';
 import { getNativeElementProps, useMergedRefs } from '@fluentui/react-utilities';
+import { useFocusVisible, useFocusWithin } from '@fluentui/react-tabster';
 import type { TableRowProps, TableRowState } from './TableRow.types';
 import { useTableContext } from '../../contexts/tableContext';
-import { useFocusVisible, useFocusWithin } from '@fluentui/react-tabster';
+import { useIsInTableHeader } from '../../contexts/tableHeaderContext';
 
 /**
  * Create the state required to render TableRow.
@@ -18,6 +19,7 @@ export const useTableRow_unstable = (props: TableRowProps, ref: React.Ref<HTMLEl
   const rootComponent = props.as ?? noNativeElements ? 'div' : 'tr';
   const focusVisibleRef = useFocusVisible();
   const focusWithinRef = useFocusWithin();
+  const isHeaderRow = useIsInTableHeader();
 
   return {
     components: {
@@ -31,5 +33,6 @@ export const useTableRow_unstable = (props: TableRowProps, ref: React.Ref<HTMLEl
     size,
     noNativeElements,
     appearance: props.appearance ?? 'none',
+    isHeaderRow,
   };
 };
diff --git a/packages/react-components/react-table/src/components/TableRow/useTableRowStyles.ts b/packages/react-components/react-table/src/components/TableRow/useTableRowStyles.ts
index 88c9b0e4d43776..7bd0739add42b8 100644
--- a/packages/react-components/react-table/src/components/TableRow/useTableRowStyles.ts
+++ b/packages/react-components/react-table/src/components/TableRow/useTableRowStyles.ts
@@ -5,7 +5,6 @@ import type { SlotClassNames } from '@fluentui/react-utilities';
 import { tableCellActionsClassNames } from '../TableCellActions/useTableCellActionsStyles';
 import { tableSelectionCellClassNames } from '../TableSelectionCell/useTableSelectionCellStyles';
 import { createCustomFocusIndicatorStyle } from '@fluentui/react-tabster';
-import { useIsInTableHeader } from '../../contexts/tableHeaderContext';
 
 export const tableRowClassName = 'fui-TableRow';
 export const tableRowClassNames: SlotClassNames<TableRowSlots> = {
@@ -151,7 +150,6 @@ const useStyles = makeStyles({
  * Apply styling to the TableRow slots based on the state
  */
 export const useTableRowStyles_unstable = (state: TableRowState): TableRowState => {
-  const isHeaderRow = useIsInTableHeader();
   const styles = useStyles();
   const layoutStyles = {
     table: useTableLayoutStyles(),
@@ -160,11 +158,11 @@ export const useTableRowStyles_unstable = (state: TableRowState): TableRowState
   state.root.className = mergeClasses(
     tableRowClassNames.root,
     styles.root,
-    !isHeaderRow && styles.rootInteractive,
+    !state.isHeaderRow && styles.rootInteractive,
     styles[state.size],
     state.noNativeElements ? layoutStyles.flex.root : layoutStyles.table.root,
     styles[state.appearance],
-    state.appearance === 'none' && !isHeaderRow && styles.noAppearanceFocusWithin,
+    state.appearance === 'none' && !state.isHeaderRow && styles.noAppearanceFocusWithin,
     state.root.className,
   );
 
diff --git a/packages/react-components/react-table/src/components/TableSelectionCell/TableSelectionCell.tsx b/packages/react-components/react-table/src/components/TableSelectionCell/TableSelectionCell.tsx
index 329fab4f764dcc..5f67261dfe749b 100644
--- a/packages/react-components/react-table/src/components/TableSelectionCell/TableSelectionCell.tsx
+++ b/packages/react-components/react-table/src/components/TableSelectionCell/TableSelectionCell.tsx
@@ -6,7 +6,7 @@ import type { TableSelectionCellProps } from './TableSelectionCell.types';
 import type { ForwardRefComponent } from '@fluentui/react-utilities';
 
 /**
- * TableSelectionCell component - TODO: add more docs
+ * TableSelectionCell component
  */
 export const TableSelectionCell: ForwardRefComponent<TableSelectionCellProps> = React.forwardRef((props, ref) => {
   const state = useTableSelectionCell_unstable(props, ref);
diff --git a/packages/react-components/react-table/src/components/TableSelectionCell/TableSelectionCell.types.ts b/packages/react-components/react-table/src/components/TableSelectionCell/TableSelectionCell.types.ts
index 15b93af1f00ba4..5fb7baeec76df3 100644
--- a/packages/react-components/react-table/src/components/TableSelectionCell/TableSelectionCell.types.ts
+++ b/packages/react-components/react-table/src/components/TableSelectionCell/TableSelectionCell.types.ts
@@ -18,7 +18,7 @@ export type TableSelectionCellSlots = {
 /**
  * TableSelectionCell Props
  */
-export type TableSelectionCellProps = ComponentProps<Partial<Omit<TableSelectionCellSlots, 'media'>>> & {
+export type TableSelectionCellProps = ComponentProps<Partial<TableSelectionCellSlots>> & {
   /**
    * A table can have two kinds of selection modes.
    * @default checkbox