Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Remove legacy decorators syntax (#18357)

Browse source
This commit is contained in:
Yamagishi Kazutoshi 2023-03-24 11:17:53 +09:00 • committed by GitHub
parent 503022d6f9
commit d1b057a0ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
137 changed files with 396 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/javascript/mastodon/features/ui/components/audio_modal.jsx
View file

@ -11,7 +11,6 @@ const mapStateToProps = (state, { statusId }) => ({
accountStaticAvatar: state.getIn(['accounts', state.getIn(['statuses', statusId, 'account']), 'avatar_static']),
});
export default @connect(mapStateToProps, null, null, { forwardRef: true })
class AudioModal extends ImmutablePureComponent {
static propTypes = {
@ -55,3 +54,5 @@ class AudioModal extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps, null, null, { forwardRef: true })(AudioModal);

4
app/javascript/mastodon/features/ui/components/block_modal.jsx
View file

@ -36,8 +36,6 @@ const mapDispatchToProps = dispatch => {
};
};
export default @connect(makeMapStateToProps, mapDispatchToProps)
@injectIntl
class BlockModal extends React.PureComponent {
static propTypes = {
@ -101,3 +99,5 @@ class BlockModal extends React.PureComponent {
}
}
export default connect(makeMapStateToProps, mapDispatchToProps)(injectIntl(BlockModal));

4
app/javascript/mastodon/features/ui/components/boost_modal.jsx
View file

@ -38,8 +38,6 @@ const mapDispatchToProps = dispatch => {
};
};
export default @connect(mapStateToProps, mapDispatchToProps)
@injectIntl
class BoostModal extends ImmutablePureComponent {
static contextTypes = {
@ -140,3 +138,5 @@ class BoostModal extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(BoostModal));

3
app/javascript/mastodon/features/ui/components/bundle_column_error.jsx
View file

@ -92,7 +92,6 @@ class CopyButton extends React.PureComponent {
}
export default @injectIntl
class BundleColumnError extends React.PureComponent {
static propTypes = {
@ -160,3 +159,5 @@ class BundleColumnError extends React.PureComponent {
}
}
export default injectIntl(BundleColumnError);

3
app/javascript/mastodon/features/ui/components/compare_history_modal.jsx
View file

@ -24,7 +24,6 @@ const mapDispatchToProps = dispatch => ({
});
export default @connect(mapStateToProps, mapDispatchToProps)
class CompareHistoryModal extends React.PureComponent {
static propTypes = {
@ -100,3 +99,5 @@ class CompareHistoryModal extends React.PureComponent {
}
}
export default connect(mapStateToProps, mapDispatchToProps)(CompareHistoryModal);

3
app/javascript/mastodon/features/ui/components/compose_panel.jsx
View file

@ -8,7 +8,6 @@ import LinkFooter from './link_footer';
import ServerBanner from 'mastodon/components/server_banner';
import { changeComposing, mountCompose, unmountCompose } from 'mastodon/actions/compose';
export default @connect()
class ComposePanel extends React.PureComponent {
static contextTypes = {
@ -66,3 +65,5 @@ class ComposePanel extends React.PureComponent {
}
}
export default connect(ComposePanel);

3
app/javascript/mastodon/features/ui/components/confirmation_modal.jsx
View file

@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
import { injectIntl, FormattedMessage } from 'react-intl';
import Button from '../../../components/button';
export default @injectIntl
class ConfirmationModal extends React.PureComponent {
static propTypes = {
@ -68,3 +67,5 @@ class ConfirmationModal extends React.PureComponent {
}
}
export default injectIntl(ConfirmationModal);

4
app/javascript/mastodon/features/ui/components/disabled_account_banner.jsx
View file

@ -28,8 +28,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
},
});
export default @injectIntl
@connect(mapStateToProps, mapDispatchToProps)
class DisabledAccountBanner extends React.PureComponent {
static propTypes = {
@ -90,3 +88,5 @@ class DisabledAccountBanner extends React.PureComponent {
}
}
export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(DisabledAccountBanner));

3
app/javascript/mastodon/features/ui/components/embed_modal.jsx
View file

@ -9,7 +9,6 @@ const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },
});
export default @injectIntl
class EmbedModal extends ImmutablePureComponent {
static propTypes = {
@ -95,3 +94,5 @@ class EmbedModal extends ImmutablePureComponent {
}
}
export default injectIntl(EmbedModal);

4
app/javascript/mastodon/features/ui/components/filter_modal.jsx
View file

@ -13,8 +13,6 @@ const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },
});
export default @connect(undefined)
@injectIntl
class FilterModal extends ImmutablePureComponent {
static propTypes = {
@ -132,3 +130,5 @@ class FilterModal extends ImmutablePureComponent {
}
}
export default connect(injectIntl(FilterModal));

6
app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
View file

@ -100,8 +100,6 @@ class ImageLoader extends React.PureComponent {
}
export default @connect(mapStateToProps, mapDispatchToProps, null, { forwardRef: true })
@(component => injectIntl(component, { withRef: true }))
class FocalPointModal extends ImmutablePureComponent {
static propTypes = {
@ -428,3 +426,7 @@ class FocalPointModal extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps, mapDispatchToProps, null, {
forwardRef: true,
})(injectIntl(FocalPointModal, { withRef: true }));

4
app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx
View file

@ -15,8 +15,6 @@ const mapStateToProps = state => ({
count: state.getIn(['user_lists', 'follow_requests', 'items'], ImmutableList()).size,
});
export default @injectIntl
@connect(mapStateToProps)
class FollowRequestsColumnLink extends React.Component {
static propTypes = {
@ -49,3 +47,5 @@ class FollowRequestsColumnLink extends React.Component {
}
}
export default injectIntl(connect(mapStateToProps)(FollowRequestsColumnLink));

4
app/javascript/mastodon/features/ui/components/header.jsx
View file

@ -22,8 +22,6 @@ const mapDispatchToProps = (dispatch) => ({
},
});
export default @withRouter
@connect(null, mapDispatchToProps)
class Header extends React.PureComponent {
static contextTypes = {
@ -85,3 +83,5 @@ class Header extends React.PureComponent {
}
}
export default withRouter(connect(null, mapDispatchToProps)(Header));

3
app/javascript/mastodon/features/ui/components/image_modal.jsx
View file

@ -9,7 +9,6 @@ const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },
});
export default @injectIntl
class ImageModal extends React.PureComponent {
static propTypes = {
@ -57,3 +56,5 @@ class ImageModal extends React.PureComponent {
}
}
export default injectIntl(ImageModal);

4
app/javascript/mastodon/features/ui/components/link_footer.jsx
View file

@ -24,8 +24,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
},
});
export default @injectIntl
@connect(null, mapDispatchToProps)
class LinkFooter extends React.PureComponent {
static contextTypes = {
@ -100,3 +98,5 @@ class LinkFooter extends React.PureComponent {
}
}
export default injectIntl(connect(null, mapDispatchToProps)(LinkFooter));

4
app/javascript/mastodon/features/ui/components/list_panel.jsx
View file

@ -20,8 +20,6 @@ const mapStateToProps = state => ({
lists: getOrderedLists(state),
});
export default @withRouter
@connect(mapStateToProps)
class ListPanel extends ImmutablePureComponent {
static propTypes = {
@ -53,3 +51,5 @@ class ListPanel extends ImmutablePureComponent {
}
}
export default withRouter(connect(mapStateToProps)(ListPanel));

4
app/javascript/mastodon/features/ui/components/media_modal.jsx
View file

@ -25,8 +25,6 @@ const mapStateToProps = (state, { statusId }) => ({
language: state.getIn(['statuses', statusId, 'language']),
});
export default @connect(mapStateToProps, null, null, { forwardRef: true })
@injectIntl
class MediaModal extends ImmutablePureComponent {
static propTypes = {
@ -257,3 +255,5 @@ class MediaModal extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps, null, null, { forwardRef: true })(injectIntl(MediaModal));

4
app/javascript/mastodon/features/ui/components/mute_modal.jsx
View file

@ -43,8 +43,6 @@ const mapDispatchToProps = dispatch => {
};
};
export default @connect(mapStateToProps, mapDispatchToProps)
@injectIntl
class MuteModal extends React.PureComponent {
static propTypes = {
@ -138,3 +136,5 @@ class MuteModal extends React.PureComponent {
}
}
export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(MuteModal));

3
app/javascript/mastodon/features/ui/components/navigation_panel.jsx
View file

@ -28,7 +28,6 @@ const messages = defineMessages({
search: { id: 'navigation_bar.search', defaultMessage: 'Search' },
});
export default @injectIntl
class NavigationPanel extends React.Component {
static contextTypes = {
@ -105,3 +104,5 @@ class NavigationPanel extends React.Component {
}
}
export default injectIntl(NavigationPanel);

4
app/javascript/mastodon/features/ui/components/report_modal.jsx
View file

@ -30,8 +30,6 @@ const makeMapStateToProps = () => {
return mapStateToProps;
};
export default @connect(makeMapStateToProps)
@injectIntl
class ReportModal extends ImmutablePureComponent {
static propTypes = {
@ -217,3 +215,5 @@ class ReportModal extends ImmutablePureComponent {
}
}
export default connect(makeMapStateToProps)(injectIntl(ReportModal));

3
app/javascript/mastodon/features/ui/components/video_modal.jsx
View file

@ -11,7 +11,6 @@ const mapStateToProps = (state, { statusId }) => ({
language: state.getIn(['statuses', statusId, 'language']),
});
export default @connect(mapStateToProps, null, null, { forwardRef: true })
class VideoModal extends ImmutablePureComponent {
static propTypes = {
@ -68,3 +67,5 @@ class VideoModal extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps, null, null, { forwardRef: true })(VideoModal);

3
app/javascript/mastodon/features/ui/components/zoomable_image.jsx
View file

@ -91,7 +91,6 @@ const normalizeWheel = event => {
};
};
export default @injectIntl
class ZoomableImage extends React.PureComponent {
static propTypes = {
@ -451,3 +450,5 @@ class ZoomableImage extends React.PureComponent {
}
}
export default injectIntl(ZoomableImage);