@@ -11,13 +11,13 @@ import { CSSProperties, ComponentClass, ReactNode, StatelessComponent, HTMLAttri
11
11
import { assemble , setDisplayName , omitProps , defaultProps } from "reassemble" ;
12
12
13
13
import { reducer } from "./reducer" ;
14
- import { withTransitionState } from "./composables/withTransitionState" ;
14
+ import { withTransitionState , WithTransitionStateProps } from "./composables/withTransitionState" ;
15
15
import { mergeWithBaseStyle } from "./composables/mergeWithBaseStyle" ;
16
- import { withTransitionInfo } from "./composables/withTransitionInfo" ;
17
- import { withTransitionObserver } from "./composables/withTransitionObserver" ;
16
+ import { withTransitionInfo , WithTransitionInfoProps } from "./composables/withTransitionInfo" ;
17
+ import { withTransitionObserver , WithTransitionObserverProps } from "./composables/withTransitionObserver" ;
18
18
import { withWorkaround } from "./composables/withWorkaround" ;
19
19
import { preventPhantomEvents } from "./composables/preventPhantomEvents" ;
20
- import { withDOMNodeCallback } from "./composables/withDOMNodeCallback" ;
20
+ import { withDOMNodeCallback , WithDOMNodeCallbackProps } from "./composables/withDOMNodeCallback" ;
21
21
22
22
export type CSSTransitionDelay = number | { appear ?: number ; enter ?: number ; leave ?: number } ;
23
23
export type CSSTransitionEventHandler = ( ) => void ;
@@ -59,11 +59,18 @@ export interface CSSTransitionInnerProps
59
59
onDOMNodeRef ?: ( ref : Element ) => void ;
60
60
}
61
61
62
+ type PropsUnion = CSSTransitionProps
63
+ & WithTransitionInfoProps
64
+ & WithTransitionStateProps
65
+ & WithDOMNodeCallbackProps
66
+ & WithTransitionObserverProps
67
+ & CSSTransitionInnerProps ;
68
+
62
69
const withDefaultProps = defaultProps < Partial < CSSTransitionProps > > ( {
63
70
component : "div" ,
64
71
} ) ;
65
72
66
- const mapPropsToInner = omitProps < keyof CSSTransitionProps | "onTransitionBegin" | "transitionInfo" | "transitionState" | "getDOMNode" > (
73
+ const mapPropsToInner = omitProps < keyof PropsUnion > (
67
74
"active" ,
68
75
"transitionAppear" ,
69
76
"defaultStyle" ,
0 commit comments