@applicaster/zapp-react-native-app 14.0.0-alpha.6391068513 → 14.0.0-alpha.6893149866
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/App/Layout/index.tsx +12 -22
- package/package.json +6 -7
package/App/Layout/index.tsx
CHANGED
|
@@ -3,10 +3,7 @@ import * as R from "ramda";
|
|
|
3
3
|
|
|
4
4
|
import { View, StyleSheet } from "react-native";
|
|
5
5
|
|
|
6
|
-
import {
|
|
7
|
-
getNavigationProps,
|
|
8
|
-
resolveNavigationPlugin,
|
|
9
|
-
} from "@applicaster/zapp-react-native-utils/navigationUtils";
|
|
6
|
+
import { getNavigationProps } from "@applicaster/zapp-react-native-utils/navigationUtils";
|
|
10
7
|
import {
|
|
11
8
|
useDimensions,
|
|
12
9
|
useGetBottomTabBarHeight,
|
|
@@ -71,12 +68,6 @@ const LayoutWithMenu = () => {
|
|
|
71
68
|
|
|
72
69
|
const { activeRiver, videoModalState, isVideoModalDocked } = navigator;
|
|
73
70
|
|
|
74
|
-
const plugin = resolveNavigationPlugin({
|
|
75
|
-
category: "menu",
|
|
76
|
-
navigations: activeRiver?.navigations,
|
|
77
|
-
plugins,
|
|
78
|
-
});
|
|
79
|
-
|
|
80
71
|
const Menu = React.useMemo(
|
|
81
72
|
() =>
|
|
82
73
|
getNavigationPluginModule(
|
|
@@ -99,11 +90,17 @@ const LayoutWithMenu = () => {
|
|
|
99
90
|
* also check isMenuVisible
|
|
100
91
|
*/
|
|
101
92
|
const showMenu = React.useMemo(() => {
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
93
|
+
const menuVisible = isMenuVisible(
|
|
94
|
+
navigator.currentRoute,
|
|
95
|
+
navigator.screenData,
|
|
96
|
+
plugins
|
|
97
|
+
);
|
|
105
98
|
|
|
106
|
-
|
|
99
|
+
const shouldShowWithVideo =
|
|
100
|
+
videoModalState.visible &&
|
|
101
|
+
["MINIMIZED", "MAXIMIZED"].includes(videoModalState.mode);
|
|
102
|
+
|
|
103
|
+
return menuVisible && (shouldShowWithVideo || !videoModalState.visible);
|
|
107
104
|
}, [
|
|
108
105
|
videoModalState.visible,
|
|
109
106
|
videoModalState.mode,
|
|
@@ -111,12 +108,7 @@ const LayoutWithMenu = () => {
|
|
|
111
108
|
isActiveGesture,
|
|
112
109
|
]);
|
|
113
110
|
|
|
114
|
-
const
|
|
115
|
-
|
|
116
|
-
const paddingBottom =
|
|
117
|
-
showMenu && isBottomTabsPlugin
|
|
118
|
-
? bottomTabBarHeight + safeAreaBottomInset
|
|
119
|
-
: 0; // if activeRiver?.navigations has quick-brick-bottom-tabs - append bottomTabBarHeight as padding
|
|
111
|
+
const paddingBottom = showMenu ? bottomTabBarHeight + safeAreaBottomInset : 0; // if activeRiver?.navigations has quick-brick-bottom-tabs - append bottomTabBarHeight as padding
|
|
120
112
|
|
|
121
113
|
const contentStyle = React.useMemo(
|
|
122
114
|
() =>
|
|
@@ -168,8 +160,6 @@ const LayoutWithMenu = () => {
|
|
|
168
160
|
PushTopicManager.getInstance().prepareTags();
|
|
169
161
|
}, []);
|
|
170
162
|
|
|
171
|
-
console.log("Layout", { navigatorData: navigator.data });
|
|
172
|
-
|
|
173
163
|
return (
|
|
174
164
|
<>
|
|
175
165
|
{appReady ? (
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@applicaster/zapp-react-native-app",
|
|
3
|
-
"version": "14.0.0-alpha.
|
|
3
|
+
"version": "14.0.0-alpha.6893149866",
|
|
4
4
|
"description": "Zapp App Component for Applicaster's Quick Brick React Native App",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -27,11 +27,11 @@
|
|
|
27
27
|
},
|
|
28
28
|
"homepage": "https://github.com/applicaster/quickbrick#readme",
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@applicaster/quick-brick-core": "14.0.0-alpha.
|
|
31
|
-
"@applicaster/zapp-react-native-bridge": "14.0.0-alpha.
|
|
32
|
-
"@applicaster/zapp-react-native-redux": "14.0.0-alpha.
|
|
33
|
-
"@applicaster/zapp-react-native-ui-components": "14.0.0-alpha.
|
|
34
|
-
"@applicaster/zapp-react-native-utils": "14.0.0-alpha.
|
|
30
|
+
"@applicaster/quick-brick-core": "14.0.0-alpha.6893149866",
|
|
31
|
+
"@applicaster/zapp-react-native-bridge": "14.0.0-alpha.6893149866",
|
|
32
|
+
"@applicaster/zapp-react-native-redux": "14.0.0-alpha.6893149866",
|
|
33
|
+
"@applicaster/zapp-react-native-ui-components": "14.0.0-alpha.6893149866",
|
|
34
|
+
"@applicaster/zapp-react-native-utils": "14.0.0-alpha.6893149866",
|
|
35
35
|
"axios": "^0.28.0",
|
|
36
36
|
"camelize": "^1.0.0",
|
|
37
37
|
"query-string": "7.1.3",
|
|
@@ -46,7 +46,6 @@
|
|
|
46
46
|
"@applicaster/zapp-react-native-tvos-ui-components": "*",
|
|
47
47
|
"@babel/runtime": "*",
|
|
48
48
|
"@react-native-community/netinfo": "*",
|
|
49
|
-
"immer": "*",
|
|
50
49
|
"react": "*",
|
|
51
50
|
"react-native": "*",
|
|
52
51
|
"react-native-fs": "*",
|