Skip to content

17038 - migrate AddReactionBubble to PressableWithFeedback #20158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luacmartins merged 5 commits into from
Jun 14, 2023
Merged

17038 - migrate AddReactionBubble to PressableWithFeedback #20158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1c4d9cf
migrated AddReactionBubble to PressableWithoutFeedback
Skalakid Jun 5, 2023
895cf5e
changed PressableWithFeedback to be able to change icon color on hove…
Skalakid Jun 5, 2023
77fd23f
disabled dimming
Skalakid Jun 5, 2023
3bc0c79
Merge branch 'main' into 17038-migrate-AddReactionBubble
Skalakid Jun 13, 2023
d9cabaa
removed repeating default dimming value
Skalakid Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/Pressable/PressableWithFeedback.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ const PressableWithFeedback = forwardRef((props, ref) => {
...(state.focused ? StyleUtils.parseStyleAsArray(props.focusStyle, state) : []),
]}
>
{props.children}
{_.isFunction(props.children) ? props.children(state) : props.children}
</OpacityView>
)}
</GenericPressable>
Expand Down
11 changes: 8 additions & 3 deletions src/components/Reactions/AddReactionBubble.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {useRef} from 'react';
import {Pressable, View} from 'react-native';
import {View} from 'react-native';
import PropTypes from 'prop-types';
import Tooltip from '../Tooltip';
import styles from '../../styles/styles';
Expand All @@ -12,6 +12,7 @@ import * as EmojiPickerAction from '../../libs/actions/EmojiPickerAction';
import variables from '../../styles/variables';
import withLocalize, {withLocalizePropTypes} from '../withLocalize';
import * as Session from '../../libs/actions/Session';
import PressableWithFeedback from '../Pressable/PressableWithFeedback';

const propTypes = {
/** Whether it is for context menu so we can modify its style */
Expand Down Expand Up @@ -68,12 +69,16 @@ const AddReactionBubble = (props) => {

return (
<Tooltip text={props.translate('emojiReactions.addReactionTooltip')}>
<Pressable
<PressableWithFeedback
ref={ref}
style={({hovered, pressed}) => [styles.emojiReactionBubble, styles.userSelectNone, StyleUtils.getEmojiReactionBubbleStyle(hovered || pressed, false, props.isContextMenu)]}
onPress={Session.checkIfActionIsAllowed(onPress)}
// Prevent text input blur when Add reaction is clicked
onMouseDown={(e) => e.preventDefault()}
accessibilityLabel={props.translate('emojiReactions.addReactionTooltip')}
accessibilityRole="button"

@luacmartins luacmartins Jun 6, 2023 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NAB should we create a CONST for "button"?

@luacmartins luacmartins Jun 7, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're adding the CONSTs here. Let's incorporate those changes in this PR as well.

// disable dimming
pressDimmingValue={1}
>
{({hovered, pressed}) => (
<>
Expand All @@ -91,7 +96,7 @@ const AddReactionBubble = (props) => {
</View>
</>
)}
</Pressable>
</PressableWithFeedback>
</Tooltip>
);
};
Expand Down