bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix display of ColumnLoading and BundleColumnError

Browse source
This commit is contained in:
Alex Gleason 2021-03-31 15:02:23 -05:00
parent 2500dcf77a
commit a12cff8f8b
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/soapbox/features/ui/components/column_loading.js
View file

@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
import Column from '../../../components/column'; import Column from '../../../components/column';
import ColumnHeader from '../../../components/column_header'; import ColumnHeader from '../../../components/column_header';
import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePureComponent from 'react-immutable-pure-component';
import LoadingIndicator from 'soapbox/components/loading_indicator';
export default class ColumnLoading extends ImmutablePureComponent { export default class ColumnLoading extends ImmutablePureComponent {
@ -22,7 +23,7 @@ export default class ColumnLoading extends ImmutablePureComponent {
return ( return (
<Column> <Column>
<ColumnHeader icon={icon} title={title} focusable={false} /> <ColumnHeader icon={icon} title={title} focusable={false} />
<div /> <LoadingIndicator />
</Column> </Column>
); );
} }

12
app/soapbox/features/ui/util/react_router_helpers.js
View file

@ -65,11 +65,19 @@ class WrappedRoute extends React.Component {
} }
renderLoading = () => { renderLoading = () => {
return <ColumnLoading />; return (
<ColumnsAreaContainer layout={this.props.layout}>
<ColumnLoading />
</ColumnsAreaContainer>
);
} }
renderError = (props) => { renderError = (props) => {
return <BundleColumnError {...props} />; return (
<ColumnsAreaContainer layout={this.props.layout}>
<BundleColumnError {...props} />
</ColumnsAreaContainer>
);
} }
render() { render() {