@applicaster/zapp-react-native-app 11.0.0-rc.99 → 12.0.0-alpha.5643066061
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 +20 -6
- package/package.json +6 -6
package/App/Layout/index.tsx
CHANGED
|
@@ -4,11 +4,12 @@ import * as R from "ramda";
|
|
|
4
4
|
import { View } from "react-native";
|
|
5
5
|
|
|
6
6
|
import { getNavigationProps } from "@applicaster/zapp-react-native-utils/navigationUtils";
|
|
7
|
-
import { useDimensions } from "@applicaster/zapp-react-native-utils/reactHooks";
|
|
8
7
|
import {
|
|
9
8
|
useGetBottomTabBarHeight,
|
|
10
9
|
useNavigation,
|
|
11
|
-
|
|
10
|
+
useDimensions,
|
|
11
|
+
useIsNavBarVisible,
|
|
12
|
+
} from "@applicaster/zapp-react-native-utils/reactHooks";
|
|
12
13
|
import { Transitioner } from "@applicaster/zapp-react-native-ui-components/Components/Transitioner";
|
|
13
14
|
import { transitionConfig } from "@applicaster/zapp-react-native-ui-components/Components/Transitioner/config";
|
|
14
15
|
import { Screen } from "@applicaster/zapp-react-native-ui-components/Components/Screen";
|
|
@@ -24,6 +25,9 @@ import { VideoModal } from "@applicaster/zapp-react-native-ui-components/Compone
|
|
|
24
25
|
import { withDimensionsProvider } from "@applicaster/zapp-react-native-utils/dimensionsProvider";
|
|
25
26
|
|
|
26
27
|
import { ZappHooksModal } from "@applicaster/zapp-react-dom-ui-components/Components/ZappHooksModal";
|
|
28
|
+
import { useNavbarState } from "@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenContext";
|
|
29
|
+
import { useListenEventBusEvent } from "@applicaster/zapp-react-native-utils/reactHooks/useListenEventBusEvent";
|
|
30
|
+
import { PushTopicManager, PushTopicManagerConsts, PushTopicManagerEvents } from "@applicaster/zapp-react-native-bridge/PushNotifications/PushTopicManager";
|
|
27
31
|
|
|
28
32
|
type Props = {
|
|
29
33
|
children: React.ReactNode;
|
|
@@ -64,13 +68,15 @@ const LayoutWithMenu = (props: Props) => {
|
|
|
64
68
|
const {
|
|
65
69
|
activeRiver,
|
|
66
70
|
currentRoute,
|
|
67
|
-
isNavBarVisible,
|
|
68
71
|
screenData,
|
|
69
72
|
videoModalState,
|
|
70
73
|
isVideoModalDocked,
|
|
71
74
|
videoModalState: { visible },
|
|
72
75
|
} = navigator;
|
|
73
76
|
|
|
77
|
+
const isNavBarVisible = useIsNavBarVisible();
|
|
78
|
+
const { title } = useNavbarState();
|
|
79
|
+
|
|
74
80
|
const NavBar = React.useMemo(
|
|
75
81
|
() => getNavigationPluginModule("nav_bar", activeRiver, plugins),
|
|
76
82
|
[]
|
|
@@ -90,8 +96,8 @@ const LayoutWithMenu = (props: Props) => {
|
|
|
90
96
|
() => ({
|
|
91
97
|
...(showMenu
|
|
92
98
|
? {
|
|
93
|
-
|
|
94
|
-
|
|
99
|
+
paddingBottom: bottomTabBarHeight,
|
|
100
|
+
}
|
|
95
101
|
: {}),
|
|
96
102
|
...containerStyle,
|
|
97
103
|
opacity: videoModalState.visible && !isVideoModalDocked ? 0 : 1,
|
|
@@ -108,7 +114,7 @@ const LayoutWithMenu = (props: Props) => {
|
|
|
108
114
|
closeMenu,
|
|
109
115
|
setCloseMenu,
|
|
110
116
|
navigator,
|
|
111
|
-
...getNavigationProps({ navigator, category: "nav_bar" }),
|
|
117
|
+
...getNavigationProps({ navigator, title, category: "nav_bar" }),
|
|
112
118
|
}),
|
|
113
119
|
[navigator.currentRoute]
|
|
114
120
|
);
|
|
@@ -124,12 +130,20 @@ const LayoutWithMenu = (props: Props) => {
|
|
|
124
130
|
navigator: navigator,
|
|
125
131
|
...getNavigationProps({
|
|
126
132
|
navigator,
|
|
133
|
+
title,
|
|
127
134
|
category: "menu",
|
|
128
135
|
}),
|
|
129
136
|
bottomTabBarHeight,
|
|
130
137
|
isRTL,
|
|
131
138
|
};
|
|
132
139
|
|
|
140
|
+
useListenEventBusEvent(
|
|
141
|
+
PushTopicManagerConsts.PushTopicManagerSubscriptionID,
|
|
142
|
+
PushTopicManagerConsts.PushTopicManagerSource,
|
|
143
|
+
Object.keys(PushTopicManagerEvents),
|
|
144
|
+
PushTopicManager.getInstance().routeEvent
|
|
145
|
+
);
|
|
146
|
+
|
|
133
147
|
return (
|
|
134
148
|
<>
|
|
135
149
|
{appReady ? (
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@applicaster/zapp-react-native-app",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "12.0.0-alpha.5643066061",
|
|
4
4
|
"description": "Zapp App Component for Applicaster's Quick Brick React Native App",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -28,11 +28,11 @@
|
|
|
28
28
|
},
|
|
29
29
|
"homepage": "https://github.com/applicaster/quickbrick#readme",
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@applicaster/quick-brick-core": "
|
|
32
|
-
"@applicaster/zapp-react-native-bridge": "
|
|
33
|
-
"@applicaster/zapp-react-native-redux": "
|
|
34
|
-
"@applicaster/zapp-react-native-ui-components": "
|
|
35
|
-
"@applicaster/zapp-react-native-utils": "
|
|
31
|
+
"@applicaster/quick-brick-core": "12.0.0-alpha.5643066061",
|
|
32
|
+
"@applicaster/zapp-react-native-bridge": "12.0.0-alpha.5643066061",
|
|
33
|
+
"@applicaster/zapp-react-native-redux": "12.0.0-alpha.5643066061",
|
|
34
|
+
"@applicaster/zapp-react-native-ui-components": "12.0.0-alpha.5643066061",
|
|
35
|
+
"@applicaster/zapp-react-native-utils": "12.0.0-alpha.5643066061",
|
|
36
36
|
"axios": "^0.21.2",
|
|
37
37
|
"camelize": "^1.0.0",
|
|
38
38
|
"query-string": "7.1.3",
|