|
1 | 1 | import { FloatingArrow } from "@floating-ui/react";
|
2 | 2 | import { clsx } from "clsx";
|
3 |
| -import React, { createElement, Component } from "react"; |
| 3 | +import React, { createElement } from "react"; |
4 | 4 |
|
5 | 5 | import Portal from "./portal";
|
6 | 6 | import TabLoop from "./tab_loop";
|
@@ -29,82 +29,74 @@ interface PopperComponentProps
|
29 | 29 | }
|
30 | 30 |
|
31 | 31 | // Exported for testing purposes
|
32 |
| -export class PopperComponent extends Component<PopperComponentProps> { |
33 |
| - static get defaultProps() { |
34 |
| - return { |
35 |
| - hidePopper: true, |
36 |
| - }; |
37 |
| - } |
38 |
| - |
39 |
| - render(): React.ReactElement { |
40 |
| - const { |
41 |
| - className, |
42 |
| - wrapperClassName, |
43 |
| - hidePopper = PopperComponent.defaultProps.hidePopper, |
44 |
| - popperComponent, |
45 |
| - targetComponent, |
46 |
| - enableTabLoop, |
47 |
| - popperOnKeyDown, |
48 |
| - portalId, |
49 |
| - portalHost, |
50 |
| - popperProps, |
51 |
| - showArrow, |
52 |
| - } = this.props; |
53 |
| - |
54 |
| - let popper: React.ReactElement | undefined = undefined; |
| 32 | +export const PopperComponent: React.FC<PopperComponentProps> = (props) => { |
| 33 | + const { |
| 34 | + className, |
| 35 | + wrapperClassName, |
| 36 | + hidePopper = true, |
| 37 | + popperComponent, |
| 38 | + targetComponent, |
| 39 | + enableTabLoop, |
| 40 | + popperOnKeyDown, |
| 41 | + portalId, |
| 42 | + portalHost, |
| 43 | + popperProps, |
| 44 | + showArrow, |
| 45 | + } = props; |
55 | 46 |
|
56 |
| - if (!hidePopper) { |
57 |
| - const classes = clsx("react-datepicker-popper", className); |
58 |
| - popper = ( |
59 |
| - <TabLoop enableTabLoop={enableTabLoop}> |
60 |
| - <div |
61 |
| - ref={popperProps.refs.setFloating} |
62 |
| - style={popperProps.floatingStyles} |
63 |
| - className={classes} |
64 |
| - data-placement={popperProps.placement} |
65 |
| - onKeyDown={popperOnKeyDown} |
66 |
| - > |
67 |
| - {popperComponent} |
68 |
| - {showArrow && ( |
69 |
| - <FloatingArrow |
70 |
| - ref={popperProps.arrowRef} |
71 |
| - context={popperProps.context} |
72 |
| - fill="currentColor" |
73 |
| - strokeWidth={1} |
74 |
| - height={8} |
75 |
| - width={16} |
76 |
| - style={{ transform: "translateY(-1px)" }} |
77 |
| - className="react-datepicker__triangle" |
78 |
| - /> |
79 |
| - )} |
80 |
| - </div> |
81 |
| - </TabLoop> |
82 |
| - ); |
83 |
| - } |
| 47 | + let popper: React.ReactElement | undefined = undefined; |
84 | 48 |
|
85 |
| - if (this.props.popperContainer) { |
86 |
| - popper = createElement(this.props.popperContainer, {}, popper); |
87 |
| - } |
88 |
| - |
89 |
| - if (portalId && !hidePopper) { |
90 |
| - popper = ( |
91 |
| - <Portal portalId={portalId} portalHost={portalHost}> |
92 |
| - {popper} |
93 |
| - </Portal> |
94 |
| - ); |
95 |
| - } |
| 49 | + if (!hidePopper) { |
| 50 | + const classes = clsx("react-datepicker-popper", className); |
| 51 | + popper = ( |
| 52 | + <TabLoop enableTabLoop={enableTabLoop}> |
| 53 | + <div |
| 54 | + ref={popperProps.refs.setFloating} |
| 55 | + style={popperProps.floatingStyles} |
| 56 | + className={classes} |
| 57 | + data-placement={popperProps.placement} |
| 58 | + onKeyDown={popperOnKeyDown} |
| 59 | + > |
| 60 | + {popperComponent} |
| 61 | + {showArrow && ( |
| 62 | + <FloatingArrow |
| 63 | + ref={popperProps.arrowRef} |
| 64 | + context={popperProps.context} |
| 65 | + fill="currentColor" |
| 66 | + strokeWidth={1} |
| 67 | + height={8} |
| 68 | + width={16} |
| 69 | + style={{ transform: "translateY(-1px)" }} |
| 70 | + className="react-datepicker__triangle" |
| 71 | + /> |
| 72 | + )} |
| 73 | + </div> |
| 74 | + </TabLoop> |
| 75 | + ); |
| 76 | + } |
96 | 77 |
|
97 |
| - const wrapperClasses = clsx("react-datepicker-wrapper", wrapperClassName); |
| 78 | + if (props.popperContainer) { |
| 79 | + popper = createElement(props.popperContainer, {}, popper); |
| 80 | + } |
98 | 81 |
|
99 |
| - return ( |
100 |
| - <> |
101 |
| - <div ref={popperProps.refs.setReference} className={wrapperClasses}> |
102 |
| - {targetComponent} |
103 |
| - </div> |
| 82 | + if (portalId && !hidePopper) { |
| 83 | + popper = ( |
| 84 | + <Portal portalId={portalId} portalHost={portalHost}> |
104 | 85 | {popper}
|
105 |
| - </> |
| 86 | + </Portal> |
106 | 87 | );
|
107 | 88 | }
|
108 |
| -} |
| 89 | + |
| 90 | + const wrapperClasses = clsx("react-datepicker-wrapper", wrapperClassName); |
| 91 | + |
| 92 | + return ( |
| 93 | + <> |
| 94 | + <div ref={popperProps.refs.setReference} className={wrapperClasses}> |
| 95 | + {targetComponent} |
| 96 | + </div> |
| 97 | + {popper} |
| 98 | + </> |
| 99 | + ); |
| 100 | +}; |
109 | 101 |
|
110 | 102 | export default withFloating<PopperComponentProps>(PopperComponent);
|
0 commit comments