From f0d2f5c5a2e5f7e902190476329a76e9d27320f4 Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Thu, 22 Jun 2017 12:51:08 -0700 Subject: [PATCH 1/3] Fix type of children in react-fa --- types/react-fa/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/react-fa/index.d.ts b/types/react-fa/index.d.ts index bab8fec196..c45f62466f 100644 --- a/types/react-fa/index.d.ts +++ b/types/react-fa/index.d.ts @@ -37,7 +37,7 @@ export const Icon: ComponentClass; export interface IconStackProps extends SizeOverrideHTMLProps { size?: IconSize; - children?: IconProps[]; + children?: JSX.Element[]; // All JSX expression has type JSX.Element } export type IconStack = Component; From f2ac2ca1ee910fd38b33e9610b157009fec4d16c Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Thu, 22 Jun 2017 14:08:03 -0700 Subject: [PATCH 2/3] Address PR feedback --- types/react-fa/index.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/types/react-fa/index.d.ts b/types/react-fa/index.d.ts index 2212a73146..7c58f3ea9e 100644 --- a/types/react-fa/index.d.ts +++ b/types/react-fa/index.d.ts @@ -4,7 +4,7 @@ // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.3 -import { Component, ComponentClass, HTMLProps, StatelessComponent } from "react"; +import { Component, ComponentClass, HTMLProps, StatelessComponent, ReactElement } from "react"; // fake intermediate interface to remove typing on size, as the typing // is overrided by react-fa @@ -37,7 +37,7 @@ export const Icon: ComponentClass; export interface IconStackProps extends SizeOverrideHTMLProps { size?: IconSize; - children?: JSX.Element[]; // All JSX expression has type JSX.Element + children?: ReactElement[] | ReactElement; } export type IconStack = Component; From 22cfe3f882fec07525272eedaddb9625267da6b6 Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Thu, 22 Jun 2017 14:17:01 -0700 Subject: [PATCH 3/3] Fix linting error --- types/react-fa/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/react-fa/index.d.ts b/types/react-fa/index.d.ts index 7c58f3ea9e..ae4baa322e 100644 --- a/types/react-fa/index.d.ts +++ b/types/react-fa/index.d.ts @@ -37,7 +37,7 @@ export const Icon: ComponentClass; export interface IconStackProps extends SizeOverrideHTMLProps { size?: IconSize; - children?: ReactElement[] | ReactElement; + children?: ReactElement | Array>; } export type IconStack = Component;