diff --git a/src/components/CopyTextToClipboard.js b/src/components/CopyTextToClipboard.js index a9f2ab8d508d..b7c6b3a04d81 100644 --- a/src/components/CopyTextToClipboard.js +++ b/src/components/CopyTextToClipboard.js @@ -5,6 +5,8 @@ import * as Expensicons from './Icon/Expensicons'; import Clipboard from '../libs/Clipboard'; import Icon from './Icon'; import styles from '../styles/styles'; +import themeColors from '../styles/themes/default'; +import variables from '../styles/variables'; const propTypes = { /** The text to display and copy to the clipboard */ @@ -51,9 +53,13 @@ class CopyTextToClipboard extends React.Component { style={[styles.flexRow, styles.cursorPointer]} > {this.props.text} - {this.state.showCheckmark - ? - : } + ); } diff --git a/src/components/Icon/IconWrapperStyles/index.ios.js b/src/components/Icon/IconWrapperStyles/index.ios.js new file mode 100644 index 000000000000..826c38c74e91 --- /dev/null +++ b/src/components/Icon/IconWrapperStyles/index.ios.js @@ -0,0 +1 @@ +export default {top: 1}; diff --git a/src/components/Icon/IconWrapperStyles/index.js b/src/components/Icon/IconWrapperStyles/index.js new file mode 100644 index 000000000000..27b34da0c927 --- /dev/null +++ b/src/components/Icon/IconWrapperStyles/index.js @@ -0,0 +1 @@ +export default {top: 2}; diff --git a/src/components/Icon/index.js b/src/components/Icon/index.js index e7cb4d1e061b..d13a2c5c07cb 100644 --- a/src/components/Icon/index.js +++ b/src/components/Icon/index.js @@ -1,7 +1,11 @@ import React, {PureComponent} from 'react'; +import {View} from 'react-native'; import PropTypes from 'prop-types'; +import styles from '../../styles/styles'; import themeColors from '../../styles/themes/default'; import variables from '../../styles/variables'; +import * as StyleUtils from '../../styles/StyleUtils'; +import IconWrapperStyles from './IconWrapperStyles'; const propTypes = { /** The asset to render. */ @@ -18,6 +22,9 @@ const propTypes = { /** Is small icon */ small: PropTypes.bool, + + /** Is inline icon */ + inline: PropTypes.bool, }; const defaultProps = { @@ -25,6 +32,7 @@ const defaultProps = { height: variables.iconSizeNormal, fill: themeColors.icon, small: false, + inline: false, }; // We must use a class component to create an animatable component with the Animated API @@ -34,13 +42,26 @@ class Icon extends PureComponent { const width = this.props.small ? variables.iconSizeSmall : this.props.width; const height = this.props.small ? variables.iconSizeSmall : this.props.height; const IconToRender = this.props.src; - return ( + + const icon = ( ); + + if (this.props.inline) { + return ( + + + {icon} + + + ); + } + + return icon; } }