@fto-consult/expo-ui 6.7.1 → 6.7.2
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/package.json
CHANGED
|
@@ -12,18 +12,27 @@ import Logo from "$ecomponents/Logo";
|
|
|
12
12
|
const DrawerNavigator = React.forwardRef(({content,children,state,...props},ref)=>{
|
|
13
13
|
const drawerRef = React.useRef(null);
|
|
14
14
|
const mergedRefs = React.useMergeRefs(drawerRef,ref);
|
|
15
|
+
const forceRender = React.useForceRender();
|
|
16
|
+
const refreshItemsRef = React.useRef(false);
|
|
15
17
|
const items = useGetItems({refresh:()=>{
|
|
16
18
|
if(drawerRef.current && drawerRef.current && drawerRef.current.forceRenderNavigationView){
|
|
17
19
|
return drawerRef.current.forceRenderNavigationView();
|
|
18
20
|
}
|
|
19
|
-
}});
|
|
21
|
+
},force:refreshItemsRef.current});
|
|
20
22
|
React.useEffect(()=>{
|
|
21
23
|
const onLogoutUser = ()=>{
|
|
22
24
|
setIsLoggedIn(false);
|
|
23
25
|
}
|
|
26
|
+
const refreshItems = ()=>{
|
|
27
|
+
refreshItemsRef.current = true;
|
|
28
|
+
forceRender();
|
|
29
|
+
refreshItemsRef.current = false;
|
|
30
|
+
};
|
|
24
31
|
APP.on(APP.EVENTS.AUTH_LOGOUT_USER,onLogoutUser);
|
|
32
|
+
APP.on(APP.EVENTS.UPDATE_THEME,refreshItems);
|
|
25
33
|
return ()=>{
|
|
26
34
|
APP.off(APP.EVENTS.AUTH_LOGOUT_USER,onLogoutUser);
|
|
35
|
+
APP.off(APP.EVENTS.UPDATE_THEME,refreshItems);
|
|
27
36
|
}
|
|
28
37
|
},[])
|
|
29
38
|
const headerCB = ({isMinimized})=>{
|
|
@@ -29,12 +29,12 @@ const useGetItems = (options)=>{
|
|
|
29
29
|
APP.on(APP.EVENTS.REFRESH_MAIN_DRAWER,refreshItems);
|
|
30
30
|
APP.on(APP.EVENTS.AUTH_LOGIN_USER,refreshItems);
|
|
31
31
|
APP.on(APP.EVENTS.AUTH_LOGOUT_USER,refreshItems);
|
|
32
|
-
APP.on(APP.EVENTS.UPDATE_THEME,refreshItems);
|
|
32
|
+
//APP.on(APP.EVENTS.UPDATE_THEME,refreshItems);
|
|
33
33
|
return ()=>{
|
|
34
34
|
APP.off(APP.EVENTS.REFRESH_MAIN_DRAWER,refreshItems);
|
|
35
35
|
APP.off(APP.EVENTS.AUTH_LOGIN_USER,refreshItems);
|
|
36
36
|
APP.off(APP.EVENTS.AUTH_LOGOUT_USER,refreshItems);
|
|
37
|
-
APP.off(APP.EVENTS.UPDATE_THEME,onLogoutUser);
|
|
37
|
+
//APP.off(APP.EVENTS.UPDATE_THEME,onLogoutUser);
|
|
38
38
|
}
|
|
39
39
|
},[])
|
|
40
40
|
return useMemo(()=>{
|