@applicaster/quick-brick-core 13.0.0-alpha.1124981321 → 13.0.0-alpha.1173186260

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.
Files changed (38) hide show
  1. package/App/DeepLinking/URLSchemeListener/__tests__/URLSchemeListener.test.js +40 -0
  2. package/App/DeepLinking/URLSchemeListener/index.tsx +1 -1
  3. package/App/ErrorBoundary/__tests__/errorBoundary.test.jsx +232 -0
  4. package/App/ErrorBoundary/__tests__/store.test.js +143 -0
  5. package/App/ErrorBoundary/index.tsx +45 -21
  6. package/App/ErrorBoundary/store.ts +26 -0
  7. package/App/LoadingOverlay/LoadingOverlayManager.tsx +27 -0
  8. package/App/LoadingOverlay/index.tsx +49 -0
  9. package/App/LoadingOverlay/useLoadingOverlayVisibility.tsx +18 -0
  10. package/App/ModalProvider/ModalBottomSheet/DraggableBottomSheet/index.tsx +0 -1
  11. package/App/ModalProvider/ModalBottomSheet/ModalBottomSheetFrame.tsx +20 -8
  12. package/App/ModalProvider/ModalBottomSheet/Overlay.tsx +5 -7
  13. package/App/ModalProvider/ModalBottomSheet/index.tsx +16 -35
  14. package/App/ModalProvider/ModalPresenter.tsx +1 -1
  15. package/App/ModalProvider/index.tsx +6 -3
  16. package/App/NavigationProvider/NavigationProvider.tsx +56 -43
  17. package/App/NavigationProvider/__tests__/navigationProvider.test.tsx +0 -44
  18. package/App/NetworkStatusProvider/utils.ts +0 -1
  19. package/App/StoreConnector/__tests__/storeConnector.test.js +17 -11
  20. package/App/appLifeCycleManager/__tests__/appLifeCycleManager.test.tsx +146 -0
  21. package/App/appLifeCycleManager/index.tsx +4 -4
  22. package/App/index.tsx +6 -3
  23. package/App/remoteContextReloader/__tests__/remoteContextReloader.test.js +11 -21
  24. package/App/remoteContextReloader/getRemoteContextData/getNativeRemoteContextData.ts +14 -0
  25. package/createZappApp/__tests__/__snapshots__/createZappApp.test.js.snap +5 -128
  26. package/createZappApp/__tests__/createZappApp.test.js +7 -20
  27. package/defaults/__tests__/defaults.test.js +3 -4
  28. package/package.json +10 -14
  29. package/App/DeepLinking/URLSchemeListener/__tests__/URLSchemeListenerTest.js +0 -177
  30. package/App/ErrorBoundary/__tests__/__snapshots__/errorBoundary.test.js.snap +0 -9
  31. package/App/ErrorBoundary/__tests__/errorBoundary.test.js +0 -72
  32. package/App/ModalProvider/ModalChildrenWrapper/index.web.ts +0 -1
  33. package/App/NavigationProvider/__tests__/__snapshots__/navigationProvider.test.tsx.snap +0 -68
  34. package/App/StoreConnector/__tests__/__snapshots__/storeConnector.test.js.snap +0 -35
  35. package/App/appLifeCycleManager/__tests__/__snapshots__/appLifeCycleManager.test.js.snap +0 -30
  36. package/App/appLifeCycleManager/__tests__/appLifeCycleManager.test.js +0 -134
  37. package/App/remoteContextReloader/__tests__/__snapshots__/remoteContextReloader.test.js.snap +0 -43
  38. /package/App/ModalProvider/ModalChildrenWrapper/{index.ios.ts → index.ts} +0 -0
@@ -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
+ });
@@ -182,13 +182,13 @@ export function appLifeCycleManager(appLoader, QuickBrickManager) {
182
182
  data: { error },
183
183
  });
184
184
  }
185
-
186
- makeAppReady();
187
- checkStoredContextKeys();
188
185
  };
189
186
 
190
187
  React.useLayoutEffect(() => {
191
- prepareApp();
188
+ prepareApp().then(() => {
189
+ makeAppReady();
190
+ checkStoredContextKeys();
191
+ });
192
192
  }, []);
