From 62aa131676ded45374dba46607e182916d1407b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=B2=89?= Date: Wed, 12 Aug 2020 08:41:41 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20Merge=20PR=20#46645=20[@types/re?= =?UTF-8?q?act-custom-scrollbars]=20feat:=20add=20style=20props=20of=20rea?= =?UTF-8?q?ct-custom-scrollbars=20by=20@RaoHai?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: add style props of react-custom-scrollbars * feat: add tests Co-authored-by: raohai.rh --- types/react-custom-scrollbars/index.d.ts | 2 ++ types/react-custom-scrollbars/react-custom-scrollbars-tests.tsx | 2 +- types/react-custom-scrollbars/v3/index.d.ts | 2 ++ .../v3/react-custom-scrollbars-tests.tsx | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/types/react-custom-scrollbars/index.d.ts b/types/react-custom-scrollbars/index.d.ts index b5b12c7ee3..9788192b7e 100644 --- a/types/react-custom-scrollbars/index.d.ts +++ b/types/react-custom-scrollbars/index.d.ts @@ -47,6 +47,8 @@ export interface ScrollbarProps extends React.HTMLProps { autoHeight?: boolean; autoHeightMin?: number | string; autoHeightMax?: number | string; + + style?: React.CSSProperties; } export class Scrollbars extends React.Component { diff --git a/types/react-custom-scrollbars/react-custom-scrollbars-tests.tsx b/types/react-custom-scrollbars/react-custom-scrollbars-tests.tsx index 240061eada..6fe45eb5a5 100644 --- a/types/react-custom-scrollbars/react-custom-scrollbars-tests.tsx +++ b/types/react-custom-scrollbars/react-custom-scrollbars-tests.tsx @@ -3,7 +3,7 @@ import { render } from 'react-dom'; import Scrollbars from "react-custom-scrollbars" render( - +
Test
, document.getElementById("main") diff --git a/types/react-custom-scrollbars/v3/index.d.ts b/types/react-custom-scrollbars/v3/index.d.ts index e0fd389335..5da9d4def0 100644 --- a/types/react-custom-scrollbars/v3/index.d.ts +++ b/types/react-custom-scrollbars/v3/index.d.ts @@ -39,6 +39,8 @@ export interface ScrollbarProps extends React.HTMLProps { thumbSize?: number; thumbMinSize?: number; universal?: boolean; + + style?: React.CSSProperties; } export class Scrollbars extends React.Component { diff --git a/types/react-custom-scrollbars/v3/react-custom-scrollbars-tests.tsx b/types/react-custom-scrollbars/v3/react-custom-scrollbars-tests.tsx index 240061eada..6fe45eb5a5 100644 --- a/types/react-custom-scrollbars/v3/react-custom-scrollbars-tests.tsx +++ b/types/react-custom-scrollbars/v3/react-custom-scrollbars-tests.tsx @@ -3,7 +3,7 @@ import { render } from 'react-dom'; import Scrollbars from "react-custom-scrollbars" render( - +
Test
, document.getElementById("main")