@applicaster/zapp-react-native-app 12.0.0-alpha.8521132326 → 12.0.0-alpha.8818231309
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 +26 -7
- package/package.json +6 -6
package/App/Layout/index.tsx
CHANGED
|
@@ -3,7 +3,10 @@ import * as R from "ramda";
|
|
|
3
3
|
|
|
4
4
|
import { View } from "react-native";
|
|
5
5
|
|
|
6
|
-
import {
|
|
6
|
+
import {
|
|
7
|
+
getNavigationProps,
|
|
8
|
+
resolveNavigationPlugin,
|
|
9
|
+
} from "@applicaster/zapp-react-native-utils/navigationUtils";
|
|
7
10
|
import {
|
|
8
11
|
useDimensions,
|
|
9
12
|
useGetBottomTabBarHeight,
|
|
@@ -63,6 +66,12 @@ const LayoutWithMenu = () => {
|
|
|
63
66
|
|
|
64
67
|
const { activeRiver, videoModalState, isVideoModalDocked } = navigator;
|
|
65
68
|
|
|
69
|
+
const plugin = resolveNavigationPlugin({
|
|
70
|
+
category: "menu",
|
|
71
|
+
navigations: activeRiver?.navigations,
|
|
72
|
+
plugins,
|
|
73
|
+
});
|
|
74
|
+
|
|
66
75
|
const Menu = React.useMemo(
|
|
67
76
|
() =>
|
|
68
77
|
getNavigationPluginModule(
|
|
@@ -75,17 +84,28 @@ const LayoutWithMenu = () => {
|
|
|
75
84
|
navigator: QuickBrickAppNavigator;
|
|
76
85
|
}
|
|
77
86
|
>,
|
|
78
|
-
[]
|
|
87
|
+
[activeRiver]
|
|
79
88
|
);
|
|
80
89
|
|
|
90
|
+
/** BTB shown when videoModalState - visible & minimized,
|
|
91
|
+
* otherwise hidden if videoModalState - visible
|
|
92
|
+
* also check isMenuVisible
|
|
93
|
+
*/
|
|
81
94
|
const showMenu = React.useMemo(
|
|
82
|
-
() =>
|
|
83
|
-
|
|
95
|
+
() =>
|
|
96
|
+
((videoModalState.visible && videoModalState.mode === "MINIMIZED") ||
|
|
97
|
+
!videoModalState.visible) &&
|
|
98
|
+
isMenuVisible(navigator.currentRoute, navigator.screenData),
|
|
99
|
+
[videoModalState.visible, videoModalState.mode, navigator.currentRoute]
|
|
84
100
|
);
|
|
85
101
|
|
|
102
|
+
const isBottomTabsPlugin = plugin?.identifier === "quick-brick-bottom-tabs";
|
|
103
|
+
|
|
104
|
+
const shouldApplyStyleForBottomTabs = showMenu && isBottomTabsPlugin;
|
|
105
|
+
|
|
86
106
|
const contentStyle = React.useMemo(
|
|
87
107
|
() => ({
|
|
88
|
-
...(
|
|
108
|
+
...(shouldApplyStyleForBottomTabs
|
|
89
109
|
? {
|
|
90
110
|
paddingBottom: bottomTabBarHeight,
|
|
91
111
|
}
|
|
@@ -140,10 +160,9 @@ const LayoutWithMenu = () => {
|
|
|
140
160
|
<View style={contentStyle}>
|
|
141
161
|
<Transitioner
|
|
142
162
|
transitionConfig={transitionConfig}
|
|
143
|
-
contentStyle={
|
|
163
|
+
contentStyle={{}}
|
|
144
164
|
isRTL={isRTL}
|
|
145
165
|
>
|
|
146
|
-
{/* has pathname context */}
|
|
147
166
|
<Screen
|
|
148
167
|
key={navigator.currentRoute}
|
|
149
168
|
pathname={navigator.currentRoute} // required by TransitionerComponent
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@applicaster/zapp-react-native-app",
|
|
3
|
-
"version": "12.0.0-alpha.
|
|
3
|
+
"version": "12.0.0-alpha.8818231309",
|
|
4
4
|
"description": "Zapp App Component for Applicaster's Quick Brick React Native App",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -29,11 +29,11 @@
|
|
|
29
29
|
},
|
|
30
30
|
"homepage": "https://github.com/applicaster/quickbrick#readme",
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@applicaster/quick-brick-core": "12.0.0-alpha.
|
|
33
|
-
"@applicaster/zapp-react-native-bridge": "12.0.0-alpha.
|
|
34
|
-
"@applicaster/zapp-react-native-redux": "12.0.0-alpha.
|
|
35
|
-
"@applicaster/zapp-react-native-ui-components": "12.0.0-alpha.
|
|
36
|
-
"@applicaster/zapp-react-native-utils": "12.0.0-alpha.
|
|
32
|
+
"@applicaster/quick-brick-core": "12.0.0-alpha.8818231309",
|
|
33
|
+
"@applicaster/zapp-react-native-bridge": "12.0.0-alpha.8818231309",
|
|
34
|
+
"@applicaster/zapp-react-native-redux": "12.0.0-alpha.8818231309",
|
|
35
|
+
"@applicaster/zapp-react-native-ui-components": "12.0.0-alpha.8818231309",
|
|
36
|
+
"@applicaster/zapp-react-native-utils": "12.0.0-alpha.8818231309",
|
|
37
37
|
"axios": "^0.28.0",
|
|
38
38
|
"camelize": "^1.0.0",
|
|
39
39
|
"query-string": "7.1.3",
|