From 477c6f8e61cb5bc719c5e4a9cb46752ec3b9dccb Mon Sep 17 00:00:00 2001 From: Phoebe Date: Fri, 23 Aug 2019 15:28:08 -0700 Subject: [PATCH 1/3] disable flip property in popover components --- src/components/Popover.js | 14 +++++++++++++- src/components/Tooltip.js | 13 ++++++++++++- src/components/UncontrolledPopover.js | 14 +++++++++++++- src/components/UncontrolledTooltip.js | 14 +++++++++++++- 4 files changed, 51 insertions(+), 4 deletions(-) diff --git a/src/components/Popover.js b/src/components/Popover.js index 0591d2c04..a65f44ec3 100644 --- a/src/components/Popover.js +++ b/src/components/Popover.js @@ -1,3 +1,4 @@ +import React from 'react'; import PropTypes from 'prop-types'; import Popover from 'reactstrap/lib/Popover'; @@ -11,4 +12,15 @@ Popover.defaultProps = { fade: false }; -export default Popover; +export default props => ( + +); diff --git a/src/components/Tooltip.js b/src/components/Tooltip.js index 23699fd25..6e5ecf962 100644 --- a/src/components/Tooltip.js +++ b/src/components/Tooltip.js @@ -26,7 +26,18 @@ export default class Tooltip extends React.Component { const { isOpen, ...props } = this.props; // eslint-disable-line no-unused-vars return ( - + ); } } diff --git a/src/components/UncontrolledPopover.js b/src/components/UncontrolledPopover.js index 8ffacf159..054898c72 100644 --- a/src/components/UncontrolledPopover.js +++ b/src/components/UncontrolledPopover.js @@ -1,3 +1,15 @@ +import React from 'react'; import UncontrolledPopover from 'reactstrap/lib/UncontrolledPopover'; -export default UncontrolledPopover; +export default props => ( + +); diff --git a/src/components/UncontrolledTooltip.js b/src/components/UncontrolledTooltip.js index 6734181e1..d953db692 100644 --- a/src/components/UncontrolledTooltip.js +++ b/src/components/UncontrolledTooltip.js @@ -1,3 +1,15 @@ +import React from 'react'; import UncontrolledTooltip from 'reactstrap/lib/UncontrolledTooltip'; -export default UncontrolledTooltip; +export default props => ( + +); From 5444152cff6cb57f676f057ed678ba37016ae26f Mon Sep 17 00:00:00 2001 From: Phoebe Date: Mon, 26 Aug 2019 09:35:23 -0700 Subject: [PATCH 2/3] user flip property instead of modifier --- src/components/Popover.js | 16 +++++----------- src/components/Tooltip.js | 12 ++++-------- src/components/UncontrolledPopover.js | 21 ++++++++------------- src/components/UncontrolledTooltip.js | 21 ++++++++------------- 4 files changed, 25 insertions(+), 45 deletions(-) diff --git a/src/components/Popover.js b/src/components/Popover.js index a65f44ec3..fd042a9c1 100644 --- a/src/components/Popover.js +++ b/src/components/Popover.js @@ -9,18 +9,12 @@ Popover.propTypes = { Popover.defaultProps = { ...Popover.defaultProps, - fade: false + fade: false, + // This is a workaround for the reactstrap Tooltip memory leak issue. + // https://github.com/reactstrap/reactstrap/issues/1482 + flip: false, }; export default props => ( - + ); diff --git a/src/components/Tooltip.js b/src/components/Tooltip.js index 6e5ecf962..8408b67dd 100644 --- a/src/components/Tooltip.js +++ b/src/components/Tooltip.js @@ -11,7 +11,10 @@ export default class Tooltip extends React.Component { static defaultProps = { ...InnerTooltip.defaultProps, isOpen: false, - fade: false + fade: false, + // This is a workaround for the reactstrap Tooltip memory leak issue. + // https://github.com/reactstrap/reactstrap/issues/1482 + flip: false, }; state = { @@ -30,13 +33,6 @@ export default class Tooltip extends React.Component { isOpen={this.state.isOpen} toggle={this.toggle} {...props} - // This is a workaround for the reactstrap Tooltip memory leak issue. - // https://github.com/reactstrap/reactstrap/issues/1482 - modifiers={{ - flip: { - enabled: false, - }, - }} /> ); } diff --git a/src/components/UncontrolledPopover.js b/src/components/UncontrolledPopover.js index 054898c72..f92eb062f 100644 --- a/src/components/UncontrolledPopover.js +++ b/src/components/UncontrolledPopover.js @@ -1,15 +1,10 @@ -import React from 'react'; import UncontrolledPopover from 'reactstrap/lib/UncontrolledPopover'; -export default props => ( - -); +UncontrolledPopover.defaultProps = { + ...UncontrolledPopover.defaultProps, + // This is a workaround for the reactstrap Tooltip memory leak issue. + // https://github.com/reactstrap/reactstrap/issues/1482 + flip: false, +}; + +export default UncontrolledPopover; diff --git a/src/components/UncontrolledTooltip.js b/src/components/UncontrolledTooltip.js index d953db692..71d73f421 100644 --- a/src/components/UncontrolledTooltip.js +++ b/src/components/UncontrolledTooltip.js @@ -1,15 +1,10 @@ -import React from 'react'; import UncontrolledTooltip from 'reactstrap/lib/UncontrolledTooltip'; -export default props => ( - -); +UncontrolledTooltip.defaultProps = { + ...UncontrolledTooltip.defaultProps, + // This is a workaround for the reactstrap Tooltip memory leak issue. + // https://github.com/reactstrap/reactstrap/issues/1482 + flip: false, +}; + +export default UncontrolledTooltip; From c160206bd5fb890d912e459b1f38f5360105b8b5 Mon Sep 17 00:00:00 2001 From: Phoebe Date: Mon, 26 Aug 2019 09:36:19 -0700 Subject: [PATCH 3/3] cleanup --- src/components/Popover.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/components/Popover.js b/src/components/Popover.js index fd042a9c1..d196f7c83 100644 --- a/src/components/Popover.js +++ b/src/components/Popover.js @@ -1,4 +1,3 @@ -import React from 'react'; import PropTypes from 'prop-types'; import Popover from 'reactstrap/lib/Popover'; @@ -15,6 +14,4 @@ Popover.defaultProps = { flip: false, }; -export default props => ( - -); +export default Popover;