193
193
 
194
194
  return <Component {...props} />;
package/App/index.tsx CHANGED
@@ -1,5 +1,6 @@
1
1
  import * as React from "react";
2
2
  import * as R from "ramda";
3
+
3
4
  import {
4
5
  initialWindowMetrics,
5
6
  SafeAreaProvider,
@@ -29,6 +30,7 @@ import { appRemoteDataLoader } from "./appRemoteDataLoader";
29
30
  import { withActionExecutor } from "@applicaster/zapp-react-native-utils/actionsExecutor/ActionExecutorContext";
30
31
  import { withScreenDataContextProvider } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenDataContext";
31
32
  import { LogicAggregatorContainer } from "./LogicAggregatorContainer";
33
+ import { LoadingOverlay } from "./LoadingOverlay";
32
34
 
33
35
  interface AppOptions {
34
36
  Layout: React.ComponentType;
@@ -71,10 +73,11 @@ const App = ({
71
73
  </SplashLoader>
72
74
  <ModalProvider />
73
75
  </URLSchemeListener>
74
- <LogicAggregatorContainer
75
- components={[InteractionManager, ApplyScreenHooks]}
76
- />
76
+ <LoadingOverlay />
77
77
  </ErrorBoundary>
78
+ <LogicAggregatorContainer
79
+ components={[InteractionManager, ApplyScreenHooks]}
80
+ />
78
81
  </AppContainer>
79
82
  </SafeAreaProvider>
80
83
  </ThemeManager>
@@ -1,7 +1,6 @@
1
1
  import * as React from "react";
2
2
  import { View, Text } from "react-native";
3
- import { shallow } from "enzyme";
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("adds a componentDidMount method", () => {
34
- const wrapper = shallow(
35
- <WrappedComponent {...{ appSettings, plugins, dispatch }} />
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" }));
@@ -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
- <Provider
104
- store={
105
- {
106
- "@@observable": [Function],
107
- "dispatch": [Function],
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
  `;
@@ -1,7 +1,6 @@
1
1
  import * as React from "react";
2
2
  import { View, Text } from "react-native";
3
- import { shallow } from "enzyme";
4
- import { shallowToJson } from "enzyme-to-json";
3
+ import { render, screen } from "@testing-library/react-native";
5
4
  import QuickBrickComponents from "@applicaster/zapp-react-native-ui-components";
6
5
  import { Provider } from "react-redux";
7
6
 
@@ -77,27 +76,17 @@ jest.mock("@applicaster/zapp-react-native-bridge/QuickBrick", () => ({
77
76
  }));
78
77
 
79
78
  describe("createZappApp", () => {
80
- it("returns a react component", () => {
81
- const ZappApp = createZappApp({});
82
- const wrapper = shallow(<ZappApp />);
83
-
84
- expect(shallowToJson(wrapper)).toMatchSnapshot();
85
- });
86
-
87
79
  it("renders the provided React App", () => {
88
80
  const ZappApp = createZappApp({ App });
89
- const wrapper = shallow(<ZappApp />);
90
-
91
- expect(shallowToJson(wrapper)).toMatchSnapshot();
81
+ render(<ZappApp />);
82
+ expect(screen.toJSON()).toMatchSnapshot();
92
83
  });
93
84
 
94
- it("has a <Provider /> component with an initialized store", () => {
85
+ it("has a Provider component with an initialized store", () => {
95
86
  const ZappApp = createZappApp(zappAppConfig);
96
- const wrapper = shallow(<ZappApp />);
97
-
98
- const providerNode = wrapper.find(Provider);
99
- const store = providerNode.prop("store");
100
- expect(providerNode.length).toBe(1);
87
+ const { UNSAFE_root } = render(<ZappApp />);
88
+ const providerInstance = UNSAFE_root.findByType(Provider);
89
+ const store = providerInstance.props.store;
101
90
 
102
91
  expect(store).toEqual(
103
92
  expect.objectContaining({
@@ -108,8 +97,6 @@ describe("createZappApp", () => {
108
97
  })
109
98
  );
110
99
 
111
- expect(store.getState()).toMatchSnapshot();
112
-
113
100
  expect(store.getState()).toEqual(
114
101
  expect.objectContaining({
115
102
  styles: expect.any(Object),
@@ -1,11 +1,10 @@
1
1
  import React from "react";
2
+ import { render } from "@testing-library/react-native";
2
3
  import { EmptyZappApp } from "../index";
3
- import { shallow } from "enzyme";
4
- import { shallowToJson } from "enzyme-to-json";
5
4
 
6
5
  describe("<EmptyZappApp />", () => {
7
6
  it("renders correctly", () => {
8
- const wrapper = shallow(<EmptyZappApp />);
9
- expect(shallowToJson(wrapper)).toMatchSnapshot();
7
+ const { toJSON } = render(<EmptyZappApp />);
8
+ expect(toJSON()).toMatchSnapshot();
10
9
  });
11
10
  });
package/package.json CHANGED
@@ -1,11 +1,10 @@
1
1
  {
2
2
  "name": "@applicaster/quick-brick-core",
3
- "version": "13.0.0-alpha.1124981321",
3
+ "version": "13.0.0-alpha.1173186260",
4
4
  "description": "Core package for Applicaster's Quick Brick App",
5
5
  "main": "index.js",
6
6
  "types": "index.d.ts",
7
7
  "scripts": {
8
- "test": "jest -w=2",
9
8
  "build": "echo 'skipping ts build for core packages'"
10
9
  },
11
10
  "repository": {
@@ -29,13 +28,13 @@
29
28
  },
30
29
  "homepage": "https://github.com/applicaster/quickbrick#readme",
31
30
  "dependencies": {
32
- "@applicaster/applicaster-types": "13.0.0-alpha.1124981321",
33
- "@applicaster/quick-brick-core-plugins": "13.0.0-alpha.1124981321",
34
- "@applicaster/zapp-pipes-v2-client": "13.0.0-alpha.1124981321",
35
- "@applicaster/zapp-react-native-bridge": "13.0.0-alpha.1124981321",
36
- "@applicaster/zapp-react-native-redux": "13.0.0-alpha.1124981321",
37
- "@applicaster/zapp-react-native-ui-components": "13.0.0-alpha.1124981321",
38
- "@applicaster/zapp-react-native-utils": "13.0.0-alpha.1124981321",
31
+ "@applicaster/applicaster-types": "13.0.0-alpha.1173186260",
32
+ "@applicaster/quick-brick-core-plugins": "13.0.0-alpha.1173186260",
33
+ "@applicaster/zapp-pipes-v2-client": "13.0.0-alpha.1173186260",
34
+ "@applicaster/zapp-react-native-bridge": "13.0.0-alpha.1173186260",
35
+ "@applicaster/zapp-react-native-redux": "13.0.0-alpha.1173186260",
36
+ "@applicaster/zapp-react-native-ui-components": "13.0.0-alpha.1173186260",
37
+ "@applicaster/zapp-react-native-utils": "13.0.0-alpha.1173186260",
39
38
  "atob": "^2.1.2",
40
39
  "axios": "^0.28.0",
41
40
  "btoa": "^1.2.1",
@@ -57,10 +56,9 @@
57
56
  "@applicaster/zapp-react-native-tvos-ui-components": "*",
58
57
  "@babel/runtime": "*",
59
58
  "@react-native-community/netinfo": "*",
60
- "@types/node": "*",
61
59
  "immer": "*",
62
- "react": "17.0.2",
63
- "react-native": "0.68.6",
60
+ "react": "*",
61
+ "react-native": "*",
64
62
  "react-native-fs": "*",
65
63
  "react-native-gesture-handler": "*",
66
64
  "react-native-linear-gradient": "*",
@@ -73,8 +71,6 @@
73
71
  "zustand": "*"
74
72
  },
75
73
  "devDependencies": {
76
- "@types/react-native": "0.69.6",
77
- "@types/tizen-tv-webapis": "^2.0.1",
78
74
  "nock": "^10.0.0",
79
75
  "redux-mock-store": "^1.5.3"
80
76
  },