Skip to content

Commit

Permalink
Merge branch 'master' into antd-3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
afc163 committed Sep 26, 2017
2 parents c64f46c + 4e726fd commit 4719309
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions components/date-picker/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ export interface DatePickerProps extends PickerProps, SinglePickerProps {
open?: boolean;
toggleOpen?: (e: {open: boolean}) => void;
disabledTime?: (current: moment.Moment) => {
disabledHours?: () => [number, number],
disabledMinutes?: () => [number, number],
disabledSeconds?: () => [number, number],
disabledHours?: () => number[],
disabledMinutes?: () => number[],
disabledSeconds?: () => number[],
};
onOpenChange?: (status: boolean) => void;
onOk?: (selectedTime: moment.Moment) => void;
Expand All @@ -71,9 +71,9 @@ export interface RangePickerProps extends PickerProps {
};
placeholder?: [string, string];
disabledTime?: (current: moment.Moment, type: string) => {
disabledHours?: () => [number, number],
disabledMinutes?: () => [number, number],
disabledSeconds?: () => [number, number],
disabledHours?: () => number[],
disabledMinutes?: () => number[],
disabledSeconds?: () => number[],
};
}

Expand Down

0 comments on commit 4719309

Please sign in to comment.