@applicaster/quick-brick-core 13.0.0-alpha.3755455151 → 13.0.0-alpha.3829509172
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/App/DeepLinking/URLSchemeListener/URLSchemeContextProvider.tsx +30 -3
- package/App/DeepLinking/URLSchemeListener/__tests__/URLSchemeListener.test.js +40 -0
- package/App/DeepLinking/URLSchemeListener/index.tsx +1 -1
- package/App/ErrorBoundary/__tests__/errorBoundary.test.jsx +232 -0
- package/App/ErrorBoundary/__tests__/store.test.js +143 -0
- package/App/ErrorBoundary/index.tsx +45 -21
- package/App/ErrorBoundary/store.ts +26 -0
- package/App/LoadingOverlay/LoadingOverlayManager.tsx +27 -0
- package/App/LoadingOverlay/index.tsx +49 -0
- package/App/LoadingOverlay/useLoadingOverlayVisibility.tsx +18 -0
- package/App/ModalProvider/ModalBottomSheet/index.tsx +4 -2
- package/App/ModalProvider/index.tsx +3 -4
- package/App/NavigationProvider/NavigationProvider.tsx +28 -2
- package/App/NetworkStatusProvider/utils.ts +0 -1
- package/App/StoreConnector/__tests__/storeConnector.test.js +17 -11
- package/App/appLifeCycleManager/__tests__/appLifeCycleManager.test.tsx +146 -0
- package/App/appLifeCycleManager/index.tsx +6 -7
- package/App/index.tsx +2 -0
- package/App/remoteContextReloader/__tests__/remoteContextReloader.test.js +11 -21
- package/App/remoteContextReloader/getRemoteContextData/getNativeRemoteContextData.ts +14 -0
- package/README.md +1 -1
- package/createZappApp/__tests__/__snapshots__/createZappApp.test.js.snap +5 -128
- package/createZappApp/__tests__/createZappApp.test.js +7 -20
- package/defaults/__tests__/defaults.test.js +3 -4
- package/index.d.ts +1 -1
- package/package.json +10 -14
- package/App/DeepLinking/URLSchemeListener/__tests__/URLSchemeListenerTest.js +0 -177
- package/App/ErrorBoundary/__tests__/__snapshots__/errorBoundary.test.js.snap +0 -9
- package/App/ErrorBoundary/__tests__/errorBoundary.test.js +0 -72
- package/App/StoreConnector/__tests__/__snapshots__/storeConnector.test.js.snap +0 -35
- package/App/appLifeCycleManager/__tests__/__snapshots__/appLifeCycleManager.test.js.snap +0 -30
- package/App/appLifeCycleManager/__tests__/appLifeCycleManager.test.js +0 -134
- package/App/remoteContextReloader/__tests__/__snapshots__/remoteContextReloader.test.js.snap +0 -43
|
@@ -4,7 +4,7 @@ import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils"
|
|
|
4
4
|
import { useSafeAreaInsets } from "react-native-safe-area-context";
|
|
5
5
|
|
|
6
6
|
import React, { useCallback, useEffect, useMemo, useState } from "react";
|
|
7
|
-
import {
|
|
7
|
+
import { Keyboard, StyleSheet, View } from "react-native";
|
|
8
8
|
|
|
9
9
|
import { Overlay } from "./Overlay";
|
|
10
10
|
import { ModalBottomSheetFrame } from "./ModalBottomSheetFrame";
|
|
@@ -83,6 +83,8 @@ export function ModalBottomSheet(props: Props) {
|
|
|
83
83
|
[isTablet]
|
|
84
84
|
);
|
|
85
85
|
|
|
86
|
+
const modalVisible = visible && sheetHeight > 0;
|
|
87
|
+
|
|
86
88
|
return (
|
|
87
89
|
<View style={styles.container}>
|
|
88
90
|
<Overlay
|
|
@@ -98,7 +100,7 @@ export function ModalBottomSheet(props: Props) {
|
|
|
98
100
|
paddingBottom={bottomOffset}
|
|
99
101
|
maxWidth={maxWidth}
|
|
100
102
|
dimensions={dimensions}
|
|
101
|
-
visible={
|
|
103
|
+
visible={modalVisible}
|
|
102
104
|
closeToast={dismiss}
|
|
103
105
|
handleProps={{
|
|
104
106
|
enabled: sheetHandleEnabled,
|
|
@@ -35,13 +35,12 @@ export function ModalProvider() {
|
|
|
35
35
|
|
|
36
36
|
const pathname = `${ROUTE_TYPES.MODAL}/${modalScreenProps?.screenId}`;
|
|
37
37
|
|
|
38
|
+
const shouldShowModal = modalVisible && modalState?.visible;
|
|
39
|
+
|
|
38
40
|
return (
|
|
39
41
|
<PathnameContext.Provider value={pathname}>
|
|
40
42
|
<ScreenContextProvider pathname={pathname}>
|
|
41
|
-
<ModalPresenter
|
|
42
|
-
visible={modalVisible && modalState?.visible}
|
|
43
|
-
{...modalState?.options}
|
|
44
|
-
>
|
|
43
|
+
<ModalPresenter visible={shouldShowModal} {...modalState?.options}>
|
|
45
44
|
<ModalChildrenWrapper>
|
|
46
45
|
<ModalContent modalScreenProps={modalScreenProps} />
|
|
47
46
|
</ModalChildrenWrapper>
|
|
@@ -49,6 +49,7 @@ import { coreAppLogger } from "../logger";
|
|
|
49
49
|
import {
|
|
50
50
|
getPlatform,
|
|
51
51
|
isTV,
|
|
52
|
+
isVizioPlatform,
|
|
52
53
|
} from "@applicaster/zapp-react-native-utils/reactUtils";
|
|
53
54
|
import { useConnectionInfo } from "@applicaster/zapp-react-native-utils/reactHooks/connection";
|
|
54
55
|
import {
|
|
@@ -67,6 +68,9 @@ import { useModalStore } from "@applicaster/zapp-react-native-utils/modalState";
|
|
|
67
68
|
import { useSubscriberFor } from "@applicaster/zapp-react-native-utils/reactHooks/useSubscriberFor";
|
|
68
69
|
import { QBUIComponentEvents } from "@applicaster/zapp-react-native-ui-components/events";
|
|
69
70
|
import { Hook } from "@applicaster/zapp-react-native-utils/appUtils/HooksManager/Hook";
|
|
71
|
+
import { URLSchemeContext } from "../DeepLinking/URLSchemeListener/URLSchemeContextProvider";
|
|
72
|
+
|
|
73
|
+
import { loadingOverlayManager } from "../LoadingOverlay";
|
|
70
74
|
|
|
71
75
|
const logger = coreAppLogger.addSubsystem("Navigator");
|
|
72
76
|
|
|
@@ -86,6 +90,8 @@ const navigationActions = {
|
|
|
86
90
|
const platform = getPlatform();
|
|
87
91
|
|
|
88
92
|
export function NavigationProvider({ children }: Props) {
|
|
93
|
+
const { url: deepLinkURL } = React.useContext(URLSchemeContext);
|
|
94
|
+
|
|
89
95
|
const {
|
|
90
96
|
appData: { layoutVersion },
|
|
91
97
|
rivers,
|
|
@@ -393,6 +399,8 @@ export function NavigationProvider({ children }: Props) {
|
|
|
393
399
|
} else {
|
|
394
400
|
dispatch(push(route, { entry: payload, screen: hookPlugin }));
|
|
395
401
|
}
|
|
402
|
+
|
|
403
|
+
closeLoadingOverlay();
|
|
396
404
|
};
|
|
397
405
|
|
|
398
406
|
const handleHookError = ({ error, hookPlugin, callback }, dispose) => {
|
|
@@ -411,6 +419,8 @@ export function NavigationProvider({ children }: Props) {
|
|
|
411
419
|
if (callback && typeof callback === "function") {
|
|
412
420
|
callback();
|
|
413
421
|
}
|
|
422
|
+
|
|
423
|
+
closeLoadingOverlay();
|
|
414
424
|
};
|
|
415
425
|
|
|
416
426
|
const handleHookCancel = ({ hookPlugin, callback }, dispose) => {
|
|
@@ -426,6 +436,8 @@ export function NavigationProvider({ children }: Props) {
|
|
|
426
436
|
} else {
|
|
427
437
|
goBack(true, true);
|
|
428
438
|
}
|
|
439
|
+
|
|
440
|
+
closeLoadingOverlay();
|
|
429
441
|
};
|
|
430
442
|
|
|
431
443
|
const handleHookSuccess = ({ hookPlugin, callback }) => {
|
|
@@ -436,6 +448,10 @@ export function NavigationProvider({ children }: Props) {
|
|
|
436
448
|
}
|
|
437
449
|
};
|
|
438
450
|
|
|
451
|
+
const handleBackgroundHook = () => {
|
|
452
|
+
openLoadingOverlay();
|
|
453
|
+
};
|
|
454
|
+
|
|
439
455
|
const checkStartUpHooks = React.useMemo(() => {
|
|
440
456
|
if (!pluginConfigurations) return false;
|
|
441
457
|
|
|
@@ -497,8 +513,7 @@ export function NavigationProvider({ children }: Props) {
|
|
|
497
513
|
({ hookPlugin, payload, callback }, dispose) => {
|
|
498
514
|
if (hookPlugin?.lastHook) {
|
|
499
515
|
dispose({ disposeAll: true });
|
|
500
|
-
|
|
501
|
-
startUpHooks.current && setStartUpHooks(false);
|
|
516
|
+
currentStartUpHooks.current && setStartUpHooks(false);
|
|
502
517
|
}
|
|
503
518
|
|
|
504
519
|
dispatch(
|
|
@@ -506,6 +521,8 @@ export function NavigationProvider({ children }: Props) {
|
|
|
506
521
|
);
|
|
507
522
|
|
|
508
523
|
callback?.();
|
|
524
|
+
|
|
525
|
+
closeLoadingOverlay();
|
|
509
526
|
};
|
|
510
527
|
|
|
511
528
|
const offlinePlugin = React.useMemo(() => {
|
|
@@ -620,6 +637,7 @@ export function NavigationProvider({ children }: Props) {
|
|
|
620
637
|
.on(HOOKS_EVENTS.ERROR, handleHookError)
|
|
621
638
|
.on(HOOKS_EVENTS.CANCEL, handleHookCancel)
|
|
622
639
|
.on(HOOKS_EVENTS.SUCCESS, handleHookSuccess)
|
|
640
|
+
.on(HOOKS_EVENTS.START_BACKGROUND_HOOK, handleBackgroundHook)
|
|
623
641
|
.on(
|
|
624
642
|
HOOKS_EVENTS.COMPLETE,
|
|
625
643
|
handleHookComplete(navigationAction, targetRoute, {
|
|
@@ -635,6 +653,14 @@ export function NavigationProvider({ children }: Props) {
|
|
|
635
653
|
},
|
|
636
654
|
});
|
|
637
655
|
|
|
656
|
+
const openLoadingOverlay = React.useCallback(() => {
|
|
657
|
+
deepLinkURL && isVizioPlatform() && loadingOverlayManager.show();
|
|
658
|
+
}, [deepLinkURL]);
|
|
659
|
+
|
|
660
|
+
const closeLoadingOverlay = React.useCallback(() => {
|
|
661
|
+
loadingOverlayManager.hide();
|
|
662
|
+
}, []);
|
|
663
|
+
|
|
638
664
|
const openPiP = React.useCallback(() => {
|
|
639
665
|
dispatch(setVideoPiP());
|
|
640
666
|
}, []);
|
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
import * as React from "react";
|
|
2
2
|
import * as ReactIs from "react-is";
|
|
3
3
|
import { View, Text } from "react-native";
|
|
4
|
-
import {
|
|
5
|
-
import { shallowToJson } from "enzyme-to-json";
|
|
4
|
+
import { render } from "@testing-library/react-native";
|
|
6
5
|
import configureStore from "redux-mock-store";
|
|
7
6
|
|
|
8
7
|
import { storeConnector } from "../index";
|
|
8
|
+
import { Provider } from "react-redux";
|
|
9
9
|
|
|
10
10
|
const styles = { foo: "bar" };
|
|
11
11
|
const components = { grid: jest.fn() };
|
|
12
12
|
const rivers = { A123: { name: "home", id: "A123" } };
|
|
13
13
|
const appSettings = { bundleIdentifier: "com.app.test" };
|
|
14
14
|
|
|
15
|
-
const Component = () => (
|
|
16
|
-
<View>
|
|
15
|
+
const Component = (props) => (
|
|
16
|
+
<View testID="test-comp" {...props}>
|
|
17
17
|
<Text>I'm a component</Text>
|
|
18
18
|
</View>
|
|
19
19
|
);
|
|
@@ -28,7 +28,6 @@ const store = configureStore()({
|
|
|
28
28
|
describe("storeConnector", () => {
|
|
29
29
|
it("returns a Component", () => {
|
|
30
30
|
const WrappedComponent = storeConnector(Component);
|
|
31
|
-
|
|
32
31
|
expect(ReactIs.isValidElementType(WrappedComponent)).toBe(true);
|
|
33
32
|
|
|
34
33
|
expect(WrappedComponent).toEqual(
|
|
@@ -41,12 +40,19 @@ describe("storeConnector", () => {
|
|
|
41
40
|
|
|
42
41
|
it("passes the props to the component", () => {
|
|
43
42
|
const WrappedComponent = storeConnector(Component);
|
|
44
|
-
const wrapper = shallow(<WrappedComponent store={store} />).dive();
|
|
45
|
-
const wrapperProps = wrapper.first().props();
|
|
46
43
|
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
44
|
+
const { getByText, getByTestId } = render(
|
|
45
|
+
<Provider store={store}>
|
|
46
|
+
<WrappedComponent />
|
|
47
|
+
</Provider>
|
|
48
|
+
);
|
|
49
|
+
|
|
50
|
+
expect(getByText("I'm a component")).toBeTruthy();
|
|
51
|
+
|
|
52
|
+
expect(getByTestId("test-comp").props).toMatchObject({
|
|
53
|
+
appSettings,
|
|
54
|
+
components,
|
|
55
|
+
rivers,
|
|
56
|
+
});
|
|
51
57
|
});
|
|
52
58
|
});
|
|
@@ -0,0 +1,146 @@
|
|
|
1
|
+
import * as React from "react";
|
|
2
|
+
import { View, Text } from "react-native";
|
|
3
|
+
import { render, waitFor } from "@testing-library/react-native";
|
|
4
|
+
import thunk from "redux-thunk";
|
|
5
|
+
import configureStore from "redux-mock-store";
|
|
6
|
+
|
|
7
|
+
let mocked_items: Record<string, any> = {};
|
|
8
|
+
|
|
9
|
+
import { appLifeCycleManager } from "../";
|
|
10
|
+
|
|
11
|
+
const mock_actions = {};
|
|
12
|
+
|
|
13
|
+
jest.mock("@applicaster/zapp-react-native-redux/AppData", () => ({
|
|
14
|
+
loadAppData: jest.fn(() => () => Promise.resolve()),
|
|
15
|
+
}));
|
|
16
|
+
|
|
17
|
+
jest.mock("@applicaster/zapp-react-native-utils/reactHooks/actions", () => ({
|
|
18
|
+
useActions: jest.fn(() => ({ actions: mock_actions })),
|
|
19
|
+
}));
|
|
20
|
+
|
|
21
|
+
jest.mock(
|
|
22
|
+
"@applicaster/zapp-react-native-bridge/ZappStorage/LocalStorage",
|
|
23
|
+
() => ({
|
|
24
|
+
localStorage: {
|
|
25
|
+
getAllItems: jest.fn(() => Promise.resolve(mocked_items)),
|
|
26
|
+
setItem: jest.fn((key, value) => {
|
|
27
|
+
mocked_items[key] = JSON.stringify(value);
|
|
28
|
+
|
|
29
|
+
return Promise.resolve(true);
|
|
30
|
+
}),
|
|
31
|
+
getItem: jest.fn((key) => {
|
|
32
|
+
if (mocked_items[key]) {
|
|
33
|
+
if (typeof mocked_items[key] === "string") {
|
|
34
|
+
return Promise.resolve(JSON.parse(mocked_items[key]));
|
|
35
|
+
} else {
|
|
36
|
+
return Promise.resolve(mocked_items[key]);
|
|
37
|
+
}
|
|
38
|
+
} else {
|
|
39
|
+
return Promise.resolve([]);
|
|
40
|
+
}
|
|
41
|
+
}),
|
|
42
|
+
__reset() {
|
|
43
|
+
mocked_items = {};
|
|
44
|
+
},
|
|
45
|
+
},
|
|
46
|
+
})
|
|
47
|
+
);
|
|
48
|
+
|
|
49
|
+
const Component = () => (
|
|
50
|
+
<View>
|
|
51
|
+
<Text>I'm a component</Text>
|
|
52
|
+
</View>
|
|
53
|
+
);
|
|
54
|
+
|
|
55
|
+
const QuickBrickManager = {
|
|
56
|
+
sendQuickBrickEvent: jest.fn(),
|
|
57
|
+
};
|
|
58
|
+
|
|
59
|
+
const LOADING_ERROR = new Error("loading failed");
|
|
60
|
+
|
|
61
|
+
const appLoader = jest.fn((_dispatch, _getState) => {
|
|
62
|
+
if (_getState().shouldFail) return Promise.reject(LOADING_ERROR);
|
|
63
|
+
|
|
64
|
+
return Promise.resolve();
|
|
65
|
+
});
|
|
66
|
+
|
|
67
|
+
const store = configureStore([thunk])({});
|
|
68
|
+
const dispatch = store.dispatch;
|
|
69
|
+
|
|
70
|
+
const state = {
|
|
71
|
+
rivers: {},
|
|
72
|
+
plugins: {},
|
|
73
|
+
appSettings: { runtimeConfigurationUrls: { rivers: "http://rivers.url" } },
|
|
74
|
+
};
|
|
75
|
+
|
|
76
|
+
const QUICK_BRICK_READY_EVENT = "quickBrickReady";
|
|
77
|
+
|
|
78
|
+
describe("appLifeCycleManager", () => {
|
|
79
|
+
const decorator = appLifeCycleManager(appLoader, QuickBrickManager);
|
|
80
|
+
const DecoratedComponent = decorator(Component);
|
|
81
|
+
|
|
82
|
+
beforeEach(() => {
|
|
83
|
+
appLoader.mockClear();
|
|
84
|
+
QuickBrickManager.sendQuickBrickEvent.mockClear();
|
|
85
|
+
});
|
|
86
|
+
|
|
87
|
+
it("returns a function to decorate a component", () => {
|
|
88
|
+
expect(decorator).toBeDefined();
|
|
89
|
+
});
|
|
90
|
+
|
|
91
|
+
it("runs the loaders, then sends quickBrickReady event", async () => {
|
|
92
|
+
const testCallback = jest.fn(() => {});
|
|
93
|
+
|
|
94
|
+
render(
|
|
95
|
+
<DecoratedComponent
|
|
96
|
+
dispatch={dispatch}
|
|
97
|
+
{...state}
|
|
98
|
+
testCallback={testCallback}
|
|
99
|
+
/>
|
|
100
|
+
);
|
|
101
|
+
|
|
102
|
+
await waitFor(() => {
|
|
103
|
+
return expect(testCallback).toHaveBeenCalled();
|
|
104
|
+
});
|
|
105
|
+
|
|
106
|
+
const actions = store.getActions();
|
|
107
|
+
|
|
108
|
+
expect(actions[0]).toMatchObject({ type: "SET_APP_READY" });
|
|
109
|
+
|
|
110
|
+
expect(QuickBrickManager.sendQuickBrickEvent).toHaveBeenCalledWith(
|
|
111
|
+
QUICK_BRICK_READY_EVENT
|
|
112
|
+
);
|
|
113
|
+
|
|
114
|
+
expect(appLoader).toHaveBeenCalled();
|
|
115
|
+
});
|
|
116
|
+
|
|
117
|
+
it("sends the quickBrickReady event when a loader doesn't resolves", async () => {
|
|
118
|
+
const testCallback = jest.fn(() => {});
|
|
119
|
+
|
|
120
|
+
render(
|
|
121
|
+
<DecoratedComponent
|
|
122
|
+
dispatch={dispatch}
|
|
123
|
+
{...state}
|
|
124
|
+
shouldFail
|
|
125
|
+
testCallback={testCallback}
|
|
126
|
+
/>
|
|
127
|
+
);
|
|
128
|
+
|
|
129
|
+
const actions = store.getActions();
|
|
130
|
+
|
|
131
|
+
await waitFor(() => {
|
|
132
|
+
return expect(testCallback).toHaveBeenCalled();
|
|
133
|
+
});
|
|
134
|
+
|
|
135
|
+
expect(actions[0]).toMatchObject({ type: "SET_APP_READY" });
|
|
136
|
+
expect(actions[1]).toMatchObject({ type: "SET_APP_LAUNCHED" });
|
|
137
|
+
|
|
138
|
+
expect(QuickBrickManager.sendQuickBrickEvent).toHaveBeenCalledWith(
|
|
139
|
+
QUICK_BRICK_READY_EVENT
|
|
140
|
+
);
|
|
141
|
+
|
|
142
|
+
expect(testCallback).toHaveBeenCalled();
|
|
143
|
+
|
|
144
|
+
expect(appLoader).toHaveBeenCalled();
|
|
145
|
+
});
|
|
146
|
+
});
|
|
@@ -131,9 +131,8 @@ export function appLifeCycleManager(appLoader, QuickBrickManager) {
|
|
|
131
131
|
)
|
|
132
132
|
.map((plugin: any) => plugin.module?.getLoginProtocol?.());
|
|
133
133
|
|
|
134
|
-
const loginProtocols: LoginProtocol[] =
|
|
135
|
-
promiseProtocols
|
|
136
|
-
);
|
|
134
|
+
const loginProtocols: LoginProtocol[] =
|
|
135
|
+
await Promise.all(promiseProtocols);
|
|
137
136
|
|
|
138
137
|
// Await all does not work here
|
|
139
138
|
for (const protocol of loginProtocols) {
|
|
@@ -183,13 +182,13 @@ export function appLifeCycleManager(appLoader, QuickBrickManager) {
|
|
|
183
182
|
data: { error },
|
|
184
183
|
});
|
|
185
184
|
}
|
|
186
|
-
|
|
187
|
-
makeAppReady();
|
|
188
|
-
checkStoredContextKeys();
|
|
189
185
|
};
|
|
190
186
|
|
|
191
187
|
React.useLayoutEffect(() => {
|
|
192
|
-
prepareApp()
|
|
188
|
+
prepareApp().then(() => {
|
|
189
|
+
makeAppReady();
|
|
190
|
+
checkStoredContextKeys();
|
|
191
|
+
});
|
|
193
192
|
}, []);
|
|
194
193
|
|
|
195
194
|
return <Component {...props} />;
|
package/App/index.tsx
CHANGED
|
@@ -29,6 +29,7 @@ import { appRemoteDataLoader } from "./appRemoteDataLoader";
|
|
|
29
29
|
import { withActionExecutor } from "@applicaster/zapp-react-native-utils/actionsExecutor/ActionExecutorContext";
|
|
30
30
|
import { withScreenDataContextProvider } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenDataContext";
|
|
31
31
|
import { LogicAggregatorContainer } from "./LogicAggregatorContainer";
|
|
32
|
+
import { LoadingOverlay } from "./LoadingOverlay";
|
|
32
33
|
|
|
33
34
|
interface AppOptions {
|
|
34
35
|
Layout: React.ComponentType;
|
|
@@ -74,6 +75,7 @@ const App = ({
|
|
|
74
75
|
<LogicAggregatorContainer
|
|
75
76
|
components={[InteractionManager, ApplyScreenHooks]}
|
|
76
77
|
/>
|
|
78
|
+
<LoadingOverlay />
|
|
77
79
|
</ErrorBoundary>
|
|
78
80
|
</AppContainer>
|
|
79
81
|
</SafeAreaProvider>
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import * as React from "react";
|
|
2
2
|
import { View, Text } from "react-native";
|
|
3
|
-
import {
|
|
4
|
-
import { shallowToJson } from "enzyme-to-json";
|
|
3
|
+
import { render } from "@testing-library/react-native";
|
|
5
4
|
|
|
6
5
|
import { remoteContextReloader } from "../index";
|
|
7
6
|
import * as ContextReloader from "../getRemoteContextData";
|
|
@@ -25,19 +24,21 @@ const dispatch = jest.fn();
|
|
|
25
24
|
|
|
26
25
|
describe("remoteContextReloader", () => {
|
|
27
26
|
const WrappedComponent = remoteContextReloader(Component);
|
|
27
|
+
let rendered;
|
|
28
|
+
|
|
29
|
+
beforeEach(() => {
|
|
30
|
+
rendered = render(
|
|
31
|
+
<WrappedComponent {...{ appSettings, plugins, dispatch }} />
|
|
32
|
+
);
|
|
33
|
+
});
|
|
28
34
|
|
|
29
35
|
afterEach(() => {
|
|
30
36
|
jest.clearAllMocks();
|
|
31
37
|
});
|
|
32
38
|
|
|
33
|
-
it("
|
|
34
|
-
const
|
|
35
|
-
|
|
36
|
-
);
|
|
37
|
-
|
|
38
|
-
expect(shallowToJson(wrapper)).toMatchSnapshot();
|
|
39
|
-
expect(wrapper.instance()).toHaveProperty("componentDidMount");
|
|
40
|
-
expect(wrapper.instance().componentDidMount).toBeFunction();
|
|
39
|
+
it("calls componentDidMount and renders correctly", () => {
|
|
40
|
+
const { getByText } = rendered;
|
|
41
|
+
expect(getByText("I'm a component")).toBeTruthy();
|
|
41
42
|
});
|
|
42
43
|
|
|
43
44
|
describe("when in __DEV__", () => {
|
|
@@ -47,11 +48,6 @@ describe("remoteContextReloader", () => {
|
|
|
47
48
|
});
|
|
48
49
|
|
|
49
50
|
it("doesn't invoke the context reloader", () => {
|
|
50
|
-
const wrapper = shallow(
|
|
51
|
-
<WrappedComponent {...{ appSettings, plugins, dispatch }} />
|
|
52
|
-
);
|
|
53
|
-
|
|
54
|
-
expect(shallowToJson(wrapper)).toMatchSnapshot();
|
|
55
51
|
expect(spy).not.toHaveBeenCalled();
|
|
56
52
|
});
|
|
57
53
|
});
|
|
@@ -62,12 +58,6 @@ describe("remoteContextReloader", () => {
|
|
|
62
58
|
});
|
|
63
59
|
|
|
64
60
|
it("invokes the context reloader", () => {
|
|
65
|
-
const wrapper = shallow(
|
|
66
|
-
<WrappedComponent {...{ appSettings, plugins, dispatch }} />
|
|
67
|
-
);
|
|
68
|
-
|
|
69
|
-
expect(shallowToJson(wrapper)).toMatchSnapshot();
|
|
70
|
-
|
|
71
61
|
expect(spy).toHaveBeenCalledWith(
|
|
72
62
|
dispatch,
|
|
73
63
|
appSettings.runtimeConfigurationUrls,
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import * as R from "ramda";
|
|
2
|
+
import isEmpty from "lodash/isEmpty";
|
|
2
3
|
import { Dimensions, NativeModules } from "react-native";
|
|
3
4
|
import { loadAppContextData } from "@applicaster/zapp-react-native-redux";
|
|
4
5
|
import { isTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
|
|
@@ -10,6 +11,7 @@ import { logger } from "@applicaster/zapp-react-native-utils/logger";
|
|
|
10
11
|
import { ACTIVE_LAYOUT_ID_STORAGE_KEY } from "../consts";
|
|
11
12
|
const { AppLoaderBridge } = NativeModules;
|
|
12
13
|
import { localStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/LocalStorage";
|
|
14
|
+
import { useErrorStore } from "../../ErrorBoundary/store";
|
|
13
15
|
|
|
14
16
|
export async function getNativeRemoteContextData(
|
|
15
17
|
dispatch,
|
|
@@ -58,6 +60,18 @@ export async function getNativeRemoteContextData(
|
|
|
58
60
|
|
|
59
61
|
const layout = await getPromiseForType("layout");
|
|
60
62
|
|
|
63
|
+
const layoutLoadingErrorMessage = "Failed to load layout data";
|
|
64
|
+
|
|
65
|
+
if (isEmpty(layout)) {
|
|
66
|
+
useErrorStore
|
|
67
|
+
.getState()
|
|
68
|
+
.setError(
|
|
69
|
+
new Error(layoutLoadingErrorMessage),
|
|
70
|
+
layoutLoadingErrorMessage,
|
|
71
|
+
false
|
|
72
|
+
);
|
|
73
|
+
}
|
|
74
|
+
|
|
61
75
|
const apiVersion = layout?.layout?.["api_version"]; // Taken from remote configuration
|
|
62
76
|
|
|
63
77
|
dispatch(appDataActions.merge({ layoutVersion: apiVersion || "v1" }));
|
package/README.md
CHANGED
|
@@ -74,7 +74,7 @@ This function allows to quickly create a QuickBrick app by providing the require
|
|
|
74
74
|
|
|
75
75
|
## NavigationProvider
|
|
76
76
|
|
|
77
|
-
This module provides routing, navigation and navBar control to the QuickBrick applications. The Navigator provider is constructed using NavigationContext and navigator object, which are exposed to the user by `withNavigator` Decorator and `useNavigation` hook.
|
|
77
|
+
This module provides routing, navigation and navBar control to the QuickBrick applications. The Navigator provider is constructed using NavigationContext and navigator object, which are exposed to the user by `withNavigator` Decorator and `useNavigation` hook.
|
|
78
78
|
|
|
79
79
|
The app is already decorated with the Navigation Provider Context so the only thing, to use navigation in your screen/component`is to use`withNavigator`decorator or`useNavigationHook` directly
|
|
80
80
|
|
|
@@ -1,132 +1,9 @@
|
|
|
1
1
|
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
|
2
2
|
|
|
3
|
-
exports[`createZappApp has a <Provider /> component with an initialized store 1`] = `
|
|
4
|
-
{
|
|
5
|
-
"appData": {
|
|
6
|
-
"countryLocale": "GB",
|
|
7
|
-
"languageLocale": "en",
|
|
8
|
-
"layoutVersion": "v1",
|
|
9
|
-
"quickBrickEvent": [MockFunction],
|
|
10
|
-
},
|
|
11
|
-
"appSettings": {
|
|
12
|
-
"runtimeConfigurationUrls": {},
|
|
13
|
-
},
|
|
14
|
-
"appState": {
|
|
15
|
-
"appLaunched": false,
|
|
16
|
-
"appReady": false,
|
|
17
|
-
"appState": {
|
|
18
|
-
"currentState": null,
|
|
19
|
-
"eventType": null,
|
|
20
|
-
"isAvailable": null,
|
|
21
|
-
"nextState": null,
|
|
22
|
-
},
|
|
23
|
-
},
|
|
24
|
-
"cellStyles": {},
|
|
25
|
-
"components": {
|
|
26
|
-
"AppContainer": [Function],
|
|
27
|
-
"ContentScreen": [Function],
|
|
28
|
-
"HookRenderer": [Function],
|
|
29
|
-
"ModalComponent": [Function],
|
|
30
|
-
"PlayerContainer": {
|
|
31
|
-
"$$typeof": Symbol(react.memo),
|
|
32
|
-
"WrappedComponent": {
|
|
33
|
-
"$$typeof": Symbol(react.memo),
|
|
34
|
-
"compare": null,
|
|
35
|
-
"type": [Function],
|
|
36
|
-
},
|
|
37
|
-
"compare": null,
|
|
38
|
-
"type": [Function],
|
|
39
|
-
},
|
|
40
|
-
"QBImage": [Function],
|
|
41
|
-
"River": {
|
|
42
|
-
"$$typeof": Symbol(react.memo),
|
|
43
|
-
"WrappedComponent": [Function],
|
|
44
|
-
"compare": null,
|
|
45
|
-
"type": [Function],
|
|
46
|
-
},
|
|
47
|
-
"TextInputTv": {
|
|
48
|
-
"$$typeof": Symbol(react.forward_ref),
|
|
49
|
-
"render": [Function],
|
|
50
|
-
},
|
|
51
|
-
"Touchable": [Function],
|
|
52
|
-
},
|
|
53
|
-
"contentTypes": null,
|
|
54
|
-
"localizations": {},
|
|
55
|
-
"pipesEndpoints": null,
|
|
56
|
-
"pluginConfigurations": {
|
|
57
|
-
"pc1": {
|
|
58
|
-
"configuration_json": null,
|
|
59
|
-
"plugin": {
|
|
60
|
-
"api": {},
|
|
61
|
-
"identifier": "pc1",
|
|
62
|
-
},
|
|
63
|
-
},
|
|
64
|
-
"pc2": {
|
|
65
|
-
"configuration_json": {
|
|
66
|
-
"foo": "bar",
|
|
67
|
-
},
|
|
68
|
-
"plugin": {
|
|
69
|
-
"api": {},
|
|
70
|
-
"identifier": "pc2",
|
|
71
|
-
},
|
|
72
|
-
},
|
|
73
|
-
},
|
|
74
|
-
"plugins": [
|
|
75
|
-
{
|
|
76
|
-
"configuration": null,
|
|
77
|
-
"identifier": "pc1",
|
|
78
|
-
"module": [MockFunction],
|
|
79
|
-
"name": "Plugin1",
|
|
80
|
-
"type": "general",
|
|
81
|
-
},
|
|
82
|
-
{
|
|
83
|
-
"configuration": {
|
|
84
|
-
"foo": "bar",
|
|
85
|
-
},
|
|
86
|
-
"identifier": "pc2",
|
|
87
|
-
"module": [MockFunction],
|
|
88
|
-
"name": "Plugin2",
|
|
89
|
-
"type": "general",
|
|
90
|
-
},
|
|
91
|
-
],
|
|
92
|
-
"presetsMapping": {},
|
|
93
|
-
"remoteConfigurations": {
|
|
94
|
-
"localizations": {},
|
|
95
|
-
},
|
|
96
|
-
"rivers": {},
|
|
97
|
-
"styles": {},
|
|
98
|
-
"zappPipes": {},
|
|
99
|
-
}
|
|
100
|
-
`;
|
|
101
|
-
|
|
102
3
|
exports[`createZappApp renders the provided React App 1`] = `
|
|
103
|
-
<
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
"getState": [Function],
|
|
109
|
-
"replaceReducer": [Function],
|
|
110
|
-
"subscribe": [Function],
|
|
111
|
-
}
|
|
112
|
-
}
|
|
113
|
-
>
|
|
114
|
-
<EmptyZappApp />
|
|
115
|
-
</Provider>
|
|
116
|
-
`;
|
|
117
|
-
|
|
118
|
-
exports[`createZappApp returns a react component 1`] = `
|
|
119
|
-
<Provider
|
|
120
|
-
store={
|
|
121
|
-
{
|
|
122
|
-
"@@observable": [Function],
|
|
123
|
-
"dispatch": [Function],
|
|
124
|
-
"getState": [Function],
|
|
125
|
-
"replaceReducer": [Function],
|
|
126
|
-
"subscribe": [Function],
|
|
127
|
-
}
|
|
128
|
-
}
|
|
129
|
-
>
|
|
130
|
-
<EmptyZappApp />
|
|
131
|
-
</Provider>
|
|
4
|
+
<View>
|
|
5
|
+
<Text>
|
|
6
|
+
Welcome to the QuickBrick App
|
|
7
|
+
</Text>
|
|
8
|
+
</View>
|
|
132
9
|
`;
|