@applicaster/zapp-react-native-ui-components 14.0.0-alpha.2247415563 → 14.0.0-alpha.2292190333

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 (108) hide show
  1. package/Components/AudioPlayer/mobile/Layout.tsx +1 -1
  2. package/Components/AudioPlayer/tv/Artwork.tsx +3 -2
  3. package/Components/AudioPlayer/tv/Channel.tsx +7 -7
  4. package/Components/AudioPlayer/tv/Layout.tsx +100 -93
  5. package/Components/AudioPlayer/tv/Runtime.tsx +7 -1
  6. package/Components/AudioPlayer/tv/Summary.tsx +6 -2
  7. package/Components/AudioPlayer/tv/Title.tsx +6 -2
  8. package/Components/AudioPlayer/tv/__tests__/__snapshots__/Runtime.test.js.snap +2 -2
  9. package/Components/AudioPlayer/tv/__tests__/__snapshots__/audioPlayer.test.js.snap +20 -26
  10. package/Components/AudioPlayer/tv/__tests__/__snapshots__/channel.test.js.snap +8 -17
  11. package/Components/AudioPlayer/tv/__tests__/__snapshots__/summary.test.js.snap +1 -2
  12. package/Components/AudioPlayer/tv/__tests__/__snapshots__/title.test.js.snap +1 -2
  13. package/Components/AudioPlayer/tv/helpers.tsx +10 -3
  14. package/Components/AudioPlayer/tv/index.tsx +6 -0
  15. package/Components/BaseFocusable/index.tsx +23 -12
  16. package/Components/Cell/__tests__/CellWIthFocusable.test.js +3 -2
  17. package/Components/Cell/index.js +7 -3
  18. package/Components/ComponentResolver/index.ts +1 -1
  19. package/Components/FeedLoader/FeedLoader.tsx +6 -15
  20. package/Components/FeedLoader/FeedLoaderHOC.tsx +21 -0
  21. package/Components/FeedLoader/index.js +2 -8
  22. package/Components/Focusable/Focusable.tsx +5 -3
  23. package/Components/Focusable/FocusableiOS.tsx +2 -2
  24. package/Components/Focusable/Touchable.tsx +6 -3
  25. package/Components/Focusable/__tests__/index.android.test.tsx +3 -0
  26. package/Components/Focusable/index.android.tsx +22 -11
  27. package/Components/Focusable/index.tsx +1 -1
  28. package/Components/FocusableList/FocusableItem.tsx +22 -3
  29. package/Components/FocusableList/FocusableListItemWrapper.tsx +2 -1
  30. package/Components/FocusableList/index.tsx +14 -7
  31. package/Components/FreezeWithCallback/__tests__/index.test.tsx +67 -43
  32. package/Components/GeneralContentScreen/utils/__tests__/useCurationAPI.test.js +42 -59
  33. package/Components/GeneralContentScreen/utils/useCurationAPI.ts +13 -10
  34. package/Components/HandlePlayable/HandlePlayable.tsx +11 -1
  35. package/Components/Layout/TV/LayoutBackground.tsx +1 -1
  36. package/Components/Layout/TV/__tests__/index.test.tsx +0 -1
  37. package/Components/MasterCell/DefaultComponents/ActionButton.tsx +2 -0
  38. package/Components/MasterCell/DefaultComponents/Button.tsx +1 -1
  39. package/Components/MasterCell/DefaultComponents/FocusableView/index.tsx +4 -27
  40. package/Components/MasterCell/DefaultComponents/Image/hoc/withDimensions.tsx +1 -1
  41. package/Components/MasterCell/DefaultComponents/ImageContainer/index.tsx +1 -1
  42. package/Components/MasterCell/DefaultComponents/__tests__/image.test.js +10 -10
  43. package/Components/MasterCell/DefaultComponents/__tests__/text.test.tsx +18 -18
  44. package/Components/MasterCell/SharedUI/CollapsibleTextContainer/__tests__/index.test.tsx +10 -10
  45. package/Components/MasterCell/index.tsx +1 -1
  46. package/Components/MasterCell/utils/behaviorProvider.ts +82 -14
  47. package/Components/MasterCell/utils/index.ts +11 -5
  48. package/Components/OfflineHandler/__tests__/index.test.tsx +26 -35
  49. package/Components/PlayerContainer/ErrorDisplay/index.ts +1 -1
  50. package/Components/PlayerContainer/PlayerContainer.tsx +15 -6
  51. package/Components/PlayerContainer/ProgramInfo/index.tsx +1 -1
  52. package/Components/PlayerContainer/index.ts +1 -1
  53. package/Components/River/ComponentsMap/hooks/__tests__/useLoadingState.test.ts +378 -0
  54. package/Components/River/ComponentsMap/hooks/useLoadingState.ts +2 -2
  55. package/Components/River/RefreshControl.tsx +11 -17
  56. package/Components/River/TV/River.tsx +2 -17
  57. package/Components/River/TV/index.tsx +3 -1
  58. package/Components/River/TV/withPipesV1DataLoader.tsx +43 -0
  59. package/Components/River/TV/withRiverDataLoader.tsx +17 -0
  60. package/Components/River/__tests__/river.test.js +12 -26
  61. package/Components/River/index.tsx +1 -1
  62. package/Components/Screen/__tests__/Screen.test.tsx +28 -29
  63. package/Components/ScreenRevealManager/ScreenRevealManager.ts +76 -0
  64. package/Components/ScreenRevealManager/__tests__/ScreenRevealManager.test.ts +107 -0
  65. package/Components/ScreenRevealManager/__tests__/withScreenRevealManager.test.tsx +96 -0
  66. package/Components/ScreenRevealManager/index.ts +1 -0
  67. package/Components/ScreenRevealManager/withScreenRevealManager.tsx +79 -0
  68. package/Components/Tabs/Tabs.tsx +2 -3
  69. package/Components/Touchable/__tests__/touchable.test.tsx +12 -17
  70. package/Components/VideoModal/ModalAnimation/AnimatedScrollModal.tsx +3 -9
  71. package/Components/VideoModal/ModalAnimation/ModalAnimationContext.tsx +32 -8
  72. package/Components/VideoModal/PlayerDetails.tsx +24 -2
  73. package/Components/VideoModal/PlayerWrapper.tsx +26 -142
  74. package/Components/VideoModal/VideoModal.tsx +3 -17
  75. package/Components/VideoModal/__tests__/PlayerDetails.test.tsx +5 -5
  76. package/Components/VideoModal/__tests__/PlayerWrapper.test.tsx +1 -7
  77. package/Components/VideoModal/__tests__/__snapshots__/PlayerWrapper.test.tsx.snap +44 -240
  78. package/Components/VideoModal/hooks/index.ts +0 -2
  79. package/Components/VideoModal/hooks/useModalSize.ts +18 -2
  80. package/Components/VideoModal/utils.ts +6 -0
  81. package/Components/Viewport/VisibilitySensor/VisibilitySensor.tsx +3 -3
  82. package/Components/default-cell-renderer/viewTrees/tv/DefaultCell/index.ts +3 -3
  83. package/Contexts/ConfigutaionContext/__tests__/ConfigurationProvider.test.tsx +3 -3
  84. package/Contexts/ScreenContext/index.tsx +46 -6
  85. package/Decorators/ConfigurationWrapper/__tests__/withConfigurationProvider.test.tsx +3 -3
  86. package/Decorators/RiverFeedLoader/__tests__/__snapshots__/riverFeedLoader.test.tsx.snap +221 -209
  87. package/Decorators/RiverFeedLoader/__tests__/riverFeedLoader.test.tsx +14 -16
  88. package/Decorators/RiverFeedLoader/__tests__/utils.test.ts +0 -20
  89. package/Decorators/RiverFeedLoader/index.tsx +22 -4
  90. package/Decorators/RiverFeedLoader/utils/index.ts +0 -18
  91. package/Decorators/RiverResolver/__tests__/riverResolver.test.tsx +3 -6
  92. package/Decorators/ZappPipesDataConnector/ResolverSelector.tsx +25 -0
  93. package/Decorators/ZappPipesDataConnector/__tests__/NullFeedResolver.test.tsx +78 -0
  94. package/Decorators/ZappPipesDataConnector/__tests__/ResolverSelector.test.tsx +205 -0
  95. package/Decorators/ZappPipesDataConnector/__tests__/StaticFeedResolver.test.tsx +251 -0
  96. package/Decorators/ZappPipesDataConnector/__tests__/UrlFeedResolver.test.tsx +368 -0
  97. package/Decorators/ZappPipesDataConnector/__tests__/utils.test.ts +39 -0
  98. package/Decorators/ZappPipesDataConnector/index.tsx +26 -293
  99. package/Decorators/ZappPipesDataConnector/resolvers/NullFeedResolver.tsx +25 -0
  100. package/Decorators/ZappPipesDataConnector/resolvers/StaticFeedResolver.tsx +87 -0
  101. package/Decorators/ZappPipesDataConnector/resolvers/UrlFeedResolver.tsx +266 -0
  102. package/Decorators/ZappPipesDataConnector/types.ts +29 -0
  103. package/Decorators/ZappPipesDataConnector/utils/mongoFilter.ts +738 -0
  104. package/Decorators/ZappPipesDataConnector/utils/useFilter.tsx +136 -0
  105. package/events/index.ts +1 -0
  106. package/package.json +5 -9
  107. package/Components/River/__tests__/__snapshots__/river.test.js.snap +0 -27
  108. package/Components/VideoModal/hooks/useBackgroundColor.ts +0 -10
