|
9 | 9 | /* tslint:disable: variable-name */ |
10 | 10 |
|
11 | 11 | import * as React from "react"; |
| 12 | +import { |
| 13 | + CSSProperties, Component, ComponentClass, ReactNode, |
| 14 | + StatelessComponent, ReactElement, HTMLAttributes, |
| 15 | +} from "react"; |
12 | 16 |
|
13 | 17 | import { resolveTransit } from "./transit"; |
14 | 18 | import { TransitionObserver, TransitionObserverProps } from "./transitionobserver"; |
15 | 19 |
|
16 | 20 | const TICK = 17; |
17 | 21 |
|
18 | 22 | export interface CSSTransitionProps |
19 | | - extends React.HTMLAttributes<any> { |
| 23 | + extends HTMLAttributes<any> { |
20 | 24 | active?: boolean; |
21 | 25 | transitionAppear?: boolean; |
22 | 26 | transitionDelay?: number; |
23 | 27 | onTransitionComplete?: () => void; |
24 | | - component?: string | React.ComponentClass<any>; |
25 | | - children?: React.ReactNode; |
26 | | - defaultStyle?: React.CSSProperties; |
27 | | - activeStyle?: React.CSSProperties; |
28 | | - enterStyle?: React.CSSProperties; |
29 | | - leaveStyle?: React.CSSProperties; |
30 | | - style?: React.CSSProperties; |
| 28 | + component?: string | ComponentClass<any> | StatelessComponent<any>; |
| 29 | + children?: ReactNode; |
| 30 | + defaultStyle?: CSSProperties; |
| 31 | + activeStyle?: CSSProperties; |
| 32 | + enterStyle?: CSSProperties; |
| 33 | + leaveStyle?: CSSProperties; |
| 34 | + style?: CSSProperties; |
31 | 35 | // TODO: |
32 | 36 | // prepareForTransition?: boolean; |
33 | | - // appearStyle?: React.CSSProperties; |
34 | | - // appearInitStyle?: React.CSSProperty; |
35 | | - // enterInitStyle?: React.CSSProperties; |
36 | | - // leaveInitStyle?: React.CSSProperties; |
| 37 | + // appearStyle?: CSSProperties; |
| 38 | + // appearInitStyle?: CSSProperty; |
| 39 | + // enterInitStyle?: CSSProperties; |
| 40 | + // leaveInitStyle?: CSSProperties; |
37 | 41 | } |
38 | 42 |
|
39 | 43 | export interface CSSTransitionState { |
40 | 44 | id?: StateID; |
41 | | - style?: React.CSSProperties; |
| 45 | + style?: CSSProperties; |
42 | 46 | } |
43 | 47 |
|
44 | 48 | export enum StateID { |
@@ -96,7 +100,7 @@ const transitToDefaultStartedState = (props: CSSTransitionProps) => ({ |
96 | 100 | style: { ...props.style, ...resolveTransit(props.leaveStyle, props.transitionDelay) }, |
97 | 101 | }); |
98 | 102 |
|
99 | | -export class CSSTransition extends React.Component<CSSTransitionProps, CSSTransitionState> { |
| 103 | +export class CSSTransition extends Component<CSSTransitionProps, CSSTransitionState> { |
100 | 104 | public static defaultProps: any = { |
101 | 105 | component: "div", |
102 | 106 | }; |
@@ -127,7 +131,7 @@ export class CSSTransition extends React.Component<CSSTransitionProps, CSSTransi |
127 | 131 | this.dispatch(Action.TransitionRun, nextProps); |
128 | 132 | } |
129 | 133 |
|
130 | | - public render(): React.ReactElement<any> { |
| 134 | + public render(): ReactElement<any> { |
131 | 135 | const { |
132 | 136 | children, |
133 | 137 | component, |
|
0 commit comments