feat: use pressable with press feedback #19391
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,9 @@ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import * as Expensicons from './Icon/Expensicons'; | ||
| import PressableWithDelayToggle from './PressableWithDelayToggle'; | ||
| import Clipboard from '../libs/Clipboard'; | ||
| import withLocalize, {withLocalizePropTypes} from './withLocalize'; | ||
|
|
||
| const propTypes = { | ||
| /** The text to display and copy to the clipboard */ | ||
|
|
@@ -23,8 +14,6 @@ const propTypes = { | |
| textStyles: PropTypes.arrayOf(PropTypes.object), | ||
|
|
||
| ...withLocalizePropTypes, | ||
| }; | ||
|
|
||
| const defaultProps = { | ||
|
|
@@ -39,40 +28,24 @@ class CopyTextToClipboard extends React.Component { | |
| } | ||
|
|
||
| copyToClipboard() { | ||
| Clipboard.setString(this.props.text); | ||
| } | ||
|
|
||
| render() { | ||
| return ( | ||
| <PressableWithDelayToggle | ||
| text={this.props.text} | ||
| tooltipText={this.props.translate('reportActionContextMenu.copyToClipboard')} | ||
| tooltipTextChecked={this.props.translate('reportActionContextMenu.copied')} | ||
| icon={Expensicons.Copy} | ||
| textStyles={this.props.textStyles} | ||
| onPress={this.copyToClipboard} | ||
|
There was a problem hiding this comment. Coming from #24591 We are missing the prop |
||
| /> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| CopyTextToClipboard.propTypes = propTypes; | ||
| CopyTextToClipboard.defaultProps = defaultProps; | ||
|
|
||
| export default withLocalize(CopyTextToClipboard); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import {Pressable} from 'react-native'; | ||
| import * as Expensicons from './Icon/Expensicons'; | ||
| import compose from '../libs/compose'; | ||
| import Icon from './Icon'; | ||
| import Tooltip from './Tooltip'; | ||
| import Text from './Text'; | ||
| import styles from '../styles/styles'; | ||
| import variables from '../styles/variables'; | ||
| import getButtonState from '../libs/getButtonState'; | ||
| import * as StyleUtils from '../styles/StyleUtils'; | ||
| import withLocalize, {withLocalizePropTypes} from './withLocalize'; | ||
| import withDelayToggleButtonState, {withDelayToggleButtonStatePropTypes} from './withDelayToggleButtonState'; | ||
|
|
||
| const propTypes = { | ||
| /** The text to display */ | ||
| text: PropTypes.string, | ||
|
|
||
| /** The text to display once the pressable is pressed */ | ||
| textChecked: PropTypes.string, | ||
|
|
||
| /** The tooltip text to display */ | ||
| tooltipText: PropTypes.string, | ||
|
|
||
| /** The tooltip text to display once the pressable is pressed */ | ||
| tooltipTextChecked: PropTypes.string, | ||
|
|
||
| /** Styles to apply to the container */ | ||
| // eslint-disable-next-line react/forbid-prop-types | ||
| styles: PropTypes.arrayOf(PropTypes.object), | ||
|
|
||
| /** Styles to apply to the text */ | ||
| // eslint-disable-next-line react/forbid-prop-types | ||
| textStyles: PropTypes.arrayOf(PropTypes.object), | ||
|
|
||
| /** Styles to apply to the icon */ | ||
| // eslint-disable-next-line react/forbid-prop-types | ||
| iconStyles: PropTypes.arrayOf(PropTypes.object), | ||
|
|
||
| /** Callback to be called on onPress */ | ||
| onPress: PropTypes.func.isRequired, | ||
|
|
||
| /** The icon to display */ | ||
| icon: PropTypes.func, | ||
|
|
||
| /** The icon to display once the pressable is pressed */ | ||
| iconChecked: PropTypes.func, | ||
|
|
||
| /** If the component should be inline with text or not */ | ||
|
There was a problem hiding this comment. This comment should describe when / why would we use this prop |
||
| inline: PropTypes.bool, | ||
|
|
||
| ...withLocalizePropTypes, | ||
|
|
||
| ...withDelayToggleButtonStatePropTypes, | ||
BeeMargarida marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }; | ||
|
|
||
| const defaultProps = { | ||
| text: '', | ||
| textChecked: '', | ||
| tooltipText: '', | ||
| tooltipTextChecked: '', | ||
| styles: [], | ||
| textStyles: [], | ||
| iconStyles: [], | ||
| icon: null, | ||
| inline: true, | ||
| iconChecked: Expensicons.Checkmark, | ||
| }; | ||
|
|
||
| function PressableWithDelayToggle(props) { | ||
| const updatePressState = () => { | ||
| if (props.isDelayButtonStateComplete) { | ||
| return; | ||
| } | ||
| props.toggleDelayButtonState(true); | ||
BeeMargarida marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| props.onPress(); | ||
| }; | ||
|
|
||
| // Due to limitations in RN regarding the vertical text alignment of non-Text elements, | ||
| // for elements that are supposed to be inline, we need to use a Text element instead | ||
| // of a Pressable | ||
| const PressableView = props.inline ? Text : Pressable; | ||
|
|
||
| return ( | ||
| <PressableView | ||
| style={[...props.styles, styles.flexRow]} | ||
BeeMargarida marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| onPress={updatePressState} | ||
| > | ||
| <Tooltip | ||
| containerStyles={styles.flexRow} | ||
| text={props.isDelayButtonStateComplete ? props.tooltipTextChecked : props.tooltipText} | ||
| > | ||
| <Text | ||
|
There was a problem hiding this comment. There is a console error caused by this line - 
|
||
| suppressHighlighting | ||
| style={[...props.textStyles, styles.mr1]} | ||
BeeMargarida marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| > | ||
| {props.isDelayButtonStateComplete && props.textChecked ? props.textChecked : props.text} | ||
| </Text> | ||
| <Pressable | ||
| ref={props.innerRef} | ||
| focusable | ||
| accessibilityLabel={props.isDelayButtonStateComplete ? props.tooltipTextChecked : props.tooltipText} | ||
| onPress={updatePressState} | ||
| > | ||
| {({hovered, pressed}) => ( | ||
| <> | ||
| {props.icon && ( | ||
| <Icon | ||
| src={props.isDelayButtonStateComplete ? props.iconChecked : props.icon} | ||
| fill={StyleUtils.getIconFillColor(getButtonState(hovered, pressed, props.isDelayButtonStateComplete))} | ||
| style={props.iconStyles} | ||
| width={variables.iconSizeSmall} | ||
| height={variables.iconSizeSmall} | ||
| /> | ||
| )} | ||
| </> | ||
| )} | ||
| </Pressable> | ||
| </Tooltip> | ||
| </PressableView> | ||
| ); | ||
| } | ||
|
|
||
| PressableWithDelayToggle.propTypes = propTypes; | ||
| PressableWithDelayToggle.defaultProps = defaultProps; | ||
|
|
||
| export default compose( | ||
| withLocalize, | ||
| withDelayToggleButtonState, | ||
| )( | ||
| React.forwardRef((props, ref) => ( | ||
| <PressableWithDelayToggle | ||
| // eslint-disable-next-line react/jsx-props-no-spreading | ||
| {...props} | ||
| innerRef={ref} | ||
| /> | ||
| )), | ||
| ); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like this has caused issues in such button components
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@MonilBhavsar Seems like the left icon styles were also being applied to the right icon. Fixed ✅