@@ -33,19 +33,15 @@ interface PortalNodeBase<C extends Component<any>> {
3333 // latest placeholder we replaced. This avoids some race conditions.
3434 unmount ( expectedPlaceholder ?: Node ) : void ;
3535}
36- export interface HtmlBlockPortalNode < C extends Component < any > = Component < any > > extends PortalNodeBase < C > {
36+ export interface HtmlPortalNode < C extends Component < any > = Component < any > > extends PortalNodeBase < C > {
3737 element : HTMLElement ;
38- elementType : typeof ELEMENT_TYPE_HTML_BLOCK ;
39- }
40- export interface HtmlInlinePortalNode < C extends Component < any > = Component < any > > extends PortalNodeBase < C > {
41- element : HTMLElement ;
42- elementType : typeof ELEMENT_TYPE_HTML_INLINE ;
38+ elementType : typeof ELEMENT_TYPE_HTML_BLOCK | typeof ELEMENT_TYPE_HTML_INLINE ;
4339}
4440export interface SvgPortalNode < C extends Component < any > = Component < any > > extends PortalNodeBase < C > {
4541 element : SVGElement ;
4642 elementType : typeof ELEMENT_TYPE_SVG ;
4743}
48- type AnyPortalNode < C extends Component < any > = Component < any > > = HtmlBlockPortalNode < C > | HtmlInlinePortalNode < C > | SvgPortalNode < C > ;
44+ type AnyPortalNode < C extends Component < any > = Component < any > > = HtmlPortalNode < C > | SvgPortalNode < C > ;
4945
5046
5147const validateElementType = ( domElement : Element , elementType : ANY_ELEMENT_TYPE ) => {
@@ -257,9 +253,9 @@ class OutPortal<C extends Component<any>> extends React.PureComponent<OutPortalP
257253}
258254
259255const createHtmlPortalNode = createPortalNode . bind ( null , ELEMENT_TYPE_HTML_BLOCK ) as
260- < C extends Component < any > = Component < any > > ( options ?: Options ) => HtmlBlockPortalNode < C > ;
256+ < C extends Component < any > = Component < any > > ( options ?: Options ) => HtmlPortalNode < C > ;
261257const createHtmlInlinePortalNode = createPortalNode . bind ( null , ELEMENT_TYPE_HTML_INLINE ) as
262- < C extends Component < any > = Component < any > > ( options ?: Options ) => HtmlInlinePortalNode < C > ;
258+ < C extends Component < any > = Component < any > > ( options ?: Options ) => HtmlPortalNode < C > ;
263259const createSvgPortalNode = createPortalNode . bind ( null , ELEMENT_TYPE_SVG ) as
264260 < C extends Component < any > = Component < any > > ( options ?: Options ) => SvgPortalNode < C > ;
265261
0 commit comments