mirror
/
soapbox
kopia lustrzana https://gitlab.com/soapbox-pub/soapbox
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge branch 'revert-511f1de4' into 'develop' 

Revert "Merge branch 'react-17-deprecated' into 'develop'"

See merge request soapbox-pub/soapbox-fe!879
merge-requests/880/head
Alex Gleason 2021-11-16 17:08:04 +00:00
rodzic 02898b6bd6 28d6c93b39
commit d4ded71d3a
1 zmienionych plików z 7 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

14
app/soapbox/features/ui/components/bundle.js
Wyświetl plik

@ -26,7 +26,7 @@ class Bundle extends React.PureComponent {
onFetchFail: noop, onFetchFail: noop,
} }
static cache = new Map() static cache = new Map
state = { state = {
mod: undefined, mod: undefined,
@ -34,12 +34,12 @@ class Bundle extends React.PureComponent {
} }
componentDidMount() { componentDidMount() {
this.load(); this.load(this.props);
} }
componentDidUpdate(prevProps) { componentWillReceiveProps(nextProps) {
if (this.props.fetchComponent !== prevProps.fetchComponent) { if (nextProps.fetchComponent !== this.props.fetchComponent) {
this.load(); this.load(nextProps);
} }
} }
@ -49,8 +49,8 @@ class Bundle extends React.PureComponent {
} }
} }
load = () => { load = (props) => {
const { fetchComponent, onFetch, onFetchSuccess, onFetchFail, renderDelay } = this.props; const { fetchComponent, onFetch, onFetchSuccess, onFetchFail, renderDelay } = props || this.props;
const cachedMod = Bundle.cache.get(fetchComponent); const cachedMod = Bundle.cache.get(fetchComponent);
if (fetchComponent === undefined) { if (fetchComponent === undefined) {