react-simple-loadable 2.3.0 → 2.3.2

package/loadable.d.ts

@@ -1,17 +1,21 @@
-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 type LoadingComponent = ComponentType<LoaderComponentProps>;
 export interface LoadableConfig {
     throwOnError?: boolean;
-    loader?: LoaderComponent;
+    loading?: LoadingComponent | ComponentType<Record<string, any>>;
+    /**
+     * @deprecated use {loading}
+     */
+    loader?: LoadingComponent | ComponentType<Record<string, any>>;
     /**
      * Component which renders with the lazy component
      */
@@ -19,6 +23,6 @@ export interface LoadableConfig {
 }
 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 declare function loadable<P = any>(loadFn: LoadComponentFn<P>, loadingOrConfig?: null | undefined | LoadableConfig['loading'] | 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,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"}
+{"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,gBAAgB,GAAG,aAAa,CAAC,oBAAoB,CAAC,CAAC;AAEnE,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,gBAAgB,GAAG,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IAChE;;OAEG;IACH,MAAM,CAAC,EAAE,gBAAgB,GAAG,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IAC/D;;OAEG;IACH,KAAK,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;CAC5B;AAwID,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,eAAe,CAAC,EACZ,IAAI,GACJ,SAAS,GACT,cAAc,CAAC,SAAS,CAAC,GACzB,cAAc,GACjB,kBAAkB,CAAC,CAAC,CAAC,CAqBvB"}

package/loadable.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { Component } from 'react';
-const DefaultLoader = () => null;
+const DefaultLoadingComponent = () => null;
 const loadingStates = new WeakMap();
 const getLoadingState = (loadFn, modify) => {
     if (!loadingStates.has(loadFn)) {
@@ -63,8 +63,8 @@ class LoadableComponentBase extends Component {
         });
     }
     render() {
-        const { loader, throwOnError } = this.config;
-        const Loader = loader || DefaultLoader;
+        const { loading, loader, throwOnError } = this.config;
+        const Loader = loading || loader || DefaultLoadingComponent;
         if (throwOnError && this.state.error) {
             throw this.state.error;
         }
@@ -93,10 +93,10 @@ class LoadableComponentBase extends Component {
 export const loadableDefaultConfig = {
     throwOnError: false,
 };
-export function loadable(loadFn, loaderOrConfig) {
-    const config = typeof loaderOrConfig === 'object'
-        ? { ...loadableDefaultConfig, ...loaderOrConfig }
-        : { ...loadableDefaultConfig, loader: loaderOrConfig };
+export function loadable(loadFn, loadingOrConfig) {
+    const config = typeof loadingOrConfig === 'object'
+        ? { ...loadableDefaultConfig, ...loadingOrConfig }
+        : { ...loadableDefaultConfig, loading: loadingOrConfig };
     class LoadableComponent extends LoadableComponentBase {
         static loadFn = loadFn;
         constructor(props) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-simple-loadable",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "description": "Really simple React Loadable component",
   "repository": {
     "type": "git",
@@ -17,7 +17,7 @@
   "license": "MIT",
   "type": "module",
   "peerDependencies": {
-    "react": "^17.0.0 || ^18.0.0 || ^19.0.0"
+    "react": "^18.0.0 || ^19.0.0"
   },
   "devDependencies": {
     "@types/react": "^18.3.18",