moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ios-emoji-react-fix' into 'develop' 

Emoji reacts: use hover or click depending on isUserTouching, fixes #629

Closes #629

See merge request soapbox-pub/soapbox-fe!492
This commit is contained in:
Alex Gleason 2021-05-02 21:08:09 +00:00
parent 010a8b5939 55902f1d80
commit e6fe7f7d52
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/soapbox/features/status/components/action_bar.js
View File

@ -8,6 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import DropdownMenuContainer from '../../../containers/dropdown_menu_container'; import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
import { defineMessages, injectIntl } from 'react-intl'; import { defineMessages, injectIntl } from 'react-intl';
import { isStaff } from 'soapbox/utils/accounts'; import { isStaff } from 'soapbox/utils/accounts';
import { isUserTouching } from 'soapbox/is_mobile';
import EmojiSelector from 'soapbox/components/emoji_selector'; import EmojiSelector from 'soapbox/components/emoji_selector';
import { getReactForStatus } from 'soapbox/utils/emoji_reacts'; import { getReactForStatus } from 'soapbox/utils/emoji_reacts';
@ -129,19 +130,17 @@ class ActionBar extends React.PureComponent {
} }
} }
isMobile = () => window.matchMedia('only screen and (max-width: 895px)').matches;
handleLikeButtonHover = e => { handleLikeButtonHover = e => {
if (!this.isMobile()) this.setState({ emojiSelectorVisible: true }); if (!isUserTouching()) this.setState({ emojiSelectorVisible: true });
} }
handleLikeButtonLeave = e => { handleLikeButtonLeave = e => {
if (!this.isMobile()) this.setState({ emojiSelectorVisible: false }); if (!isUserTouching()) this.setState({ emojiSelectorVisible: false });
} }
handleLikeButtonClick = e => { handleLikeButtonClick = e => {
const meEmojiReact = getReactForStatus(this.props.status, this.props.allowedEmoji) || '👍'; const meEmojiReact = getReactForStatus(this.props.status, this.props.allowedEmoji) || '👍';
if (this.isMobile()) { if (isUserTouching()) {
if (this.state.emojiSelectorVisible) { if (this.state.emojiSelectorVisible) {
this.handleReactClick(meEmojiReact)(); this.handleReactClick(meEmojiReact)();
} else { } else {