diff --git a/app/javascript/mastodon/features/compose/components/search.jsx b/app/javascript/mastodon/features/compose/components/search.jsx
index 7584dbc819..c2c82bdff7 100644
--- a/app/javascript/mastodon/features/compose/components/search.jsx
+++ b/app/javascript/mastodon/features/compose/components/search.jsx
@@ -57,17 +57,17 @@ class Search extends PureComponent {
};
defaultOptions = [
- { label: <>
has: , action: e => { e.preventDefault(); this._insertText('has:') } },
- { label: <>
is: , action: e => { e.preventDefault(); this._insertText('is:') } },
- { label: <>
my: , action: e => { e.preventDefault(); this._insertText('my:') } },
- { label: <>
language: , action: e => { e.preventDefault(); this._insertText('language:') } },
- { label: <>
from: , action: e => { e.preventDefault(); this._insertText('from:') } },
- { label: <>
domain: , action: e => { e.preventDefault(); this._insertText('domain:') } },
- { label: <>
before: , action: e => { e.preventDefault(); this._insertText('before:') } },
- { label: <>
during: , action: e => { e.preventDefault(); this._insertText('during:') } },
- { label: <>
after: , action: e => { e.preventDefault(); this._insertText('after:') } },
- { label: <>
in: , action: e => { e.preventDefault(); this._insertText('in:') } },
- { label: <>
order: , action: e => { e.preventDefault(); this._insertText('order:') } },
+ { label: <>
has: , action: e => { e.preventDefault(); this._insertText('has:'); } },
+ { label: <>
is: , action: e => { e.preventDefault(); this._insertText('is:'); } },
+ { label: <>
my: , action: e => { e.preventDefault(); this._insertText('my:'); } },
+ { label: <>
language: , action: e => { e.preventDefault(); this._insertText('language:'); } },
+ { label: <>
from: , action: e => { e.preventDefault(); this._insertText('from:'); } },
+ { label: <>
domain: , action: e => { e.preventDefault(); this._insertText('domain:'); } },
+ { label: <>
before: , action: e => { e.preventDefault(); this._insertText('before:'); } },
+ { label: <>
during: , action: e => { e.preventDefault(); this._insertText('during:'); } },
+ { label: <>
after: , action: e => { e.preventDefault(); this._insertText('after:'); } },
+ { label: <>
in: , action: e => { e.preventDefault(); this._insertText('in:'); } },
+ { label: <>
order: , action: e => { e.preventDefault(); this._insertText('order:'); } },
];
setRef = c => {
diff --git a/app/javascript/mastodon/features/explore/results.jsx b/app/javascript/mastodon/features/explore/results.jsx
index 4c23d6422d..a3c6adee9d 100644
--- a/app/javascript/mastodon/features/explore/results.jsx
+++ b/app/javascript/mastodon/features/explore/results.jsx
@@ -80,7 +80,7 @@ class Results extends PureComponent {
}
return null;
- };
+ }
handleSelectAll = () => {
const { submittedType, dispatch } = this.props;
@@ -116,7 +116,7 @@ class Results extends PureComponent {
}
this.setState({ type: 'hashtags' });
- }
+ };
handleSelectStatuses = () => {
const { submittedType, dispatch } = this.props;
@@ -128,7 +128,7 @@ class Results extends PureComponent {
}
this.setState({ type: 'statuses' });
- }
+ };
handleLoadMoreAccounts = () => this._loadMore('accounts');
handleLoadMoreStatuses = () => this._loadMore('statuses');
diff --git a/app/javascript/mastodon/features/firehose/index.jsx b/app/javascript/mastodon/features/firehose/index.jsx
index efde58a5c0..849ee38f5f 100644
--- a/app/javascript/mastodon/features/firehose/index.jsx
+++ b/app/javascript/mastodon/features/firehose/index.jsx
@@ -199,7 +199,7 @@ const Firehose = ({ feedType, multiColumn }) => {
);
-}
+};
Firehose.propTypes = {
multiColumn: PropTypes.bool,
diff --git a/app/javascript/mastodon/features/interaction_modal/index.jsx b/app/javascript/mastodon/features/interaction_modal/index.jsx
index e670452018..014ba993a4 100644
--- a/app/javascript/mastodon/features/interaction_modal/index.jsx
+++ b/app/javascript/mastodon/features/interaction_modal/index.jsx
@@ -27,9 +27,9 @@ const mapStateToProps = (state, { accountId }) => ({
const mapDispatchToProps = (dispatch) => ({
onSignupClick() {
dispatch(closeModal({
- modalType: undefined,
- ignoreFocus: false,
- }));
+ modalType: undefined,
+ ignoreFocus: false,
+ }));
dispatch(openModal({ modalType: 'CLOSED_REGISTRATIONS' }));
},
});
@@ -187,7 +187,7 @@ class LoginForm extends React.PureComponent {
setIFrameRef = (iframe) => {
this.iframeRef = iframe;
- }
+ };
handleFocus = () => {
this.setState({ expanded: true });
diff --git a/app/javascript/mastodon/features/lists/index.jsx b/app/javascript/mastodon/features/lists/index.jsx
index fb52973d23..33a42389e4 100644
--- a/app/javascript/mastodon/features/lists/index.jsx
+++ b/app/javascript/mastodon/features/lists/index.jsx
@@ -78,7 +78,7 @@ class Lists extends ImmutablePureComponent {
>
{lists.map(list =>
(
0) ? intl.formatMessage(messages.with_antenna) : undefined} />),
+ badge={(list.get('antennas') && list.get('antennas').size > 0) ? intl.formatMessage(messages.with_antenna) : undefined} />),
)}
diff --git a/app/javascript/mastodon/features/reaction_deck/components/reaction_emoji.jsx b/app/javascript/mastodon/features/reaction_deck/components/reaction_emoji.jsx
index 7fb6f49285..651596cda4 100644
--- a/app/javascript/mastodon/features/reaction_deck/components/reaction_emoji.jsx
+++ b/app/javascript/mastodon/features/reaction_deck/components/reaction_emoji.jsx
@@ -59,7 +59,7 @@ class ReactionEmoji extends ImmutablePureComponent {
const html = { __html: emojify(emoji) };
content = (
- )
+ );
}
return (
diff --git a/app/javascript/mastodon/features/reaction_deck/index.jsx b/app/javascript/mastodon/features/reaction_deck/index.jsx
index ebc2985abc..4a7d468dbb 100644
--- a/app/javascript/mastodon/features/reaction_deck/index.jsx
+++ b/app/javascript/mastodon/features/reaction_deck/index.jsx
@@ -100,7 +100,7 @@ class ReactionDeck extends ImmutablePureComponent {
const newDeck = this.deckToArray();
newDeck.push('👍');
this.props.onChange(newDeck);
- }
+ };
render () {
const { intl, deck, emojiMap, multiColumn } = this.props;
@@ -123,38 +123,38 @@ class ReactionDeck extends ImmutablePureComponent {
showBackButton
/>
-
-
-
- {(provided) => (
-
- {deck.map((emoji, index) => (
-
- {(provided2) => (
-
-
-
-
- )}
-
- ))}
- {provided.placeholder}
+
+
+
+ {(provided) => (
+
+ {deck.map((emoji, index) => (
+
+ {(provided2) => (
+
+
+
+
+ )}
+
+ ))}
+ {provided.placeholder}
-
-
+
+
);
-}
+};
Comment.propTypes = {
comment: PropTypes.string.isRequired,
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.jsx b/app/javascript/mastodon/features/status/components/detailed_status.jsx
index ce60f2459c..3c581b7a38 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.jsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.jsx
@@ -147,7 +147,7 @@ class DetailedStatus extends ImmutablePureComponent {
} else if (attachments.getIn([0, 'type']) === 'audio') {
return '16 / 9';
} else {
- return (attachments.size === 1 && attachments.getIn([0, 'meta', 'small', 'aspect'])) ? attachments.getIn([0, 'meta', 'small', 'aspect']) : '3 / 2'
+ return (attachments.size === 1 && attachments.getIn([0, 'meta', 'small', 'aspect'])) ? attachments.getIn([0, 'meta', 'small', 'aspect']) : '3 / 2';
}
}
diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx
index 03a721d9c8..e739514849 100644
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@@ -233,6 +233,8 @@ class Status extends ImmutablePureComponent {
componentDidMount () {
attachFullscreenListener(this.onFullScreenChange);
+
+ this._scrollStatusIntoView();
}
UNSAFE_componentWillReceiveProps (nextProps) {
@@ -638,10 +640,10 @@ class Status extends ImmutablePureComponent {
this.node = c;
};
- componentDidUpdate (prevProps) {
- const { status, ancestorsIds, multiColumn } = this.props;
+ _scrollStatusIntoView () {
+ const { status, multiColumn } = this.props;
- if (status && (ancestorsIds.size > prevProps.ancestorsIds.size || prevProps.status?.get('id') !== status.get('id'))) {
+ if (status) {
window.requestAnimationFrame(() => {
this.node?.querySelector('.detailed-status__wrapper')?.scrollIntoView(true);
@@ -658,6 +660,14 @@ class Status extends ImmutablePureComponent {
}
}
+ componentDidUpdate (prevProps) {
+ const { status, ancestorsIds } = this.props;
+
+ if (status && (ancestorsIds.size > prevProps.ancestorsIds.size || prevProps.status?.get('id') !== status.get('id'))) {
+ this._scrollStatusIntoView();
+ }
+ }
+
componentWillUnmount () {
detachFullscreenListener(this.onFullScreenChange);
}
@@ -666,6 +676,22 @@ class Status extends ImmutablePureComponent {
this.setState({ fullscreen: isFullscreen() });
};
+ shouldUpdateScroll = (prevRouterProps, { location }) => {
+ // Do not change scroll when opening a modal
+ if (location.state?.mastodonModalKey !== prevRouterProps?.location?.state?.mastodonModalKey) {
+ return false;
+ }
+
+ // Scroll to focused post if it is loaded
+ const child = this.node?.querySelector('.detailed-status__wrapper');
+ if (child) {
+ return [0, child.offsetTop];
+ }
+
+ // Do not scroll otherwise, `componentDidUpdate` will take care of that
+ return false;
+ };
+
render () {
let ancestors, descendants, references;
const { isLoading, status, ancestorsIds, descendantsIds, referenceIds, intl, domain, multiColumn, pictureInPicture } = this.props;
@@ -723,7 +749,7 @@ class Status extends ImmutablePureComponent {
)}
/>
-