gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix: #885 テーマをハイコントラストにしているとリアクションのボタンが背景と同化する (#890) (#893)

Browse source
This commit is contained in:
KMY（雪あすか） 2024-10-20 21:37:32 +09:00 • committed by GitHub
parent 53bb4a398f
commit beaf165c93
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/javascript/mastodon/components/status_action_bar.jsx
View file

@ -11,7 +11,6 @@ import { connect } from 'react-redux';
import BookmarkIcon from '@/material-icons/400-24px/bookmark-fill.svg'; import BookmarkIcon from '@/material-icons/400-24px/bookmark-fill.svg';
import BookmarkBorderIcon from '@/material-icons/400-24px/bookmark.svg?react'; import BookmarkBorderIcon from '@/material-icons/400-24px/bookmark.svg?react';
import EmojiReactionIcon from '@/material-icons/400-24px/mood.svg?react';
import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react'; import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react'; import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
import ReplyIcon from '@/material-icons/400-24px/reply.svg?react'; import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
@ -166,8 +165,6 @@ class StatusActionBar extends ImmutablePureComponent {
} }
}; };
handleEmojiPickInnerButton = () => {};
handleReblogClick = e => { handleReblogClick = e => {
const { signedIn } = this.props.identity; const { signedIn } = this.props.identity;
@ -485,9 +482,7 @@ class StatusActionBar extends ImmutablePureComponent {
const denyFromAll = emojiReactionPolicy !== 'block' && emojiReactionPolicy !== 'block'; const denyFromAll = emojiReactionPolicy !== 'block' && emojiReactionPolicy !== 'block';
const emojiPickerDropdown = (enableEmojiReaction && emojiReactionAvailableServer && denyFromAll && (writtenByMe || (following && followed && mutual && outside)) && ( const emojiPickerDropdown = (enableEmojiReaction && emojiReactionAvailableServer && denyFromAll && (writtenByMe || (following && followed && mutual && outside)) && (
<div className='status__action-bar__button-wrapper'> <div className='status__action-bar__button-wrapper'>
<EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} button={( <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} inverted={false} />
<IconButton icon='smile-o' iconComponent={EmojiReactionIcon} onClick={this.handleEmojiPickInnerButton} />
)} />
</div> </div>
)) || (enableEmojiReaction && ( )) || (enableEmojiReaction && (
<div className='status__action-bar__button-wrapper status__action-bar__button-wrapper__blank' /> <div className='status__action-bar__button-wrapper status__action-bar__button-wrapper__blank' />

5
app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
View file

@ -325,6 +325,7 @@ class EmojiPickerDropdown extends PureComponent {
onPickEmoji: PropTypes.func.isRequired, onPickEmoji: PropTypes.func.isRequired,
onSkinTone: PropTypes.func.isRequired, onSkinTone: PropTypes.func.isRequired,
skinTone: PropTypes.number.isRequired, skinTone: PropTypes.number.isRequired,
inverted: PropTypes.bool,
}; };
state = { state = {
@ -387,7 +388,7 @@ class EmojiPickerDropdown extends PureComponent {
}; };
render () { render () {
const { intl, onPickEmoji, onSkinTone, skinTone, frequentlyUsedEmojis } = this.props; const { intl, onPickEmoji, onSkinTone, skinTone, frequentlyUsedEmojis, inverted } = this.props;
const title = intl.formatMessage(messages.emoji); const title = intl.formatMessage(messages.emoji);
const { active, loading, placement } = this.state; const { active, loading, placement } = this.state;
@ -399,7 +400,7 @@ class EmojiPickerDropdown extends PureComponent {
active={active} active={active}
iconComponent={MoodIcon} iconComponent={MoodIcon}
onClick={this.onToggle} onClick={this.onToggle}
inverted inverted={typeof(inverted) === 'undefined' || inverted}
/> />
<Overlay show={active} placement={placement} flip target={this.findTarget} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}> <Overlay show={active} placement={placement} flip target={this.findTarget} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>

7
app/javascript/mastodon/features/status/components/action_bar.jsx
View file

@ -11,7 +11,6 @@ import { connect } from 'react-redux';
import BookmarkIcon from '@/material-icons/400-24px/bookmark-fill.svg?react'; import BookmarkIcon from '@/material-icons/400-24px/bookmark-fill.svg?react';
import BookmarkBorderIcon from '@/material-icons/400-24px/bookmark.svg?react'; import BookmarkBorderIcon from '@/material-icons/400-24px/bookmark.svg?react';
import EmojiReactionIcon from '@/material-icons/400-24px/mood.svg?react';
import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react'; import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react'; import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
import ReplyIcon from '@/material-icons/400-24px/reply.svg?react'; import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
@ -232,8 +231,6 @@ class ActionBar extends PureComponent {
this.props.onEmojiReact(this.props.status, data); this.props.onEmojiReact(this.props.status, data);
}; };
handleEmojiPickInnerButton = () => {};
render () { render () {
const { status, relationship, intl } = this.props; const { status, relationship, intl } = this.props;
const { signedIn, permissions } = this.props.identity; const { signedIn, permissions } = this.props.identity;
@ -401,9 +398,7 @@ class ActionBar extends PureComponent {
const denyFromAll = emojiReactionPolicy !== 'block' && emojiReactionPolicy !== 'block'; const denyFromAll = emojiReactionPolicy !== 'block' && emojiReactionPolicy !== 'block';
const emojiPickerDropdown = (enableEmojiReaction && emojiReactionAvailableServer && denyFromAll && (writtenByMe || (following && followed && mutual && outside)) && ( const emojiPickerDropdown = (enableEmojiReaction && emojiReactionAvailableServer && denyFromAll && (writtenByMe || (following && followed && mutual && outside)) && (
<div className='detailed-status__button'> <div className='detailed-status__button'>
<EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} button={( <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} inverted={false} />
<IconButton title={intl.formatMessage(messages.pickEmoji)} icon='smile-o' iconComponent={EmojiReactionIcon} onClick={this.handleEmojiPickInnerButton} />
)} />
</div> </div>
)) || (enableEmojiReaction && ( )) || (enableEmojiReaction && (
<div className='detailed-status__button__blank' /> <div className='detailed-status__button__blank' />