react-simple-loadable 2.0.3 → 2.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/loadable.d.ts.map +1 -1
- package/loadable.js +3 -8
- package/package.json +1 -1
package/loadable.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadable.d.ts","sourceRoot":"","sources":["../src/loadable.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAa,aAAa,EAAE,MAAM,OAAO,CAAC;AAEjD,MAAM,MAAM,eAAe,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,MAAM,OAAO,CAClE,aAAa,CAAC,CAAC,CAAC,CACjB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,IAAI,IAAI,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,iBAAiB,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,GACvE,aAAa,CAAC;AAIhB,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC5B;;OAEG;IACH,KAAK,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;CAC5B;
|
|
1
|
+
{"version":3,"file":"loadable.d.ts","sourceRoot":"","sources":["../src/loadable.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAa,aAAa,EAAE,MAAM,OAAO,CAAC;AAEjD,MAAM,MAAM,eAAe,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,MAAM,OAAO,CAClE,aAAa,CAAC,CAAC,CAAC,CACjB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,IAAI,IAAI,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,iBAAiB,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,GACvE,aAAa,CAAC;AAIhB,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC5B;;OAEG;IACH,KAAK,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;CAC5B;AAwHD,KAAK,kBAAkB,CAAC,CAAC,IAAI,iBAAiB,CAAC,CAAC,CAAC,CAAC;AAElD,wBAAgB,QAAQ,CAAC,CAAC,GAAG,GAAG,EAC9B,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC,EAC1B,cAAc,CAAC,EAAE,IAAI,GAAG,SAAS,GAAG,cAAc,CAAC,QAAQ,CAAC,GAAG,cAAc,GAC5E,kBAAkB,CAAC,CAAC,CAAC,CAqBvB"}
|
package/loadable.js
CHANGED
|
@@ -58,19 +58,14 @@ class LoadableComponentBase extends Component {
|
|
|
58
58
|
}
|
|
59
59
|
const { promise } = load(this.config.loadFn);
|
|
60
60
|
this.setState(getLoadingState(this.config.loadFn));
|
|
61
|
-
promise
|
|
62
|
-
.then(() => {
|
|
61
|
+
promise.finally(() => {
|
|
63
62
|
this.setState(getLoadingState(this.config.loadFn));
|
|
64
|
-
return null;
|
|
65
|
-
})
|
|
66
|
-
.catch(() => {
|
|
67
|
-
this.setState(getLoadingState(this.config.loadFn));
|
|
68
|
-
return null;
|
|
69
63
|
});
|
|
70
64
|
}
|
|
71
65
|
render() {
|
|
72
66
|
const { loader } = this.config;
|
|
73
67
|
const Loader = loader || DefaultLoader;
|
|
68
|
+
console.info('loadable render', this.state, this.props, this.config);
|
|
74
69
|
if (this.state.loading || this.state.error) {
|
|
75
70
|
return _jsx(Loader, { ...this.props });
|
|
76
71
|
}
|
|
@@ -89,7 +84,7 @@ export function loadable(loadFn, loaderOrConfig) {
|
|
|
89
84
|
? loaderOrConfig
|
|
90
85
|
: { loader: loaderOrConfig };
|
|
91
86
|
class LoadableComponent extends LoadableComponentBase {
|
|
92
|
-
loadFn = loadFn;
|
|
87
|
+
static loadFn = loadFn;
|
|
93
88
|
constructor(props) {
|
|
94
89
|
super({
|
|
95
90
|
loadFn,
|