From e443f3c90a4f96bc9f6c9ddac5663d6df41fdd5c 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.jsx | 12 ++++++++++++ .../features/status/components/action_bar.jsx | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/app/javascript/mastodon/components/status_action_bar.jsx b/app/javascript/mastodon/components/status_action_bar.jsx index 91d29de6d..c6323ac9e 100644 --- a/app/javascript/mastodon/components/status_action_bar.jsx +++ b/app/javascript/mastodon/components/status_action_bar.jsx @@ -1,5 +1,6 @@ import PropTypes from 'prop-types'; +import EmojiPickerDropdown from '../features/compose/containers/emoji_picker_dropdown_container'; import { defineMessages, injectIntl } from 'react-intl'; import classNames from 'classnames'; @@ -263,6 +264,16 @@ class StatusActionBar extends ImmutablePureComponent { } } + 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; @@ -408,6 +419,7 @@ class StatusActionBar extends ImmutablePureComponent { + {filterButton} diff --git a/app/javascript/mastodon/features/status/components/action_bar.jsx b/app/javascript/mastodon/features/status/components/action_bar.jsx index 29ecdb9ff..898ca7ebf 100644 --- a/app/javascript/mastodon/features/status/components/action_bar.jsx +++ b/app/javascript/mastodon/features/status/components/action_bar.jsx @@ -1,6 +1,7 @@ import PropTypes from 'prop-types'; import { PureComponent } from 'react'; +import EmojiPickerDropdown from '../../compose/containers/emoji_picker_dropdown_container'; import { defineMessages, injectIntl } from 'react-intl'; import classNames from 'classnames'; @@ -204,6 +205,16 @@ class ActionBar extends 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; @@ -325,6 +336,7 @@ class ActionBar extends PureComponent {
+