Merge commit 'ce1d5f90156913e27652261c998fe32bc8e0545b' into iipbs_common

packages/common/components/src/ui/button/index.tsx

@@ -24,7 +24,7 @@ const buttonVariants = cva(
       size: {
         default: "h-[3.2rem] px-10",
         xs: "h-8 px-2 !text-[1.1rem]",
-        sm: "h-10 px-4",
+        sm: "h-10 px-4 !text-[1.2rem]",
         lg: "h-16 px-12",
         icon: "h-10 w-10",
       },

packages/common/components/src/ui/data-table/data-table.stories.tsx

@@ -1,5 +1,9 @@
 import type { Meta, StoryObj } from "@storybook/react";
-import { createColumnHelper } from "@tanstack/react-table";
+import {
+  createColumnHelper,
+  getCoreRowModel,
+  useReactTable,
+} from "@tanstack/react-table";
 import { DataTable } from ".";
 
 const meta: Meta<typeof DataTable> = {
@@ -14,8 +18,6 @@ const meta: Meta<typeof DataTable> = {
       },
       source: {
         code: `
-import { createColumnHelper } from "@tanstack/react-table";
-
 type Person = {
   firstName: string;
   lastName: string;
@@ -25,7 +27,7 @@ type Person = {
   progress: number;
 };
 
-const defaultData: Person[] = [
+const data: Person[] = [
   {
     firstName: "tanner",
     lastName: "linsley",
@@ -78,7 +80,17 @@ const columns = [
   }),
 ];
 
-return <Table data={defaultData} columns={columns} />;
+
+function Table() {
+  const table = useReactTable({
+    data,
+    columns,
+    getCoreRowModel: getCoreRowModel(),
+  });
+
+  return <DataTable table={table} />;
+}
+
         `,
       },
     },
@@ -89,69 +101,77 @@ export default meta;
 type Story = StoryObj<typeof DataTable>;
 
 export const Default: Story = {
-  render: () => {
-    type Person = {
-      firstName: string;
-      lastName: string;
-      age: number;
-      visits: number;
-      status: string;
-      progress: number;
-    };
-
-    const defaultData: Person[] = [
-      {
-        firstName: "tanner",
-        lastName: "linsley",
-        age: 24,
-        visits: 100,
-        status: "In Relationship",
-        progress: 50,
-      },
-      {
-        firstName: "tandy",
-        lastName: "miller",
-        age: 40,
-        visits: 40,
-        status: "Single",
-        progress: 80,
-      },
-      {
-        firstName: "joe",
-        lastName: "dirte",
-        age: 45,
-        visits: 20,
-        status: "Complicated",
-        progress: 10,
-      },
-    ];
-
-    const columnHelper = createColumnHelper<Person>();
-
-    const columns = [
-      columnHelper.accessor("firstName", {
-        cell: (info) => info.getValue(),
-      }),
-      columnHelper.accessor((row) => row.lastName, {
-        id: "lastName",
-        cell: (info) => <i>{info.getValue()}</i>,
-        header: () => <span>Last Name</span>,
-      }),
-      columnHelper.accessor("age", {
-        header: () => "Age",
-        cell: (info) => info.renderValue(),
-      }),
-      columnHelper.accessor("visits", {
-        header: () => <span>Visits</span>,
-      }),
-      columnHelper.accessor("status", {
-        header: "Status",
-      }),
-      columnHelper.accessor("progress", {
-        header: "Profile Progress",
-      }),
-    ];
-
-    return <DataTable data={defaultData} columns={columns} />;
-  },
+  render: () => <Table />,
 };
+
+type Person = {
+  firstName: string;
+  lastName: string;
+  age: number;
+  visits: number;
+  status: string;
+  progress: number;
+};
+
+const data: Person[] = [
+  {
+    firstName: "tanner",
+    lastName: "linsley",
+    age: 24,
+    visits: 100,
+    status: "In Relationship",
+    progress: 50,
+  },
+  {
+    firstName: "tandy",
+    lastName: "miller",
+    age: 40,
+    visits: 40,
+    status: "Single",
+    progress: 80,
+  },
+  {
+    firstName: "joe",
+    lastName: "dirte",
+    age: 45,
+    visits: 20,
+    status: "Complicated",
+    progress: 10,
+  },
+];
+
+const columnHelper = createColumnHelper<Person>();
+
+const columns = [
+  columnHelper.accessor("firstName", {
+    cell: (info) => info.getValue(),
+  }),
+  columnHelper.accessor((row) => row.lastName, {
+    id: "lastName",
+    cell: (info) => <i>{info.getValue()}</i>,
+    header: () => <span>Last Name</span>,
+  }),
+  columnHelper.accessor("age", {
+    header: () => "Age",
+    cell: (info) => info.renderValue(),
+  }),
+  columnHelper.accessor("visits", {
+    header: () => <span>Visits</span>,
+  }),
+  columnHelper.accessor("status", {
+    header: "Status",
+  }),
+  columnHelper.accessor("progress", {
+    header: "Profile Progress",
+  }),
+];
+
+function Table() {
+  const table = useReactTable({
+    data,
+    columns,
+    getCoreRowModel: getCoreRowModel(),
+  });
+
+  return <DataTable table={table} />;
+}

packages/common/components/src/ui/data-table/index.tsx

@@ -1,8 +1,5 @@
 import {
   flexRender,
-  getCoreRowModel,
-  useReactTable,
-  type ColumnDef,
   type RowData,
   type Table as TableType,
 } from "@tanstack/react-table";
@@ -39,19 +36,9 @@ function THead<T>({ table }: { table: TableType<T> }) {
   );
 }
 
-interface TableProps<T> {
-  data: T[];
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  columns: ColumnDef<T, any>[];
-}
-
-function DataTable<T>({ data, columns }: TableProps<T>) {
-  const table = useReactTable({
-    data,
-    columns,
-    getCoreRowModel: getCoreRowModel(),
-  });
+type TableProps<T> = { table: TableType<T> };
 
+function DataTable<T>({ table }: TableProps<T>) {
   return (
     <Table className="w-full">
       <THead table={table} />