diff --git a/types/material-ui/index.d.ts b/types/material-ui/index.d.ts index 017ff05765..b6919280d3 100644 --- a/types/material-ui/index.d.ts +++ b/types/material-ui/index.d.ts @@ -1,6 +1,6 @@ -// Type definitions for material-ui v0.17.1 +// Type definitions for material-ui v0.17.4 // Project: https://github.com/callemall/material-ui -// Definitions by: Nathan Brown , Oliver Herrmann , Igor Belagorudsky , Daniel Roth +// Definitions by: Nathan Brown , Igor Belagorudsky , Ali Taheri Moghaddar , Oliver Herrmann , Daniel Roth // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.2 @@ -531,6 +531,17 @@ declare namespace __MaterialUI { vertical: vertical; } + interface utils { + getWeekArray: (date: Date, firstDayOfWeek: number) => (Date | null)[][]; + getYear: (date: Date) => number; + setYear: (date: Date, year: number) => Date; + addDays: (date: Date, days: number) => Date; + addMonths: (date: Date, months: number) => Date; + addYears: (date: Date, years: number) => Date; + getFirstDayOfMonth: (date: Date) => Date; + monthDiff: (date1: Date, date2: Date) => number; + } + type corners = 'bottom-left' | 'bottom-right' | 'top-left' | 'top-right'; type cornersAndCenter = 'bottom-center' | 'bottom-left' | 'bottom-right' | 'top-center' | 'top-left' | 'top-right'; } @@ -869,7 +880,7 @@ declare namespace __MaterialUI { namespace DatePicker { interface DatePickerProps { // is the element that get the 'other' properties - DateTimeFormat?: Intl.DateTimeFormat; + DateTimeFormat?: typeof Intl.DateTimeFormat; autoOk?: boolean; cancelLabel?: React.ReactNode; container?: "dialog" | "inline"; @@ -916,13 +927,14 @@ declare namespace __MaterialUI { underlineFocusStyle?: React.CSSProperties; underlineShow?: boolean; underlineStyle?: React.CSSProperties; + utils?: propTypes.utils; } export class DatePicker extends React.Component { } interface DatePickerDialogProps { // is the element that get the 'other' properties - DateTimeFormat?: Intl.DateTimeFormat; + DateTimeFormat?: typeof Intl.DateTimeFormat; animation?: React.ComponentClass; autoOk?: boolean; cancelLabel?: React.ReactNode; @@ -940,8 +952,11 @@ declare namespace __MaterialUI { onShow?: () => void; shouldDisableDate?: (day: Date) => boolean; style?: React.CSSProperties; + utils?: propTypes.utils; } export class DatePickerDialog extends React.Component { + public show(): void; + public dismiss(): void; } } @@ -2051,6 +2066,11 @@ declare module 'material-ui/DatePicker' { export default DatePicker; } +declare module 'material-ui/DatePicker/DatePickerDialog' { + export import DatePickerDialog = __MaterialUI.DatePicker.DatePickerDialog; + export default DatePickerDialog; +} + declare module 'material-ui/Dialog' { export import Dialog = __MaterialUI.Dialog; export default Dialog; diff --git a/types/material-ui/material-ui-tests.tsx b/types/material-ui/material-ui-tests.tsx index cf160761d9..d1a6397f42 100644 --- a/types/material-ui/material-ui-tests.tsx +++ b/types/material-ui/material-ui-tests.tsx @@ -1244,12 +1244,11 @@ const DatePickerExampleDisableDates = () => ( ); -let DateTimeFormat = new Intl.DateTimeFormat('fr'); const DatePickerExampleInternational = () => (