@applicaster/zapp-react-native-app 14.0.0-alpha.2345544020 → 14.0.0-alpha.3038031102
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 +22 -14
- package/package.json +6 -8
package/App/Layout/index.tsx
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as React from "react";
|
|
2
2
|
import * as R from "ramda";
|
|
3
3
|
|
|
4
|
-
import { View } from "react-native";
|
|
4
|
+
import { View, StyleSheet } from "react-native";
|
|
5
5
|
|
|
6
6
|
import {
|
|
7
7
|
getNavigationProps,
|
|
@@ -39,10 +39,13 @@ import {
|
|
|
39
39
|
PushTopicManagerConsts,
|
|
40
40
|
PushTopicManagerEvents,
|
|
41
41
|
} from "@applicaster/zapp-react-native-bridge/PushNotifications/PushTopicManager";
|
|
42
|
+
import { useSafeAreaInsets } from "react-native-safe-area-context";
|
|
42
43
|
|
|
43
|
-
const
|
|
44
|
-
|
|
45
|
-
|
|
44
|
+
const styles = StyleSheet.create({
|
|
45
|
+
container: {
|
|
46
|
+
height: "100%",
|
|
47
|
+
},
|
|
48
|
+
});
|
|
46
49
|
|
|
47
50
|
const LayoutWithMenu = () => {
|
|
48
51
|
const {
|
|
@@ -63,6 +66,7 @@ const LayoutWithMenu = () => {
|
|
|
63
66
|
const isRTL = useIsRTL();
|
|
64
67
|
const navigator = useNavigation();
|
|
65
68
|
const bottomTabBarHeight = useGetBottomTabBarHeight();
|
|
69
|
+
const { bottom: safeAreaBottomInset } = useSafeAreaInsets();
|
|
66
70
|
const { title } = useNavbarState();
|
|
67
71
|
|
|
68
72
|
const { activeRiver, videoModalState, isVideoModalDocked } = navigator;
|
|
@@ -111,17 +115,21 @@ const LayoutWithMenu = () => {
|
|
|
111
115
|
|
|
112
116
|
const isBottomTabsPlugin = plugin?.identifier === "quick-brick-bottom-tabs";
|
|
113
117
|
|
|
114
|
-
const paddingBottom =
|
|
115
|
-
|
|
116
|
-
|
|
118
|
+
const paddingBottom =
|
|
119
|
+
showMenu && isBottomTabsPlugin
|
|
120
|
+
? bottomTabBarHeight + safeAreaBottomInset
|
|
121
|
+
: 0; // if activeRiver?.navigations has quick-brick-bottom-tabs - append bottomTabBarHeight as padding
|
|
117
122
|
|
|
118
123
|
const contentStyle = React.useMemo(
|
|
119
|
-
() =>
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
124
|
+
() =>
|
|
125
|
+
StyleSheet.flatten([
|
|
126
|
+
styles.container,
|
|
127
|
+
{
|
|
128
|
+
paddingBottom,
|
|
129
|
+
opacity: videoModalState.visible && !isVideoModalDocked ? 0 : 1,
|
|
130
|
+
},
|
|
131
|
+
]),
|
|
132
|
+
[videoModalState.visible, isVideoModalDocked]
|
|
125
133
|
);
|
|
126
134
|
|
|
127
135
|
const menuProps = React.useMemo(() => {
|
|
@@ -165,7 +173,7 @@ const LayoutWithMenu = () => {
|
|
|
165
173
|
return (
|
|
166
174
|
<>
|
|
167
175
|
{appReady ? (
|
|
168
|
-
<View style={
|
|
176
|
+
<View style={styles.container}>
|
|
169
177
|
<Transitioner
|
|
170
178
|
transitionConfig={transitionConfig}
|
|
171
179
|
contentStyle={contentStyle}
|
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.3038031102",
|
|
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.3038031102",
|
|
31
|
+
"@applicaster/zapp-react-native-bridge": "14.0.0-alpha.3038031102",
|
|
32
|
+
"@applicaster/zapp-react-native-redux": "14.0.0-alpha.3038031102",
|
|
33
|
+
"@applicaster/zapp-react-native-ui-components": "14.0.0-alpha.3038031102",
|
|
34
|
+
"@applicaster/zapp-react-native-utils": "14.0.0-alpha.3038031102",
|
|
35
35
|
"axios": "^0.28.0",
|
|
36
36
|
"camelize": "^1.0.0",
|
|
37
37
|
"query-string": "7.1.3",
|
|
@@ -50,11 +50,9 @@
|
|
|
50
50
|
"react": "*",
|
|
51
51
|
"react-native": "*",
|
|
52
52
|
"react-native-fs": "*",
|
|
53
|
-
"react-native-gesture-handler": "*",
|
|
54
53
|
"react-native-linear-gradient": "*",
|
|
55
54
|
"react-native-safe-area-context": "*",
|
|
56
55
|
"react-native-svg": "*",
|
|
57
|
-
"react-native-web": "*",
|
|
58
56
|
"react-native-webview": "*",
|
|
59
57
|
"uglify-js": "*",
|
|
60
58
|
"validate-color": "*",
|