From 7fcd0e41e55ec745f84176eefe8521b6f0e43f4c Mon Sep 17 00:00:00 2001 From: KMY Date: Wed, 22 Feb 2023 16:48:37 +0900 Subject: [PATCH] Add emoji-reaction icons as an item of action bar --- .../mastodon/components/status_action_bar.js | 12 ++++++++++++ .../features/status/components/action_bar.js | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js index eeb376561c..f6967219dc 100644 --- a/app/javascript/mastodon/components/status_action_bar.js +++ b/app/javascript/mastodon/components/status_action_bar.js @@ -4,6 +4,7 @@ import { connect } from 'react-redux'; import PropTypes from 'prop-types'; import IconButton from './icon_button'; import DropdownMenuContainer from '../containers/dropdown_menu_container'; +import EmojiPickerDropdown from '../features/compose/containers/emoji_picker_dropdown_container'; import { defineMessages, injectIntl } from 'react-intl'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { me } from '../initial_state'; @@ -231,6 +232,16 @@ class StatusActionBar extends ImmutablePureComponent { this.props.onFilter(); }; + handleEmojiPick = (data) => { + /* + const { text } = this.props; + const position = this.autosuggestTextarea.textarea.selectionStart; + const needsSpace = data.custom && position > 0 && !allowedAroundShortCode.includes(text[position - 1]); + + this.props.onPickEmoji(position, data, needsSpace); + */ + }; + render () { const { status, relationship, intl, withDismiss, withCounters, scrollKey } = this.props; const { signedIn, permissions } = this.context.identity; @@ -363,6 +374,7 @@ class StatusActionBar extends ImmutablePureComponent { + {shareButton} diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js index 0d4767331a..02860357ce 100644 --- a/app/javascript/mastodon/features/status/components/action_bar.js +++ b/app/javascript/mastodon/features/status/components/action_bar.js @@ -4,6 +4,7 @@ import { connect } from 'react-redux'; import IconButton from '../../../components/icon_button'; import ImmutablePropTypes from 'react-immutable-proptypes'; import DropdownMenuContainer from '../../../containers/dropdown_menu_container'; +import EmojiPickerDropdown from '../../compose/containers/emoji_picker_dropdown_container'; import { defineMessages, injectIntl } from 'react-intl'; import { me } from '../../../initial_state'; import classNames from 'classnames'; @@ -180,6 +181,16 @@ class ActionBar extends React.PureComponent { navigator.clipboard.writeText(url); }; + handleEmojiPick = (data) => { + /* + const { text } = this.props; + const position = this.autosuggestTextarea.textarea.selectionStart; + const needsSpace = data.custom && position > 0 && !allowedAroundShortCode.includes(text[position - 1]); + + this.props.onPickEmoji(position, data, needsSpace); + */ + }; + render () { const { status, relationship, intl } = this.props; const { signedIn, permissions } = this.context.identity; @@ -287,6 +298,7 @@ class ActionBar extends React.PureComponent {
+
{shareButton}