@trackunit/react-table 0.0.348 → 0.0.351

package/index.cjs.js

@@ -12,6 +12,7 @@ var reactRouter = require('@tanstack/react-router');
 var reactTable = require('@tanstack/react-table');
 var reactTableBaseComponents = require('@trackunit/react-table-base-components');
 var reactTablePagination = require('@trackunit/react-table-pagination');
+var tailwindMerge = require('tailwind-merge');
 var reactFormComponents = require('@trackunit/react-form-components');
 var update = require('immutability-helper');
 var reactDnd = require('react-dnd');
@@ -125,7 +126,7 @@ const cvaActionSheet = cssClassVarianceUtilities.cvaMerge([
     "sm:grid-cols-[min-content,1fr,min-content]",
     "sm:grid-rows-1",
     "p-2",
-    "bg-blue-600",
+    "bg-primary-600",
     "gap-1",
     "rounded-2xl",
     "items-center",
@@ -302,7 +303,7 @@ const Table = (_a) => {
         rowHeight,
     });
     const hasResults = props.getRowModel().rows.length > 0;
-    return (jsxRuntime.jsxs(reactComponents.Card, { className: `flex flex-col overflow-hidden ${props.className || ""}`, dataTestId: props.dataTestId, children: [(props.headerLeftActions || props.headerRightActions) && (jsxRuntime.jsxs("div", { className: "z-default flex justify-between gap-2 p-2", children: [jsxRuntime.jsx("div", { className: "flex items-center", children: props.headerLeftActions }), jsxRuntime.jsx("div", { className: "flex items-center", children: props.headerRightActions })] })), jsxRuntime.jsx("div", { className: "h-full overflow-x-auto overflow-y-scroll border-b border-t border-gray-300", onScroll: e => fetchMoreOnBottomReached(e.target), ref: tableContainerRef, children: jsxRuntime.jsxs(reactTableBaseComponents.TableRoot, { style: {
+    return (jsxRuntime.jsxs(reactComponents.Card, { className: tailwindMerge.twMerge("flex flex-col overflow-hidden", props.className), dataTestId: props.dataTestId, children: [(props.headerLeftActions || props.headerRightActions) && (jsxRuntime.jsxs("div", { className: "z-default flex justify-between gap-2 p-2", children: [jsxRuntime.jsx("div", { className: "flex items-center", children: props.headerLeftActions }), jsxRuntime.jsx("div", { className: "flex items-center", children: props.headerRightActions })] })), jsxRuntime.jsx("div", { className: "h-full overflow-x-auto overflow-y-scroll border-b border-t border-gray-300", onScroll: e => fetchMoreOnBottomReached(e.target), ref: tableContainerRef, children: jsxRuntime.jsxs(reactTableBaseComponents.TableRoot, { style: {
                         height: hasResults ? "auto" : "100%",
                         width: "100%",
                         position: "relative",
@@ -715,7 +716,7 @@ const useTableSelection = ({ data, defaultSelectedIds, enableRowSelection = true
             alignment: "left",
             columnFilterLabel: t("table.selection.label"),
         },
-    }), [columnHelper]);
+    }), [columnHelper, t]);
     const selectionTableState = React.useMemo(() => ({
         rowSelection,
     }), [rowSelection]);

package/index.esm.js

@@ -10,6 +10,7 @@ import { flexRender, useReactTable, getSortedRowModel, getCoreRowModel, createCo
 export { createColumnHelper } from '@tanstack/react-table';
 import { TableRoot, Thead, Tr, Th, SortIndicator, ResizeHandle, Tbody, Td } from '@trackunit/react-table-base-components';
 import { useInfiniteScroll, noPagination } from '@trackunit/react-table-pagination';
+import { twMerge } from 'tailwind-merge';
 import { Toggle, RadioGroup, RadioItem, Checkbox } from '@trackunit/react-form-components';
 import update from 'immutability-helper';
 import { DndProvider, useDrop, useDrag } from 'react-dnd';
@@ -100,7 +101,7 @@ const cvaActionSheet = cvaMerge([
     "sm:grid-cols-[min-content,1fr,min-content]",
     "sm:grid-rows-1",
     "p-2",
-    "bg-blue-600",
+    "bg-primary-600",
     "gap-1",
     "rounded-2xl",
     "items-center",
@@ -277,7 +278,7 @@ const Table = (_a) => {
         rowHeight,
     });
     const hasResults = props.getRowModel().rows.length > 0;
-    return (jsxs(Card, { className: `flex flex-col overflow-hidden ${props.className || ""}`, dataTestId: props.dataTestId, children: [(props.headerLeftActions || props.headerRightActions) && (jsxs("div", { className: "z-default flex justify-between gap-2 p-2", children: [jsx("div", { className: "flex items-center", children: props.headerLeftActions }), jsx("div", { className: "flex items-center", children: props.headerRightActions })] })), jsx("div", { className: "h-full overflow-x-auto overflow-y-scroll border-b border-t border-gray-300", onScroll: e => fetchMoreOnBottomReached(e.target), ref: tableContainerRef, children: jsxs(TableRoot, { style: {
+    return (jsxs(Card, { className: twMerge("flex flex-col overflow-hidden", props.className), dataTestId: props.dataTestId, children: [(props.headerLeftActions || props.headerRightActions) && (jsxs("div", { className: "z-default flex justify-between gap-2 p-2", children: [jsx("div", { className: "flex items-center", children: props.headerLeftActions }), jsx("div", { className: "flex items-center", children: props.headerRightActions })] })), jsx("div", { className: "h-full overflow-x-auto overflow-y-scroll border-b border-t border-gray-300", onScroll: e => fetchMoreOnBottomReached(e.target), ref: tableContainerRef, children: jsxs(TableRoot, { style: {
                         height: hasResults ? "auto" : "100%",
                         width: "100%",
                         position: "relative",
@@ -690,7 +691,7 @@ const useTableSelection = ({ data, defaultSelectedIds, enableRowSelection = true
             alignment: "left",
             columnFilterLabel: t("table.selection.label"),
         },
-    }), [columnHelper]);
+    }), [columnHelper, t]);
     const selectionTableState = useMemo(() => ({
         rowSelection,
     }), [rowSelection]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trackunit/react-table",
-  "version": "0.0.348",
+  "version": "0.0.351",
   "repository": "https://github.com/Trackunit/manager",
   "license": "SEE LICENSE IN LICENSE.txt",
   "engines": {
@@ -22,7 +22,8 @@
     "@trackunit/ui-icons": "*",
     "@trackunit/i18n-library-translation": "*",
     "@tanstack/react-router": "1.31.6",
-    "@trackunit/shared-utils": "*"
+    "@trackunit/shared-utils": "*",
+    "tailwind-merge": "^2.0.0"
   },
   "module": "./index.esm.js",
   "main": "./index.cjs.js"

package/src/menus/ColumnFilter.d.ts

@@ -16,7 +16,7 @@ export interface ColumnFilterProps<TColumnFilter extends object, TColumnFilterVa
  * @param {ColumnFilterProps<TColumnFilter, TColumnFilterValue>} props - The props object containing necessary properties.
  * @returns {JSX.Element | null} A React JSX element representing the ColumnFilter component or null if columns are not provided.
  */
-export declare const ColumnFilter: <TColumnFilter extends Object, TColumnFilterValue>({ columns, setColumnOrder, defaultColumnOrder, columnOrder, onUserEvent, }: ColumnFilterProps<TColumnFilter, TColumnFilterValue>) => JSX.Element | null;
+export declare const ColumnFilter: <TColumnFilter extends object, TColumnFilterValue>({ columns, setColumnOrder, defaultColumnOrder, columnOrder, onUserEvent, }: ColumnFilterProps<TColumnFilter, TColumnFilterValue>) => JSX.Element | null;
 export interface ColumnFiltersDragAndDropProps<TColumnFiltersDragAndDrop extends object, TColumnFiltersDragAndDropValue> {
     columns: Column<TColumnFiltersDragAndDrop, TColumnFiltersDragAndDropValue>[];
     setColumnOrder: (updater: Updater<ColumnOrderState>) => void;

package/src/menus/Sorting.d.ts

@@ -11,5 +11,5 @@ interface SortingProps<TSorting extends object, TSortingValue> {
  * @param {SortingProps<TSorting, TSortingValue>} props - The props object containing sorting properties.
  * @returns {JSX.Element | null} A React JSX element representing the Sorting component or null if there are no sortable columns.
  */
-export declare const Sorting: <TSorting extends Object, TSortingValue>({ columns, }: SortingProps<TSorting, TSortingValue>) => JSX.Element | null;
+export declare const Sorting: <TSorting extends object, TSortingValue>({ columns, }: SortingProps<TSorting, TSortingValue>) => JSX.Element | null;
 export {};