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

Fix original component errors

Browse source
This commit is contained in:
KMY 2023-04-01 18:08:21 +09:00
parent ceec3a92cd
commit 8dc93587de
4 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/features/compose/components/expiration_dropdown.jsx
View file

@ -5,7 +5,6 @@ import IconButton from '../../../components/icon_button';
import Overlay from 'react-overlays/Overlay';
import { supportsPassiveEvents } from 'detect-passive-events';
import classNames from 'classnames';
import Icon from 'mastodon/components/icon';
const messages = defineMessages({
add_expiration: { id: 'status.expiration.add', defaultMessage: 'Set status expiration' },
@ -119,7 +118,6 @@ class ExpirationDropdownMenu extends React.PureComponent {
}
export default @injectIntl
class ExpirationDropdown extends React.PureComponent {
static propTypes = {
@ -266,3 +264,5 @@ class ExpirationDropdown extends React.PureComponent {
}
}
export default injectIntl(ExpirationDropdown);

4
app/javascript/mastodon/features/emoji_reacted_statuses/index.jsx
View file

@ -22,8 +22,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['status_lists', 'emoji_reactions', 'next']),
});
export default @connect(mapStateToProps)
@injectIntl
class EmojiReactions extends ImmutablePureComponent {
static propTypes = {
@ -106,3 +104,5 @@ class EmojiReactions extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(EmojiReactions));

16
app/javascript/mastodon/features/emoji_reactions/index.jsx
View file

@ -6,7 +6,7 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import { connect } from 'react-redux';
import ColumnHeader from 'mastodon/components/column_header';
import Icon from 'mastodon/components/icon';
import { fetchEmojiReactions, fetchFavourites } from 'mastodon/actions/interactions';
import { fetchEmojiReactions } from 'mastodon/actions/interactions';
import LoadingIndicator from 'mastodon/components/loading_indicator';
import ScrollableList from 'mastodon/components/scrollable_list';
import AccountContainer from 'mastodon/containers/account_container';
@ -18,12 +18,12 @@ const messages = defineMessages({
refresh: { id: 'refresh', defaultMessage: 'Refresh' },
});
const mapStateToProps = (state, props) => { return {
accountIds: state.getIn(['user_lists', 'emoji_reactioned_by', props.params.statusId]),
} };
const mapStateToProps = (state, props) => {
return {
accountIds: state.getIn(['user_lists', 'emoji_reactioned_by', props.params.statusId]),
};
};
export default @connect(mapStateToProps)
@injectIntl
class EmojiReactions extends ImmutablePureComponent {
static propTypes = {
@ -88,7 +88,7 @@ class EmojiReactions extends ImmutablePureComponent {
>
{Object.keys(groups).map((key) =>(
<AccountContainer key={key} id={key} withNote={false}>
<div style={ { 'maxWidth': '100px' } }>
<div style={{ 'maxWidth': '100px' }}>
{groups[key].map((value, index2) => <EmojiView key={index2} name={value.name} url={value.url} staticUrl={value.static_url} />)}
</div>
</AccountContainer>
@ -103,3 +103,5 @@ class EmojiReactions extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(EmojiReactions));