@applicaster/zapp-react-native-ui-components 16.0.0-alpha.1011304583 → 16.0.0-alpha.1035454037

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 (126) hide show
  1. package/Components/AudioPlayer/tv/__tests__/audioPlayer.test.js +19 -0
  2. package/Components/AudioPlayer/tv/__tests__/index.test.tsx +120 -0
  3. package/Components/AudioPlayer/tv/index.tsx +5 -1
  4. package/Components/Cell/Cell.tsx +3 -6
  5. package/Components/Cell/TvOSCellComponent.tsx +0 -1
  6. package/Components/GeneralContentScreen/GeneralContentScreenHookAdapter.tsx +15 -0
  7. package/Components/GeneralContentScreen/hookAdapter/__tests__/skipExpression.test.ts +294 -0
  8. package/Components/GeneralContentScreen/hookAdapter/__tests__/validationHelper.test.ts +64 -0
  9. package/Components/GeneralContentScreen/hookAdapter/skipExpression.ts +252 -0
  10. package/Components/GeneralContentScreen/hookAdapter/validationHelper.ts +18 -0
  11. package/Components/LinkHandler/LinkHandler.tsx +2 -7
  12. package/Components/MasterCell/DefaultComponents/ActionButton.tsx +5 -1
  13. package/Components/MasterCell/DefaultComponents/ActionButtonsCore/__tests__/placement.test.ts +47 -21
  14. package/Components/MasterCell/DefaultComponents/ActionButtonsCore/components/ActionButtonController.tsx +19 -4
  15. package/Components/MasterCell/DefaultComponents/ActionButtonsCore/components/__tests__/ActionButtonController.test.tsx +43 -1
  16. package/Components/MasterCell/DefaultComponents/ActionButtonsCore/placement.ts +34 -6
  17. package/Components/MasterCell/DefaultComponents/Button.tsx +1 -0
  18. package/Components/MasterCell/DefaultComponents/Image/hoc/utils/__tests__/withDimensions.test.ts +420 -125
  19. package/Components/MasterCell/DefaultComponents/Image/hoc/utils/index.ts +114 -19
  20. package/Components/MasterCell/DefaultComponents/Image/hoc/withDimensions.tsx +19 -8
  21. package/Components/MasterCell/DefaultComponents/ImageContainer/index.tsx +5 -3
  22. package/Components/MasterCell/DefaultComponents/LiveImage/executePreloadHooks.ts +2 -4
  23. package/Components/MasterCell/DefaultComponents/LiveImage/index.tsx +2 -3
  24. package/Components/MasterCell/DefaultComponents/PressableView.tsx +29 -9
  25. package/Components/MasterCell/DefaultComponents/Text/hooks/useText.ts +4 -0
  26. package/Components/MasterCell/DefaultComponents/Toggle.tsx +36 -14
  27. package/Components/MasterCell/DefaultComponents/__tests__/Toggle.test.tsx +167 -0
  28. package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/ActionButton.tsx +154 -100
  29. package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/AssetComponent.tsx +15 -4
  30. package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/Button.ts +56 -22
  31. package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/Spacer.ts +6 -4
  32. package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/TextLabelsContainer.ts +3 -1
  33. package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/__tests__/PressableView.test.tsx +32 -21
  34. package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/__tests__/index.test.ts +15 -4
  35. package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/index.ts +23 -16
  36. package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/utils/__tests__/insertButtons.test.ts +8 -3
  37. package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/utils/index.ts +2 -2
  38. package/Components/MasterCell/DefaultComponents/tv/TvActionButtons/utils/__tests__/insertButtonsBetweenLabels.test.ts +45 -13
  39. package/Components/MasterCell/DefaultComponents/tv/TvActionButtons/utils/index.ts +2 -2
  40. package/Components/MasterCell/SharedUI/CollapsibleTextContainer/__tests__/factory.test.ts +32 -0
  41. package/Components/MasterCell/SharedUI/CollapsibleTextContainer/index.ts +1 -2
  42. package/Components/MasterCell/contexts/PressedStateContext.ts +3 -0
  43. package/Components/MasterCell/hooks/index.ts +2 -0
  44. package/Components/MasterCell/hooks/usePressedState.ts +4 -0
  45. package/Components/ModalComponent/ActionsBottomSheet/ActionButton.tsx +56 -0
  46. package/Components/ModalComponent/ActionsBottomSheet/__tests__/openActionsBottomSheet.test.ts +38 -0
  47. package/Components/ModalComponent/ActionsBottomSheet/boundActionButton.tsx +24 -0
  48. package/Components/ModalComponent/ActionsBottomSheet/index.ts +9 -0
  49. package/Components/ModalComponent/ActionsBottomSheet/openActionsBottomSheet.ts +61 -0
  50. package/Components/ModalComponent/AudioPlayer/Components/Button.tsx +392 -0
  51. package/Components/ModalComponent/AudioPlayer/Components/Header.tsx +772 -0
  52. package/Components/ModalComponent/AudioPlayer/Components/Input.tsx +728 -0
  53. package/Components/ModalComponent/AudioPlayer/Components/Item.tsx +1007 -0
  54. package/Components/ModalComponent/AudioPlayer/Components/NowPlayingHeaderSection.tsx +205 -0
  55. package/Components/ModalComponent/AudioPlayer/Components/__tests__/Item.test.tsx +113 -0
  56. package/Components/ModalComponent/AudioPlayer/Components/__tests__/NowPlayingHeaderSection.test.tsx +36 -0
  57. package/Components/ModalComponent/AudioPlayer/Components/index.ts +9 -0
  58. package/Components/ModalComponent/AudioPlayer/utils/__tests__/mergeStyles.test.ts +356 -0
  59. package/Components/ModalComponent/AudioPlayer/utils/mergeStyles.ts +521 -0
  60. package/Components/ModalComponent/BottomSheetDragArea.tsx +33 -0
  61. package/Components/ModalComponent/BottomSheetModalContent.tsx +505 -50
  62. package/Components/ModalComponent/Button/index.tsx +5 -3
  63. package/Components/ModalComponent/Header/CloseButton.tsx +12 -0
  64. package/Components/ModalComponent/Header/__tests__/CloseButton.test.tsx +72 -0
  65. package/Components/ModalComponent/Header/index.tsx +20 -7
  66. package/Components/ModalComponent/Header/utils.ts +1 -1
  67. package/Components/ModalComponent/ModalBlocksStyleContext.tsx +10 -0
  68. package/Components/ModalComponent/SortableList.tsx +156 -0
  69. package/Components/ModalComponent/SortableList.web.tsx +34 -0
  70. package/Components/ModalComponent/TextInputContent.tsx +135 -0
  71. package/Components/ModalComponent/__tests__/BottomSheetDragArea.test.tsx +74 -0
  72. package/Components/ModalComponent/__tests__/BottomSheetModalContent.test.tsx +343 -0
  73. package/Components/ModalComponent/__tests__/SortableList.web.test.tsx +16 -0
  74. package/Components/ModalComponent/__tests__/TextInputContent.test.tsx +169 -0
  75. package/Components/ModalComponent/__tests__/showTextInput.test.ts +95 -0
  76. package/Components/ModalComponent/index.tsx +18 -9
  77. package/Components/ModalComponent/presets/__tests__/getCell.test.ts +90 -0
  78. package/Components/ModalComponent/presets/dynamicCollectionCell.tsx +78 -0
  79. package/Components/ModalComponent/presets/index.ts +27 -0
  80. package/Components/ModalComponent/presets/selectableCell.tsx +28 -0
  81. package/Components/ModalComponent/presets/standardCell.tsx +41 -0
  82. package/Components/ModalComponent/presets/types.ts +35 -0
  83. package/Components/ModalComponent/showTextInput.ts +52 -0
  84. package/Components/ModalComponent/utils.ts +82 -21
  85. package/Components/OfflineHandler/__tests__/__snapshots__/index.test.tsx.snap +4 -85
  86. package/Components/OfflineHandler/__tests__/index.test.tsx +186 -17
  87. package/Components/OfflineHandler/hooks.ts +111 -0
  88. package/Components/OfflineHandler/index.tsx +91 -75
  89. package/Components/OfflineHandler/utils/index.ts +1 -13
  90. package/Components/PlayerContainer/PlayerContainer.tsx +19 -8
  91. package/Components/PlayerContainer/ProgramInfo/index.tsx +3 -4
  92. package/Components/PlayerContainer/__tests__/PlayerContainer.test.tsx +66 -13
  93. package/Components/PreloaderWrapper/index.tsx +1 -1
  94. package/Components/River/ComponentsMap/ComponentsMap.tsx +85 -59
  95. package/Components/River/River.tsx +4 -0
  96. package/Components/River/__tests__/__snapshots__/componentsMap.test.js.snap +140 -75
  97. package/Components/River/__tests__/componentsMap.test.js +8 -3
  98. package/Components/River/__tests__/resultCallback.test.tsx +47 -0
  99. package/Components/Screen/__tests__/Screen.test.tsx +24 -0
  100. package/Components/Screen/__tests__/__snapshots__/Screen.test.tsx.snap +2 -0
  101. package/Components/Screen/index.tsx +5 -0
  102. package/Components/Screen/navigationHandler.ts +8 -8
  103. package/Components/ScreenFeedLoader/ScreenFeedLoader.tsx +5 -3
  104. package/Components/ScreenResolverFeedProvider/ScreenResolverFeedProvider.tsx +1 -1
  105. package/Components/ScreenRevealManager/ScreenRevealManager.ts +18 -2
  106. package/Components/ScreenRevealManager/__tests__/ScreenRevealManager.test.ts +36 -0
  107. package/Components/ScreenRevealManager/__tests__/withScreenRevealManager.test.tsx +56 -0
  108. package/Components/ScreenRevealManager/withScreenRevealManager.tsx +21 -4
  109. package/Components/TopCutoffOverlay/index.tsx +2 -2
  110. package/Components/Transitioner/AnimationManager.js +1 -1
  111. package/Components/Transitioner/Scene.tsx +4 -3
  112. package/Components/Transitioner/Transitioner.tsx +98 -49
  113. package/Components/Transitioner/__tests__/transitioner.test.js +372 -3
  114. package/Components/VideoLive/LiveImageManager.ts +9 -3
  115. package/Components/VideoLive/__tests__/LiveImageManager.test.ts +59 -0
  116. package/Contexts/ModalNavigationContext/__tests__/index.test.tsx +15 -0
  117. package/Contexts/ModalNavigationContext/index.tsx +2 -2
  118. package/Hooks/useEntryActionsExpander.ts +63 -0
  119. package/assets/empty-Info.png +0 -0
  120. package/package.json +6 -5
  121. package/Components/OfflineHandler/NotificationView/NotificationView.lg.tsx +0 -112
  122. package/Components/OfflineHandler/NotificationView/NotificationView.samsung.tsx +0 -107
  123. package/Components/OfflineHandler/NotificationView/NotificationView.tsx +0 -153
  124. package/Components/OfflineHandler/NotificationView/__tests__/index.test.tsx +0 -66
  125. package/Components/OfflineHandler/NotificationView/utils.ts +0 -34
  126. /package/Decorators/ZappPipesDataConnector/__tests__/{Hero.js → Hero.tsx} +0 -0
