@applicaster/zapp-react-native-app 13.0.0-rc.137 → 13.0.0-rc.139

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 +22 -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(() => {
@@ -165,7 +173,7 @@ const LayoutWithMenu = () => {
165
173
  return (
166
174
  <>
167
175
  {appReady ? (
168
- <View style={containerStyle}>
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": "13.0.0-rc.137",
3
+ "version": "13.0.0-rc.139",
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": "13.0.0-rc.137",
31
- "@applicaster/zapp-react-native-bridge": "13.0.0-rc.137",
32
- "@applicaster/zapp-react-native-redux": "13.0.0-rc.137",
33
- "@applicaster/zapp-react-native-ui-components": "13.0.0-rc.137",
34
- "@applicaster/zapp-react-native-utils": "13.0.0-rc.137",
30
+ "@applicaster/quick-brick-core": "13.0.0-rc.139",
31
+ "@applicaster/zapp-react-native-bridge": "13.0.0-rc.139",
32
+ "@applicaster/zapp-react-native-redux": "13.0.0-rc.139",
33
+ "@applicaster/zapp-react-native-ui-components": "13.0.0-rc.139",
34
+ "@applicaster/zapp-react-native-utils": "13.0.0-rc.139",
35
35
  "axios": "^0.28.0",
36
36
  "camelize": "^1.0.0",
37
37
  "query-string": "7.1.3",