@applicaster/zapp-react-native-ui-components 14.0.0-alpha.1718713411 → 14.0.0-alpha.2012126431

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 (94) hide show
  1. package/Components/AnimatedInOut/index.tsx +5 -3
  2. package/Components/AudioPlayer/mobile/Layout.tsx +1 -1
  3. package/Components/AudioPlayer/tv/helpers.tsx +10 -3
  4. package/Components/BaseFocusable/index.tsx +23 -12
  5. package/Components/Cell/__tests__/CellWIthFocusable.test.js +3 -2
  6. package/Components/Cell/index.js +1 -1
  7. package/Components/ComponentResolver/index.ts +1 -1
  8. package/Components/FeedLoader/FeedLoader.tsx +6 -15
  9. package/Components/FeedLoader/FeedLoaderHOC.tsx +21 -0
  10. package/Components/FeedLoader/index.js +2 -8
  11. package/Components/Focusable/Focusable.tsx +5 -3
  12. package/Components/Focusable/FocusableTvOS.tsx +3 -3
  13. package/Components/Focusable/FocusableiOS.tsx +2 -2
  14. package/Components/Focusable/index.tsx +1 -1
  15. package/Components/FocusableList/index.tsx +4 -0
  16. package/Components/FreezeWithCallback/__tests__/index.test.tsx +67 -43
  17. package/Components/GeneralContentScreen/utils/__tests__/useCurationAPI.test.js +42 -59
  18. package/Components/GeneralContentScreen/utils/useCurationAPI.ts +13 -10
  19. package/Components/HandlePlayable/HandlePlayable.tsx +14 -8
  20. package/Components/Layout/TV/LayoutBackground.tsx +1 -1
  21. package/Components/Layout/TV/__tests__/index.test.tsx +0 -1
  22. package/Components/MasterCell/DefaultComponents/ActionButton.tsx +2 -0
  23. package/Components/MasterCell/DefaultComponents/Button.tsx +1 -1
  24. package/Components/MasterCell/DefaultComponents/Image/hoc/withDimensions.tsx +1 -1
  25. package/Components/MasterCell/DefaultComponents/ImageContainer/index.tsx +1 -1
  26. package/Components/MasterCell/DefaultComponents/__tests__/image.test.js +10 -10
  27. package/Components/MasterCell/DefaultComponents/__tests__/text.test.tsx +18 -18
  28. package/Components/MasterCell/SharedUI/CollapsibleTextContainer/__tests__/index.test.tsx +10 -10
  29. package/Components/MasterCell/elementMapper.tsx +1 -2
  30. package/Components/MasterCell/utils/behaviorProvider.ts +82 -14
  31. package/Components/MasterCell/utils/index.ts +11 -5
  32. package/Components/OfflineHandler/NotificationView/__tests__/index.test.tsx +13 -18
  33. package/Components/OfflineHandler/__tests__/__snapshots__/index.test.tsx.snap +9 -0
  34. package/Components/OfflineHandler/__tests__/index.test.tsx +26 -35
  35. package/Components/PlayerContainer/ErrorDisplay/index.ts +1 -1
  36. package/Components/PlayerContainer/PlayerContainer.tsx +26 -22
  37. package/Components/PlayerContainer/ProgramInfo/index.tsx +1 -1
  38. package/Components/PlayerContainer/index.ts +1 -1
  39. package/Components/River/ComponentsMap/ComponentsMap.tsx +0 -1
  40. package/Components/River/ComponentsMap/hooks/__tests__/useLoadingState.test.ts +378 -0
  41. package/Components/River/ComponentsMap/hooks/useLoadingState.ts +2 -2
  42. package/Components/River/RefreshControl.tsx +11 -17
  43. package/Components/River/TV/River.tsx +2 -17
  44. package/Components/River/TV/index.tsx +3 -1
  45. package/Components/River/TV/withPipesV1DataLoader.tsx +43 -0
  46. package/Components/River/TV/withRiverDataLoader.tsx +17 -0
  47. package/Components/River/TV/withTVEventHandler.tsx +1 -1
  48. package/Components/River/__tests__/__snapshots__/componentsMap.test.js.snap +2 -0
  49. package/Components/River/__tests__/river.test.js +12 -26
  50. package/Components/River/index.tsx +1 -1
  51. package/Components/Screen/__tests__/Screen.test.tsx +28 -29
  52. package/Components/Screen/navigationHandler.ts +20 -2
  53. package/Components/ScreenRevealManager/ScreenRevealManager.ts +76 -0
  54. package/Components/ScreenRevealManager/__tests__/ScreenRevealManager.test.ts +107 -0
  55. package/Components/ScreenRevealManager/__tests__/withScreenRevealManager.test.tsx +96 -0
  56. package/Components/ScreenRevealManager/index.ts +1 -0
  57. package/Components/ScreenRevealManager/withScreenRevealManager.tsx +79 -0
  58. package/Components/Tabs/TV/Tabs.android.tsx +0 -2
  59. package/Components/Tabs/Tabs.tsx +2 -3
  60. package/Components/Touchable/__tests__/__snapshots__/touchable.test.tsx.snap +34 -0
  61. package/Components/Touchable/__tests__/touchable.test.tsx +12 -17
  62. package/Components/Transitioner/__tests__/__snapshots__/Scene.test.js.snap +15 -9
  63. package/Components/VideoLive/animationUtils.ts +3 -3
  64. package/Components/VideoModal/ModalAnimation/AnimatedScrollModal.tsx +3 -9
  65. package/Components/VideoModal/ModalAnimation/ModalAnimationContext.tsx +24 -8
  66. package/Components/VideoModal/__tests__/PlayerDetails.test.tsx +5 -5
  67. package/Components/Viewport/ViewportAware/__tests__/viewportAware.test.js +12 -16
  68. package/Components/Viewport/ViewportTracker/__tests__/viewportTracker.test.js +84 -24
  69. package/Contexts/ConfigutaionContext/__tests__/ConfigurationProvider.test.tsx +3 -3
  70. package/Contexts/ScreenContext/index.tsx +46 -6
  71. package/Decorators/ConfigurationWrapper/__tests__/withConfigurationProvider.test.tsx +3 -3
  72. package/Decorators/ConfigurationWrapper/withConfigurationProvider.tsx +2 -2
  73. package/Decorators/RiverFeedLoader/__tests__/__snapshots__/riverFeedLoader.test.tsx.snap +221 -209
  74. package/Decorators/RiverFeedLoader/__tests__/riverFeedLoader.test.tsx +14 -16
  75. package/Decorators/RiverFeedLoader/__tests__/utils.test.ts +0 -20
  76. package/Decorators/RiverFeedLoader/index.tsx +22 -4
  77. package/Decorators/RiverFeedLoader/utils/index.ts +0 -18
  78. package/Decorators/RiverResolver/__tests__/riverResolver.test.tsx +3 -6
  79. package/Decorators/ZappPipesDataConnector/ResolverSelector.tsx +25 -0
  80. package/Decorators/ZappPipesDataConnector/__tests__/NullFeedResolver.test.tsx +78 -0
  81. package/Decorators/ZappPipesDataConnector/__tests__/ResolverSelector.test.tsx +205 -0
  82. package/Decorators/ZappPipesDataConnector/__tests__/StaticFeedResolver.test.tsx +251 -0
  83. package/Decorators/ZappPipesDataConnector/__tests__/UrlFeedResolver.test.tsx +368 -0
  84. package/Decorators/ZappPipesDataConnector/__tests__/utils.test.ts +39 -0
  85. package/Decorators/ZappPipesDataConnector/index.tsx +26 -293
  86. package/Decorators/ZappPipesDataConnector/resolvers/NullFeedResolver.tsx +25 -0
  87. package/Decorators/ZappPipesDataConnector/resolvers/StaticFeedResolver.tsx +87 -0
  88. package/Decorators/ZappPipesDataConnector/resolvers/UrlFeedResolver.tsx +266 -0
  89. package/Decorators/ZappPipesDataConnector/types.ts +29 -0
  90. package/Decorators/ZappPipesDataConnector/utils/mongoFilter.ts +738 -0
  91. package/Decorators/ZappPipesDataConnector/utils/useFilter.tsx +136 -0
  92. package/events/index.ts +1 -0
  93. package/package.json +5 -7
  94. package/Components/River/__tests__/__snapshots__/river.test.js.snap +0 -27
