From d561d987680396e10bb47268d07840b69a1a15a9 Mon Sep 17 00:00:00 2001
From: Kevin <kevin.poirier@ozytis.fr>
Date: Thu, 16 Nov 2017 10:07:21 +0100
Subject: [PATCH] Add missings typings

---
 types/react-onsenui/index.d.ts              | 70 +++++++++++++++++----
 types/react-onsenui/react-onsenui-tests.tsx | 10 +--
 2 files changed, 63 insertions(+), 17 deletions(-)

diff --git a/types/react-onsenui/index.d.ts b/types/react-onsenui/index.d.ts
index a910b94adf..72cd5658e8 100644
--- a/types/react-onsenui/index.d.ts
+++ b/types/react-onsenui/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for React OnSenui (react-onsenui) 2.1
+// Type definitions for React OnSenui (react-onsenui) 2.7
 // Project: https://onsen.io/v2/docs/guide/react/
 // Definitions by: Ozytis <https://ozytis.fr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -48,7 +48,9 @@ export class Splitter extends Component { }
 
 /*** toolbar ***/
 
-export class Toolbar extends Component {}
+export class Toolbar extends Component<{
+    modifier?: string
+}, any> {}
 
 export class BottomToolbar extends Component<{
     modifier?: string
@@ -57,7 +59,7 @@ export class BottomToolbar extends Component<{
 export class ToolbarButton extends Component<{
     modifier?: string,
     disabled?: boolean,
-    onClick?(e?: Event): void
+    onClick?(e?: React.MouseEvent<HTMLElement>): void
 }, any> {}
 
 /*** icon ***/
@@ -101,7 +103,7 @@ export class BackButton extends Component<{
 }, any> {}
 
 export class Navigator extends Component<{
-    renderPage(route: any, navigator: Navigator): JSX.Element,
+    renderPage(route: any): JSX.Element,
     initialRouteStack?: string[],
     initialRoute?: any,
     onPrePush?(): void,
@@ -109,8 +111,10 @@ export class Navigator extends Component<{
     onPrePop?(): void,
     onPostPop?(): void,
     animation?: "slide" | "lift" | "fade" | "none" | string,
-    animationOptions?: AnimationOptions
+    animationOptions?: AnimationOptions,
 }, any> {
+    pages: any[];
+    routes: any[];
     resetPage(route: any, options?: any): void;
     resetPageStack(route: any, options?: any): void;
     pushPage(route: any, options?: any): void;
@@ -196,6 +200,29 @@ export class Popover extends Component<{
     onPostHide?(): void,
 }, any> {}
 
+export class ActionSheet extends Component<{
+    onCancel?(): void,
+    isOpen?: boolean,
+    isCancelable?: boolean,
+    isDisabled?: boolean,
+    animation?: string,
+    modifier?: string
+    maskColor?: string,
+    animationOptions?: {},
+    title?: string
+    onPreShow?(): void,
+    onPostShow?(): void,
+    onPreHide?(): void,
+    onPostHide?(): void,
+    onDeviceBackButton?(): void
+}, any> {}
+
+export class ActionSheetButton extends Component<{
+    modifier?: string,
+    icon?: string,
+    onClick?(e?: React.MouseEvent<HTMLElement>): void
+}, any> {}
+
 export class ProgressBar extends Component<{
     modifier?: string,
     value?: number,
@@ -222,20 +249,21 @@ export class Fab extends Component<{
     ripple?: boolean,
     position?: string,
     disabled?: boolean,
-    onClick?: React.MouseEventHandler<HTMLButtonElement>,
+    onClick?(e?: React.MouseEvent<HTMLElement>): void,
 }, any> {}
 
 export class Button extends Component<{
     modifier?: string,
     disabled?: boolean,
     ripple?: boolean,
-    onClick?: React.MouseEventHandler<HTMLButtonElement>,
+    className?: string,
+    onClick?(e?: React.MouseEvent<HTMLElement>): void
 }, any> {}
 
 export class Input extends Component<{
     modifier?: string,
     disabled?: boolean,
-    onChange?: React.ChangeEventHandler<HTMLInputElement>,
+    onChange?: (e: React.ChangeEvent<any>) => void,
     value?: string,
     checked?: boolean,
     placeholder?: string,
@@ -243,18 +271,36 @@ export class Input extends Component<{
     inputId?: string,
     float?: boolean,
     name?: string,
+    className?: string
+}, any> {}
+
+export class Radio extends Component<{
+    modifier?: string,
+    disabled?: boolean,
+    onChange?(e: Event): void,
+    value?: string,
+    checked?: boolean,
+    inputId?: string
+}, any> {}
+
+export class Checkbox extends Component<{
+    modifier?: string,
+    disabled?: boolean,
+    onChange?(e: Event): void,
+    value?: string,
+    checked?: boolean,
+    inputId?: string
 }, any> {}
 
 export class Range extends Component<{
     modifier?: string,
-    onChange?: React.ChangeEventHandler<HTMLInputElement>,
+    onChange?(e: Event): void,
     value?: number,
     disabled?: boolean,
 }, any> {}
 
 export class Switch extends Component<{
-    modifier?: string,
-    onChange?: React.ChangeEventHandler<HTMLInputElement>,
+    onChange?(e: Event): void,
     checked?: boolean,
     disabled?: boolean,
     inputId?: string
@@ -309,7 +355,7 @@ export class ListItem extends Component<{
     tappable?: boolean,
     tapBackgroundColor?: string,
     lockOnDrag?: boolean,
-    onClick?: React.MouseEventHandler<HTMLUListElement>,
+    onClick?: React.MouseEventHandler<any>,
 }, any> {}
 
 export class Card extends Component { }
diff --git a/types/react-onsenui/react-onsenui-tests.tsx b/types/react-onsenui/react-onsenui-tests.tsx
index 9d5c86682f..fc472b96d6 100644
--- a/types/react-onsenui/react-onsenui-tests.tsx
+++ b/types/react-onsenui/react-onsenui-tests.tsx
@@ -21,6 +21,9 @@ export class App extends React.Component<AppProps, AppState> {
         this.setState({ isOpen: false });
     }
 
+    onChange(event: React.ChangeEvent<HTMLInputElement>) {}
+    onClick(event: React.MouseEvent<HTMLButtonElement>) {}
+
     render() {
         return (
             <Splitter>
@@ -37,8 +40,8 @@ export class App extends React.Component<AppProps, AppState> {
                 <SplitterContent>
                     <Page>
                         Test page
-                        <Input name='test' type='text' value='test' onChange={onChange} />
-                        <Button onClick={onClick} />
+                        <Input name='test' type='text' value='test' onChange={this.onChange} />
+                        <Button onClick={this.onClick} />
 					</Page>
                 </SplitterContent>
             </Splitter>
@@ -47,6 +50,3 @@ export class App extends React.Component<AppProps, AppState> {
 }
 
 ReactDOM.render(<App />, document.getElementById('react-body'));
-
-function onChange(event: React.ChangeEvent<HTMLInputElement>) { }
-function onClick(event: React.MouseEvent<HTMLButtonElement>) { }