@applicaster/zapp-react-native-ui-components 12.0.0-alpha.4802689107 → 12.0.0-alpha.4945500007
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Components/GeneralContentScreen/utils/__tests__/useCurationAPI.test.js +13 -6
- package/Components/GeneralContentScreen/utils/useCurationAPI.ts +1 -1
- package/Components/MasterCell/DefaultComponents/Image/Image.ios.tsx +5 -3
- package/Components/MasterCell/DefaultComponents/LiveImage/index.tsx +14 -1
- package/Components/MasterCell/DefaultComponents/__tests__/image.test.js +1 -1
- package/Components/MasterCell/utils/index.ts +16 -5
- package/Components/PlayerContainer/PlayerContainer.tsx +14 -2
- package/Components/PlayerImageBackground/index.tsx +34 -8
- package/Components/River/ComponentsMap/ComponentsMap.tsx +86 -22
- package/Components/River/__tests__/componentsMap.test.js +6 -0
- package/Components/Screen/__tests__/__snapshots__/Screen.test.tsx.snap +4 -0
- package/Components/Screen/index.tsx +36 -25
- package/Components/VideoLive/__tests__/PlayerLiveImageComponent.test.tsx +20 -5
- package/Components/VideoLive/__tests__/__snapshots__/PlayerLiveImageComponent.test.tsx.snap +0 -5
- package/Components/VideoModal/ModalAnimation/AnimatedPlayerModalWrapper.tsx +78 -0
- package/Components/VideoModal/ModalAnimation/AnimatedScrollModal.tsx +342 -0
- package/Components/VideoModal/ModalAnimation/AnimatedVideoPlayerComponent.tsx +151 -0
- package/Components/VideoModal/ModalAnimation/AnimationComponent.tsx +438 -0
- package/Components/VideoModal/ModalAnimation/ModalAnimationContext.tsx +143 -0
- package/Components/VideoModal/ModalAnimation/index.ts +15 -0
- package/Components/VideoModal/ModalAnimation/utils.ts +299 -0
- package/Components/VideoModal/PlayerWrapper.tsx +64 -41
- package/Components/VideoModal/VideoModal.tsx +8 -25
- package/Components/VideoModal/__tests__/PlayerWrapper.test.tsx +6 -1
- package/Components/VideoModal/__tests__/__snapshots__/PlayerWrapper.test.tsx.snap +151 -119
- package/Components/VideoModal/utils.ts +3 -3
- package/Components/Viewport/ViewportTracker/ViewportTracker.tsx +31 -40
- package/Components/Viewport/ViewportTracker/index.tsx +1 -0
- package/Components/Viewport/utils.js +1 -1
- package/Contexts/MenuToggleContext/{index.js → index.ts} +16 -0
- package/Contexts/ScreenContext/__tests__/__snapshots__/index.test.tsx.snap +3 -0
- package/Contexts/ScreenContext/__tests__/index.test.tsx +27 -0
- package/Contexts/ScreenContext/index.tsx +94 -25
- package/package.json +5 -5
- package/Components/VideoModal/hooks/usePosition.ts +0 -50
- /package/Contexts/{index.js → index.ts} +0 -0
|
@@ -1,4 +1,10 @@
|
|
|
1
|
-
import React, {
|
|
1
|
+
import React, {
|
|
2
|
+
createContext,
|
|
3
|
+
ReactNode,
|
|
4
|
+
useCallback,
|
|
5
|
+
useMemo,
|
|
6
|
+
useRef,
|
|
7
|
+
} from "react";
|
|
2
8
|
import {
|
|
3
9
|
useCurrentScreenData,
|
|
4
10
|
useNavigation,
|
|
@@ -7,27 +13,67 @@ import {
|
|
|
7
13
|
} from "@applicaster/zapp-react-native-utils/reactHooks";
|
|
8
14
|
import { useModalNavigationContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ModalNavigationContext";
|
|
9
15
|
import { useNestedNavigationContext } from "@applicaster/zapp-react-native-ui-components/Contexts/NestedNavigationContext";
|
|
16
|
+
import { create, StoreApi, UseBoundStore } from "zustand";
|
|
17
|
+
import { useShallow } from "zustand/react/shallow";
|
|
18
|
+
import { Animated } from "react-native";
|
|
19
|
+
|
|
20
|
+
interface NavBarStoreState {
|
|
21
|
+
visible: boolean;
|
|
22
|
+
title: string;
|
|
23
|
+
summary: string;
|
|
24
|
+
setVisible: (state: boolean) => void;
|
|
25
|
+
setTitle: (title: string) => void;
|
|
26
|
+
setSummary: (subtitle: string) => void;
|
|
27
|
+
height: number;
|
|
28
|
+
scrollState: number;
|
|
29
|
+
isOnBottomNavBar: boolean;
|
|
30
|
+
scrollYAnimated: Animated.Value;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
interface NavBarState {
|
|
34
|
+
visible: boolean;
|
|
35
|
+
title: string;
|
|
36
|
+
summary: string;
|
|
37
|
+
setVisible: (state: boolean) => void;
|
|
38
|
+
setTitle: (title: string) => void;
|
|
39
|
+
setSummary: (subtitle: string) => void;
|
|
40
|
+
}
|
|
10
41
|
|
|
11
42
|
type ScreenContextType = {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
title: string;
|
|
15
|
-
summary: string;
|
|
16
|
-
setVisible: (state: boolean) => void;
|
|
17
|
-
setTitle: (title: string) => void;
|
|
18
|
-
setSummary: (subtitle: string) => void;
|
|
19
|
-
};
|
|
43
|
+
_navBarStore: UseBoundStore<StoreApi<NavBarStoreState>>;
|
|
44
|
+
navBar: NavBarState;
|
|
20
45
|
legacyFormatScreenData: LegacyNavigationScreenData | null;
|
|
21
46
|
};
|
|
22
47
|
|
|
48
|
+
const createStore = () =>
|
|
49
|
+
create<NavBarStoreState>((set) => ({
|
|
50
|
+
title: "",
|
|
51
|
+
summary: "",
|
|
52
|
+
visible: true,
|
|
53
|
+
height: 0,
|
|
54
|
+
scrollState: 0,
|
|
55
|
+
isOnBottomNavBar: true,
|
|
56
|
+
scrollYAnimated: new Animated.Value(0),
|
|
57
|
+
setTitle(title) {
|
|
58
|
+
set({ title });
|
|
59
|
+
},
|
|
60
|
+
setSummary(summary) {
|
|
61
|
+
set({ summary });
|
|
62
|
+
},
|
|
63
|
+
setVisible(visible) {
|
|
64
|
+
set({ visible });
|
|
65
|
+
},
|
|
66
|
+
}));
|
|
67
|
+
|
|
23
68
|
export const ScreenContext = createContext<ScreenContextType>({
|
|
69
|
+
_navBarStore: createStore(),
|
|
24
70
|
navBar: {
|
|
25
71
|
visible: true,
|
|
26
72
|
title: "",
|
|
27
73
|
summary: "",
|
|
28
|
-
setVisible: (_state) =>
|
|
29
|
-
setTitle: (_title) =>
|
|
30
|
-
setSummary: (_subtitle) =>
|
|
74
|
+
setVisible: (_state) => void 0,
|
|
75
|
+
setTitle: (_title) => void 0,
|
|
76
|
+
setSummary: (_subtitle) => void 0,
|
|
31
77
|
},
|
|
32
78
|
legacyFormatScreenData: {} as LegacyNavigationScreenData,
|
|
33
79
|
});
|
|
@@ -53,9 +99,30 @@ export function ScreenContextProvider({
|
|
|
53
99
|
const isNested = useNestedNavigationContext();
|
|
54
100
|
const currentScreenScreenData = useCurrentScreenData();
|
|
55
101
|
|
|
56
|
-
const
|
|
57
|
-
|
|
58
|
-
|
|
102
|
+
const screenNavBarStateRef =
|
|
103
|
+
useRef<null | ReturnType<typeof createStore>>(null);
|
|
104
|
+
|
|
105
|
+
const getScreenNavBarState = useCallback(() => {
|
|
106
|
+
if (screenNavBarStateRef.current !== null) {
|
|
107
|
+
return screenNavBarStateRef.current;
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
const navBarState = createStore();
|
|
111
|
+
screenNavBarStateRef.current = navBarState;
|
|
112
|
+
|
|
113
|
+
return navBarState;
|
|
114
|
+
}, []);
|
|
115
|
+
|
|
116
|
+
const screenNavBarState = getScreenNavBarState()(
|
|
117
|
+
useShallow((state) => ({
|
|
118
|
+
visible: state.visible,
|
|
119
|
+
title: state.title,
|
|
120
|
+
summary: state.summary,
|
|
121
|
+
setTitle: state.setTitle,
|
|
122
|
+
setSummary: state.setSummary,
|
|
123
|
+
setVisible: state.setVisible,
|
|
124
|
+
}))
|
|
125
|
+
);
|
|
59
126
|
|
|
60
127
|
const isHook = pathname.includes("hook");
|
|
61
128
|
|
|
@@ -73,26 +140,28 @@ export function ScreenContextProvider({
|
|
|
73
140
|
const isVisible = isNavBarVisible(
|
|
74
141
|
pathname,
|
|
75
142
|
currentScreenScreenData, // what fallback should be if currentScreenData is not available?
|
|
76
|
-
|
|
143
|
+
screenNavBarState.visible,
|
|
77
144
|
canGoBack(isHook, pathname),
|
|
78
145
|
videoModalState
|
|
79
146
|
);
|
|
80
147
|
|
|
81
|
-
const navBarState = useMemo(
|
|
82
|
-
|
|
83
|
-
title:
|
|
84
|
-
summary:
|
|
148
|
+
const navBarState = useMemo(
|
|
149
|
+
() => ({
|
|
150
|
+
title: screenNavBarState.title,
|
|
151
|
+
summary: screenNavBarState.summary,
|
|
85
152
|
visible: isVisible,
|
|
86
|
-
setTitle:
|
|
87
|
-
setSummary:
|
|
88
|
-
setVisible:
|
|
89
|
-
}
|
|
90
|
-
|
|
153
|
+
setTitle: screenNavBarState.setTitle,
|
|
154
|
+
setSummary: screenNavBarState.setSummary,
|
|
155
|
+
setVisible: screenNavBarState.setVisible,
|
|
156
|
+
}),
|
|
157
|
+
[isVisible, screenNavBarState.title, screenNavBarState.summary]
|
|
158
|
+
);
|
|
91
159
|
|
|
92
160
|
return (
|
|
93
161
|
<ScreenContext.Provider
|
|
94
162
|
value={useMemo(
|
|
95
163
|
() => ({
|
|
164
|
+
_navBarStore: getScreenNavBarState(),
|
|
96
165
|
navBar: navBarState,
|
|
97
166
|
legacyFormatScreenData: routeScreenData,
|
|
98
167
|
}),
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@applicaster/zapp-react-native-ui-components",
|
|
3
|
-
"version": "12.0.0-alpha.
|
|
3
|
+
"version": "12.0.0-alpha.4945500007",
|
|
4
4
|
"description": "Applicaster Zapp React Native ui components for the Quick Brick App",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"types": "index.d.ts",
|
|
@@ -34,10 +34,10 @@
|
|
|
34
34
|
"redux-mock-store": "^1.5.3"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@applicaster/applicaster-types": "12.0.0-alpha.
|
|
38
|
-
"@applicaster/zapp-react-native-bridge": "12.0.0-alpha.
|
|
39
|
-
"@applicaster/zapp-react-native-redux": "12.0.0-alpha.
|
|
40
|
-
"@applicaster/zapp-react-native-utils": "12.0.0-alpha.
|
|
37
|
+
"@applicaster/applicaster-types": "12.0.0-alpha.4945500007",
|
|
38
|
+
"@applicaster/zapp-react-native-bridge": "12.0.0-alpha.4945500007",
|
|
39
|
+
"@applicaster/zapp-react-native-redux": "12.0.0-alpha.4945500007",
|
|
40
|
+
"@applicaster/zapp-react-native-utils": "12.0.0-alpha.4945500007",
|
|
41
41
|
"promise": "^8.3.0",
|
|
42
42
|
"react-router-native": "^5.1.2",
|
|
43
43
|
"url": "^0.11.0",
|
|
@@ -1,50 +0,0 @@
|
|
|
1
|
-
import {
|
|
2
|
-
useNavigation,
|
|
3
|
-
useNavigationType,
|
|
4
|
-
MenuTypes,
|
|
5
|
-
useGetBottomTabBarHeight,
|
|
6
|
-
} from "@applicaster/zapp-react-native-utils/reactHooks";
|
|
7
|
-
import { useSafeAreaInsets } from "react-native-safe-area-context";
|
|
8
|
-
import { isMenuVisible } from "@applicaster/zapp-react-native-ui-components/Components/Screen/navigationHandler";
|
|
9
|
-
|
|
10
|
-
import { useConfiguration } from "../utils";
|
|
11
|
-
|
|
12
|
-
type Option<T> = T | undefined;
|
|
13
|
-
|
|
14
|
-
type Return = {
|
|
15
|
-
top: Option<number>;
|
|
16
|
-
height: Option<number>;
|
|
17
|
-
bottom: Option<number>;
|
|
18
|
-
};
|
|
19
|
-
|
|
20
|
-
export const usePosition = (): Return => {
|
|
21
|
-
const { minimised_height: minimisedHeight } = useConfiguration();
|
|
22
|
-
const insets = useSafeAreaInsets();
|
|
23
|
-
const bottomTabBarHeight = useGetBottomTabBarHeight();
|
|
24
|
-
|
|
25
|
-
const {
|
|
26
|
-
videoModalState: { mode },
|
|
27
|
-
currentRoute,
|
|
28
|
-
screenData,
|
|
29
|
-
} = useNavigation();
|
|
30
|
-
|
|
31
|
-
const docked = mode === "MINIMIZED";
|
|
32
|
-
|
|
33
|
-
const navType = useNavigationType();
|
|
34
|
-
const isBottomBarNavigation = navType === MenuTypes.bottomTabBar;
|
|
35
|
-
|
|
36
|
-
const minimisedMarginBottom =
|
|
37
|
-
isMenuVisible(currentRoute, screenData) && isBottomBarNavigation
|
|
38
|
-
? bottomTabBarHeight
|
|
39
|
-
: insets.bottom;
|
|
40
|
-
|
|
41
|
-
if (docked) {
|
|
42
|
-
return {
|
|
43
|
-
top: undefined,
|
|
44
|
-
height: minimisedHeight,
|
|
45
|
-
bottom: minimisedMarginBottom,
|
|
46
|
-
};
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
return { top: 0, height: undefined, bottom: 0 };
|
|
50
|
-
};
|
|
File without changes
|