Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add start end #175

Merged
merged 2 commits into from
Nov 19, 2020
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
3 changes: 3 additions & 0 deletions src/generate/dateFns.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
getYear,
getMonth,
getDate,
endOfMonth,
getHours,
getMinutes,
getSeconds,
Expand Down Expand Up @@ -40,6 +41,8 @@ const localeParse = (format: string) => {
const generateConfig: GenerateConfig<Date> = {
// get
getNow: () => new Date(),
getFixedDate: string => new Date(string),
getEndDate: date => endOfMonth(date),
getWeekDay: date => getDay(date),
getYear: date => getYear(date),
getMonth: date => getMonth(date),
Expand Down
2 changes: 2 additions & 0 deletions src/generate/dayjs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ const parseNoMatchNotice = () => {
const generateConfig: GenerateConfig<Dayjs> = {
// get
getNow: () => dayjs(),
getFixedDate: string => dayjs(string, 'YYYY-MM-DD'),
getEndDate: date => date.endOf('month'),
getWeekDay: date => {
const clone = date.locale('en');
return clone.weekday() + clone.localeData().firstDayOfWeek();
Expand Down
2 changes: 2 additions & 0 deletions src/generate/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ export interface GenerateConfig<DateType> {
getMonth: (value: DateType) => number;
getYear: (value: DateType) => number;
getNow: () => DateType;
getFixedDate: (fixed: string) => DateType;
getEndDate: (value: DateType) => DateType;

// Set
addYear: (value: DateType, diff: number) => DateType;
Expand Down
5 changes: 5 additions & 0 deletions src/generate/moment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ import { GenerateConfig } from '.';
const generateConfig: GenerateConfig<Moment> = {
// get
getNow: () => moment(),
getFixedDate: string => moment(string, 'YYYY-MM-DD'),
getEndDate: date => {
const clone = date.clone();
return clone.endOf('month');
},
getWeekDay: date => {
const clone = date.clone().locale('en_US');
return clone.weekday() + clone.localeData().firstDayOfWeek();
Expand Down
10 changes: 9 additions & 1 deletion src/panels/PanelBody.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import * as React from 'react';
import classNames from 'classnames';
import PanelContext from '../PanelContext';
import { GenerateConfig } from '../generate';
import { getLastDay } from '../utils/timeUtil';

export interface PanelBodyProps<DateType> {
prefixCls: string;
Expand All @@ -17,6 +19,7 @@ export interface PanelBodyProps<DateType> {
getCellText: (date: DateType) => React.ReactNode;
getCellNode?: (date: DateType) => React.ReactNode;
titleCell?: (date: DateType) => string;
generateConfig: GenerateConfig<DateType>;

// Used for week panel
prefixColumn?: (date: DateType) => React.ReactNode;
Expand All @@ -36,6 +39,7 @@ export default function PanelBody<DateType>({
getCellText,
getCellNode,
getCellDate,
generateConfig,
titleCell,
headerCells,
}: PanelBodyProps<DateType>) {
Expand Down Expand Up @@ -63,12 +67,16 @@ export default function PanelBody<DateType>({
}
}

const title = titleCell && titleCell(currentDate);

row.push(
<td
key={j}
title={titleCell && titleCell(currentDate)}
title={title}
className={classNames(cellPrefixCls, {
[`${cellPrefixCls}-disabled`]: disabled,
[`${cellPrefixCls}-start`]: getCellText(currentDate) === 1,
[`${cellPrefixCls}-end`]: title === getLastDay(generateConfig, currentDate),
...getCellClassName(currentDate),
})}
onClick={() => {
Expand Down
9 changes: 9 additions & 0 deletions src/utils/timeUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,12 @@ export function getLowerBoundTime(
const lowerBoundSecond = Math.floor(second / secondStep) * secondStep;
return [lowerBoundHour, lowerBoundMinute, lowerBoundSecond];
}

export function getLastDay<DateType>(generateConfig: GenerateConfig<DateType>, date: DateType) {
const year = generateConfig.getYear(date);
const month = generateConfig.getMonth(date) + 1;
const endDate = generateConfig.getEndDate(generateConfig.getFixedDate(`${year}-${month}-01`));
const lastDay = generateConfig.getDate(endDate);
const monthShow = month < 10 ? `0${month}` : `${month}`;
return `${year}-${monthShow}-${lastDay}`;
}
8 changes: 4 additions & 4 deletions tests/__snapshots__/panel.spec.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
</div>
</td>
<td
class="rc-picker-cell"
class="rc-picker-cell rc-picker-cell-end"
title="1990-08-31"
>
<div
Expand All @@ -237,7 +237,7 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
</div>
</td>
<td
class="rc-picker-cell rc-picker-cell-in-view"
class="rc-picker-cell rc-picker-cell-start rc-picker-cell-in-view"
title="1990-09-01"
>
<div
Expand Down Expand Up @@ -537,7 +537,7 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
</tr>
<tr>
<td
class="rc-picker-cell rc-picker-cell-in-view"
class="rc-picker-cell rc-picker-cell-end rc-picker-cell-in-view"
title="1990-09-30"
>
<div
Expand All @@ -547,7 +547,7 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
</div>
</td>
<td
class="rc-picker-cell"
class="rc-picker-cell rc-picker-cell-start"
title="1990-10-01"
>
<div
Expand Down
8 changes: 8 additions & 0 deletions tests/generate.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,21 @@ describe('Picker.Generate', () => {
describe(name, () => {
it('get', () => {
const now = generateConfig.getNow();
const fixedDate = generateConfig.getFixedDate('1990-09-03');
const endDate = generateConfig.getEndDate(fixedDate);
expect(generateConfig.getWeekDay(now)).toEqual(1);
expect(generateConfig.getSecond(now)).toEqual(3);
expect(generateConfig.getMinute(now)).toEqual(2);
expect(generateConfig.getHour(now)).toEqual(1);
expect(generateConfig.getDate(now)).toEqual(3);
expect(generateConfig.getDate(fixedDate)).toEqual(3);
expect(generateConfig.getDate(endDate)).toEqual(30);
expect(generateConfig.getMonth(now)).toEqual(8);
expect(generateConfig.getMonth(fixedDate)).toEqual(8);
expect(generateConfig.getMonth(endDate)).toEqual(8);
expect(generateConfig.getYear(now)).toEqual(1990);
expect(generateConfig.getYear(fixedDate)).toEqual(1990);
expect(generateConfig.getYear(endDate)).toEqual(1990);
});

it('set', () => {
Expand Down
11 changes: 10 additions & 1 deletion tests/util.spec.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import momentGenerateConfig from '../src/generate/moment';
import { getLowerBoundTime, setTime } from '../src/utils/timeUtil';
import { getLowerBoundTime, setTime, getLastDay } from '../src/utils/timeUtil';
import { toArray } from '../src/utils/miscUtil';
import { isSameTime, isSameDecade } from '../src/utils/dateUtil';
import { getMoment } from './util/commonUtil';
Expand Down Expand Up @@ -64,4 +64,13 @@ describe('Picker.Util', () => {
),
).toBeTruthy();
});

describe('getLastDay', () => {
expect(
getLastDay(
momentGenerateConfig,
getMoment('2020-10-01'),
),
).toEqual('2020-10-31');
});
});