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
6 changes: 2 additions & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ module.exports = {
...base,
rules: {
...base.rules,
'arrow-parens': 0,
'no-template-curly-in-string': 0,
'prefer-promise-reject-errors': 0,
'react/no-array-index-key': 0,
Expand All @@ -13,9 +14,6 @@ module.exports = {
'no-confusing-arrow': 0,
'jsx-a11y/no-autofocus': 0,
'jsx-a11y/heading-has-content': 0,
'import/no-extraneous-dependencies': [
'error',
{ devDependencies: ['**/tests/**'] },
],
'import/no-extraneous-dependencies': ['error', { devDependencies: ['**/tests/**'] }],
},
};
21 changes: 21 additions & 0 deletions src/RangePicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import useRangeDisabled from './hooks/useRangeDisabled';
import getExtraFooter from './utils/getExtraFooter';
import getRanges from './utils/getRanges';
import useRangeViewDates from './hooks/useRangeViewDates';
import { DateRender } from './panels/DatePanel/DateBody';

function reorderValues<DateType>(
values: RangeValue<DateType>,
Expand Down Expand Up @@ -54,6 +55,14 @@ function canValueTrigger<DateType>(
return false;
}

export type RangeDateRender<DateType> = (
currentDate: DateType,
today: DateType,
info: {
range: 'start' | 'end';
},
) => React.ReactNode;

export interface RangePickerSharedProps<DateType> {
id?: string;
value?: RangeValue<DateType>;
Expand All @@ -79,6 +88,7 @@ export interface RangePickerSharedProps<DateType> {
autoComplete?: string;
/** @private Internal control of active picker. Do not use since it's private usage */
activePickerIndex?: 0 | 1;
dateRender?: RangeDateRender<DateType>;
}

type OmitPickerProps<Props> = Omit<
Expand All @@ -98,6 +108,7 @@ type OmitPickerProps<Props> = Omit<
| 'pickerValue'
| 'onPickerValueChange'
| 'onOk'
| 'dateRender'
>;

type RangeShowTimeObject<DateType> = Omit<SharedTimeProps<DateType>, 'defaultValue'> & {
Expand Down Expand Up @@ -162,6 +173,7 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
defaultOpen,
disabledDate,
disabledTime,
dateRender,
ranges,
allowEmpty,
allowClear,
Expand Down Expand Up @@ -623,6 +635,14 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
};
}

let panelDateRender: DateRender<DateType> | null = null;
if (dateRender) {
panelDateRender = (date, today) =>
dateRender(date, today, {
range: mergedActivePickerIndex ? 'end' : 'start',
});
}

return (
<RangeContext.Provider
value={{
Expand All @@ -635,6 +655,7 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
<PickerPanel<DateType>
{...(props as any)}
{...panelProps}
dateRender={panelDateRender}
showTime={panelShowTime}
mode={mergedModes[mergedActivePickerIndex]}
generateConfig={generateConfig}
Expand Down
10 changes: 10 additions & 0 deletions tests/picker.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -630,4 +630,14 @@ describe('Picker.Basic', () => {
const wrapper = mount(<MomentPicker id="light" />);
expect(wrapper.find('input').props().id).toEqual('light');
});

it('dateRender', () => {
const wrapper = mount(<MomentPicker open dateRender={date => date.format('YYYY-MM-DD')} />);
expect(
wrapper
.find('tbody td')
.last()
.text(),
).toEqual('1990-10-06');
});
});
23 changes: 23 additions & 0 deletions tests/range.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1063,4 +1063,27 @@ describe('Picker.Range', () => {
.props().id,
).toEqual('bamboo');
});

it('dateRender', () => {
let range = 'start';

const wrapper = mount(
<MomentRangePicker
open
dateRender={(date, _, info) => {
expect(info.range).toEqual(range);
return date.format('YYYY-MM-DD');
}}
/>,
);
expect(
wrapper
.find('tbody td')
.last()
.text(),
).toEqual('1990-11-10');

range = 'end';
wrapper.openPicker(1);
});
});