mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-06-11 11:32:52 +08:00
Code Issues Actions 38 Packages Projects Releases Wiki Activity

Fix TimePicker isMoment call

Browse Source
This commit is contained in:
Wei Zhu 2018-03-13 22:53:02 +08:00
parent 8b1d0224cb
commit 85c78e49a9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/time-picker/index.tsx
View File

@ -4,6 +4,7 @@ import RcTimePicker from 'rc-time-picker/lib/TimePicker';
import classNames from 'classnames'; import classNames from 'classnames';
import LocaleReceiver from '../locale-provider/LocaleReceiver'; import LocaleReceiver from '../locale-provider/LocaleReceiver';
import defaultLocale from './locale/en_US'; import defaultLocale from './locale/en_US';
import interopDefault from '../_util/interopDefault';
export function generateShowHourMinuteSecond(format: string) { export function generateShowHourMinuteSecond(format: string) {
// Ref: http://momentjs.com/docs/#/parsing/string-format/ // Ref: http://momentjs.com/docs/#/parsing/string-format/
@ -74,7 +75,7 @@ export default class TimePicker extends React.Component<TimePickerProps, any> {
constructor(props: TimePickerProps) { constructor(props: TimePickerProps) {
super(props); super(props);
const value = props.value || props.defaultValue; const value = props.value || props.defaultValue;
if (value && !moment.isMoment(value)) { if (value && !interopDefault(moment).isMoment(value)) {
throw new Error( throw new Error(
'The value/defaultValue of TimePicker must be a moment object after `antd@2.0`, ' + 'The value/defaultValue of TimePicker must be a moment object after `antd@2.0`, ' +
'see: https://u.ant.design/time-picker-value', 'see: https://u.ant.design/time-picker-value',