@servicetitan/react-ioc 28.3.2 → 28.4.0
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/dist/__tests__/provide.test.js +10 -1
- package/dist/__tests__/provide.test.js.map +1 -1
- package/dist/await.d.ts +1 -1
- package/dist/await.d.ts.map +1 -1
- package/dist/provide.d.ts +5 -6
- package/dist/provide.d.ts.map +1 -1
- package/dist/provide.js +4 -6
- package/dist/provide.js.map +1 -1
- package/dist/provider.d.ts +3 -3
- package/dist/provider.d.ts.map +1 -1
- package/dist/provider.js.map +1 -1
- package/package.json +3 -3
- package/src/__tests__/provide.test.tsx +15 -3
- package/src/await.tsx +1 -1
- package/src/provide.tsx +11 -14
- package/src/provider.tsx +3 -3
|
@@ -37,7 +37,8 @@ describe('[react-ioc] provide', () => {
|
|
|
37
37
|
});
|
|
38
38
|
test('passes fallback options to <Provider>', () => {
|
|
39
39
|
subject();
|
|
40
|
-
|
|
40
|
+
const props = { ...stores, ...options };
|
|
41
|
+
expect(screen.getByText(`<Provider ${JSON.stringify(props)} />`)).toBeInTheDocument();
|
|
41
42
|
});
|
|
42
43
|
describe('with empty fallback options', () => {
|
|
43
44
|
beforeEach(() => (options = {}));
|
|
@@ -57,6 +58,14 @@ describe('[react-ioc] provide', () => {
|
|
|
57
58
|
loadingFallback: _jsx(LoadingFallback, {}),
|
|
58
59
|
})} />`)).toBeInTheDocument();
|
|
59
60
|
});
|
|
61
|
+
describe('when fallback element is "null"', () => {
|
|
62
|
+
beforeEach(() => (options = null));
|
|
63
|
+
test('passes null {loadingFallback} option', () => {
|
|
64
|
+
subject();
|
|
65
|
+
const props = { ...stores, loadingFallback: null };
|
|
66
|
+
expect(screen.getByText(`<Provider ${JSON.stringify(props)} />`)).toBeInTheDocument();
|
|
67
|
+
});
|
|
68
|
+
});
|
|
60
69
|
});
|
|
61
70
|
});
|
|
62
71
|
//# sourceMappingURL=provide.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provide.test.js","sourceRoot":"","sources":["../../src/__tests__/provide.test.tsx"],"names":[],"mappings":";AAAA,OAAO,2BAA2B,CAAC;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAM,QAAQ,EAAqB,MAAM,OAAO,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC,CAAC;IAC5B,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,KAAK,EAA0B,EAAE,EAAE;QACzD,OAAO,CACH,MAAC,QAAQ,eACJ,aAAa,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,EACvC,QAAQ,IACF,CACd,CAAC;IACN,CAAC;CACJ,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACjC,IAAI,MAAqC,CAAC;IAC1C,IAAI,OAAsC,CAAC;IAC3C,IAAI,KAAsC,CAAC;IAE3C,MAAM,OAAO,GAAG,GAAG,EAAE;QACjB,MAAM,SAAS,GAAG,OAAO,CACrB,MAAM,EACN,OAAO,CACV,CAAC,WAAW,CAAC,EAAE,CAAC,wBAAM,cAAc,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,GAAO,CAAC,CAAC;QAE9E,OAAO,MAAM,CAAC,KAAC,SAAS,OAAK,KAAK,GAAI,CAAC,CAAC;IAC5C,CAAC,CAAC;IAEF,UAAU,CAAC,GAAG,EAAE;QACZ,MAAM,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;QAC3C,OAAO,GAAG,SAAS,CAAC;QACpB,KAAK,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACtC,OAAO,EAAE,CAAC;QAEV,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,iBAAiB,EAAE,CAAC;IAC3F,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,mCAAmC,EAAE,GAAG,EAAE;QAC3C,OAAO,EAAE,CAAC;QAEV,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,aAAa,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,iBAAiB,EAAE,CAAC;IAC3F,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;QACnC,MAAM,eAAe,GAAO,GAAG,EAAE,CAAC,IAAI,CAAC;QACvC,MAAM,aAAa,GAAO,GAAG,EAAE,CAAC,IAAI,CAAC;QAErC,UAAU,CAAC,GAAG,EAAE;YACZ,OAAO,GAAG,EAAE,eAAe,EAAE,KAAC,eAAe,KAAG,EAAE,aAAa,EAAE,KAAC,aAAa,KAAG,EAAE,CAAC;QACzF,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,uCAAuC,EAAE,GAAG,EAAE;YAC/C,OAAO,EAAE,CAAC;YAEV,MAAM,
|
|
1
|
+
{"version":3,"file":"provide.test.js","sourceRoot":"","sources":["../../src/__tests__/provide.test.tsx"],"names":[],"mappings":"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"}
|
package/dist/await.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { FC, PropsWithChildren, ReactNode } from 'react';
|
|
2
2
|
export type AwaitProps = PropsWithChildren<{
|
|
3
3
|
promises: Promise<void>[];
|
|
4
|
-
fallback?:
|
|
4
|
+
fallback?: ReactNode;
|
|
5
5
|
}>;
|
|
6
6
|
export declare const Await: FC<AwaitProps>;
|
|
7
7
|
//# sourceMappingURL=await.d.ts.map
|
package/dist/await.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"await.d.ts","sourceRoot":"","sources":["../src/await.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAQ,iBAAiB,EAAgB,SAAS,EAAqB,MAAM,OAAO,CAAC;AAGhG,MAAM,MAAM,UAAU,GAAG,iBAAiB,CAAC;IACvC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;IAC1B,QAAQ,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"await.d.ts","sourceRoot":"","sources":["../src/await.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAQ,iBAAiB,EAAgB,SAAS,EAAqB,MAAM,OAAO,CAAC;AAGhG,MAAM,MAAM,UAAU,GAAG,iBAAiB,CAAC;IACvC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;IAC1B,QAAQ,CAAC,EAAE,SAAS,CAAC;CACxB,CAAC,CAAC;AAEH,eAAO,MAAM,KAAK,EAAE,EAAE,CAAC,UAAU,CAsBhC,CAAC"}
|
package/dist/provide.d.ts
CHANGED
|
@@ -1,17 +1,16 @@
|
|
|
1
|
-
import { ComponentType, ReactInstance } from 'react';
|
|
1
|
+
import { ComponentType, ReactInstance, ReactNode } from 'react';
|
|
2
2
|
import { ProviderConfigEntrySingletons, ProviderConfigEntryInstances } from './provider';
|
|
3
3
|
export interface WrappedComponent<P> {
|
|
4
4
|
wrappedComponent: ComponentType<P>;
|
|
5
5
|
wrappedInstance: ReactInstance | undefined;
|
|
6
6
|
}
|
|
7
|
-
interface FallbackOptions {
|
|
8
|
-
loadingFallback?:
|
|
9
|
-
errorFallback?:
|
|
7
|
+
export interface FallbackOptions {
|
|
8
|
+
loadingFallback?: ReactNode;
|
|
9
|
+
errorFallback?: ReactNode;
|
|
10
10
|
}
|
|
11
11
|
export type ProvideDecorator = (stores: {
|
|
12
12
|
singletons?: ProviderConfigEntrySingletons<any>[];
|
|
13
13
|
instances?: ProviderConfigEntryInstances<any>[];
|
|
14
|
-
}, options?:
|
|
14
|
+
}, options?: ReactNode | FallbackOptions) => <T extends ComponentType<any>>(target: T) => T & WrappedComponent<T>;
|
|
15
15
|
export declare const provide: ProvideDecorator;
|
|
16
|
-
export {};
|
|
17
16
|
//# sourceMappingURL=provide.d.ts.map
|
package/dist/provide.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provide.d.ts","sourceRoot":"","sources":["../src/provide.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"provide.d.ts","sourceRoot":"","sources":["../src/provide.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEhE,OAAO,EAAY,6BAA6B,EAAE,4BAA4B,EAAE,MAAM,YAAY,CAAC;AAEnG,MAAM,WAAW,gBAAgB,CAAC,CAAC;IAC/B,gBAAgB,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;IACnC,eAAe,EAAE,aAAa,GAAG,SAAS,CAAC;CAC9C;AAED,MAAM,WAAW,eAAe;IAC5B,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,aAAa,CAAC,EAAE,SAAS,CAAC;CAC7B;AAED,MAAM,MAAM,gBAAgB,GAAG,CAC3B,MAAM,EAAE;IACJ,UAAU,CAAC,EAAE,6BAA6B,CAAC,GAAG,CAAC,EAAE,CAAC;IAClD,SAAS,CAAC,EAAE,4BAA4B,CAAC,GAAG,CAAC,EAAE,CAAC;CACnD,EACD,OAAO,CAAC,EAAE,SAAS,GAAG,eAAe,KACpC,CAAC,CAAC,SAAS,aAAa,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;AAE1E,eAAO,MAAM,OAAO,EAId,gBAAgB,CAAC"}
|
package/dist/provide.js
CHANGED
|
@@ -5,11 +5,9 @@ function getOptions(arg) {
|
|
|
5
5
|
return arg && isOptionsObject(arg) ? arg : { loadingFallback: arg };
|
|
6
6
|
}
|
|
7
7
|
function isOptionsObject(arg) {
|
|
8
|
-
return (
|
|
9
|
-
Object.hasOwn(arg, '
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
function isEmptyObject(arg) {
|
|
13
|
-
return typeof arg === 'object' && Object.keys(arg).length === 0;
|
|
8
|
+
return (typeof arg === 'object' &&
|
|
9
|
+
(Object.hasOwn(arg, 'loadingFallback') ||
|
|
10
|
+
Object.hasOwn(arg, 'errorFallback') ||
|
|
11
|
+
Object.keys(arg).length === 0));
|
|
14
12
|
}
|
|
15
13
|
//# sourceMappingURL=provide.js.map
|
package/dist/provide.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provide.js","sourceRoot":"","sources":["../src/provide.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,QAAQ,EAA+D,MAAM,YAAY,CAAC;AAoBnG,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAC,SAAwB,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CACzF,KAAC,QAAQ,OAAK,MAAM,KAAM,UAAU,CAAC,gBAAgB,CAAC,YAClD,KAAC,SAAS,OAAK,KAAK,GAAI,GACjB,CACd,CAAqB,CAAC;AAEvB,SAAS,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"provide.js","sourceRoot":"","sources":["../src/provide.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,QAAQ,EAA+D,MAAM,YAAY,CAAC;AAoBnG,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAC,SAAwB,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CACzF,KAAC,QAAQ,OAAK,MAAM,KAAM,UAAU,CAAC,gBAAgB,CAAC,YAClD,KAAC,SAAS,OAAK,KAAK,GAAI,GACjB,CACd,CAAqB,CAAC;AAEvB,SAAS,UAAU,CAAC,GAAiC;IACjD,OAAO,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,GAAG,EAAE,CAAC;AACxE,CAAC;AAED,SAAS,eAAe,CAAC,GAA6C;IAClE,OAAO,CACH,OAAO,GAAG,KAAK,QAAQ;QACvB,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,iBAAiB,CAAC;YAClC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,eAAe,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CACrC,CAAC;AACN,CAAC"}
|
package/dist/provider.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { FC, PropsWithChildren,
|
|
1
|
+
import { FC, PropsWithChildren, ReactNode } from 'react';
|
|
2
2
|
import { interfaces } from 'inversify';
|
|
3
3
|
import { Token, SymbolToken } from './common';
|
|
4
4
|
export type ProviderConfigEntrySingletons<T> = ClassProviderConfigEntry<T> | ValueProviderConfigEntry<T>;
|
|
@@ -23,8 +23,8 @@ interface ValueProviderConfigEntry<T> {
|
|
|
23
23
|
export type ProviderProps = PropsWithChildren<{
|
|
24
24
|
singletons?: ProviderConfigEntrySingletons<any>[];
|
|
25
25
|
instances?: ProviderConfigEntryInstances<any>[];
|
|
26
|
-
loadingFallback?:
|
|
27
|
-
errorFallback?:
|
|
26
|
+
loadingFallback?: ReactNode;
|
|
27
|
+
errorFallback?: ReactNode;
|
|
28
28
|
}>;
|
|
29
29
|
export declare const Provider: FC<ProviderProps>;
|
|
30
30
|
export {};
|
package/dist/provider.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,iBAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,iBAAiB,EAAE,SAAS,EAAmC,MAAM,OAAO,CAAC;AAE1F,OAAO,EAAa,UAAU,EAAE,MAAM,WAAW,CAAC;AAGlD,OAAO,EAAoB,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAIhE,MAAM,MAAM,6BAA6B,CAAC,CAAC,IACrC,wBAAwB,CAAC,CAAC,CAAC,GAC3B,wBAAwB,CAAC,CAAC,CAAC,CAAC;AAClC,MAAM,MAAM,4BAA4B,CAAC,CAAC,IAAI,iCAAiC,CAAC,CAAC,CAAC,CAAC;AACnF,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAC3B,6BAA6B,CAAC,CAAC,CAAC,GAChC,4BAA4B,CAAC,CAAC,CAAC,CAAC;AAEtC,KAAK,wBAAwB,CAAC,CAAC,IACzB,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,GACrB,gCAAgC,CAAC,CAAC,CAAC,GACnC,6BAA6B,CAAC,CAAC,CAAC,CAAC;AAEvC,KAAK,iCAAiC,CAAC,CAAC,IAClC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,GACrB,IAAI,CAAC,gCAAgC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;AAE3D,UAAU,gCAAgC,CAAC,CAAC;IACxC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAClB,QAAQ,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,IAAI,CAAC;CAClB;AAED,UAAU,6BAA6B,CAAC,CAAC;IACrC,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC/B,OAAO,CAAC,EAAE,IAAI,CAAC;CAClB;AAED,UAAU,wBAAwB,CAAC,CAAC;IAChC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC;IACnC,QAAQ,EAAE,CAAC,CAAC;IACZ,OAAO,CAAC,EAAE,IAAI,CAAC;CAClB;AA2JD,MAAM,MAAM,aAAa,GAAG,iBAAiB,CAAC;IAC1C,UAAU,CAAC,EAAE,6BAA6B,CAAC,GAAG,CAAC,EAAE,CAAC;IAClD,SAAS,CAAC,EAAE,4BAA4B,CAAC,GAAG,CAAC,EAAE,CAAC;IAChD,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,aAAa,CAAC,EAAE,SAAS,CAAC;CAC7B,CAAC,CAAC;AAEH,eAAO,MAAM,QAAQ,EAAE,EAAE,CAAC,aAAa,CA+DtC,CAAC"}
|
package/dist/provider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.tsx"],"names":[],"mappings":";AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@servicetitan/react-ioc",
|
|
3
|
-
"version": "28.
|
|
3
|
+
"version": "28.4.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"homepage": "https://docs.st.dev/docs/frontend/react-ioc",
|
|
6
6
|
"repository": {
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"devDependencies": {
|
|
22
22
|
"@testing-library/dom": "^10.4.0",
|
|
23
23
|
"@testing-library/jest-dom": "^6.6.3",
|
|
24
|
-
"@testing-library/react": "^16.
|
|
24
|
+
"@testing-library/react": "^16.2.0",
|
|
25
25
|
"@types/react": "~18.3.3",
|
|
26
26
|
"react": "~18.3.1"
|
|
27
27
|
},
|
|
@@ -34,5 +34,5 @@
|
|
|
34
34
|
"cli": {
|
|
35
35
|
"webpack": false
|
|
36
36
|
},
|
|
37
|
-
"gitHead": "
|
|
37
|
+
"gitHead": "051b5b2f70ae6be345aa08ffdd49d8c049272940"
|
|
38
38
|
}
|
|
@@ -58,9 +58,8 @@ describe('[react-ioc] provide', () => {
|
|
|
58
58
|
test('passes fallback options to <Provider>', () => {
|
|
59
59
|
subject();
|
|
60
60
|
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
).toBeInTheDocument();
|
|
61
|
+
const props = { ...stores, ...(options as any) };
|
|
62
|
+
expect(screen.getByText(`<Provider ${JSON.stringify(props)} />`)).toBeInTheDocument();
|
|
64
63
|
});
|
|
65
64
|
|
|
66
65
|
describe('with empty fallback options', () => {
|
|
@@ -93,5 +92,18 @@ describe('[react-ioc] provide', () => {
|
|
|
93
92
|
)
|
|
94
93
|
).toBeInTheDocument();
|
|
95
94
|
});
|
|
95
|
+
|
|
96
|
+
describe('when fallback element is "null"', () => {
|
|
97
|
+
beforeEach(() => (options = null));
|
|
98
|
+
|
|
99
|
+
test('passes null {loadingFallback} option', () => {
|
|
100
|
+
subject();
|
|
101
|
+
|
|
102
|
+
const props = { ...stores, loadingFallback: null };
|
|
103
|
+
expect(
|
|
104
|
+
screen.getByText(`<Provider ${JSON.stringify(props)} />`)
|
|
105
|
+
).toBeInTheDocument();
|
|
106
|
+
});
|
|
107
|
+
});
|
|
96
108
|
});
|
|
97
109
|
});
|
package/src/await.tsx
CHANGED
package/src/provide.tsx
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ComponentType, ReactInstance } from 'react';
|
|
1
|
+
import { ComponentType, ReactInstance, ReactNode } from 'react';
|
|
2
2
|
|
|
3
3
|
import { Provider, ProviderConfigEntrySingletons, ProviderConfigEntryInstances } from './provider';
|
|
4
4
|
|
|
@@ -7,9 +7,9 @@ export interface WrappedComponent<P> {
|
|
|
7
7
|
wrappedInstance: ReactInstance | undefined;
|
|
8
8
|
}
|
|
9
9
|
|
|
10
|
-
interface FallbackOptions {
|
|
11
|
-
loadingFallback?:
|
|
12
|
-
errorFallback?:
|
|
10
|
+
export interface FallbackOptions {
|
|
11
|
+
loadingFallback?: ReactNode;
|
|
12
|
+
errorFallback?: ReactNode;
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
export type ProvideDecorator = (
|
|
@@ -17,7 +17,7 @@ export type ProvideDecorator = (
|
|
|
17
17
|
singletons?: ProviderConfigEntrySingletons<any>[];
|
|
18
18
|
instances?: ProviderConfigEntryInstances<any>[];
|
|
19
19
|
},
|
|
20
|
-
options?:
|
|
20
|
+
options?: ReactNode | FallbackOptions
|
|
21
21
|
) => <T extends ComponentType<any>>(target: T) => T & WrappedComponent<T>;
|
|
22
22
|
|
|
23
23
|
export const provide = ((stores, elementOrOptions) => (Component: ComponentType) => props => (
|
|
@@ -26,18 +26,15 @@ export const provide = ((stores, elementOrOptions) => (Component: ComponentType)
|
|
|
26
26
|
</Provider>
|
|
27
27
|
)) as ProvideDecorator;
|
|
28
28
|
|
|
29
|
-
function getOptions(arg?: FallbackOptions |
|
|
29
|
+
function getOptions(arg?: FallbackOptions | ReactNode): FallbackOptions | undefined {
|
|
30
30
|
return arg && isOptionsObject(arg) ? arg : { loadingFallback: arg };
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
-
function isOptionsObject(arg: FallbackOptions |
|
|
33
|
+
function isOptionsObject(arg: FallbackOptions | NonNullable<ReactNode>): arg is FallbackOptions {
|
|
34
34
|
return (
|
|
35
|
-
|
|
36
|
-
Object.hasOwn(arg, '
|
|
37
|
-
|
|
35
|
+
typeof arg === 'object' &&
|
|
36
|
+
(Object.hasOwn(arg, 'loadingFallback') ||
|
|
37
|
+
Object.hasOwn(arg, 'errorFallback') ||
|
|
38
|
+
Object.keys(arg).length === 0)
|
|
38
39
|
);
|
|
39
40
|
}
|
|
40
|
-
|
|
41
|
-
function isEmptyObject(arg: FallbackOptions | JSX.Element) {
|
|
42
|
-
return typeof arg === 'object' && Object.keys(arg).length === 0;
|
|
43
|
-
}
|
package/src/provider.tsx
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { FC, PropsWithChildren,
|
|
1
|
+
import { FC, PropsWithChildren, ReactNode, useState, useContext, useEffect } from 'react';
|
|
2
2
|
|
|
3
3
|
import { Container, interfaces } from 'inversify';
|
|
4
4
|
|
|
@@ -197,8 +197,8 @@ function disposeStores(stores: Store[]) {
|
|
|
197
197
|
export type ProviderProps = PropsWithChildren<{
|
|
198
198
|
singletons?: ProviderConfigEntrySingletons<any>[];
|
|
199
199
|
instances?: ProviderConfigEntryInstances<any>[];
|
|
200
|
-
loadingFallback?:
|
|
201
|
-
errorFallback?:
|
|
200
|
+
loadingFallback?: ReactNode;
|
|
201
|
+
errorFallback?: ReactNode;
|
|
202
202
|
}>;
|
|
203
203
|
|
|
204
204
|
export const Provider: FC<ProviderProps> = ({
|