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

Change: #273 投稿下のアクションバーについて、スタンプボタンを消すとき他のボタンで詰めない (#386)

Browse source
This commit is contained in:
KMY（雪あすか） 2023-12-26 09:30:23 +09:00 • committed by GitHub
parent dc6e60517d
commit b94ffe6699
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -468,11 +468,12 @@ class StatusActionBar extends ImmutablePureComponent {
const mutual = emojiReactionPolicy !== 'mutuals_only' || (relationship && relationship.get('following') && relationship.get('followed_by')); const mutual = emojiReactionPolicy !== 'mutuals_only' || (relationship && relationship.get('following') && relationship.get('followed_by'));
const outside = emojiReactionPolicy !== 'outside_only' || (relationship && (relationship.get('following') || relationship.get('followed_by'))); const outside = emojiReactionPolicy !== 'outside_only' || (relationship && (relationship.get('following') || relationship.get('followed_by')));
const denyFromAll = emojiReactionPolicy !== 'block' && emojiReactionPolicy !== 'block'; const denyFromAll = emojiReactionPolicy !== 'block' && emojiReactionPolicy !== 'block';
const emojiPickerButton = ( const emojiPickerDropdown = (enableEmojiReaction && emojiReactionAvailableServer && denyFromAll && (writtenByMe || (following && followed && mutual && outside)) && (
<IconButton className='status__action-bar__button' title={intl.formatMessage(messages.emojiReaction)} icon='smile-o' iconComponent={EmojiReactionIcon} onClick={this.handleEmojiPickInnerButton} /> <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} button={(
); <IconButton className='status__action-bar__button' title={intl.formatMessage(messages.emojiReaction)} icon='smile-o' iconComponent={EmojiReactionIcon} onClick={this.handleEmojiPickInnerButton} />
const emojiPickerDropdown = enableEmojiReaction && emojiReactionAvailableServer && denyFromAll && (writtenByMe || (following && followed && mutual && outside)) && ( )} />
<EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} button={emojiPickerButton} /> )) || (
<div className='status__action-bar__button__blank' />
); );
const isReply = status.get('in_reply_to_account_id') === status.getIn(['account', 'id']); const isReply = status.get('in_reply_to_account_id') === status.getIn(['account', 'id']);

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

@ -376,11 +376,14 @@ class ActionBar extends PureComponent {
const mutual = emojiReactionPolicy !== 'mutuals_only' || (relationship && relationship.get('following') && relationship.get('followed_by')); const mutual = emojiReactionPolicy !== 'mutuals_only' || (relationship && relationship.get('following') && relationship.get('followed_by'));
const outside = emojiReactionPolicy !== 'outside_only' || (relationship && (relationship.get('following') || relationship.get('followed_by'))); const outside = emojiReactionPolicy !== 'outside_only' || (relationship && (relationship.get('following') || relationship.get('followed_by')));
const denyFromAll = emojiReactionPolicy !== 'block' && emojiReactionPolicy !== 'block'; const denyFromAll = emojiReactionPolicy !== 'block' && emojiReactionPolicy !== 'block';
const emojiPickerButton = ( const emojiPickerDropdown = (enableEmojiReaction && emojiReactionAvailableServer && denyFromAll && (writtenByMe || (following && followed && mutual && outside)) && (
<IconButton icon='smile-o' iconComponent={EmojiReactionIcon} onClick={this.handleEmojiPickInnerButton} title={intl.formatMessage(messages.pickEmoji)} /> <div className='detailed-status__button'>
); <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} button={(
const emojiPickerDropdown = enableEmojiReaction && emojiReactionAvailableServer && denyFromAll && (writtenByMe || (following && followed && mutual && outside)) && ( <IconButton title={intl.formatMessage(messages.pickEmoji)} icon='smile-o' iconComponent={EmojiReactionIcon} onClick={this.handleEmojiPickInnerButton} />
<div className='detailed-status__button'><EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} button={emojiPickerButton} /></div> )} />
</div>
)) || (
<div className='detailed-status__button__blank' />
); );
return ( return (

9
app/javascript/styles/mastodon/components.scss
View file

@ -1388,6 +1388,10 @@ body > [data-popper-placement] {
align-items: center; align-items: center;
gap: 18px; gap: 18px;
margin-top: 16px; margin-top: 16px;
&__button__blank {
width: 24px;
}
} }
.detailed-status__action-bar-dropdown { .detailed-status__action-bar-dropdown {
@ -1442,6 +1446,11 @@ body > [data-popper-placement] {
padding: 0; padding: 0;
margin-bottom: 16px; margin-bottom: 16px;
} }
&__button__blank {
width: 24px;
flex: 1 1 auto;
}
} }
.scrollable > div:first-child .detailed-status { .scrollable > div:first-child .detailed-status {