@@ -1,28 +1,58 @@
1
1
  import { playerManager } from "@applicaster/zapp-react-native-utils/appUtils";
2
- import { StorageSingleValueProvider } from "@applicaster/zapp-react-native-bridge/ZappStorage/StorageSingleSelectProvider";
2
+ import { StorageSingleValueProvider } from "@applicaster/zapp-react-native-utils/storage/StorageSingleSelectProvider";
3
3
  import { PushTopicManager } from "@applicaster/zapp-react-native-bridge/PushNotifications/PushTopicManager";
4
- import { StorageMultiSelectProvider } from "@applicaster/zapp-react-native-bridge/ZappStorage/StorageMultiSelectProvider";
4
+ import { StorageMultiSelectProvider } from "@applicaster/zapp-react-native-utils/storage/StorageMultiSelectProvider";
5
5
  import React, { useEffect } from "react";
6
6
  import { usePlayer } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/usePlayer";
7
7
  import { BehaviorSubject } from "rxjs";
8
8
  import { masterCellLogger } from "../logger";
9
9
  import get from "lodash/get";
10
-
11
- const parseContextKey = (key: string): string | null => {
12
- if (!key?.startsWith("@{ctx/")) return null;
13
-
14
- return key.substring("@{ctx/".length, key.length - 1);
10
+ import { ScreenMultiSelectProvider } from "@applicaster/zapp-react-native-utils/storage/ScreenStateMultiSelectProvider";
11
+ import { ScreenSingleValueProvider } from "@applicaster/zapp-react-native-utils/storage/ScreenSingleValueProvider";
12
+ import { useRoute } from "@applicaster/zapp-react-native-utils/reactHooks";
13
+ import { useScreenStateStore } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/useScreenStateStore";
14
+
15
+ const parseContextKey = (
16
+ key: string,
17
+ context: string = "ctx"
18
+ ): string | null => {
19
+ if (!key?.startsWith(`@{${context}/`)) return null;
20
+
21
+ return key.substring(`@{${context}/`.length, key.length - 1);
15
22
  };
16
23
 
17
24
  const getDataSourceProvider = (
18
- behavior: Behavior
25
+ behavior: Behavior,
26
+ screenRoute: string,
27
+ screenStateStore: ReturnType<typeof useScreenStateStore>
19
28
  ): BehaviorSubject<string[] | string> | null => {
20
29
  if (!behavior) return null;
21
30
 
22
31
  const selection = String(behavior.current_selection);
32
+ const screenKey = parseContextKey(selection, "screen");
33
+
34
+ if (screenKey) {
35
+ if (behavior.select_mode === "multi") {
36
+ return ScreenMultiSelectProvider.getProvider(
37
+ screenKey,
38
+ screenRoute,
39
+ screenStateStore
40
+ ).getObservable();
41
+ }
42
+
43
+ if (behavior.select_mode === "single") {
44
+ return ScreenSingleValueProvider.getProvider(
45
+ screenKey,
46
+ screenRoute,
47
+ screenStateStore
48
+ ).getObservable();
49
+ }
50
+ }
51
+
23
52
  const contextKey = parseContextKey(selection);
24
53
 
25
54
  if (contextKey) {
55
+ // TODO: Add storage scope to behavior
26
56
  if (behavior.select_mode === "multi") {
27
57
  return StorageMultiSelectProvider.getProvider(contextKey).getObservable();
28
58
  }
@@ -41,6 +71,8 @@ const getDataSourceProvider = (
41
71
 
42
72
  export const useBehaviorUpdate = (behavior: Behavior) => {
43
73
  const [lastUpdate, setLastUpdate] = React.useState<number | null>(null);
74
+ const screenRoute = useRoute()?.pathname || "";
75
+ const screenStateStore = useScreenStateStore();
44
76
  const player = usePlayer();
45
77
 
46
78
  const triggerUpdate = () => setLastUpdate(Date.now());
@@ -48,7 +80,11 @@ export const useBehaviorUpdate = (behavior: Behavior) => {
48
80
  useEffect(() => {
49
81
  if (!behavior) return;
50
82
 
51
- const dataSource = getDataSourceProvider(behavior);
83
+ const dataSource = getDataSourceProvider(
84
+ behavior,
85
+ screenRoute,
86
+ screenStateStore
87
+ );
52
88
 
53
89
  if (dataSource) {
54
90
  const subscription = dataSource.subscribe(triggerUpdate);
@@ -72,10 +108,17 @@ export const useBehaviorUpdate = (behavior: Behavior) => {
72
108
 
73
109
  // We cant use async in this function (its inside render),
74
110
  // so we rely on useBehaviorUpdate to update current value and trigger re-render
75
- export const isCellSelected = (
76
- item: ZappEntry,
77
- behavior?: Behavior
78
- ): boolean => {
111
+ export const isCellSelected = ({
112
+ item,
113
+ screenRoute,
114
+ screenStateStore,
115
+ behavior,
116
+ }: {
117
+ item: ZappEntry;
118
+ screenRoute: string;
119
+ screenStateStore: ReturnType<typeof useScreenStateStore>;
120
+ behavior?: Behavior;
121
+ }): boolean => {
79
122
  if (!behavior) return false;
80
123
 
81
124
  const id = behavior.selector ? get(item, behavior.selector) : item.id;
@@ -99,7 +142,32 @@ export const isCellSelected = (
99
142
  }
100
143
 
101
144
  const selection = String(behavior.current_selection);
102
- const contextKey = parseContextKey(selection);
145
+
146
+ const screenKey = parseContextKey(selection, "screen");
147
+
148
+ if (screenKey) {
149
+ if (behavior.select_mode === "single") {
150
+ const selectedItem = ScreenSingleValueProvider.getProvider(
151
+ screenKey,
152
+ screenRoute,
153
+ screenStateStore
154
+ ).getValue();
155
+
156
+ return selectedItem === String(id);
157
+ }
158
+
159
+ if (behavior.select_mode === "multi") {
160
+ const selectedItems = ScreenMultiSelectProvider.getProvider(
161
+ screenKey,
162
+ screenRoute,
163
+ screenStateStore
164
+ ).getSelectedItems();
165
+
166
+ return selectedItems?.includes(String(id));
167
+ }
168
+ }
169
+
170
+ const contextKey = parseContextKey(selection, "ctx");
103
171
 
104
172
  if (contextKey) {
105
173
  if (behavior.select_mode === "single") {
@@ -8,6 +8,8 @@ import { masterCellLogger } from "../logger";
8
8
  import { getCellState } from "../../Cell/utils";
9
9
  import { getColorFromData } from "@applicaster/zapp-react-native-utils/cellUtils";
10
10
  import { isCellSelected, useBehaviorUpdate } from "./behaviorProvider";
11
+ import { useRoute } from "@applicaster/zapp-react-native-utils/reactHooks";
12
+ import { useScreenStateStore } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/useScreenStateStore";
11
13
 
12
14
  const hasElementSpecificViewType = (viewType) => (element) => {
13
15
  if (R.isNil(element)) {
@@ -190,10 +192,6 @@ export const getFocusedButtonId = (focusable) => {
190
192
  });
191
193
  };
192
194
 
193
- export const isSelected = (item: ZappEntry, behavior?: Behavior) => {
194
- return isCellSelected(item, behavior);
195
- };
196
-
197
195
  export const useCellState = ({
198
196
  item,
199
197
  behavior,
@@ -204,9 +202,17 @@ export const useCellState = ({
204
202
  focused: boolean;
205
203
  }): CellState => {
206
204
  const lastUpdate = useBehaviorUpdate(behavior);
205
+ const router = useRoute();
206
+ const screenStateStore = useScreenStateStore();
207
207
 
208
208
  const _isSelected = useMemo(
209
- () => isSelected(item, behavior),
209
+ () =>
210
+ isCellSelected({
211
+ item,
212
+ screenRoute: router?.pathname,
213
+ screenStateStore,
214
+ behavior,
215
+ }),
210
216
  [behavior, item, lastUpdate]
211
217
  );
212
218
 
@@ -1,9 +1,12 @@
1
1
  import React from "react";
2
2
  import { Text, Animated } from "react-native";
3
+ import { render } from "@testing-library/react-native";
3
4
 
4
- import renderer from "react-test-renderer";
5
-
6
- jest.useFakeTimers();
5
+ import {
6
+ NotificationView,
7
+ onlinePhrase,
8
+ offlinePhrase,
9
+ } from "../NotificationView";
7
10
 
8
11
  jest.mock("@applicaster/zapp-react-native-redux/hooks", () => ({
9
12
  usePickFromState: () => ({
@@ -32,39 +35,31 @@ jest.mock("react-native-safe-area-context", () => ({
32
35
 
33
36
  const dismiss = jest.fn();
34
37
 
35
- const {
36
- NotificationView,
37
- onlinePhrase,
38
- offlinePhrase,
39
- } = require("../NotificationView");
40
-
41
38
  describe("NotificationView", () => {
42
39
  it("Show online message when Online", () => {
43
- const component = renderer.create(
44
- <NotificationView online dismiss={dismiss} />
45
- );
40
+ const component = render(<NotificationView online dismiss={dismiss} />);
46
41
 
47
- expect(component.root.findByType(Text).props.children).toBe(onlinePhrase);
42
+ expect(component.UNSAFE_getByType(Text).props.children).toBe(onlinePhrase);
48
43
  });
49
44
 
50
45
  it("Show offline message when Online", () => {
51
- const component = renderer.create(
46
+ const component = render(
52
47
  <NotificationView online={false} dismiss={dismiss} />
53
48
  );
54
49
 
55
- expect(component.root.findByType(Text).props.children).toBe(offlinePhrase);
50
+ expect(component.UNSAFE_getByType(Text).props.children).toBe(offlinePhrase);
56
51
  });
57
52
 
58
53
  it("When hidden is false to true notification is visible", () => {
59
- const component = renderer.create(
54
+ const component = render(
60
55
  <NotificationView online={false} hidden={false} dismiss={dismiss} />
61
56
  );
62
57
 
63
- component.update(
58
+ component.rerender(
64
59
  <NotificationView online={false} hidden={true} dismiss={dismiss} />
65
60
  );
66
61
 
67
- const animatedView = component.root.findByType(Animated.View);
62
+ const animatedView = component.UNSAFE_getByType(Animated.View);
68
63
  const animatedViewStyles = animatedView.props.style;
69
64
 
70
65
  expect(animatedViewStyles.opacity).toBe(1);
@@ -21,6 +21,15 @@ exports[`OfflineHandler renders 1`] = `
21
21
  }
22
22
  >
23
23
  <View
24
+ accessibilityState={
25
+ {
26
+ "busy": undefined,
27
+ "checked": undefined,
28
+ "disabled": undefined,
29
+ "expanded": undefined,
30
+ "selected": undefined,
31
+ }
32
+ }
24
33
  accessible={true}
25
34
  collapsable={false}
26
35
  focusable={true}
@@ -1,6 +1,5 @@
1
1
  import React from "react";
2
-
3
- import renderer, { act } from "react-test-renderer";
2
+ import { render } from "@testing-library/react-native";
4
3
 
5
4
  jest.useFakeTimers({ legacyFakeTimers: true });
6
5
 
@@ -19,29 +18,27 @@ jest.mock("@applicaster/zapp-react-native-utils/reactHooks/utils", () => {
19
18
  };
20
19
  });
21
20
 
22
- jest.mock(
23
- "@applicaster/zapp-react-native-redux/hooks/usePickFromState",
24
- () => ({
25
- usePickFromState: () => ({
26
- plugins: [
27
- {
28
- name: "offline experience",
29
- identifier: "offline-experience",
30
- type: "general",
31
- module: {
32
- useOfflineExperienceConfiguration: () => ({
33
- configurationFields: {},
34
- localizations: {
35
- offline_toast_message: "No internet connection",
36
- online_toast_message: "You are back online",
37
- },
38
- }),
39
- },
21
+ jest.mock("@applicaster/zapp-react-native-redux/hooks", () => ({
22
+ ...jest.requireActual("@applicaster/zapp-react-native-redux/hooks"),
23
+ usePickFromState: () => ({
24
+ plugins: [
25
+ {
26
+ name: "offline experience",
27
+ identifier: "offline-experience",
28
+ type: "general",
29
+ module: {
30
+ useOfflineExperienceConfiguration: () => ({
31
+ configurationFields: {},
32
+ localizations: {
33
+ offline_toast_message: "No internet connection",
34
+ online_toast_message: "You are back online",
35
+ },
36
+ }),
40
37
  },
41
- ],
42
- }),
43
- })
44
- );
38
+ },
39
+ ],
40
+ }),
41
+ }));
45
42
 
46
43
  jest.mock("react-native-safe-area-context", () => ({
47
44
  useSafeAreaInsets: () => ({ top: 44 }),
@@ -51,24 +48,18 @@ describe("OfflineHandler", () => {
51
48
  const { OfflineHandler, NotificationView } = require("../");
52
49
 
53
50
  it("renders", () => {
54
- const instance = renderer.create(<OfflineHandler />);
55
- expect(instance.toJSON()).toMatchSnapshot();
51
+ const { toJSON } = render(<OfflineHandler />);
52
+ expect(toJSON()).toMatchSnapshot();
56
53
  });
57
54
 
58
55
  it("renders Notification mode if component was rendered while online", () => {
59
56
  mockConnectionStatus = true;
60
57
 
61
- let instance;
62
-
63
- act(() => {
64
- instance = renderer.create(<OfflineHandler />);
65
- });
58
+ const { rerender, UNSAFE_getByType } = render(<OfflineHandler />);
66
59
 
67
- act(() => {
68
- instance.update(<OfflineHandler />);
69
- });
60
+ rerender(<OfflineHandler />);
70
61
 
71
- const notificationsView = instance.root.findByType(NotificationView);
62
+ const notificationsView = UNSAFE_getByType(NotificationView);
72
63
  expect(notificationsView).toBeDefined();
73
64
  });
74
65
  });
@@ -1,6 +1,6 @@
1
1
  import * as R from "ramda";
2
2
 
3
- import { connectToStore } from "@applicaster/zapp-react-native-redux";
3
+ import { connectToStore } from "@applicaster/zapp-react-native-redux/utils/connectToStore";
4
4
 
5
5
  import { ErrorDisplayComponent } from "./ErrorDisplay";
6
6
 
@@ -1,7 +1,6 @@
1
1
  import * as React from "react";
2
2
  import { useEffect, useReducer } from "react";
3
- // @ts-ignore
4
- import { TVMenuControl, View, ViewStyle } from "react-native";
3
+ import { View, ViewStyle } from "react-native";
5
4
  import * as R from "ramda";
6
5
  import uuid from "uuid/v4";
7
6
  import { playerManager } from "@applicaster/zapp-react-native-utils/appUtils/playerManager";
@@ -62,6 +61,11 @@ import {
62
61
  useModalAnimationContext,
63
62
  } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
64
63
 
64
+ import {
65
+ PlayerNativeCommandTypes,
66
+ PlayerNativeSendCommand,
67
+ } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/playerNativeCommand";
68
+
65
69
  type Props = {
66
70
  Player: React.ComponentType<any>;
67
71
  PlayerLoadingView?: React.ComponentType<any>; // 👀 we are not receiving this prop
@@ -259,9 +263,15 @@ const PlayerContainerComponent = (props: Props) => {
259
263
  return;
260
264
  }
261
265
 
266
+ // send command to clear and stop player
267
+ PlayerNativeSendCommand(
268
+ PlayerNativeCommandTypes.clearPlayerData,
269
+ state.playerId
270
+ );
271
+
262
272
  showNavBar(true);
263
273
  navigator.goBack();
264
- }, [isModal, navigator.goBack, showNavBar]);
274
+ }, [isModal, navigator.goBack, state.playerId, showNavBar]);
265
275
 
266
276
  const playEntry = (entry) => navigator.replaceTop(entry, { mode });
267
277
 
@@ -389,13 +399,17 @@ const PlayerContainerComponent = (props: Props) => {
389
399
  }
390
400
  };
391
401
 
392
- const playerRemoteHandler = (event, isLanguageOverlayVisible) => {
393
- const { eventType } = event;
402
+ const playerRemoteHandler = React.useCallback(
403
+ (isLanguageOverlayVisible = false) =>
404
+ (event) => {
405
+ const { eventType } = event;
394
406
 
395
- if (!isLanguageOverlayVisible && eventType === "menu") {
396
- close();
397
- }
398
- };
407
+ if (!isLanguageOverlayVisible && eventType === "menu") {
408
+ close();
409
+ }
410
+ },
411
+ [close]
412
+ );
399
413
 
400
414
  // Effects
401
415
  useEffect(() => {
@@ -508,16 +522,6 @@ const PlayerContainerComponent = (props: Props) => {
508
522
  }
509
523
  }, [isAudioContent]);
510
524
 
511
- // Needs to handle back button on Apple TV
512
- // https://github.com/facebook/react-native/issues/18930
513
- useEffect(() => {
514
- TVMenuControl?.enableTVMenuKey();
515
-
516
- return () => {
517
- TVMenuControl?.disableTVMenuKey();
518
- };
519
- }, []);
520
-
521
525
  useEffect(() => {
522
526
  playerEvent("source_changed", { item });
523
527
 
@@ -633,9 +637,9 @@ const PlayerContainerComponent = (props: Props) => {
633
637
  <PlayerContainerContext.Consumer>
634
638
  {(context) => (
635
639
  <TVEventHandlerComponent
636
- tvEventHandler={(_component, event) =>
637
- playerRemoteHandler(event, context.isLanguageOverlayVisible)
638
- }
640
+ tvEventHandler={playerRemoteHandler(
641
+ context.isLanguageOverlayVisible
642
+ )}
639
643
  >
640
644
  <FocusableGroup
641
645
  id={FocusableGroupMainContainerId}
@@ -1,4 +1,4 @@
1
- import { connectToStore } from "@applicaster/zapp-react-native-redux";
1
+ import { connectToStore } from "@applicaster/zapp-react-native-redux/utils/connectToStore";
2
2
  import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
3
3
  import { styleKeys } from "@applicaster/zapp-react-native-utils/styleKeysUtils";
4
4
  import { transformColorCode as fixColorHexCode } from "@applicaster/zapp-react-native-utils/transform";
@@ -1,6 +1,6 @@
1
1
  import * as R from "ramda";
2
2
 
3
- import { connectToStore } from "@applicaster/zapp-react-native-redux";
3
+ import { connectToStore } from "@applicaster/zapp-react-native-redux/utils/connectToStore";
4
4
  import { loadPipesData } from "@applicaster/zapp-react-native-redux/ZappPipes";
5
5
 
6
6
  import { PlayerContainer as PlayerContainerComponent } from "./PlayerContainer";
@@ -286,7 +286,6 @@ function ComponentsMapComponent(props: Props) {
286
286
  initialNumToRender={3}
287
287
  maxToRenderPerBatch={10}
288
288
  windowSize={12}
289
- listKey={riverId}
290
289
  keyExtractor={keyExtractor}
291
290
  renderItem={renderRiverItem}
292
291
  data={riverComponents}