From 029797d3158f20521dbf1453d72cea6b29266e29 Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Wed, 19 Apr 2017 16:29:34 -0700 Subject: [PATCH 1/3] Update react-helmet return type of toComponent() according to https://github.com/nfl/react-helmet/blob/master/src/HelmetUtils.js --- types/react-helmet/index.d.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/types/react-helmet/index.d.ts b/types/react-helmet/index.d.ts index aa80c77b3b..f8a96617b6 100644 --- a/types/react-helmet/index.d.ts +++ b/types/react-helmet/index.d.ts @@ -32,8 +32,8 @@ export class Helmet extends React.Component { export interface HelmetData { base: HelmetDatum; - bodyAttributes: HelmetDatum; - htmlAttributes: HelmetDatum; + bodyAttributes: HelmetAttributesTagObject; + htmlAttributes: HelmetAttributesTagObject; link: HelmetDatum; meta: HelmetDatum; noscript: HelmetDatum; @@ -48,6 +48,11 @@ export interface HelmetDatum { toComponent(): React.Component; } +export interface HelmetAttributesTagObject { + toString(): string; + toComponent(): React.HTMLAttributes; +} + export const peek: () => HelmetData; export const rewind: () => HelmetData; export const renderStatic: () => HelmetData; From b8848ee8cacbcf3a5b6de3eb08a772061eda1e8f Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Mon, 24 Apr 2017 14:47:56 -0700 Subject: [PATCH 2/3] update header --- types/react-helmet/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/react-helmet/index.d.ts b/types/react-helmet/index.d.ts index f8a96617b6..fc44177f51 100644 --- a/types/react-helmet/index.d.ts +++ b/types/react-helmet/index.d.ts @@ -1,6 +1,6 @@ // Type definitions for react-helmet 5.0 // Project: https://github.com/nfl/react-helmet -// Definitions by: Evan Bremer , Isman Usoh , François Nguyen , Kok Sam +// Definitions by: Evan Bremer , Isman Usoh , François Nguyen , Kok Sam , Yui T. // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.1 From 49b9b5a2a281c3b1f52089b4438fc4597dece9fd Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Tue, 25 Apr 2017 09:55:51 -0700 Subject: [PATCH 3/3] Address PR: split BodyAttribute data and HTMLElement data --- types/react-helmet/index.d.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/types/react-helmet/index.d.ts b/types/react-helmet/index.d.ts index fc44177f51..0d4a75878b 100644 --- a/types/react-helmet/index.d.ts +++ b/types/react-helmet/index.d.ts @@ -32,8 +32,8 @@ export class Helmet extends React.Component { export interface HelmetData { base: HelmetDatum; - bodyAttributes: HelmetAttributesTagObject; - htmlAttributes: HelmetAttributesTagObject; + bodyAttributes: HelmetHTMLBodyDatum; + htmlAttributes: HelmetHTMLElementDatum; link: HelmetDatum; meta: HelmetDatum; noscript: HelmetDatum; @@ -48,9 +48,14 @@ export interface HelmetDatum { toComponent(): React.Component; } -export interface HelmetAttributesTagObject { +export interface HelmetHTMLBodyDatum { toString(): string; - toComponent(): React.HTMLAttributes; + toComponent(): React.HTMLAttributes; +} + +export interface HelmetHTMLElementDatum { + toString(): string; + toComponent(): React.HTMLAttributes; } export const peek: () => HelmetData;