@applicaster/zapp-react-native-app 12.0.0-rc.89 → 12.0.0-rc.90
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 +16 -3
- 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,7 +84,7 @@ const LayoutWithMenu = () => {
|
|
|
75
84
|
navigator: QuickBrickAppNavigator;
|
|
76
85
|
}
|
|
77
86
|
>,
|
|
78
|
-
[]
|
|
87
|
+
[activeRiver]
|
|
79
88
|
);
|
|
80
89
|
|
|
81
90
|
const showMenu = React.useMemo(
|
|
@@ -83,9 +92,13 @@ const LayoutWithMenu = () => {
|
|
|
83
92
|
[navigator.currentRoute]
|
|
84
93
|
);
|
|
85
94
|
|
|
95
|
+
const isBottomTabsPlugin = plugin?.identifier === "quick-brick-bottom-tabs";
|
|
96
|
+
|
|
97
|
+
const shouldApplyStyleForBottomTabs = showMenu && isBottomTabsPlugin;
|
|
98
|
+
|
|
86
99
|
const contentStyle = React.useMemo(
|
|
87
100
|
() => ({
|
|
88
|
-
...(
|
|
101
|
+
...(shouldApplyStyleForBottomTabs
|
|
89
102
|
? {
|
|
90
103
|
paddingBottom: bottomTabBarHeight,
|
|
91
104
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@applicaster/zapp-react-native-app",
|
|
3
|
-
"version": "12.0.0-rc.
|
|
3
|
+
"version": "12.0.0-rc.90",
|
|
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-rc.
|
|
33
|
-
"@applicaster/zapp-react-native-bridge": "12.0.0-rc.
|
|
34
|
-
"@applicaster/zapp-react-native-redux": "12.0.0-rc.
|
|
35
|
-
"@applicaster/zapp-react-native-ui-components": "12.0.0-rc.
|
|
36
|
-
"@applicaster/zapp-react-native-utils": "12.0.0-rc.
|
|
32
|
+
"@applicaster/quick-brick-core": "12.0.0-rc.90",
|
|
33
|
+
"@applicaster/zapp-react-native-bridge": "12.0.0-rc.90",
|
|
34
|
+
"@applicaster/zapp-react-native-redux": "12.0.0-rc.90",
|
|
35
|
+
"@applicaster/zapp-react-native-ui-components": "12.0.0-rc.90",
|
|
36
|
+
"@applicaster/zapp-react-native-utils": "12.0.0-rc.90",
|
|
37
37
|
"axios": "^0.28.0",
|
|
38
38
|
"camelize": "^1.0.0",
|
|
39
39
|
"query-string": "7.1.3",
|