af4160eb20
This also tries to make the autoscroll functionality a bit more consistent, where all items are always shown in the list, but items which have not yet occurred will be partially transparent until they happen. Due to that change, autoscroll behavior which previously always went all the way to the bottom of a list didn't make sense anymore, so now it scrolls to the current item.
40 lines
No EOL
1.2 KiB
JavaScript
40 lines
No EOL
1.2 KiB
JavaScript
import React from 'react';
|
|
import { connect } from 'react-redux';
|
|
import { setSiteId } from 'Duck/site';
|
|
|
|
export default (BaseComponent) => {
|
|
@connect((state, props) => ({
|
|
urlSiteId: props.match.params.siteId,
|
|
siteId: state.getIn(['site', 'siteId']),
|
|
}), {
|
|
setSiteId,
|
|
})
|
|
class WrapperClass extends React.PureComponent {
|
|
state = { load: false }
|
|
constructor(props) {
|
|
super(props);
|
|
if (props.urlSiteId && props.urlSiteId !== props.siteId) {
|
|
props.setSiteId(props.urlSiteId);
|
|
}
|
|
}
|
|
componentDidUpdate(prevProps) {
|
|
const { urlSiteId, siteId, location: { pathname }, history } = this.props;
|
|
const shouldUrlUpdate = urlSiteId && urlSiteId !== siteId;
|
|
if (shouldUrlUpdate) {
|
|
const path = ['', siteId].concat(pathname.split('/').slice(2)).join('/');
|
|
history.push(path);
|
|
}
|
|
const shouldBaseComponentReload = shouldUrlUpdate || siteId !== prevProps.siteId;
|
|
if (shouldBaseComponentReload) {
|
|
this.setState({ load: true });
|
|
setTimeout(() => this.setState({ load: false }), 0);
|
|
}
|
|
}
|
|
|
|
render() {
|
|
return this.state.load ? null : <BaseComponent {...this.props} />;
|
|
}
|
|
}
|
|
|
|
return WrapperClass
|
|
} |