From 7a2fa0a98e77583e9dde205a0c8c07f68e3f79ba Mon Sep 17 00:00:00 2001 From: Carson Howard Date: Mon, 14 May 2018 15:11:22 -0700 Subject: [PATCH 1/5] Update Rebass to have a provider and fix Tooltip --- types/rebass/index.d.ts | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/types/rebass/index.d.ts b/types/rebass/index.d.ts index f50691e116..1f02aa2a92 100644 --- a/types/rebass/index.d.ts +++ b/types/rebass/index.d.ts @@ -505,7 +505,38 @@ type ToolbarClass = React.StatelessComponent export declare const Toolbar: ToolbarClass; export interface TooltipProps extends BaseProps { - title?: string; + text?: string; } type TooltipClass = React.StatelessComponent export declare const Tooltip: TooltipClass; + +export interface FontWeights { + normal?: number; + bold?: number; +} + +export interface Fonts { + [0]?: string; + sans?: string; + mono?: string; +} + +export interface Colors {} + +export interface Theme { + breakpoints?: string[]; + space?: number[]; + fontSizes?: number[]; + fontWeights?: FontWeights; + fonts?: Fonts; + shadows?: string[]; + radii?: number[]; + colors?: Colors; +} + +export interface ProviderProps { + theme: Theme; +} + +type ProviderClass = React.StatelessComponent; +export const Provider: ProviderClass; \ No newline at end of file From 1990eb58c073aea51545c7209b2826f6e5397327 Mon Sep 17 00:00:00 2001 From: Carson Howard Date: Mon, 14 May 2018 15:16:07 -0700 Subject: [PATCH 2/5] Update Rebass to use fontSize on BaseProps --- types/rebass/index.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/types/rebass/index.d.ts b/types/rebass/index.d.ts index 1f02aa2a92..0cd6c151df 100644 --- a/types/rebass/index.d.ts +++ b/types/rebass/index.d.ts @@ -11,6 +11,7 @@ import * as React from "react"; export interface BaseProps extends React.Props { tagName?: string; className?: string; + fontSize?: number | number[]; baseStyle?: Object; style?: Object; m?: number; From e79a26e4b5324b44a621ec15803732b24ed100f2 Mon Sep 17 00:00:00 2001 From: Carson Howard Date: Mon, 14 May 2018 15:33:45 -0700 Subject: [PATCH 3/5] Update tests and fix minor prop issue --- types/rebass/index.d.ts | 3 ++- types/rebass/rebass-tests.tsx | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/types/rebass/index.d.ts b/types/rebass/index.d.ts index 0cd6c151df..b69c6f7839 100644 --- a/types/rebass/index.d.ts +++ b/types/rebass/index.d.ts @@ -507,6 +507,7 @@ export declare const Toolbar: ToolbarClass; export interface TooltipProps extends BaseProps { text?: string; + title?: string; } type TooltipClass = React.StatelessComponent export declare const Tooltip: TooltipClass; @@ -536,7 +537,7 @@ export interface Theme { } export interface ProviderProps { - theme: Theme; + theme?: Theme; } type ProviderClass = React.StatelessComponent; diff --git a/types/rebass/rebass-tests.tsx b/types/rebass/rebass-tests.tsx index 430e277541..814c11a523 100644 --- a/types/rebass/rebass-tests.tsx +++ b/types/rebass/rebass-tests.tsx @@ -42,6 +42,7 @@ import { , PanelHeader , Pre , Progress + , Provider , Radio , Rating , Section @@ -156,6 +157,12 @@ class RebassTest extends React.Component { Generic box for containing things + + This is a large font + + + A set of fonts! + @@ -618,6 +625,9 @@ class RebassTest extends React.Component { Tooltip + + + ; } } From 91b98bfe0fc41aebcbef88cfb57a70684e1a6212 Mon Sep 17 00:00:00 2001 From: Carson Howard Date: Mon, 14 May 2018 15:37:09 -0700 Subject: [PATCH 4/5] Remove untyped color on theme --- types/rebass/index.d.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/types/rebass/index.d.ts b/types/rebass/index.d.ts index b69c6f7839..e91be9e3a0 100644 --- a/types/rebass/index.d.ts +++ b/types/rebass/index.d.ts @@ -523,8 +523,6 @@ export interface Fonts { mono?: string; } -export interface Colors {} - export interface Theme { breakpoints?: string[]; space?: number[]; @@ -533,7 +531,6 @@ export interface Theme { fonts?: Fonts; shadows?: string[]; radii?: number[]; - colors?: Colors; } export interface ProviderProps { From 927c2f961145a183dfb48e578b462ed5002f86be Mon Sep 17 00:00:00 2001 From: Carson Howard Date: Mon, 14 May 2018 15:49:07 -0700 Subject: [PATCH 5/5] Bump version --- types/rebass/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/rebass/index.d.ts b/types/rebass/index.d.ts index e91be9e3a0..0c55b12240 100644 --- a/types/rebass/index.d.ts +++ b/types/rebass/index.d.ts @@ -1,4 +1,4 @@ -// Type definitions for Rebass 0.2.5 +// Type definitions for Rebass 0.2.6 // Project: https://github.com/jxnblk/rebass // Definitions by: rhysd // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped