diff --git a/src/components/table/TableRow.tsx b/src/components/table/TableRow.tsx
index 9e3de919..e3421110 100644
--- a/src/components/table/TableRow.tsx
+++ b/src/components/table/TableRow.tsx
@@ -3,14 +3,11 @@ import {
   splitProps,
   children as resolveChildren,
   JSX,
-  For,
-  Show,
+  createMemo,
 } from "solid-js";
 import clsx from "clsx";
 import { twMerge } from "tailwind-merge";
 import { type IComponentBaseProps } from "../types";
-import TableCell from "./TableCell";
-import TableHeadCell from "./TableHeadCell";
 
 export type TableRowProps = JSX.HTMLAttributes<HTMLTableRowElement> &
   IComponentBaseProps & {
@@ -24,34 +21,24 @@ const TableRow: Component<TableRowProps> = (props) => {
     "class",
     "active",
     "noCell",
+    "className",
+    "class",
   ]);
-  const classAttr = () =>
+  const classes = createMemo(() =>
     twMerge(
-      clsx(local.class, {
+      clsx({
         active: local.active,
-      })
-    );
+      }),
+      local.className,
+      local.class
+    )
+  );
 
   const resolved = resolveChildren(() => local.children);
 
   return (
-    <tr {...rest} class={classAttr()}>
-      <Show
-        when={local.noCell}
-        fallback={
-          <For each={resolved.toArray()}>
-            {(child, i) =>
-              i() === 0 ? (
-                <TableHeadCell>{child}</TableHeadCell>
-              ) : (
-                <TableCell>{child}</TableCell>
-              )
-            }
-          </For>
-        }
-      >
-        {resolved()}
-      </Show>
+    <tr {...rest} class={classes()}>
+      {resolved()}
     </tr>
   );
 };