Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import { TanstackTable } from '@/lib';
import {
TrashCan,
Download,
TableSplit as TableIcon,
} from '@carbon/icons-react';
import { Breadcrumb, BreadcrumbItem, Button } from '@carbon/react';
import { TrashCan, Download } from '@carbon/icons-react';
import { Button } from '@carbon/react';
import commonStyles from './scss/common.module.scss';

const ExampleTanstack = () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useMemo } from 'react';
import { TanstackTable } from '@/lib';
import { Add as AddIcon, TableSplit as TableIcon } from '@carbon/icons-react';
import { Breadcrumb, BreadcrumbItem, Button } from '@carbon/react';
import { Add as AddIcon } from '@carbon/icons-react';
import { Button } from '@carbon/react';
import commonStyles from './scss/common.module.scss';

const ExampleWithColumnCustomization = () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import React, { useState, useMemo } from 'react';
import { TanstackTable } from '@/lib';
import { TableSplit as TableIcon } from '@carbon/icons-react';
import { Breadcrumb, BreadcrumbItem } from '@carbon/react';
import commonStyles from './scss/common.module.scss';

/**
Expand Down Expand Up @@ -276,7 +274,7 @@ const ExampleWithCustomFilters = () => {
[]
);

// Handle custom filter apply
// Handle custom filter apply — filterValues is the flat filter state object.
const handleCustomFiltersApply = (filterValues) => {
let filtered = [...data];

Expand Down Expand Up @@ -325,11 +323,13 @@ const ExampleWithCustomFilters = () => {
filtered = filtered.filter((item) => item.age >= filterValues.ageSlider);
}

// 8. Date filter - Specific date
// 8. Date filter - Specific date (Flatpickr gives a Date object; compare as ISO string)
if (filterValues.specificDate) {
filtered = filtered.filter(
(item) => item.joinDate === filterValues.specificDate
);
const d = new Date(filterValues.specificDate);
const selectedISO = `${d.getFullYear()}-${String(
d.getMonth() + 1
).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
filtered = filtered.filter((item) => item.joinDate === selectedISO);
}

// 9. DateRange filter
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import React, { useState, useMemo } from 'react';
import { TanstackTable } from '@/lib';
import { TableSplit as TableIcon } from '@carbon/icons-react';
import { Breadcrumb, BreadcrumbItem } from '@carbon/react';
import commonStyles from './scss/common.module.scss';

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
import { useState } from 'react';
import { TanstackTable } from '@/lib';
import { Add as AddIcon, TableSplit as TableIcon } from '@carbon/icons-react';
import {
Breadcrumb,
BreadcrumbItem,
Button,
Tag,
UnorderedList,
ListItem,
} from '@carbon/react';
import { Add as AddIcon } from '@carbon/icons-react';
import { Button, Tag, UnorderedList, ListItem } from '@carbon/react';
import commonStyles from './scss/common.module.scss';

const formatDateForStorage = (date) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import { useState } from 'react';
import { TanstackTable } from '@/lib';
import {
Add as AddIcon,
Folder,
TableSplit as TableIcon,
} from '@carbon/icons-react';
import { Breadcrumb, BreadcrumbItem, Button, Toggle } from '@carbon/react';
import { Add as AddIcon, Folder } from '@carbon/icons-react';
import { Button, Toggle } from '@carbon/react';
import commonStyles from './scss/common.module.scss';
import styles from './scss/emptyState.module.scss';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
import { useState } from 'react';
import { TanstackTable } from '@/lib';
import {
Add as AddIcon,
TableSplit as TableIcon,
TrashCan,
Download,
} from '@carbon/icons-react';
import {
Breadcrumb,
BreadcrumbItem,
Button,
UnorderedList,
ListItem,
} from '@carbon/react';
import { Add as AddIcon, TrashCan, Download } from '@carbon/icons-react';
import { Button, UnorderedList, ListItem } from '@carbon/react';
import commonStyles from './scss/common.module.scss';
import styles from './scss/expansionRadioSticky.module.scss';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
import React, { useMemo } from 'react';
import { TanstackTable } from '@/lib';
import {
TableSplit as TableIcon,
TrashCan,
Download,
} from '@carbon/icons-react';
import { Breadcrumb, BreadcrumbItem } from '@carbon/react';
import { TrashCan, Download } from '@carbon/icons-react';
import commonStyles from './scss/common.module.scss';

// Sample data generator
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { TanstackTable } from '@/lib';
import { Add as AddIcon, TableSplit as TableIcon } from '@carbon/icons-react';
import { Breadcrumb, BreadcrumbItem, Button } from '@carbon/react';
import { Add as AddIcon } from '@carbon/icons-react';
import { Button } from '@carbon/react';
import commonStyles from './scss/common.module.scss';

const ExampleLoadingState = () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { useMemo, useState } from 'react';
import { TanstackTable } from '@/lib';
import { useTranslation } from 'react-i18next';
import { TableSplit as TableIcon } from '@carbon/icons-react';
import { Breadcrumb, BreadcrumbItem, Dropdown } from '@carbon/react';
import { Dropdown } from '@carbon/react';
import commonStyles from './scss/common.module.scss';

const LocalizedTable = () => {
Expand Down
38 changes: 28 additions & 10 deletions react/community/tanstack-table-carbon/src/examples/mixTable.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable max-lines-per-function */
import { useEffect, useState } from 'react';
import { TanstackTable, TableOverflowMenu } from '@/lib';
import {
Expand All @@ -8,11 +7,8 @@ import {
Renew,
ChevronUp,
ChevronDown,
TableSplit as TableIcon,
} from '@carbon/icons-react';
import {
Breadcrumb,
BreadcrumbItem,
Button,
Tag,
Dropdown,
Expand Down Expand Up @@ -148,7 +144,7 @@ const MixTable = ({ toggleHeaderContent, isHeaderContentVisible }) => {
await new Promise((resolve) => setTimeout(resolve, 3500));

// Generate mock data
const data = generateMockData(50).sort((a, b) =>
const data = generateMockData(10000).sort((a, b) =>
a.userId.localeCompare(b.userId)
);
setTableData(data);
Expand Down Expand Up @@ -340,29 +336,51 @@ const MixTable = ({ toggleHeaderContent, isHeaderContentVisible }) => {
},
{
accessorKey: 'joinDate',
// accessorFn returns the formatted display string so TanStack's built-in
// includesString globalFilterFn can match "jan", "2022", etc.
// The dateRange filterFn in columnHelpers reads row.original.joinDate
// (the raw ISO string) so side-panel date filtering is unaffected.
accessorFn: (row) => formatJoinDateForDisplay(row.joinDate),
// ISO strings ("2022-01-15") sort lexicographically = chronologically,
// so read raw value from row.original to sort correctly.
sortingFn: (rowA, rowB) =>
(rowA.original.joinDate ?? '').localeCompare(
rowB.original.joinDate ?? ''
),
header: 'Join Date',
enableSorting: true,
enableColumnFilter: true,
meta: {
filterVariant: 'dateRange',
dateFormat: 'Y-m-d',
editable: true,
editableType: 'date',
},
cell: ({ getValue }) => formatJoinDateForDisplay(getValue()),
cell: ({ getValue }) => getValue(),
size: 150,
},
{
accessorKey: 'resignDate',
// accessorFn returns the formatted display string for global search.
// The date filterFn in columnHelpers reads row.original.resignDate
// (the raw ISO string) so side-panel date filtering is unaffected.
accessorFn: (row) => {
return row.resignDate ? formatJoinDateForDisplay(row.resignDate) : '-';
},
// ISO strings sort lexicographically = chronologically.
// Null resignDates sort to the end in both directions.
sortingFn: (rowA, rowB) => {
const a = rowA.original.resignDate ?? '';
const b = rowB.original.resignDate ?? '';
return a.localeCompare(b);
},
header: 'Resign Date',
enableSorting: true,
enableColumnFilter: true,
meta: {
filterVariant: 'date',
},
cell: ({ getValue }) => {
const value = getValue();
return value ? formatJoinDateForDisplay(value) : '-';
},
cell: ({ getValue }) => getValue(),
size: 150,
},
{
Expand Down
97 changes: 53 additions & 44 deletions react/community/tanstack-table-carbon/src/examples/mixedFilters.jsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
import React, { useState, useMemo } from 'react';
import React, { useState, useMemo, useEffect } from 'react';
import { TanstackTable } from '@/lib';
import {
TableSplit as TableIcon,
TrashCan,
Download,
} from '@carbon/icons-react';
import {
Breadcrumb,
BreadcrumbItem,
UnorderedList,
ListItem,
} from '@carbon/react';
import { TrashCan, Download } from '@carbon/icons-react';
import { UnorderedList, ListItem } from '@carbon/react';
import commonStyles from './scss/common.module.scss';

/**
Expand All @@ -20,38 +11,54 @@ import commonStyles from './scss/common.module.scss';
* Some filters are grouped in accordion sections, others are standalone.
*/

const SOURCE_DATA = [
{
id: 1,
name: 'John Doe',
age: 28,
department: 'Engineering',
salary: 75000,
status: 'Active',
verified: true,
},
{
id: 2,
name: 'Jane Smith',
age: 34,
department: 'Marketing',
salary: 65000,
status: 'Active',
verified: true,
},
{
id: 3,
name: 'Bob Johnson',
age: 45,
department: 'Sales',
salary: 80000,
status: 'Inactive',
verified: false,
},
];

const ExampleWithMixedFilters = () => {
const [data] = useState([
{
id: 1,
name: 'John Doe',
age: 28,
department: 'Engineering',
salary: 75000,
status: 'Active',
verified: true,
},
{
id: 2,
name: 'Jane Smith',
age: 34,
department: 'Marketing',
salary: 65000,
status: 'Active',
verified: true,
},
{
id: 3,
name: 'Bob Johnson',
age: 45,
department: 'Sales',
salary: 80000,
status: 'Inactive',
verified: false,
},
]);
const [isLoading, setIsLoading] = useState(true);
const [filteredData, setFilteredData] = useState([]);

// Simulate API call with initial loading delay
useEffect(() => {
const fetchData = async () => {
setIsLoading(true);

// Simulate API delay
await new Promise((resolve) => setTimeout(resolve, 3500));

setFilteredData(SOURCE_DATA);
setIsLoading(false);
};

const [filteredData, setFilteredData] = useState(data);
fetchData();
}, []);

const columns = useMemo(
() => [
Expand Down Expand Up @@ -184,8 +191,9 @@ const ExampleWithMixedFilters = () => {
[]
);

// Handle custom filter apply — filterValues is the flat filter state object.
const handleCustomFiltersApply = (filterValues) => {
let filtered = [...data];
let filtered = [...SOURCE_DATA];

// Quick search
if (filterValues.quickSearch) {
Expand Down Expand Up @@ -239,7 +247,7 @@ const ExampleWithMixedFilters = () => {
};

const handleCustomFiltersReset = () => {
setFilteredData(data);
setFilteredData(SOURCE_DATA);
};

// Batch actions for selected rows
Expand Down Expand Up @@ -305,6 +313,7 @@ const ExampleWithMixedFilters = () => {
<TanstackTable
data={filteredData}
columns={columns}
isLoading={isLoading}
toolbar={[{ type: 'filter' }, { type: 'search' }]}
features={{
selection: {
Expand Down
17 changes: 2 additions & 15 deletions react/community/tanstack-table-carbon/src/examples/serverSide.jsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,7 @@
import { useState, useEffect } from 'react';
import { TanstackTable, TableOverflowMenu } from '@/lib';
import {
Add as AddIcon,
Download,
Renew,
Settings,
TableSplit as TableIcon,
} from '@carbon/icons-react';
import {
Breadcrumb,
BreadcrumbItem,
Button,
Tag,
IconButton,
OverflowMenuItem,
} from '@carbon/react';
import { Add as AddIcon, Download, Renew, Settings } from '@carbon/icons-react';
import { Button, Tag, IconButton, OverflowMenuItem } from '@carbon/react';
import commonStyles from './scss/common.module.scss';

// Mock API function to simulate server-side data fetching
Expand Down
Loading
Loading