@applicaster/zapp-react-native-app 14.0.0-alpha.1054425138 → 14.0.0-alpha.1216545755

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.
Files changed (2) hide show
  1. package/App/Layout/index.tsx +24 -14
  2. package/package.json +6 -6
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 containerStyle = {
44
- height: "100%",
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 = React.useMemo(() => {
115
- return showMenu && isBottomTabsPlugin ? bottomTabBarHeight : 0; // if activeRiver?.navigations has quick-brick-bottom-tabs - append bottomTabBarHeight as padding
116
- }, [showMenu, isBottomTabsPlugin, bottomTabBarHeight]);
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
- ...containerStyle,
121
- paddingBottom,
122
- opacity: videoModalState.visible && !isVideoModalDocked ? 0 : 1,
123
- }),
124
- [videoModalState.visible, isVideoModalDocked, paddingBottom]
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(() => {
@@ -162,10 +170,12 @@ const LayoutWithMenu = () => {
162
170
  PushTopicManager.getInstance().prepareTags();
163
171
  }, []);
164
172
 
173
+ console.log("Layout", { navigatorData: navigator.data });
174
+
165
175
  return (
166
176
  <>
167
177
  {appReady ? (
168
- <View style={containerStyle}>
178
+ <View style={styles.container}>
169
179
  <Transitioner
170
180
  transitionConfig={transitionConfig}
171
181
  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.1054425138",
3
+ "version": "14.0.0-alpha.1216545755",
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.1054425138",
31
- "@applicaster/zapp-react-native-bridge": "14.0.0-alpha.1054425138",
32
- "@applicaster/zapp-react-native-redux": "14.0.0-alpha.1054425138",
33
- "@applicaster/zapp-react-native-ui-components": "14.0.0-alpha.1054425138",
34
- "@applicaster/zapp-react-native-utils": "14.0.0-alpha.1054425138",
30
+ "@applicaster/quick-brick-core": "14.0.0-alpha.1216545755",
31
+ "@applicaster/zapp-react-native-bridge": "14.0.0-alpha.1216545755",
32
+ "@applicaster/zapp-react-native-redux": "14.0.0-alpha.1216545755",
33
+ "@applicaster/zapp-react-native-ui-components": "14.0.0-alpha.1216545755",
34
+ "@applicaster/zapp-react-native-utils": "14.0.0-alpha.1216545755",
35
35
  "axios": "^0.28.0",
36
36
  "camelize": "^1.0.0",
37
37
  "query-string": "7.1.3",