sforkowany z mirror/soapbox
Delay rendering until instance has loaded or failed (for feature detection)
rodzic
467ddf404e
commit
7e7ca52cca
|
@ -31,6 +31,14 @@ import configureStore from '../store/configureStore';
|
|||
|
||||
const validLocale = locale => Object.keys(messages).includes(locale);
|
||||
|
||||
// Delay rendering until instance has loaded or failed (for feature detection)
|
||||
const isInstanceLoaded = state => {
|
||||
const v = state.getIn(['instance', 'version']);
|
||||
const fetchFailed = state.getIn(['meta', 'instance_fetch_failed'], false);
|
||||
|
||||
return v !== '0.0.0' || fetchFailed;
|
||||
};
|
||||
|
||||
export const store = configureStore();
|
||||
|
||||
// Configure global functions for developers
|
||||
|
@ -60,6 +68,7 @@ const mapStateToProps = (state) => {
|
|||
return {
|
||||
showIntroduction,
|
||||
me,
|
||||
instanceLoaded: isInstanceLoaded(state),
|
||||
reduceMotion: settings.get('reduceMotion'),
|
||||
underlineLinks: settings.get('underlineLinks'),
|
||||
systemFont: settings.get('systemFont'),
|
||||
|
@ -80,6 +89,7 @@ class SoapboxMount extends React.PureComponent {
|
|||
static propTypes = {
|
||||
showIntroduction: PropTypes.bool,
|
||||
me: SoapboxPropTypes.me,
|
||||
instanceLoaded: PropTypes.bool,
|
||||
reduceMotion: PropTypes.bool,
|
||||
underlineLinks: PropTypes.bool,
|
||||
systemFont: PropTypes.bool,
|
||||
|
@ -124,8 +134,9 @@ class SoapboxMount extends React.PureComponent {
|
|||
}
|
||||
|
||||
render() {
|
||||
const { me, themeCss, locale, customCss } = this.props;
|
||||
const { me, instanceLoaded, themeCss, locale, customCss } = this.props;
|
||||
if (me === null) return null;
|
||||
if (!instanceLoaded) return null;
|
||||
if (this.state.localeLoading) return null;
|
||||
|
||||
// Disabling introduction for launch
|
||||
|
|
Ładowanie…
Reference in New Issue