@@ -1,6 +1,6 @@
1
1
  import * as React from "react";
2
2
  import { View } from "react-native";
3
- import { append, compose, identity, isNil, tail, take, update } from "ramda";
3
+ import { append, compose, identity, tail, update } from "ramda";
4
4
 
5
5
  import { AnimationManager } from "./AnimationManager";
6
6
  import { Scene } from "./Scene";
@@ -10,6 +10,7 @@ import {
10
10
  shouldSkipAnimationForPreviousWebViewScene,
11
11
  } from "./utils";
12
12
  import { v4 as uuid_v4 } from "uuid";
13
+ import { isScreenActiveForRoute } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/useIsScreenActive";
13
14
 
14
15
  export const NAV_ACTION_PUSH = "PUSH";
15
16
 
@@ -17,11 +18,23 @@ export const NAV_ACTION_REPLACE = "REPLACE";
17
18
 
18
19
  export const NAV_ACTION_BACK = "POP";
19
20
 
20
- type SceneProps = {
21
- children: React.ReactNode;
22
- overlayStyle: any;
23
- style: any;
24
- animating: boolean;
21
+ const RIVER_SEGMENT_REGEX = /river\//g;
22
+
23
+ // Number of "river/" segments in the route, i.e. its depth in the navigation stack
24
+ function countRiverSegments(route?: string): number {
25
+ return (route?.match(RIVER_SEGMENT_REGEX) || []).length;
26
+ }
27
+
28
+ // The screen element rendered for the current route
29
+ type SceneChild = React.ReactElement<{
30
+ pathname: string;
31
+ screenData: NavigationScreenData;
32
+ }>;
33
+
34
+ type TransitionerScene = {
35
+ children: SceneChild;
36
+ key: string;
37
+ screenUniqueId: string;
25
38
  };
26
39
 
27
40
  /**
@@ -30,7 +43,7 @@ type SceneProps = {
30
43
  * @param {Object} children
31
44
  * @returns { children: Object, key: string }
32
45
  */
33
- function prepareScene(children) {
46
+ function prepareScene(children: SceneChild): TransitionerScene {
34
47
  return {
35
48
  children,
36
49
  key: children.props.pathname,
@@ -44,22 +57,26 @@ function prepareScene(children) {
44
57
  * @param {any} props Component's props
45
58
  * @param {any} state Component's state
46
59
  */
47
- function scenesForBackTransition(props: SceneProps, { scenes }) {
60
+ function scenesForBackTransition(
61
+ props: Pick<Props, "children">,
62
+ { scenes }: Pick<State, "scenes">
63
+ ): TransitionerScene[] {
48
64
  return scenes.length > 1
49
65
  ? identity(scenes)
50
66
  : [prepareScene(props.children), scenes[0]];
51
67
  }
52
68
 
53
- const isModalClosed = (navigator) => {
54
- return !!isNil(navigator?.modalData);
55
- };
56
-
57
69
  type Props = {
58
70
  transitionConfig: any;
59
- children: React.ReactNode;
71
+ isRTL?: boolean;
72
+ children: SceneChild;
60
73
  navigator: {
61
74
  previousAction: string;
62
75
  currentRoute: string;
76
+ videoModalState?: {
77
+ visible?: boolean;
78
+ mode?: string;
79
+ };
63
80
  screenData: {
64
81
  [key: string]: any;
65
82
  };
@@ -77,13 +94,12 @@ type Props = {
77
94
  };
78
95
 
79
96
  type State = {
80
- animatedValue: any;
81
97
  animating: boolean;
82
98
  duration: number;
83
99
  easing: any;
84
100
  from: any;
85
101
  to: any;
86
- scenes: any;
102
+ scenes: TransitionerScene[];
87
103
  };
88
104
 
89
105
  const styles = {
@@ -91,11 +107,18 @@ const styles = {
91
107
  } as const;
92
108
 
93
109
  export class TransitionerComponent extends React.PureComponent<Props, State> {
110
+ private animationManager: AnimationManager;
111
+
112
+ private transitionId: number;
113
+
94
114
  constructor(props: Props) {
95
115
  super(props);
96
116
 
97
117
  this.animationManager = new AnimationManager(props);
98
118
 
119
+ // Bumped by every animated transition; end callbacks of older ones are ignored
120
+ this.transitionId = 0;
121
+
99
122
  this.state = {
100
123
  scenes: [prepareScene(props.children)], // starting with index: 0
101
124
  ...this.animationManager.initialState(),
@@ -112,29 +135,36 @@ export class TransitionerComponent extends React.PureComponent<Props, State> {
112
135
  * and trigger push animation with callbacks.
113
136
  */
114
137
  pushTransitionStart() {
138
+ const transitionId = ++this.transitionId;
139
+
115
140
  this.setState(
116
141
  {
117
- scenes: append(prepareScene(this.props.children), this.state.scenes),
142
+ // Append right after the visible scene: stateForAction(PUSH) animates to.index + 1
143
+ scenes: [
144
+ ...this.state.scenes.slice(0, this.state.to.index + 1),
145
+ prepareScene(this.props.children),
146
+ ],
118
147
  ...this.animationManager.stateForAction(this.state, NAV_ACTION_PUSH),
119
148
  },
120
149
  () => {
121
- this.animationManager.animate(this.state, this.pushTransitionEnd);
150
+ this.animationManager.animate(this.state, () =>
151
+ this.pushTransitionEnd(transitionId)
152
+ );
122
153
  }
123
154
  );
124
155
  }
125
156
 
126
157
  /**
127
158
  * Trigger back animation.
128
- * The last scene in the array is removed in the "backTransitionEnd" callback,
159
+ * The scenes after the target one are removed in the "backTransitionEnd" callback,
129
160
  * only after the animation is complete.
130
161
  */
131
- backTransitionStart() {
132
- const previousRoute = this.props.navigator?.currentRoute;
162
+ backTransitionStart(previousRoute: string) {
163
+ const transitionId = ++this.transitionId;
133
164
  const currentRoute = this.props.navigator?.currentRoute;
134
165
 
135
166
  const diffLengthRoutes =
136
- (previousRoute?.match(/river\//g) || []).length -
137
- (currentRoute?.match(/river\//g) || []).length;
167
+ countRiverSegments(previousRoute) - countRiverSegments(currentRoute);
138
168
 
139
169
  const stepsBack =
140
170
  diffLengthRoutes && diffLengthRoutes > 0 ? diffLengthRoutes : 1;
@@ -150,30 +180,32 @@ export class TransitionerComponent extends React.PureComponent<Props, State> {
150
180
  },
151
181
  () => {
152
182
  this.animationManager.animate(this.state, () =>
153
- this.backTransitionEnd(stepsBack)
183
+ this.backTransitionEnd(transitionId)
154
184
  );
155
185
  }
156
186
  );
157
187
  }
158
188
 
159
- shouldSkipAnimationForRoute(route) {
189
+ shouldSkipAnimationForRoute(route: string) {
160
190
  // We are skipping animations for some routes, likes hooks & the player mainly
161
191
 
162
192
  return route.includes("/playable") || route.includes("/hook");
163
193
  }
164
194
 
165
- shouldResetStateForRoute(route) {
195
+ shouldResetStateForRoute(route: string) {
166
196
  // We are resetting the transitioner state for root routes
167
197
 
168
- return (route?.match(/river\//g) || []).length === 1;
198
+ return countRiverSegments(route) === 1;
169
199
  }
170
200
 
171
- transitionWithoutAnimation(resetState) {
172
- const { scenes } = this.state;
201
+ transitionWithoutAnimation(resetState?: boolean) {
202
+ // Scenes after the visible one are only leaving (back animation in flight),
203
+ // so the new scene replaces the one being backed to
204
+ const scenes = this.state.scenes.slice(0, this.state.to.index + 1);
173
205
  const newScene = prepareScene(this.props.children);
174
206
  const isLastSceneHook = scenes[scenes.length - 1].key.startsWith("/hook");
175
207
 
176
- let newState;
208
+ let newState: Pick<State, "scenes"> | Pick<State, "scenes" | "to">;
177
209
 
178
210
  if (resetState) {
179
211
  newState = {
@@ -241,7 +273,7 @@ export class TransitionerComponent extends React.PureComponent<Props, State> {
241
273
  break;
242
274
 
243
275
  case NAV_ACTION_BACK: {
244
- this.backTransitionStart();
276
+ this.backTransitionStart(previousRoute);
245
277
  break;
246
278
  }
247
279
 
@@ -263,28 +295,37 @@ export class TransitionerComponent extends React.PureComponent<Props, State> {
263
295
  }
264
296
  }
265
297
 
266
- // Sets state.animating to false
267
- pushTransitionEnd() {
298
+ // Sets state.animating to false,
299
+ // unless a newer transition has started since this one
300
+ pushTransitionEnd(transitionId: number) {
301
+ if (transitionId !== this.transitionId) return;
302
+
268
303
  this.setState({
269
304
  animating: false,
270
305
  });
271
306
  }
272
307
 
273
308
  // Sets state.animating to false
274
- // and remove last scene from scenes stack
275
- backTransitionEnd(stepsBack) {
276
- this.setState({
309
+ // and drops every scene after the target one. Reads the latest state,
310
+ // so it's correct however many backs were merged into this animation.
311
+ // Ignored if a newer transition has started since this one
312
+ backTransitionEnd(transitionId: number) {
313
+ if (transitionId !== this.transitionId) return;
314
+
315
+ this.setState(({ scenes, to }) => ({
277
316
  animating: false,
278
- scenes: take(this.state.scenes.length - stepsBack, this.state.scenes),
279
- });
317
+ scenes: scenes.slice(0, to.index + 1),
318
+ }));
280
319
  }
281
320
 
282
321
  // On initial state, both "to" and "from" point to a single scene
283
322
  // so only a single scene should be rendered,
284
323
  // instead of dangerous nulls or duplicates.
285
324
  renderSingleScene({ scenes, to }) {
286
- const { contentStyle } = this.props;
287
- const screenData = this.props.children.props.screenData;
325
+ const { contentStyle, navigator, children } = this.props;
326
+
327
+ const { currentRoute, videoModalState } = navigator;
328
+ const screenData = children.props.screenData;
288
329
  const pathname = scenes[to.index].key;
289
330
 
290
331
  return (
@@ -293,7 +334,11 @@ export class TransitionerComponent extends React.PureComponent<Props, State> {
293
334
  <Scene
294
335
  {...{ style: to?.style || {} }}
295
336
  pathname={pathname}
296
- isActive={pathname === this.props.navigator.currentRoute}
337
+ isActive={isScreenActiveForRoute(
338
+ pathname,
339
+ currentRoute,
340
+ videoModalState
341
+ )}
297
342
  contentStyle={contentStyle}
298
343
  key={scenes[to.index].key}
299
344
  screenUniqueId={scenes[to.index].screenUniqueId}
@@ -311,16 +356,19 @@ export class TransitionerComponent extends React.PureComponent<Props, State> {
311
356
  // Looks redundant, but when written like this
312
357
  // we do not need to pass or generate keys.
313
358
  renderScenes({ scenes, from, to }) {
314
- const { contentStyle } = this.props;
359
+ const { contentStyle, navigator } = this.props;
360
+
361
+ const { currentRoute, videoModalState } = navigator;
315
362
 
316
363
  const fromScene = scenes[from.index] && (
317
364
  <Scene
318
365
  key={scenes[from.index].key}
319
366
  pathname={scenes[from.index].key}
320
- isActive={
321
- scenes[from.index].key === this.props.navigator.currentRoute &&
322
- isModalClosed(this.props.navigator)
323
- }
367
+ isActive={isScreenActiveForRoute(
368
+ scenes[from.index].key,
369
+ currentRoute,
370
+ videoModalState
371
+ )}
324
372
  style={from.style}
325
373
  pointerEvents="none"
326
374
  overlayStyle={from.overlayStyle}
@@ -336,10 +384,11 @@ export class TransitionerComponent extends React.PureComponent<Props, State> {
336
384
  const toScene = scenes[to.index] && (
337
385
  <Scene
338
386
  pathname={scenes[to.index].key}
339
- isActive={
340
- scenes[to.index].key === this.props.navigator.currentRoute &&
341
- isModalClosed(this.props.navigator)
342
- }
387
+ isActive={isScreenActiveForRoute(
388
+ scenes[to.index].key,
389
+ currentRoute,
390
+ videoModalState
391
+ )}
343
392
  key={scenes[to.index].key}
344
393
  style={to.style}
345
394
  overlayStyle={to.overlayStyle}
@@ -1,8 +1,15 @@
1
1
  import React from "react";
2
- import { Text, View } from "react-native";
2
+ import { Animated, Text, View } from "react-native";
3
+ import { v4 as uuidV4 } from "uuid";
3
4
 
4
- import { TransitionerComponent } from "../Transitioner";
5
- import { render } from "@testing-library/react-native";
5
+ import { AnimationManager } from "../AnimationManager";
6
+ import {
7
+ NAV_ACTION_BACK,
8
+ NAV_ACTION_PUSH,
9
+ NAV_ACTION_REPLACE,
10
+ TransitionerComponent,
11
+ } from "../Transitioner";
12
+ import { act, render } from "@testing-library/react-native";
6
13
 
7
14
  jest.mock("../Scene", () => {
8
15
  const View = jest.requireActual("react-native").View;
@@ -40,6 +47,47 @@ const transitionerComponentProps = {
40
47
 
41
48
  jest.mock("uuid");
42
49
 
50
+ const sceneTransitionConfig = () => ({
51
+ push: {
52
+ duration: 0,
53
+ easing: jest.fn(),
54
+ from: { style: {} },
55
+ to: { style: {} },
56
+ },
57
+ back: {
58
+ duration: 0,
59
+ easing: jest.fn(),
60
+ from: { style: {} },
61
+ to: { style: {} },
62
+ },
63
+ });
64
+
65
+ const sceneFor = (route) => (
66
+ <View pathname={route}>
67
+ <Text>{route}</Text>
68
+ </View>
69
+ );
70
+
71
+ const root = "/river/root";
72
+ const child = `${root}/river/child`;
73
+ const grandchild = `${child}/river/grandchild`;
74
+
75
+ const propsFor = (route, previousAction, children = sceneFor(route)) => ({
76
+ navigator: {
77
+ previousAction,
78
+ currentRoute: route,
79
+ screenData: {},
80
+ },
81
+ transitionConfig: sceneTransitionConfig,
82
+ layoutData: {
83
+ isTablet: false,
84
+ isTabletPortrait: false,
85
+ },
86
+ children,
87
+ });
88
+
89
+ const sceneKeys = (ref) => ref.current.state.scenes.map((scene) => scene.key);
90
+
43
91
  describe("<TransitionerComponent />", () => {
44
92
  it("renders correctly", () => {
45
93
  const wrapper = render(
@@ -50,4 +98,325 @@ describe("<TransitionerComponent />", () => {
50
98
 
51
99
  expect(wrapper.toJSON()).toMatchSnapshot();
52
100
  });
101
+
102
+ it("removes both intermediate scenes when backing out to the tab root", () => {
103
+ jest
104
+ .spyOn(AnimationManager.prototype, "animate")
105
+ .mockImplementation((_, done) => done());
106
+
107
+ const ref = React.createRef();
108
+
109
+ const { rerender } = render(
110
+ <TransitionerComponent
111
+ ref={ref}
112
+ {...propsFor(root, NAV_ACTION_REPLACE)}
113
+ />
114
+ );
115
+
116
+ act(() => {
117
+ rerender(
118
+ <TransitionerComponent
119
+ ref={ref}
120
+ {...propsFor(child, NAV_ACTION_PUSH)}
121
+ />
122
+ );
123
+ });
124
+
125
+ act(() => {
126
+ rerender(
127
+ <TransitionerComponent
128
+ ref={ref}
129
+ {...propsFor(grandchild, NAV_ACTION_PUSH)}
130
+ />
131
+ );
132
+ });
133
+
134
+ act(() => {
135
+ rerender(
136
+ <TransitionerComponent ref={ref} {...propsFor(root, NAV_ACTION_BACK)} />
137
+ );
138
+ });
139
+
140
+ expect(sceneKeys(ref)).toEqual([root]);
141
+ });
142
+
143
+ describe("with interruptible animations", () => {
144
+ // End callback of the animation that is currently "running"
145
+ let runningAnimationEnd = null;
146
+
147
+ const finishAnimation = () => {
148
+ act(() => {
149
+ const done = runningAnimationEnd;
150
+ runningAnimationEnd = null;
151
+ done?.();
152
+ });
153
+ };
154
+
155
+ const mountTransitioner = ({
156
+ initialRoute = root,
157
+ renderScene = sceneFor,
158
+ } = {}) => {
159
+ const ref = React.createRef();
160
+
161
+ const transitioner = (route, action) => (
162
+ <TransitionerComponent
163
+ ref={ref}
164
+ {...propsFor(route, action, renderScene(route))}
165
+ />
166
+ );
167
+
168
+ const { rerender } = render(
169
+ transitioner(initialRoute, NAV_ACTION_REPLACE)
170
+ );
171
+
172
+ const navigate = (route, action) => {
173
+ act(() => {
174
+ rerender(transitioner(route, action));
175
+ });
176
+ };
177
+
178
+ return { ref, navigate };
179
+ };
180
+
181
+ beforeEach(() => {
182
+ let sceneCount = 0;
183
+ uuidV4.mockImplementation(() => `scene-${++sceneCount}`);
184
+
185
+ jest
186
+ .spyOn(AnimationManager.prototype, "animate")
187
+ .mockImplementation((_, done) => {
188
+ runningAnimationEnd = done;
189
+ });
190
+
191
+ const setValue = Animated.Value.prototype.setValue;
192
+
193
+ // RN 0.77: setValue() stops the running animation, which calls
194
+ // its end callback synchronously with { finished: false }
195
+ jest
196
+ .spyOn(Animated.Value.prototype, "setValue")
197
+ .mockImplementation(function (value) {
198
+ const interrupted = runningAnimationEnd;
199
+ runningAnimationEnd = null;
200
+ interrupted?.();
201
+
202
+ return setValue.call(this, value);
203
+ });
204
+ });
205
+
206
+ afterEach(() => {
207
+ runningAnimationEnd = null;
208
+ jest.restoreAllMocks();
209
+ uuidV4.mockReset();
210
+ });
211
+
212
+ it("drops interrupted scenes when going back twice during a back animation", () => {
213
+ const { ref, navigate } = mountTransitioner();
214
+
215
+ navigate(child, NAV_ACTION_PUSH);
216
+ finishAnimation();
217
+ navigate(grandchild, NAV_ACTION_PUSH);
218
+ finishAnimation();
219
+
220
+ navigate(child, NAV_ACTION_BACK);
221
+ navigate(root, NAV_ACTION_BACK);
222
+
223
+ expect(ref.current.state.animating).toBe(true);
224
+
225
+ finishAnimation();
226
+
227
+ expect(sceneKeys(ref)).toEqual([root]);
228
+ expect(ref.current.state.animating).toBe(false);
229
+ });
230
+
231
+ it("remounts the screen when revisiting it after a quick double back", () => {
232
+ const mounts = {};
233
+
234
+ const MountProbe = ({ pathname }) => {
235
+ React.useEffect(() => {
236
+ mounts[pathname] = (mounts[pathname] || 0) + 1;
237
+ }, [pathname]);
238
+
239
+ return <Text>{pathname}</Text>;
240
+ };
241
+
242
+ const { ref, navigate } = mountTransitioner({
243
+ renderScene: (route) => <MountProbe pathname={route} />,
244
+ });
245
+
246
+ navigate(child, NAV_ACTION_PUSH);
247
+ finishAnimation();
248
+
249
+ const originalChildId = ref.current.state.scenes[1].screenUniqueId;
250
+
251
+ navigate(grandchild, NAV_ACTION_PUSH);
252
+ finishAnimation();
253
+ navigate(child, NAV_ACTION_BACK);
254
+ navigate(root, NAV_ACTION_BACK);
255
+ finishAnimation();
256
+
257
+ navigate(child, NAV_ACTION_PUSH);
258
+ finishAnimation();
259
+
260
+ const { scenes, to } = ref.current.state;
261
+
262
+ expect(scenes).toHaveLength(2);
263
+ expect(to.index).toBe(1);
264
+ expect(scenes[1].screenUniqueId).not.toBe(originalChildId);
265
+ expect(mounts[child]).toBe(2);
266
+ });
267
+
268
+ it("keeps a single scene when going back from the first scene", () => {
269
+ const { ref, navigate } = mountTransitioner({ initialRoute: child });
270
+
271
+ navigate(root, NAV_ACTION_BACK);
272
+ finishAnimation();
273
+
274
+ expect(sceneKeys(ref)).toEqual([root]);
275
+ expect(ref.current.state.to.index).toBe(0);
276
+ expect(ref.current.state.animating).toBe(false);
277
+ });
278
+
279
+ it("pushes a fresh scene after a completed single back", () => {
280
+ const { ref, navigate } = mountTransitioner();
281
+
282
+ navigate(child, NAV_ACTION_PUSH);
283
+ finishAnimation();
284
+
285
+ const originalChildId = ref.current.state.scenes[1].screenUniqueId;
286
+
287
+ navigate(root, NAV_ACTION_BACK);
288
+ finishAnimation();
289
+ navigate(child, NAV_ACTION_PUSH);
290
+ finishAnimation();
291
+
292
+ const { scenes, to } = ref.current.state;
293
+
294
+ expect(sceneKeys(ref)).toEqual([root, child]);
295
+ expect(to.index).toBe(1);
296
+ expect(scenes[1].screenUniqueId).not.toBe(originalChildId);
297
+ });
298
+
299
+ it("ignores the end of a back animation that a newer back superseded", () => {
300
+ const { ref, navigate } = mountTransitioner();
301
+
302
+ navigate(child, NAV_ACTION_PUSH);
303
+ finishAnimation();
304
+ navigate(grandchild, NAV_ACTION_PUSH);
305
+ finishAnimation();
306
+
307
+ navigate(child, NAV_ACTION_BACK);
308
+
309
+ const supersededEnd = runningAnimationEnd;
310
+
311
+ // Deliver the interrupted animation's end late, after the newer one started
312
+ Animated.Value.prototype.setValue.mockImplementation(() => {});
313
+
314
+ navigate(root, NAV_ACTION_BACK);
315
+
316
+ act(() => {
317
+ supersededEnd();
318
+ });
319
+
320
+ expect(ref.current.state.animating).toBe(true);
321
+ expect(sceneKeys(ref)).toEqual([root, child, grandchild]);
322
+
323
+ finishAnimation();
324
+
325
+ expect(sceneKeys(ref)).toEqual([root]);
326
+ expect(ref.current.state.animating).toBe(false);
327
+ });
328
+
329
+ it("drops the pushed scene when going back before its push animation ends", () => {
330
+ const { ref, navigate } = mountTransitioner();
331
+
332
+ navigate(child, NAV_ACTION_PUSH);
333
+ navigate(root, NAV_ACTION_BACK);
334
+
335
+ expect(ref.current.state.animating).toBe(true);
336
+
337
+ finishAnimation();
338
+
339
+ expect(sceneKeys(ref)).toEqual([root]);
340
+ expect(ref.current.state.animating).toBe(false);
341
+ });
342
+
343
+ it("pushes right after the visible scene even when stale scenes are left behind", () => {
344
+ const { ref, navigate } = mountTransitioner();
345
+
346
+ navigate(child, NAV_ACTION_PUSH);
347
+ finishAnimation();
348
+
349
+ // Leftover past to.index, as some other path could leave behind
350
+ act(() => {
351
+ ref.current.setState(({ scenes }) => ({
352
+ scenes: [
353
+ ...scenes,
354
+ {
355
+ ...scenes[1],
356
+ key: `${root}/river/stale`,
357
+ screenUniqueId: "stale",
358
+ },
359
+ ],
360
+ }));
361
+ });
362
+
363
+ navigate(grandchild, NAV_ACTION_PUSH);
364
+ finishAnimation();
365
+
366
+ const { scenes, to } = ref.current.state;
367
+
368
+ expect(sceneKeys(ref)).toEqual([root, child, grandchild]);
369
+ expect(scenes[to.index].key).toBe(grandchild);
370
+ });
371
+
372
+ it("shows the replaced screen when going home during a back animation", () => {
373
+ const home = "/river/home";
374
+ const { ref, navigate } = mountTransitioner();
375
+
376
+ navigate(child, NAV_ACTION_PUSH);
377
+ finishAnimation();
378
+
379
+ navigate(root, NAV_ACTION_BACK);
380
+ navigate(home, NAV_ACTION_REPLACE);
381
+
382
+ const { scenes, to } = ref.current.state;
383
+
384
+ expect(scenes[to.index].key).toBe(home);
385
+
386
+ finishAnimation();
387
+
388
+ expect(sceneKeys(ref)).toEqual([home]);
389
+ expect(ref.current.state.animating).toBe(false);
390
+ });
391
+
392
+ it("shows the pushed screen when pushing during a back animation", () => {
393
+ const sibling = `${root}/river/sibling`;
394
+ const { ref, navigate } = mountTransitioner();
395
+
396
+ navigate(child, NAV_ACTION_PUSH);
397
+ finishAnimation();
398
+
399
+ navigate(root, NAV_ACTION_BACK);
400
+ navigate(sibling, NAV_ACTION_PUSH);
401
+
402
+ const { scenes, to } = ref.current.state;
403
+
404
+ expect(scenes[to.index].key).toBe(sibling);
405
+
406
+ finishAnimation();
407
+
408
+ expect(sceneKeys(ref)).not.toContain(child);
409
+ expect(ref.current.state.animating).toBe(false);
410
+ });
411
+
412
+ it("keeps both scenes when pushing during a push animation", () => {
413
+ const { ref, navigate } = mountTransitioner();
414
+
415
+ navigate(child, NAV_ACTION_PUSH);
416
+ navigate(grandchild, NAV_ACTION_PUSH);
417
+
418
+ expect(sceneKeys(ref)).toEqual([child, grandchild]);
419
+ expect(ref.current.state.to.index).toBe(1);
420
+ });
421
+ });
53
422
  });