@@ -146,10 +146,14 @@ export class BaseFocusable<
146
146
  * @param {Object} scrollDirection
147
147
  * @returns {Promise}
148
148
  */
149
- onFocus: FocusManager.FocusEventCB = (focusable, scrollDirection) => {
149
+ onFocus: FocusManager.FocusEventCB = (
150
+ focusable,
151
+ scrollDirection,
152
+ context
153
+ ) => {
150
154
  const { onFocus = noop } = this.props;
151
155
  this.setFocusedState(true);
152
- onFocus(focusable, scrollDirection);
156
+ onFocus(focusable, scrollDirection, context);
153
157
  };
154
158
 
155
159
  /**
@@ -247,8 +251,8 @@ export class BaseFocusable<
247
251
  * @param {Object} scrollDirection
248
252
  * @returns {Promise}
249
253
  */
250
- focus(_, scrollDirection) {
251
- return this.onFocus(this, scrollDirection); // invokeComponentMethod(this, "onFocus", scrollDirection);
254
+ focus(_, scrollDirection, context?: FocusManager.FocusContext) {
255
+ return this.onFocus(this, scrollDirection, context); // invokeComponentMethod(this, "onFocus", scrollDirection, context);
252
256
  }
253
257
 
254
258
  /**
@@ -258,9 +262,10 @@ export class BaseFocusable<
258
262
  */
259
263
  blur(
260
264
  _,
261
- scrollDirection?: FocusManager.Web.Direction | FocusManager.IOS.Direction
265
+ scrollDirection?: FocusManager.Web.Direction | FocusManager.IOS.Direction,
266
+ context?: FocusManager.FocusContext
262
267
  ) {
263
- return this.onBlur(this, scrollDirection);
268
+ return this.onBlur(this, scrollDirection, context);
264
269
  }
265
270
 
266
271
  /**
@@ -272,7 +277,7 @@ export class BaseFocusable<
272
277
  * @param {string} scrollDirection string representation of the direction of the navigation which landed
273
278
  * to this item being focused
274
279
  */
275
- _executeFocusSequence(methodNames, scrollDirection) {
280
+ _executeFocusSequence(methodNames, scrollDirection, context) {
276
281
  return R.reduce(
277
282
  (sequence, methodName) => {
278
283
  const method = this[methodName]; // Access the method by name
@@ -284,7 +289,7 @@ export class BaseFocusable<
284
289
  }
285
290
 
286
291
  return sequence
287
- .then(() => method.call(this, scrollDirection))
292
+ .then(() => method.call(this, this, scrollDirection, context))
288
293
  .catch((e) => {
289
294
  throw e; // Re-throw for consistent error handling
290
295
  });
@@ -294,15 +299,21 @@ export class BaseFocusable<
294
299
  );
295
300
  }
296
301
 
297
- setFocus(scrollDirection) {
302
+ setFocus(
303
+ scrollDirection?: ScrollDirection,
304
+ context?: FocusManager.FocusContext
305
+ ) {
298
306
  const focusMethods = ["willReceiveFocus", "focus", "hasReceivedFocus"];
299
307
 
300
- return this._executeFocusSequence(focusMethods, scrollDirection);
308
+ return this._executeFocusSequence(focusMethods, scrollDirection, context);
301
309
  }
302
310
 
303
- setBlur(scrollDirection) {
311
+ setBlur(
312
+ scrollDirection?: ScrollDirection,
313
+ context?: FocusManager.FocusContext
314
+ ) {
304
315
  const blurMethods = ["willLoseFocus", "blur", "hasLostFocus"];
305
316
 
306
- return this._executeFocusSequence(blurMethods, scrollDirection);
317
+ return this._executeFocusSequence(blurMethods, scrollDirection, context);
307
318
  }
308
319
  }
@@ -1,12 +1,13 @@
1
1
  import { View } from "react-native";
2
2
  import React from "react";
3
- import { act, render } from "@testing-library/react-native";
3
+ import { act } from "@testing-library/react-native";
4
4
  import { CellWithFocusable } from "../CellWithFocusable.tsx";
5
5
 
6
6
  import { focusManager } from "@applicaster/zapp-react-native-utils/appUtils/focusManager";
7
+ import { renderWithProviders } from "@applicaster/zapp-react-native-utils/testUtils/index.tsx";
7
8
 
8
9
  const renderWith = (props) => {
9
- return render(<CellWithFocusable {...props} />);
10
+ return renderWithProviders(<CellWithFocusable {...props} />);
10
11
  };
11
12
 
12
13
  describe("CellWithFocusable", () => {
@@ -1,13 +1,17 @@
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 { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
5
5
 
6
- import { HorizontalScrollContext, RiverOffsetContext } from "../../Contexts";
6
+ import {
7
+ HorizontalScrollContext,
8
+ RiverOffsetContext,
9
+ ScreenScrollingContext,
10
+ } from "../../Contexts";
11
+
7
12
  import { CellComponent } from "./Cell";
8
13
  import { TvOSCellComponent } from "./TvOSCellComponent";
9
14
  import { withConsumer } from "../../Contexts/HeaderOffsetContext";
10
- import { ScreenScrollingContext } from "../../Contexts/ScreenScrollingContext";
11
15
 
12
16
  import { ScreenLayoutContextConsumer } from "../../Contexts/ScreenLayoutContext";
13
17
  import { createContext } from "@applicaster/zapp-react-native-utils/reactUtils/createContext";
@@ -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 { ComponentResolverComponent } from "./ComponentResolver";
6
6
 
@@ -1,25 +1,16 @@
1
1
  import React from "react";
2
2
  import * as R from "ramda";
3
+ import { selectZappPipes } from "@applicaster/zapp-react-native-redux";
3
4
 
4
5
  type Props = {
5
- zappPipes: ZappPipesData;
6
- loadPipesData: (
7
- feed: string,
8
- options?: Partial<{
9
- clearCache: boolean;
10
- meta: any;
11
- loadLocalFavorites: boolean;
12
- silentRefresh: boolean;
13
- parentFeed: ZappFeed;
14
- callback: () => void;
15
- bodyParams: any;
16
- riverId: string;
17
- }>
18
- ) => void;
6
+ zappPipes: ReturnType<typeof selectZappPipes>;
7
+ loadPipesData: ReturnType<
8
+ typeof import("@applicaster/zapp-react-native-utils/reactHooks/feed").useLoadPipesDataDispatch
9
+ >;
19
10
  feedUrl: string;
20
11
  children: (feed: ZappFeed) => React.ComponentType<any>;
21
12
  onFeedLoaded: (feed: ZappFeed) => {};
22
- onError: (feed: ZappFeed) => {};
13
+ onError: (error: ZappPipesData["error"]) => {};
23
14
  refreshing: boolean;
24
15
  refreshCallback: () => void;
25
16
  };
@@ -0,0 +1,21 @@
1
+ import React from "react";
2
+ import {
3
+ selectZappPipes,
4
+ useAppSelector,
5
+ } from "@applicaster/zapp-react-native-redux";
6
+ import { useLoadPipesDataDispatch } from "@applicaster/zapp-react-native-utils/reactHooks/feed";
7
+
8
+ export const FeedLoaderHOC = (_Component: any) => {
9
+ return function FeedLoaderHOC(props: any) {
10
+ const zappPipes = useAppSelector(selectZappPipes);
11
+ const loadPipesData = useLoadPipesDataDispatch();
12
+
13
+ return (
14
+ <_Component
15
+ {...props}
16
+ zappPipes={zappPipes}
17
+ loadPipesData={loadPipesData}
18
+ />
19
+ );
20
+ };
21
+ };
@@ -1,10 +1,4 @@
1
- import * as R from "ramda";
2
-
3
- import { connectToStore } from "@applicaster/zapp-react-native-redux";
4
- import { loadPipesData } from "@applicaster/zapp-react-native-redux/ZappPipes";
5
-
6
1
  import { FeedLoaderComponent } from "./FeedLoader";
2
+ import { FeedLoaderHOC } from "./FeedLoaderHOC";
7
3
 
8
- export const FeedLoader = connectToStore(R.pick(["zappPipes"]), {
9
- loadPipesData,
10
- })(FeedLoaderComponent);
4
+ export const FeedLoader = FeedLoaderHOC(FeedLoaderComponent);
@@ -5,6 +5,7 @@ import { BaseFocusable } from "../BaseFocusable";
5
5
  import { focusManager } from "@applicaster/zapp-react-native-utils/appUtils/focusManager";
6
6
  import { LONG_KEY_PRESS_TIMEOUT } from "@applicaster/quick-brick-core/const";
7
7
  import { withFocusableContext } from "../../Contexts/FocusableGroupContext/withFocusableContext";
8
+ import { StyleSheet, ViewStyle } from "react-native";
8
9
 
9
10
  type Props = {
10
11
  initialFocus?: boolean;
@@ -21,7 +22,7 @@ type Props = {
21
22
  handleFocus?: ({ mouse }: { mouse: boolean }) => void;
22
23
  children: (boolean, string) => React.ComponentType<any>;
23
24
  selected?: boolean;
24
- style?: React.CSSProperties;
25
+ style?: ViewStyle[] | ViewStyle;
25
26
  };
26
27
 
27
28
  class Focusable extends BaseFocusable<Props> {
@@ -122,7 +123,7 @@ class Focusable extends BaseFocusable<Props> {
122
123
  }
123
124
 
124
125
  render() {
125
- const { children, style } = this.props;
126
+ const { children, style, ...otherProps } = this.props;
126
127
  const { focused } = this.state;
127
128
 
128
129
  const id = this.getId();
@@ -139,7 +140,8 @@ class Focusable extends BaseFocusable<Props> {
139
140
  onMouseUp={this.pressOut}
140
141
  data-testid={focusableId}
141
142
  focused-teststate={focused ? "focused" : "default"}
142
- style={style}
143
+ style={StyleSheet.flatten(style) as any as React.CSSProperties}
144
+ {...otherProps}
143
145
  >
144
146
  {children(focused, { mouse: this.mouse })}
145
147
  </div>
@@ -2,7 +2,7 @@ import React from "react";
2
2
 
3
3
  type Props = {
4
4
  children: () => React.ReactNode;
5
- };
5
+ } & Record<string, any>;
6
6
 
7
7
  function FocusableiOSComponent({ children }: Props) {
8
8
  if (typeof children === "function") {
@@ -12,4 +12,4 @@ function FocusableiOSComponent({ children }: Props) {
12
12
  return children;
13
13
  }
14
14
 
15
- export const FocusableiOS = React.forwardRef(FocusableiOSComponent);
15
+ export const FocusableiOS = FocusableiOSComponent;
@@ -9,7 +9,8 @@ type Props = {
9
9
  onLongPress?: (ref: FocusManager.TouchableRef) => void;
10
10
  onFocus?: (
11
11
  ref: FocusManager.TouchableRef,
12
- options: FocusManager.Android.CallbackOptions
12
+ options: FocusManager.Android.CallbackOptions,
13
+ context: Option<FocusManager.FocusContext>
13
14
  ) => void;
14
15
  onBlur?: (
15
16
  ref: FocusManager.TouchableRef,
@@ -18,6 +19,7 @@ type Props = {
18
19
 
19
20
  disableFocus?: boolean;
20
21
  blockFocus?: boolean;
22
+ isSelected: (id?: string) => boolean;
21
23
  } & Partial<ParentFocus>;
22
24
 
23
25
  export class Touchable extends React.Component<Props> {
@@ -39,9 +41,10 @@ export class Touchable extends React.Component<Props> {
39
41
 
40
42
  onFocus(
41
43
  focusableRef: FocusManager.TouchableRef,
42
- options: FocusManager.Android.CallbackOptions
44
+ options: FocusManager.Android.CallbackOptions,
45
+ context: Option<FocusManager.FocusContext>
43
46
  ): void {
44
- this.props?.onFocus?.(focusableRef, options);
47
+ this.props?.onFocus?.(focusableRef, options, context);
45
48
  }
46
49
 
47
50
  onBlur(
@@ -38,6 +38,9 @@ describe("Focusable", () => {
38
38
  });
39
39
 
40
40
  it("updates disableFocus state when disableFocus prop changes", () => {
41
+ const unregister = jest.fn();
42
+ mockFocusManager.registerFocusable.mockReturnValue(unregister);
43
+
41
44
  const { rerender } = render(
42
45
  <Focusable id="test-id" disableFocus={false}>
43
46
  <Touchable testID="touchable" />
@@ -22,7 +22,8 @@ type Props = {
22
22
  onPress?: (ref: FocusManager.FocusableRef) => void;
23
23
  onFocus?: (
24
24
  ref: FocusManager.FocusableRef,
25
- options: FocusManager.Android.CallbackOptions
25
+ options: FocusManager.Android.CallbackOptions,
26
+ context?: FocusManager.FocusContext
26
27
  ) => void;
27
28
  onBlur?: (
28
29
  ref: FocusManager.FocusableRef,
@@ -32,9 +33,11 @@ type Props = {
32
33
  onPressOut?: (ref: FocusManager.FocusableRef) => void;
33
34
  onLongPress?: (ref: FocusManager.FocusableRef) => void;
34
35
  onRegister?: () => void;
36
+ onUnRegister?: () => void;
35
37
  isFocusableCell?: boolean;
36
38
  /** only for FocusableScrollView */
37
39
  onSetIsFocusable?: (isFocusable: boolean) => void;
40
+ isSelected?: (id?: string) => boolean;
38
41
  } & ParentFocus;
39
42
 
40
43
  export const FocusableContext = React.createContext<
@@ -43,11 +46,13 @@ export const FocusableContext = React.createContext<
43
46
  // eslint-disable-next-line
44
47
  setIsFocusable: (enableFocus: boolean) => void;
45
48
  ref: FocusManager.FocusableRef;
49
+ parentFocusableId: Option<string>;
46
50
  } & ParentFocus
47
51
  >({
48
52
  focused: false,
49
53
  setIsFocusable: () => {},
50
54
  ref: { current: null },
55
+ parentFocusableId: undefined,
51
56
  });
52
57
 
53
58
  export const useFocusable = () => React.useContext(FocusableContext);
@@ -68,13 +73,15 @@ function FocusableComponent(props: Props, forwardedRef) {
68
73
  onPressOut,
69
74
  onLongPress,
70
75
  onRegister = noop,
76
+ onUnRegister = noop,
71
77
  isFocusableCell = true,
72
78
  onSetIsFocusable,
79
+ isSelected,
73
80
  } = props;
74
81
 
75
82
  const isRTL = useIsRTL();
76
83
  const focusManager = useFocusManager();
77
- const { ref: parentFocusable } = useFocusable();
84
+ const { ref: parentFocusableRef, parentFocusableId } = useFocusable();
78
85
  const touchableRef = React.useRef(null);
79
86
 
80
87
  const [focused, setFocused] = React.useState(() =>
@@ -98,21 +105,23 @@ function FocusableComponent(props: Props, forwardedRef) {
98
105
  }
99
106
  }, [disableFocus]);
100
107
 
101
- React.useEffect(() => {
108
+ React.useLayoutEffect(() => {
102
109
  if (id) {
103
- const unregister = focusManager.registerFocusable(
110
+ const unregister = focusManager.registerFocusable({
104
111
  touchableRef,
105
- parentFocusable,
106
- isFocusableCell
107
- );
112
+ parentFocusableRef,
113
+ isFocusableCell,
114
+ parentFocusableId,
115
+ });
108
116
 
109
117
  onRegister();
110
118
 
111
119
  return () => {
112
120
  unregister();
121
+ onUnRegister();
113
122
  };
114
123
  }
115
- }, [id, onRegister, isFocusableCell]);
124
+ }, [id, onRegister, onUnRegister, isFocusableCell, parentFocusableId]);
116
125
 
117
126
  if (R.isNil(id)) {
118
127
  // eslint-disable-next-line no-console
@@ -122,9 +131,9 @@ function FocusableComponent(props: Props, forwardedRef) {
122
131
  }
123
132
 
124
133
  const _onFocus = React.useCallback(
125
- (ref, options) => {
134
+ (ref, options, context) => {
126
135
  setFocused(true);
127
- onFocus?.(ref, options);
136
+ onFocus?.(ref, options, context);
128
137
  },
129
138
  [onFocus]
130
139
  );
@@ -164,8 +173,9 @@ function FocusableComponent(props: Props, forwardedRef) {
164
173
  ...parentFocus,
165
174
  ref: touchableRef,
166
175
  setIsFocusable,
176
+ parentFocusableId: id,
167
177
  };
168
- }, [parentFocus, focused]);
178
+ }, [parentFocus, focused, id]);
169
179
 
170
180
  return (
171
181
  <Touchable
@@ -179,6 +189,7 @@ function FocusableComponent(props: Props, forwardedRef) {
179
189
  blockFocus={blockFocus}
180
190
  onPressIn={onPressIn}
181
191
  onPressOut={onPressOut}
192
+ isSelected={isSelected}
182
193
  {...parentFocus}
183
194
  >
184
195
  <FocusableContext.Provider value={contextState}>
@@ -4,7 +4,7 @@ import { FocusableiOS } from "./FocusableiOS";
4
4
 
5
5
  import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
6
6
 
7
- export const Focusable = platformSelect({
7
+ export const Focusable: React.ComponentType<any> = platformSelect({
8
8
  tvos: FocusableTvOS,
9
9
  ios: FocusableiOS,
10
10
  default: FocusableDefault,
@@ -10,7 +10,8 @@ type FocusableItemComponentProps = {
10
10
  onFocus: (
11
11
  element: FocusManager.FocusableRef,
12
12
  renderArgs: { item: FocusableItemComponentProps["item"]; index: number },
13
- direction: FocusManager.Android.FocusNavigationDirections
13
+ direction: FocusManager.Android.FocusNavigationDirections,
14
+ context: Option<FocusManager.FocusContext>
14
15
  ) => void;
15
16
  onListElementFocus?: (any, RenderItemProps, Direction) => void;
16
17
  onListElementBlur?: (any, RenderItemProps, Direction) => void;
@@ -45,8 +46,8 @@ const FocusableItemComponent = ({
45
46
  const renderArgs = { item, index };
46
47
 
47
48
  const onFocusHandler = React.useCallback(
48
- (element, direction) => {
49
- onFocus?.(element, renderArgs, direction);
49
+ (element, direction, context) => {
50
+ onFocus?.(element, renderArgs, direction, context);
50
51
  },
51
52
  [item, onFocus]
52
53
  );
@@ -79,6 +80,23 @@ const FocusableItemComponent = ({
79
80
  [item, onListElementPressOut]
80
81
  );
81
82
 
83
+ const isSelected = React.useCallback(
84
+ (id_: Option<string>) => {
85
+ console.log("debug_2", "isSelected", {
86
+ item,
87
+ extraChildrenData,
88
+ id_,
89
+ });
90
+
91
+ if (id_) {
92
+ return id_ === item.id;
93
+ }
94
+
95
+ return item?.data?.target === extraChildrenData;
96
+ },
97
+ [item, extraChildrenData]
98
+ );
99
+
82
100
  return (
83
101
  <Focusable
84
102
  nextFocusDown={nextFocusDown}
@@ -91,6 +109,7 @@ const FocusableItemComponent = ({
91
109
  onLongPress={onLongPressHandler}
92
110
  onPressOut={onPressOutHandler}
93
111
  id={id}
112
+ isSelected={isSelected}
94
113
  {...focusableItemProps}
95
114
  >
96
115
  <FocusableChild
@@ -17,7 +17,8 @@ type Props = {
17
17
  onFocus: (
18
18
  element: FocusManager.FocusableRef,
19
19
  renderArgs: { item: Item; index: number },
20
- direction: FocusManager.Android.FocusNavigationDirections
20
+ direction: FocusManager.Android.FocusNavigationDirections,
21
+ context: FocusManager.FocusContext
21
22
  ) => void;
22
23
  onListElementBlur?: (any, RenderItemProps, Direction) => void;
23
24
  onListElementPress?: (any, RenderItemProps) => void;
@@ -30,17 +30,24 @@ export type IListRenderItem<ItemT> = (
30
30
  export const getFocusableId = (parentId, index) =>
31
31
  `${parentId}___index:${index}`;
32
32
 
33
+ type Item = ZappEntry | ZappUIComponent | any;
34
+
33
35
  export type Props<ItemT> = FlatListProps<ItemT> & {
34
36
  id?: number | string;
35
37
  horizontal?: boolean;
36
38
  loop?: boolean;
37
39
  numColumns?: number;
38
40
  data: ZappEntry[] | ZappUIComponent[] | any[];
39
- onListElementFocus?: (any, RenderItemProps, Direction) => void;
40
- onListElementBlur?: (any, RenderItemProps, Direction) => void;
41
- onListElementPress?: (any, RenderItemProps) => void;
42
- onListElementPressOut?: (any, RenderItemProps) => void;
43
- onListElementLongPress?: (any, RenderItemProps) => void;
41
+ onListElementFocus?: (
42
+ element: FocusManager.FocusableRef,
43
+ renderItemProps: { item: Item; index: number },
44
+ direction: FocusManager.Android.FocusNavigationDirections,
45
+ context: FocusManager.FocusContext
46
+ ) => void;
47
+ onListElementBlur?: (element, renderItemProps, direction) => void;
48
+ onListElementPress?: (element, renderItemProps) => void;
49
+ onListElementPressOut?: (element, renderItemProps) => void;
50
+ onListElementLongPress?: (element, renderItemProps) => void;
44
51
  focusableItemProps?: any;
45
52
  focused?: boolean;
46
53
  initialScrollIndex?: number;
@@ -138,11 +145,11 @@ function FocusableListComponent<ItemT>(props: Props<ItemT>, ref) {
138
145
  );
139
146
 
140
147
  const onFocus = React.useCallback(
141
- (element, renderArgs, direction) => {
148
+ (element, renderArgs, direction, context) => {
142
149
  const { index } = renderArgs;
143
150
 
144
151
  updateFocusedIndex?.(index);
145
- onListElementFocus?.(element, renderArgs, direction);
152
+ onListElementFocus?.(element, renderArgs, direction, context);
146
153
  },
147
154
  [onListElementFocus, updateFocusedIndex]
148
155
  );