diff --git a/packages/fether-react/package.json b/packages/fether-react/package.json index 6b68b0cbe4894eba24b0b10053ed4fbce9eb3a15..112e5a7dded1ab6283312397e38cccde4b14cd36 100644 --- a/packages/fether-react/package.json +++ b/packages/fether-react/package.json @@ -54,7 +54,6 @@ "react-markdown": "^3.3.4", "react-router-dom": "^4.2.2", "react-scripts": "1.1.4", - "react-tooltip": "^3.6.1", "recompose": "^0.27.1", "rxjs": "^6.2.0" }, diff --git a/packages/fether-ui/package.json b/packages/fether-ui/package.json index 9d676770c8ce5416e6e0c3892da5877a2213d7f4..54c8a4b87a2ac607bf2e147b6af76df5f1dde371 100644 --- a/packages/fether-ui/package.json +++ b/packages/fether-ui/package.json @@ -33,7 +33,6 @@ "dependencies": { "react-blockies": "^1.3.0", "react-content-loader": "^3.1.2", - "react-tooltip": "^3.6.1", "semantic-ui-css": "^2.3.2", "semantic-ui-react": "^0.81.3" }, diff --git a/packages/fether-ui/src/ClickToCopy/ClickToCopy.js b/packages/fether-ui/src/ClickToCopy/ClickToCopy.js index ceb3180a31b89ee47360f4f3a9ddcf9b51bf09fc..dad2824317eb610366c90ba1079827e4a2056866 100644 --- a/packages/fether-ui/src/ClickToCopy/ClickToCopy.js +++ b/packages/fether-ui/src/ClickToCopy/ClickToCopy.js @@ -4,8 +4,9 @@ // SPDX-License-Identifier: BSD-3-Clause import React, { PureComponent } from 'react'; +import { Popup } from 'semantic-ui-react'; import PropTypes from 'prop-types'; -import ReactTooltip from 'react-tooltip'; +import 'semantic-ui-css/components/popup.min.css'; export class ClickToCopy extends PureComponent { static defaultProps = { @@ -21,10 +22,6 @@ export class ClickToCopy extends PureComponent { copied: false }; - componentWillUnmount () { - window.clearTimeout(this.timeout); - } - handleCopy = () => { // https://hackernoon.com/copying-text-to-clipboard-with-javascript-df4d4988697f // Note react-copy-to-clipboard created a bug, https://github.com/nkbt/react-copy-to-clipboard/issues/92 @@ -36,35 +33,27 @@ export class ClickToCopy extends PureComponent { document.body.removeChild(el); this.setState({ copied: true }); - - // Show the copied state only for 1s - if (this.timeout) { - window.clearTimeout(this.timeout); - } - this.timeout = window.setTimeout( - () => this.setState({ copied: false }), - 1000 - ); }; - handleResetCopied = () => {}; + handleResetCopied = () => this.setState({ copied: false }); render () { const { children, label, ...otherProps } = this.props; const { copied } = this.state; return ( -