-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into dc/issues/3236-3218-3206-3197-3188-refresh…
…-not-working-as-expected * master: fixes Actions.reset when getParent returns null (#3245) reset error prop for all actions improve ts typings README and ISSUE_TEMPLATE updated to reflect decision about 4.0.0-beta.x version (#3242) Add support for deprecated Tabs component (#3214)
- Loading branch information
Showing
7 changed files
with
201 additions
and
144 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,162 +1,170 @@ | ||
| /// <reference types="react"/> | ||
| /// <reference types="react-native"/> | ||
|
|
||
| import * as React from "react"; | ||
| import { StyleProp, Image, ViewStyle, TextStyle, ImageStyle } from "react-native"; | ||
| import * as React from 'react'; | ||
| import { StyleProp, Image, ViewStyle, TextStyle, ImageStyle } from 'react-native'; | ||
|
|
||
| export var Router: RouterStatic; | ||
| export type Router = RouterStatic; | ||
|
|
||
| // Router | ||
| interface RouterProps extends React.Props<Router> { | ||
| sceneStyle?: StyleProp<ViewStyle>; | ||
| backAndroidHandler?: Function; | ||
| wrapBy?: Function; | ||
| scenes?: any; | ||
| sceneStyle?: StyleProp<ViewStyle>; | ||
| backAndroidHandler?: Function; | ||
| wrapBy?: Function; | ||
| scenes?: any; | ||
| } | ||
| interface RouterStatic extends React.ComponentClass<RouterProps> { } | ||
| interface RouterStatic extends React.ComponentClass<RouterProps> {} | ||
|
|
||
| // Scene | ||
| export var Scene: SceneStatic; | ||
| export type Scene = SceneStatic; | ||
| interface SceneProps extends React.Props<Scene> { | ||
| key?: string; | ||
| component?: React.ComponentType<any> | ||
| back?: boolean; | ||
| init?: boolean; | ||
| clone?: boolean; | ||
| contentComponent?: React.ComponentType<any> | ||
| backButtonImage?: string; | ||
| backButtonTintColor?: string; | ||
| drawer?: boolean; | ||
| failure?: () => void; | ||
| headerBackTitle?: string; | ||
| headerMode?: HeaderModeType; | ||
| hideNavBar?: boolean; | ||
| hideTabBar?: boolean; | ||
| hideBackImage?: boolean; | ||
| initial?: boolean; | ||
| leftButtonImage?: Image; | ||
| modal?: boolean; | ||
| navigationBarTitleImage?: Image; | ||
| navigationBarTitleImageStyle?: StyleProp<ImageStyle>; | ||
| navTransparent?: boolean; | ||
| on?: (props: any) => void; | ||
| onEnter?: (props: any) => void; | ||
| onExit?: (props: any) => void; | ||
| onLeft?: (props: any) => void; | ||
| onRight?: (props: any) => void; | ||
| renderTitle?: React.ComponentType<any> | ||
| renderLeftButton?: React.ComponentType<any> | ||
| renderRightButton?: React.ComponentType<any> | ||
| renderBackButton?: React.ComponentType<any> | ||
| rightButtonImage?: Image; | ||
| rightButtonTextStyle?: StyleProp<TextStyle>; | ||
| success?: () => void; | ||
| tabs?: boolean; | ||
| title?: string; | ||
| titleStyle?: StyleProp<TextStyle>; | ||
| type?: ActionConstShort; | ||
| [name: string]: any; // These are passed through to the scenes | ||
| key?: string; | ||
| component?: React.ComponentType<any>; | ||
| back?: boolean; | ||
| init?: boolean; | ||
| clone?: boolean; | ||
| contentComponent?: React.ComponentType<any>; | ||
| backButtonImage?: string; | ||
| backButtonTintColor?: string; | ||
| drawer?: boolean; | ||
| failure?: (() => void) | string; | ||
| headerBackTitle?: string; | ||
| headerMode?: HeaderModeType; | ||
| hideNavBar?: boolean; | ||
| hideTabBar?: boolean; | ||
| hideBackImage?: boolean; | ||
| initial?: boolean; | ||
| leftButtonImage?: Image; | ||
| modal?: boolean; | ||
| navigationBarTitleImage?: Image; | ||
| navigationBarTitleImageStyle?: StyleProp<ImageStyle>; | ||
| navTransparent?: boolean; | ||
| on?: (props: any) => void; | ||
| onEnter?: (props: any) => void; | ||
| onExit?: (props: any) => void; | ||
| onLeft?: (props: any) => void; | ||
| onRight?: (props: any) => void; | ||
| renderTitle?: React.ComponentType<any>; | ||
| renderLeftButton?: React.ComponentType<any>; | ||
| renderRightButton?: React.ComponentType<any>; | ||
| renderBackButton?: React.ComponentType<any>; | ||
| rightButtonImage?: Image; | ||
| rightButtonTextStyle?: StyleProp<TextStyle>; | ||
| success?: (() => void) | string; | ||
| tabs?: boolean; | ||
| title?: string; | ||
| titleStyle?: StyleProp<TextStyle>; | ||
| type?: ActionConstShort; | ||
| [name: string]: any; // These are passed through to the scenes | ||
| } | ||
| interface TabSceneProps extends React.Props<Scene> { | ||
| icon?: React.ComponentType<any> | ||
| tabBarLabel?: string; | ||
| icon?: React.ComponentType<any>; | ||
| tabBarLabel?: string; | ||
| } | ||
| interface SceneStatic extends React.ComponentClass<SceneProps & TabsProps & TabSceneProps & DrawerProps & ModalProps> { } | ||
| export type HeaderModeType = "float" | "screen" | "none"; | ||
| interface SceneStatic extends React.ComponentClass<SceneProps & TabsProps & TabSceneProps & DrawerProps & ModalProps> {} | ||
| export type HeaderModeType = 'float' | 'screen' | 'none'; | ||
|
|
||
| // Tabs | ||
| export var Tabs: TabsStatic; | ||
| export type Tabs = TabsStatic; | ||
| interface TabsProps extends React.Props<Tabs> { | ||
| wrap?: boolean; | ||
| activeBackgroundColor?: string; | ||
| activeTintColor?: string; | ||
| inactiveBackgroundColor?: string; | ||
| inactiveTintColor?: string; | ||
| labelStyle?: StyleProp<TextStyle>; | ||
| lazy?: boolean; | ||
| tabBarComponent?: React.ComponentType<any> | ||
| tabBarPosition?: TabBarPositionType; | ||
| tabBarStyle?: StyleProp<ViewStyle>; | ||
| tabStyle?: StyleProp<ViewStyle>; | ||
| showLabel?: boolean; | ||
| swipeEnabled?: boolean; | ||
| tabBarOnPress?: Function; | ||
| backToInitial?: boolean; | ||
| wrap?: boolean; | ||
| activeBackgroundColor?: string; | ||
| activeTintColor?: string; | ||
| inactiveBackgroundColor?: string; | ||
| inactiveTintColor?: string; | ||
| labelStyle?: StyleProp<TextStyle>; | ||
| lazy?: boolean; | ||
| hideTabBar?: boolean; | ||
| tabBarComponent?: React.ComponentType<any>; | ||
| tabBarPosition?: TabBarPositionType; | ||
| tabBarStyle?: StyleProp<ViewStyle>; | ||
| tabStyle?: StyleProp<ViewStyle>; | ||
| showLabel?: boolean; | ||
| swipeEnabled?: boolean; | ||
| tabBarOnPress?: Function; | ||
| backToInitial?: boolean; | ||
| } | ||
| interface TabsStatic extends React.ComponentClass<TabsProps> { } | ||
| export type TabBarPositionType = "top" | "bottom"; | ||
| interface TabsStatic extends React.ComponentClass<TabsProps> {} | ||
| export type TabBarPositionType = 'top' | 'bottom'; | ||
|
|
||
| // Drawer | ||
| export var Drawer: DrawerStatic; | ||
| export type Drawer = DrawerStatic; | ||
| interface DrawerProps extends React.Props<Drawer> { | ||
| drawerImage?: Image; | ||
| drawerIcon?: React.ComponentType<any> | ||
| drawerPosition?: DrawerPositionType; | ||
| drawerImage?: Image; | ||
| drawerIcon?: React.ComponentType<any>; | ||
| drawerPosition?: DrawerPositionType; | ||
| } | ||
| interface DrawerStatic extends React.ComponentClass<SceneProps & DrawerProps> { } | ||
| export type DrawerPositionType = "right" | "left"; | ||
| interface DrawerStatic extends React.ComponentClass<SceneProps & DrawerProps> {} | ||
| export type DrawerPositionType = 'right' | 'left'; | ||
|
|
||
| // Modal | ||
| export var Modal: ModalStatic; | ||
| export type Modal = ModalStatic; | ||
| interface ModalProps extends React.Props<Modal> { } | ||
| interface ModalStatic extends React.ComponentClass<SceneProps & ModalProps> { } | ||
| interface ModalProps extends React.Props<Modal> {} | ||
| interface ModalStatic extends React.ComponentClass<SceneProps & ModalProps> {} | ||
|
|
||
| // Overlay | ||
| export var Overlay: OverlayStatic; | ||
| export type Overlay = OverlayStatic; | ||
| interface OverlayProps extends React.Props<Overlay> { } | ||
| interface OverlayStatic extends React.ComponentClass<SceneProps & OverlayProps> { } | ||
| interface OverlayProps extends React.Props<Overlay> {} | ||
| interface OverlayStatic extends React.ComponentClass<SceneProps & OverlayProps> {} | ||
|
|
||
| // Lightbox | ||
| export var Lightbox : LightboxStatic; | ||
| export type Lightbox = LightboxStatic; | ||
| interface LightboxProps extends React.Props<Modal> { } | ||
| interface LightboxStatic extends React.ComponentClass<LightboxProps> { } | ||
| export var Lightbox: LightboxStatic; | ||
| export type Lightbox = LightboxStatic; | ||
| interface LightboxProps extends React.Props<Modal> {} | ||
| interface LightboxStatic extends React.ComponentClass<LightboxProps> {} | ||
|
|
||
| // Stack | ||
| export var Stack: StackStatic; | ||
| export type Stack = StackStatic; | ||
|
|
||
| interface StackProps extends React.Props<Stack> { | ||
| navigationBarStyle?: StyleProp<ViewStyle>; | ||
| icon?: any; | ||
| tintColor?: string; | ||
| hideNavBar?: boolean; | ||
| title?: string; | ||
| titleStyle?: StyleProp<TextStyle>; | ||
| } | ||
| interface StackStatic extends React.ComponentClass<StackProps> { | ||
| navigationBarStyle?: StyleProp<ViewStyle>; | ||
| icon?: any; | ||
| tintColor?: string; | ||
| hideNavBar?: boolean; | ||
| title?: string; | ||
| titleStyle?: StyleProp<TextStyle>; | ||
| } | ||
| interface StackStatic extends React.ComponentClass<StackProps> {} | ||
|
|
||
| export var Actions: ActionsGenericStatic; | ||
| export type Actions = ActionsGenericStatic; | ||
| interface ActionsStatic { | ||
| currentScene: any; | ||
| jump: (sceneKey: string, props?: any) => void; | ||
| pop: () => void; | ||
| popAndPush: (sceneKey: string, props?: any) => void; | ||
| popTo: (sceneKey: string, props?: any) => void; | ||
| push: (sceneKey: string, props?: any) => void; | ||
| refresh: (props?: any) => void; | ||
| replace: (sceneKey: string, props?: any) => void; | ||
| reset: (sceneKey: string, props?: any) => void; | ||
| drawerOpen?: any; | ||
| drawerClose?: any; | ||
|
|
||
| currentScene: any; | ||
| jump: (sceneKey: string, props?: any) => void; | ||
| pop: () => void; | ||
| popAndPush: (sceneKey: string, props?: any) => void; | ||
| popTo: (sceneKey: string, props?: any) => void; | ||
| push: (sceneKey: string, props?: any) => void; | ||
| refresh: (props?: any) => void; | ||
| replace: (sceneKey: string, props?: any) => void; | ||
| reset: (sceneKey: string, props?: any) => void; | ||
| drawerOpen?: any; | ||
| drawerClose?: any; | ||
| } | ||
| interface ActionsGenericStatic extends ActionsStatic { | ||
| [key: string]: (props?: any) => void; | ||
| [key: string]: (props?: any) => void; | ||
| } | ||
|
|
||
| export type ActionConstShort = "jump" | "push" | "replace" | "pop" | "popTo" | "refresh" | "reset"; | ||
| export type ActionConstShort = 'jump' | 'push' | 'replace' | 'pop' | 'popTo' | 'refresh' | 'reset'; | ||
| export declare const ActionConst: ActionConst; | ||
| export type ActionConst = { | ||
| JUMP: string; PUSH: string; PUSH_OR_POP: string; REPLACE: string; | ||
| BACK: string; BACK_ACTION: string; POP_TO: string; REFRESH: string; | ||
| RESET: string; FOCUS: string; BLUR: string; ANDROID_BACK: string; | ||
| } | ||
| JUMP: string; | ||
| PUSH: string; | ||
| PUSH_OR_POP: string; | ||
| REPLACE: string; | ||
| BACK: string; | ||
| BACK_ACTION: string; | ||
| POP_TO: string; | ||
| REFRESH: string; | ||
| RESET: string; | ||
| FOCUS: string; | ||
| BLUR: string; | ||
| ANDROID_BACK: string; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| /** | ||
| * Copyright (c) 2015-present, Pavel Aksonov | ||
| * All rights reserved. | ||
| * | ||
| * This source code is licensed under the BSD-style license found in the | ||
| * LICENSE file in the root directory of this source tree. | ||
| * | ||
| */ | ||
| export default () => null; |
Oops, something went wrong.