From c2a030337460b9d710629f3bbbb5097264afcd05 Mon Sep 17 00:00:00 2001 From: Edo Rivai Date: Mon, 15 Jan 2018 11:49:29 +0100 Subject: [PATCH 1/5] Create typings.d.ts --- typings.d.ts | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 typings.d.ts diff --git a/typings.d.ts b/typings.d.ts new file mode 100644 index 0000000..b501d7c --- /dev/null +++ b/typings.d.ts @@ -0,0 +1,9 @@ +declare module 'react-media' { + interface MediaProps { + query: string; + defaultMatches?: boolean; + children: ((matches: boolean) => JSX.Element) | JSX.Element + } + + export default class Media extends React.Component {} +} From 463ebf114f1f6295cfc888e31ff9a489433d5f9b Mon Sep 17 00:00:00 2001 From: Edo Rivai Date: Thu, 18 Jan 2018 15:31:48 +0100 Subject: [PATCH 2/5] Fix react TS typings --- typings.d.ts | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/typings.d.ts b/typings.d.ts index b501d7c..ff4f17a 100644 --- a/typings.d.ts +++ b/typings.d.ts @@ -1,9 +1,14 @@ declare module 'react-media' { - interface MediaProps { - query: string; - defaultMatches?: boolean; - children: ((matches: boolean) => JSX.Element) | JSX.Element - } + export interface MediaQueryObject { + [id: string]: boolean | number | string; + } - export default class Media extends React.Component {} + export interface MediaProps { + query: string | MediaQueryObject | MediaQueryObject[]; + defaultMatches?: boolean; + children?: ((matches: boolean) => React.ReactNode) | React.ReactNode; + render?: () => React.ReactNode; + } + + export default class Media extends React.Component {} } From 8b03e23cf6410e1d330e1db2569406f22d8187aa Mon Sep 17 00:00:00 2001 From: Edo Rivai Date: Tue, 23 Jan 2018 16:13:24 +0100 Subject: [PATCH 3/5] Rename TS typings file, and add it to package.json files field --- typings.d.ts => index.d.ts | 0 package.json | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename typings.d.ts => index.d.ts (100%) diff --git a/typings.d.ts b/index.d.ts similarity index 100% rename from typings.d.ts rename to index.d.ts diff --git a/package.json b/package.json index 90a734c..00687a0 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,8 @@ "files": [ "cjs", "esm", - "umd" + "umd", + "index.d.ts" ], "main": "cjs/react-media.js", "module": "esm/react-media.js", From bf2e991d0dccf120b98c2ee91effca479990d042 Mon Sep 17 00:00:00 2001 From: Edo Rivai Date: Thu, 25 Jan 2018 17:57:25 +0100 Subject: [PATCH 4/5] Minor fixes to Typescript setup --- index.d.ts | 22 ++++++++++++---------- package.json | 4 ++-- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/index.d.ts b/index.d.ts index ff4f17a..54d55fa 100644 --- a/index.d.ts +++ b/index.d.ts @@ -1,14 +1,16 @@ +import { ReactNode, Component } from 'react'; + declare module 'react-media' { - export interface MediaQueryObject { - [id: string]: boolean | number | string; - } + export interface MediaQueryObject { + [id: string]: boolean | number | string; + } - export interface MediaProps { - query: string | MediaQueryObject | MediaQueryObject[]; - defaultMatches?: boolean; - children?: ((matches: boolean) => React.ReactNode) | React.ReactNode; - render?: () => React.ReactNode; - } + export interface MediaProps { + query: string | MediaQueryObject | MediaQueryObject[]; + defaultMatches?: boolean; + children?: ((matches: boolean) => ReactNode) | ReactNode; + render?: () => ReactNode; + } - export default class Media extends React.Component {} + export default class Media extends Component {} } diff --git a/package.json b/package.json index 00687a0..1b93c9f 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,8 @@ "files": [ "cjs", "esm", - "umd", - "index.d.ts" + "umd", + "index.d.ts" ], "main": "cjs/react-media.js", "module": "esm/react-media.js", From 37aa81c350eac95bc2d8779400959abbdf87767b Mon Sep 17 00:00:00 2001 From: Edo Rivai Date: Thu, 25 Jan 2018 18:08:47 +0100 Subject: [PATCH 5/5] Remove `declare module` statement --- index.d.ts | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/index.d.ts b/index.d.ts index 54d55fa..0ba9fa4 100644 --- a/index.d.ts +++ b/index.d.ts @@ -1,16 +1,14 @@ import { ReactNode, Component } from 'react'; -declare module 'react-media' { - export interface MediaQueryObject { - [id: string]: boolean | number | string; - } - - export interface MediaProps { - query: string | MediaQueryObject | MediaQueryObject[]; - defaultMatches?: boolean; - children?: ((matches: boolean) => ReactNode) | ReactNode; - render?: () => ReactNode; - } +export interface MediaQueryObject { + [id: string]: boolean | number | string; +} - export default class Media extends Component {} +export interface MediaProps { + query: string | MediaQueryObject | MediaQueryObject[]; + defaultMatches?: boolean; + children?: ((matches: boolean) => ReactNode) | ReactNode; + render?: () => ReactNode; } + +export default class Media extends Component {}