Skip to content

Commit

Permalink
fix: date and time picker filters on mobile screensizes (#930)
Browse files Browse the repository at this point in the history
  • Loading branch information
chmelevskij committed Jan 10, 2024
1 parent 7b863a9 commit 948e5ca
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,6 @@ export const MRT_FilterTextField = <TData extends MRT_RowData>({
}
},
margin: 'none',
onClick: (e: MouseEvent<HTMLInputElement>) => e.stopPropagation(),
placeholder:
filterChipLabel || isSelectFilter || isMultiSelectFilter
? undefined
Expand Down Expand Up @@ -459,6 +458,7 @@ export const MRT_FilterTextField = <TData extends MRT_RowData>({
...commonTextFieldProps?.inputProps,
}}
onChange={handleTextFieldChange}
onClick={(e: MouseEvent<HTMLInputElement>) => e.stopPropagation()}
/>
)}
value={filterValue}
Expand Down Expand Up @@ -493,6 +493,7 @@ export const MRT_FilterTextField = <TData extends MRT_RowData>({
...commonTextFieldProps.SelectProps,
}}
onChange={handleTextFieldChange}
onClick={(e: MouseEvent<HTMLInputElement>) => e.stopPropagation()}
value={filterValue ?? ''}
>
{(isSelectFilter || isMultiSelectFilter) && [
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@

import {
MaterialReactTable,
} from '../../src';
import { faker } from '@faker-js/faker';
import { type Meta } from '@storybook/react';

const meta: Meta = {
title: 'Fixed Bugs/mobile date pickers',
};

export default meta;

const data = [...Array(120)].map(() => ({
arrivalTime: faker.date.recent(),
birthDate: faker.date.birthdate({ max: 2020, min: 1980 }),
deliverySlot: faker.date.recent(),
departureTime: faker.date.recent(),
hireDate: faker.date.birthdate({ max: 2024, min: 2011 }),
startTime: faker.date.recent(),
}));


export const MobileDateTimePickers = () => (
<MaterialReactTable
columns={[
{
Cell: ({ cell }) => cell.getValue<Date>().toLocaleDateString(), //transform data to readable format for cell render
accessorFn: (row) => new Date(row.birthDate), //transform data before processing so sorting works
filterFn: 'lessThan',
filterVariant: 'date',
header: 'Birth Date',
id: 'birthDate',
},
{
Cell: ({ cell }) => cell.getValue<Date>().toLocaleDateString(), //transform data to readable format for cell render
accessorFn: (row) => new Date(row.hireDate), //transform data before processing so sorting works
filterVariant: 'date-range',
header: 'Hire Date',
id: 'hireDate',
},
{
Cell: ({ cell }) => cell.getValue<Date>().toLocaleString(), //transform data to readable format for cell render
accessorFn: (row) => new Date(row.departureTime), //transform data before processing so sorting works
filterVariant: 'datetime',
header: 'Departure',
id: 'departureTime',
},
{
Cell: ({ cell }) => cell.getValue<Date>().toLocaleString(), //transform data to readable format for cell render
accessorFn: (row) => new Date(row.arrivalTime), //transform data before processing so sorting works
filterVariant: 'datetime-range',
header: 'Arrival time',
id: 'arrivalTime',
},
{
Cell: ({ cell }) => cell.getValue<Date>().toLocaleString(), //transform data to readable format for cell render
accessorFn: (row) => new Date(row.startTime), //transform data before processing so sorting works
filterVariant: 'time',
header: 'Start Time',
id: 'startTime',
},
{
Cell: ({ cell }) => cell.getValue<Date>().toLocaleString(), //transform data to readable format for cell render
accessorFn: (row) => new Date(row.deliverySlot), //transform data before processing so sorting works
filterVariant: 'time-range',
header: 'Delivery Slot',
id: 'deliverySlot',
},
]}
data={data}
initialState={{ showColumnFilters: true }}
/>
);

2 comments on commit 948e5ca

@vercel
Copy link

@vercel vercel bot commented on 948e5ca Jan 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vercel
Copy link

@vercel vercel bot commented on 948e5ca Jan 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.