628e5823c3
* Refactor shouldUpdateScroll passing So far, shouldUpdateScroll has been manually passed down from the very top of the React component hierarchy even though it is a static function common to all ScrollContainer instances, so replaced that with a custom class extending ScrollContainer. * Generalize “press back to close modal” to any modal and to public pages * Fix boost confirmation modal closing media modal
64 lines
1.9 KiB
JavaScript
64 lines
1.9 KiB
JavaScript
import React from 'react';
|
|
import { Provider } from 'react-redux';
|
|
import PropTypes from 'prop-types';
|
|
import configureStore from '../store/configureStore';
|
|
import { BrowserRouter, Route } from 'react-router-dom';
|
|
import { ScrollContext } from 'react-router-scroll-4';
|
|
import UI from '../features/ui';
|
|
import { fetchCustomEmojis } from '../actions/custom_emojis';
|
|
import { hydrateStore } from '../actions/store';
|
|
import { connectUserStream } from '../actions/streaming';
|
|
import { IntlProvider, addLocaleData } from 'react-intl';
|
|
import { getLocale } from '../locales';
|
|
import initialState from '../initial_state';
|
|
import ErrorBoundary from '../components/error_boundary';
|
|
|
|
const { localeData, messages } = getLocale();
|
|
addLocaleData(localeData);
|
|
|
|
export const store = configureStore();
|
|
const hydrateAction = hydrateStore(initialState);
|
|
|
|
store.dispatch(hydrateAction);
|
|
store.dispatch(fetchCustomEmojis());
|
|
|
|
export default class Mastodon extends React.PureComponent {
|
|
|
|
static propTypes = {
|
|
locale: PropTypes.string.isRequired,
|
|
};
|
|
|
|
componentDidMount() {
|
|
this.disconnect = store.dispatch(connectUserStream());
|
|
}
|
|
|
|
componentWillUnmount () {
|
|
if (this.disconnect) {
|
|
this.disconnect();
|
|
this.disconnect = null;
|
|
}
|
|
}
|
|
|
|
shouldUpdateScroll (prevRouterProps, { location }) {
|
|
return !(location.state?.mastodonModalKey && location.state?.mastodonModalKey !== prevRouterProps?.location?.state?.mastodonModalKey);
|
|
}
|
|
|
|
render () {
|
|
const { locale } = this.props;
|
|
|
|
return (
|
|
<IntlProvider locale={locale} messages={messages}>
|
|
<Provider store={store}>
|
|
<ErrorBoundary>
|
|
<BrowserRouter basename='/web'>
|
|
<ScrollContext shouldUpdateScroll={this.shouldUpdateScroll}>
|
|
<Route path='/' component={UI} />
|
|
</ScrollContext>
|
|
</BrowserRouter>
|
|
</ErrorBoundary>
|
|
</Provider>
|
|
</IntlProvider>
|
|
);
|
|
}
|
|
|
|
}
|