Merge branch 'revert-511f1de4' into 'develop'
Revert "Merge branch 'react-17-deprecated' into 'develop'" See merge request soapbox-pub/soapbox-fe!879
This commit is contained in:
commit
d4ded71d3a
1 changed files with 7 additions and 7 deletions
|
@ -26,7 +26,7 @@ class Bundle extends React.PureComponent {
|
|||
onFetchFail: noop,
|
||||
}
|
||||
|
||||
static cache = new Map()
|
||||
static cache = new Map
|
||||
|
||||
state = {
|
||||
mod: undefined,
|
||||
|
@ -34,12 +34,12 @@ class Bundle extends React.PureComponent {
|
|||
}
|
||||
|
||||
componentDidMount() {
|
||||
this.load();
|
||||
this.load(this.props);
|
||||
}
|
||||
|
||||
componentDidUpdate(prevProps) {
|
||||
if (this.props.fetchComponent !== prevProps.fetchComponent) {
|
||||
this.load();
|
||||
componentWillReceiveProps(nextProps) {
|
||||
if (nextProps.fetchComponent !== this.props.fetchComponent) {
|
||||
this.load(nextProps);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -49,8 +49,8 @@ class Bundle extends React.PureComponent {
|
|||
}
|
||||
}
|
||||
|
||||
load = () => {
|
||||
const { fetchComponent, onFetch, onFetchSuccess, onFetchFail, renderDelay } = this.props;
|
||||
load = (props) => {
|
||||
const { fetchComponent, onFetch, onFetchSuccess, onFetchFail, renderDelay } = props || this.props;
|
||||
const cachedMod = Bundle.cache.get(fetchComponent);
|
||||
|
||||
if (fetchComponent === undefined) {
|
||||
|
|
Loading…
Reference in a new issue