Commit 882f814e authored by Yamagishi Kazutoshi's avatar Yamagishi Kazutoshi Committed by GitHub
Browse files

Remove legacy decorators syntax

parent f804c009
Showing with 43 additions and 38 deletions
+43 -38
......@@ -4,7 +4,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import { injectIntl, FormattedMessage } from 'react-intl';
import SettingToggle from '../../notifications/components/setting_toggle';
export default @injectIntl
class ColumnSettings extends React.PureComponent {
static propTypes = {
......@@ -32,3 +31,5 @@ class ColumnSettings extends React.PureComponent {
}
}
export default injectIntl(ColumnSettings);
......@@ -28,8 +28,6 @@ const mapStateToProps = state => ({
showAnnouncements: state.getIn(['announcements', 'show']),
});
export default @connect(mapStateToProps)
@injectIntl
class HomeTimeline extends React.PureComponent {
static propTypes = {
......@@ -160,3 +158,5 @@ class HomeTimeline extends React.PureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(HomeTimeline));
......@@ -9,7 +9,6 @@ const messages = defineMessages({
heading: { id: 'keyboard_shortcuts.heading', defaultMessage: 'Keyboard Shortcuts' },
});
export default @injectIntl
class KeyboardShortcuts extends ImmutablePureComponent {
static propTypes = {
......@@ -164,3 +163,5 @@ class KeyboardShortcuts extends ImmutablePureComponent {
}
}
export default injectIntl(KeyboardShortcuts);
......@@ -17,9 +17,6 @@ const makeMapStateToProps = () => {
return mapStateToProps;
};
export default @connect(makeMapStateToProps)
@injectIntl
class Account extends ImmutablePureComponent {
static propTypes = {
......@@ -41,3 +38,5 @@ class Account extends ImmutablePureComponent {
}
}
export default connect(makeMapStateToProps)(injectIntl(Account));
......@@ -23,8 +23,6 @@ const mapDispatchToProps = (dispatch, { listId }) => ({
onAdd: () => dispatch(addToListAdder(listId)),
});
export default @connect(MapStateToProps, mapDispatchToProps)
@injectIntl
class List extends ImmutablePureComponent {
static propTypes = {
......@@ -67,3 +65,5 @@ class List extends ImmutablePureComponent {
}
}
export default connect(MapStateToProps, mapDispatchToProps)(injectIntl(List));
......@@ -28,8 +28,6 @@ const mapDispatchToProps = dispatch => ({
onReset: () => dispatch(resetListAdder()),
});
export default @connect(mapStateToProps, mapDispatchToProps)
@injectIntl
class ListAdder extends ImmutablePureComponent {
static propTypes = {
......@@ -71,3 +69,5 @@ class ListAdder extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(ListAdder));
......@@ -31,8 +31,6 @@ const mapDispatchToProps = (dispatch, { accountId }) => ({
onAdd: () => dispatch(addToListEditor(accountId)),
});
export default @connect(makeMapStateToProps, mapDispatchToProps)
@injectIntl
class Account extends ImmutablePureComponent {
static propTypes = {
......@@ -75,3 +73,5 @@ class Account extends ImmutablePureComponent {
}
}
export default connect(makeMapStateToProps, mapDispatchToProps)(injectIntl(Account));
......@@ -19,8 +19,6 @@ const mapDispatchToProps = dispatch => ({
onSubmit: () => dispatch(submitListEditor(false)),
});
export default @connect(mapStateToProps, mapDispatchToProps)
@injectIntl
class ListForm extends React.PureComponent {
static propTypes = {
......@@ -68,3 +66,5 @@ class ListForm extends React.PureComponent {
}
}
export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(ListForm));
......@@ -20,8 +20,6 @@ const mapDispatchToProps = dispatch => ({
onChange: value => dispatch(changeListSuggestions(value)),
});
export default @connect(mapStateToProps, mapDispatchToProps)
@injectIntl
class Search extends React.PureComponent {
static propTypes = {
......@@ -74,3 +72,5 @@ class Search extends React.PureComponent {
}
}
export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(Search));
......@@ -22,8 +22,6 @@ const mapDispatchToProps = dispatch => ({
onReset: () => dispatch(resetListEditor()),
});
export default @connect(mapStateToProps, mapDispatchToProps)
@injectIntl
class ListEditor extends ImmutablePureComponent {
static propTypes = {
......@@ -77,3 +75,5 @@ class ListEditor extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(ListEditor));
......@@ -30,8 +30,6 @@ const mapStateToProps = (state, props) => ({
hasUnread: state.getIn(['timelines', `list:${props.params.id}`, 'unread']) > 0,
});
export default @connect(mapStateToProps)
@injectIntl
class ListTimeline extends React.PureComponent {
static contextTypes = {
......@@ -213,3 +211,5 @@ class ListTimeline extends React.PureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(ListTimeline));
......@@ -20,8 +20,6 @@ const mapDispatchToProps = dispatch => ({
onSubmit: () => dispatch(submitListEditor(true)),
});
export default @connect(mapStateToProps, mapDispatchToProps)
@injectIntl
class NewListForm extends React.PureComponent {
static propTypes = {
......@@ -76,3 +74,5 @@ class NewListForm extends React.PureComponent {
}
}
export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(NewListForm));
......@@ -31,8 +31,6 @@ const mapStateToProps = state => ({
lists: getOrderedLists(state),
});
export default @connect(mapStateToProps)
@injectIntl
class Lists extends ImmutablePureComponent {
static propTypes = {
......@@ -81,3 +79,5 @@ class Lists extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(Lists));
......@@ -22,8 +22,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['user_lists', 'mutes', 'isLoading'], true),
});
export default @connect(mapStateToProps)
@injectIntl
class Mutes extends ImmutablePureComponent {
static propTypes = {
......@@ -77,3 +75,5 @@ class Mutes extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(Mutes));
......@@ -12,7 +12,6 @@ const tooltips = defineMessages({
statuses: { id: 'notifications.filter.statuses', defaultMessage: 'Updates from people you follow' },
});
export default @injectIntl
class FilterBar extends React.PureComponent {
static propTypes = {
......@@ -108,3 +107,5 @@ class FilterBar extends React.PureComponent {
}
}
export default injectIntl(FilterBar);
import React, { Fragment } from 'react';
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import Avatar from 'mastodon/components/avatar';
......@@ -13,7 +13,6 @@ const messages = defineMessages({
reject: { id: 'follow_request.reject', defaultMessage: 'Reject' },
});
export default @injectIntl
class FollowRequest extends ImmutablePureComponent {
static propTypes = {
......@@ -32,10 +31,10 @@ class FollowRequest extends ImmutablePureComponent {
if (hidden) {
return (
<Fragment>
<React.Fragment>
{account.get('display_name')}
{account.get('username')}
</Fragment>
</React.Fragment>
);
}
......@@ -57,3 +56,5 @@ class FollowRequest extends ImmutablePureComponent {
}
}
export default injectIntl(FollowRequest);
......@@ -33,7 +33,6 @@ const notificationForScreenReader = (intl, message, timestamp) => {
return output.join(', ');
};
export default @injectIntl
class Notification extends ImmutablePureComponent {
static contextTypes = {
......@@ -428,3 +427,5 @@ class Notification extends ImmutablePureComponent {
}
}
export default injectIntl(Notification);
......@@ -12,8 +12,6 @@ const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },
});
export default @connect()
@injectIntl
class NotificationsPermissionBanner extends React.PureComponent {
static propTypes = {
......@@ -46,3 +44,5 @@ class NotificationsPermissionBanner extends React.PureComponent {
}
}
export default connect()(injectIntl(NotificationsPermissionBanner));
......@@ -13,7 +13,6 @@ const messages = defineMessages({
violation: { id: 'report_notification.categories.violation', defaultMessage: 'Rule violation' },
});
export default @injectIntl
class Report extends ImmutablePureComponent {
static propTypes = {
......@@ -60,3 +59,5 @@ class Report extends ImmutablePureComponent {
}
}
export default injectIntl(Report);
......@@ -65,8 +65,6 @@ const mapStateToProps = state => ({
needsNotificationPermission: state.getIn(['settings', 'notifications', 'alerts']).includes(true) && state.getIn(['notifications', 'browserSupport']) && state.getIn(['notifications', 'browserPermission']) === 'default' && !state.getIn(['settings', 'notifications', 'dismissPermissionBanner']),
});
export default @connect(mapStateToProps)
@injectIntl
class Notifications extends React.PureComponent {
static propTypes = {
......@@ -269,3 +267,5 @@ class Notifications extends React.PureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(Notifications));
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment