react-simple-loadable 2.2.0 → 2.3.1

package/loadable.d.ts

@@ -1,17 +1,24 @@
-import { ComponentType } from 'react';
+import { ComponentType, ReactNode } from 'react';
 export type LoadComponentFn<P = Record<string, any>> = () => Promise<ComponentType<P>>;
 export type LoadableMixin = {
     preload(): void;
 };
-export type LoadableComponent<P = Record<string, any>> = ComponentType<P> & LoadableMixin;
+export type LoadableComponent<P = Record<string, any>> = ((props: P) => ReactNode) & LoadableMixin;
+export interface LoaderComponentProps {
+    error?: any;
+    isLoading?: boolean;
+}
+export type LoaderComponent = ComponentType<LoaderComponentProps>;
 export interface LoadableConfig {
-    loader?: ComponentType<any>;
+    throwOnError?: boolean;
+    loader?: LoaderComponent;
     /**
      * Component which renders with the lazy component
      */
     extra?: ComponentType<any>;
 }
 type LoadableComponent$<P> = LoadableComponent<P>;
+export declare const loadableDefaultConfig: Partial<LoadableConfig>;
 export declare function loadable<P = any>(loadFn: LoadComponentFn<P>, loaderOrConfig?: null | undefined | LoadableConfig['loader'] | LoadableConfig): LoadableComponent$<P>;
 export {};
 //# sourceMappingURL=loadable.d.ts.map

package/loadable.d.ts.map

@@ -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;AAsHD,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"}
+{"version":3,"file":"loadable.d.ts","sourceRoot":"","sources":["../src/loadable.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAa,aAAa,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAE5D,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,CAAC,CACxD,KAAK,EAAE,CAAC,KACL,SAAS,CAAC,GACb,aAAa,CAAC;AAIhB,MAAM,WAAW,oBAAoB;IACnC,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,MAAM,eAAe,GAAG,aAAa,CAAC,oBAAoB,CAAC,CAAC;AAElE,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB;;OAEG;IACH,KAAK,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;CAC5B;AAoID,KAAK,kBAAkB,CAAC,CAAC,IAAI,iBAAiB,CAAC,CAAC,CAAC,CAAC;AAElD,eAAO,MAAM,qBAAqB,EAAE,OAAO,CAAC,cAAc,CAEzD,CAAC;AAEF,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

@@ -63,10 +63,22 @@ class LoadableComponentBase extends Component {
         });
     }
     render() {
-        const { loader } = this.config;
+        const { loader, throwOnError } = this.config;
         const Loader = loader || DefaultLoader;
+        if (throwOnError && this.state.error) {
+            throw this.state.error;
+        }
         if (this.state.loading || this.state.error) {
-            return _jsx(Loader, { ...this.props });
+            const loaderProps = {
+                ...this.props,
+            };
+            if (this.state.error) {
+                loaderProps.error = this.state.error;
+            }
+            else if (!loaderProps.isLoading) {
+                loaderProps.isLoading = true;
+            }
+            return _jsx(Loader, { ...loaderProps });
         }
         else if (this.state.result) {
             const Component = this.state.result;
@@ -78,10 +90,13 @@ class LoadableComponentBase extends Component {
         }
     }
 }
+export const loadableDefaultConfig = {
+    throwOnError: false,
+};
 export function loadable(loadFn, loaderOrConfig) {
     const config = typeof loaderOrConfig === 'object'
-        ? loaderOrConfig
-        : { loader: loaderOrConfig };
+        ? { ...loadableDefaultConfig, ...loaderOrConfig }
+        : { ...loadableDefaultConfig, loader: loaderOrConfig };
     class LoadableComponent extends LoadableComponentBase {
         static loadFn = loadFn;
         constructor(props) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-simple-loadable",
-  "version": "2.2.0",
+  "version": "2.3.1",
   "description": "Really simple React Loadable component",
   "repository": {
     "type": "git",