npm - @axelor/aos-mobile-core - Versions diffs - 7.0.2 → 7.0.4 - Mend

@axelor/aos-mobile-core 7.0.2 → 7.0.4

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 (197) hide show

package/lib/i18n/translations/fr.json CHANGED Viewed

@@ -34,6 +34,7 @@
     "Base_Content": "Contenu",
     "Base_ViewAll": "Tout voir",
     "Base_ChooseFile": "Choisir un fichier",
+    "Base_FileSizeUploadError": "Le fichier est trop lourd, la taille maximale est {{maxSize}}.",
     "Base_NoAppConfigured": "Votre application n'est pas configurée, merci de contacter un administrateur.",
     "Base_MinimalRequiredVersion": "La version actuelle est en dessous de la version minimale requise, merci de mettre à jour votre application.",
     "Base_Contact_Admin": "Merci de contacter un administrateur.",
@@ -65,11 +66,21 @@
     "Base_Failed_To": "N'a pas réussi à effectuer l'action :",
     "Base_Offline_Mode": "La connexion internet est désactivée",
     "Base_Compatibily_Error": "Cette app n'est pas compatible avec l'application web (v{{compatibility.moduleVersion}}).",
-    "Base_Compatibily_ErrorDetails": "Cette entrée de menu n'est pas compatible avec la configuration de l'ERP web actuelle. Cette entrée de menu nécessite que l'application {{compatibility.moduleName}} soit installée sur l'instance web avec une version comprise entre {{compatibility.downToVersion}} et {{compatibility.upToVersion}}. La version web installée de l'application est actuellement la {{compatibility.moduleVersion}}.",
+    "Base_Compatibily_ErrorDetails": "Cette entrée de menu n'est pas compatible avec la configuration de l'ERP web actuelle. Cette entrée de menu nécessite que l'application {{compatibility.moduleName}} soit installée sur l'instance web avec une version supérieure à {{compatibility.downToVersion}} et strictement inférieure à {{compatibility.upToVersion}}. La version web installée de l'application est actuellement la {{compatibility.moduleVersion}}.",
     "Base_Compatibily_NotFound": "L'application web {{compatibility.moduleName}} est introuvable.",
-    "Base_Compatibily_NotFoundDetails": "Cette entrée de menu n'est pas compatible avec la configuration de l'ERP web actuelle. Cette entrée de menu nécessite que l'application {{compatibility.moduleName}} soit installée sur l'instance web avec une version comprise entre {{compatibility.downToVersion}} et {{compatibility.upToVersion}}. L'application n'est pas installée sur l'instance web.",
-    "Auth_WrongPasswordOrUserName": "Mauvais nom d'utilisateur ou mot de passe",
-    "Auth_InvalidUrl": "Url non valide",
+    "Base_Compatibily_NotFoundDetails": "Cette entrée de menu n'est pas compatible avec la configuration de l'ERP web actuelle. Cette entrée de menu nécessite que l'application {{compatibility.moduleName}} soit installée sur l'instance web avec une version supérieure à {{compatibility.downToVersion}} et strictement inférieure à {{compatibility.upToVersion}}. L'application n'est pas installée sur l'instance web.",
+    "Base_Connection_Login": "Se connecter",
+    "Base_Connection_SessionName": "Nom de la session",
+    "Base_Connection_Url": "Url",
+    "Base_Connection_Username": "Nom utilisateur",
+    "Base_Connection_Password": "Mot de passe",
+    "Base_Connection_Update": "Mettre à jour",
+    "Base_Connection_SessionNameAlreadyExist": "Ce nom de session existe déjà",
+    "Base_Connection_WrongPasswordOrUserName": "Mauvais nom d'utilisateur ou mot de passe",
+    "Base_Connection_InvalidUrl": "Url non valide",
+    "Base_Connection_CreateSession": "Créer une session",
+    "Base_Connection_EditSession": "Editer la session",
+    "Base_Connection_DefaultSession": "Session par défaut ?",
     "User_BlockConnection": "Bloquer la connexion internet",
     "Stopwatch_Status_Ready": "Prêt",
     "Stopwatch_Status_InProgress": "En cours",
@@ -77,6 +88,25 @@
     "Stopwatch_Status_Finished": "Terminé",
     "Stopwatch_Status_Canceled": "Annulé",
     "Stopwatch_TimerFormat": "mm:ss",
+    "Base_Day_Sun": "Dim.",
+    "Base_Day_Mon": "Lun.",
+    "Base_Day_Tue": "Mar.",
+    "Base_Day_Wed": "Mer.",
+    "Base_Day_Thu": "Jeu.",
+    "Base_Day_Fri": "Ven.",
+    "Base_Day_Sat": "Sam.",
+    "Base_Month_Jan": "Janv.",
+    "Base_Month_Feb": "Fev.",
+    "Base_Month_Mar": "Mars",
+    "Base_Month_Apr": "Avr.",
+    "Base_Month_May": "Mai",
+    "Base_Month_Jun": "Juin",
+    "Base_Month_Jul": "Juill.",
+    "Base_Month_Aug": "Août",
+    "Base_Month_Sep": "Sept.",
+    "Base_Month_Oct": "Oct.",
+    "Base_Month_Nov": "Nov.",
+    "Base_Month_Dec": "Déc.",
     "Base_SliceAction_FetchAttachedFiles": "récupération des fichiers joints",
     "Base_SliceAction_FetchFilesDetails": "récupération des détails du fichier",
     "Base_SliceAction_FetchMetaModule": "récupération des modules",

package/lib/navigator/Navigator.js CHANGED Viewed

@@ -22,7 +22,7 @@ import { createStackNavigator } from '@react-navigation/stack';
 import { useThemeColor } from '@axelor/aos-mobile-ui';
 import DrawerContent from './drawer/DrawerContent';
 import { filterAuthorizedModules, getDefaultModule, manageOverridingMenus, manageWebCompatibility, moduleHasMenus, updateAccessibleMenus, } from './module.helper';
-import { getMenuTitle } from './menu.helper';
+import { manageSubMenusOverriding, getMenuTitle, hasSubMenus, } from './menu.helper';
 import useTranslator from '../i18n/hooks/use-translator';
 import { useDispatch, useSelector } from 'react-redux';
 import { fetchMenuConfig } from '../features/menuConfigSlice';
@@ -46,7 +46,7 @@ const Navigator = ({ modules, mainMenu, onRefresh, version, versionCheckConfig,
     const I18n = useTranslator();
     const Colors = useThemeColor();
     const dispatch = useDispatch();
-    const enabledModule = useMemo(() => manageWebCompatibility(manageOverridingMenus(filterAuthorizedModules(modules, mobileConfigs, user)), metaModules), [metaModules, mobileConfigs, modules, user]);
+    const enabledModule = useMemo(() => manageWebCompatibility(manageOverridingMenus(manageSubMenusOverriding(filterAuthorizedModules(modules, mobileConfigs, user))), metaModules), [metaModules, mobileConfigs, modules, user]);
     const [activeModule, setActiveModule] = useState(getDefaultModule(enabledModule, mainMenu));
     useEffect(() => {
         dispatch(fetchMobileConfig());
@@ -110,11 +110,23 @@ const Navigator = ({ modules, mainMenu, onRefresh, version, versionCheckConfig,
                 width: isLargeScreen ? windowWidth * 0.5 : windowWidth * 0.8,
             },
         }} drawerContent={props => (<DrawerContent {...props} modules={enabledModule} onModuleClick={changeActiveModule} onRefresh={onRefresh} version={version} versionCheckConfig={versionCheckConfig}/>)}>
-        {Object.entries(modulesMenus).map(([key, menu]) => (<Drawer.Screen key={key} name={key} options={{
-                title: getMenuTitle(menu, { I18n }),
-            }}>
-            {props => (<ModulesScreensStackNavigator {...props} initialRouteName={menu.screen}/>)}
-          </Drawer.Screen>))}
+        {Object.entries(modulesMenus).map(([key, menu], index) => {
+            return (<React.Fragment key={index}>
+              <Drawer.Screen key={key} name={key} options={{
+                    title: getMenuTitle(menu, { I18n }),
+                }}>
+                {props => menu.screen && (<ModulesScreensStackNavigator {...props} initialRouteName={menu.screen}/>)}
+              </Drawer.Screen>
+              {hasSubMenus(menu) &&
+                    Object.entries(menu.subMenus).map(([subMenukey, subMenu]) => {
+                        return (<Drawer.Screen key={subMenukey} name={subMenukey} options={{
+                                title: getMenuTitle(subMenu, { I18n }),
+                            }}>
+                      {props => (<ModulesScreensStackNavigator {...props} initialRouteName={subMenu.screen}/>)}
+                    </Drawer.Screen>);
+                    })}
+            </React.Fragment>);
+        })}
       </Drawer.Navigator>
     </ModuleNavigatorContext.Provider>);
 };

package/lib/navigator/Navigator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Navigator.js","sourceRoot":"","sources":["../../src/navigator/Navigator.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EACZ,aAAa,EACb,WAAW,EACX,SAAS,EACT,OAAO,EACP,QAAQ,GACT,MAAM,OAAO,CAAC;AACf,OAAO,EAAC,UAAU,EAAE,QAAQ,EAAC,MAAM,cAAc,CAAC;AAClD,OAAO,EAAC,qBAAqB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAC,oBAAoB,EAAC,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACpD,OAAO,aAAa,MAAM,wBAAwB,CAAC;AACnD,OAAO,EACL,uBAAuB,EACvB,gBAAgB,EAChB,qBAAqB,EACrB,sBAAsB,EACtB,cAAc,EACd,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,~~EAAC~~,YAAY,~~EAAC~~,MAAM,eAAe,CAAC;~~AAC3C~~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~~CACjD~~,CAAC,MAAM,CAAC,MAAM,CACZ,GAAG,CAAC,CAAC,GAAG,CAAC,CACT,IAAI,CAAC,CAAC,GAAG,CAAC,CACV,OAAO,CAAC,CAAC;~~gBACP~~,KAAK,EAAE,YAAY,CAAC,IAAI,EAAE,EAAC,IAAI,EAAC,CAAC;~~aAClC~~,CAAC,CACF;~~YAAA~~,CAAC,KAAK,CAAC,EAAE,CAAC,~~CACR~~,CAAC,4BAA4B,CAC3B,IAAI,KAAK,CAAC,CACV,gBAAgB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAC9B,CACH,CACH;~~UAAA~~,EAAE,MAAM,CAAC,MAAM,CAAC,CACjB,CAAC,CACJ;MAAA,EAAE,MAAM,CAAC,SAAS,CACpB;IAAA,EAAE,sBAAsB,CAAC,QAAQ,CAAC,CACnC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}
1	+ {"version":3,"file":"Navigator.js","sourceRoot":"","sources":["../../src/navigator/Navigator.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EACZ,aAAa,EACb,WAAW,EACX,SAAS,EACT,OAAO,EACP,QAAQ,GACT,MAAM,OAAO,CAAC;AACf,OAAO,EAAC,UAAU,EAAE,QAAQ,EAAC,MAAM,cAAc,CAAC;AAClD,OAAO,EAAC,qBAAqB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAC,oBAAoB,EAAC,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACpD,OAAO,aAAa,MAAM,wBAAwB,CAAC;AACnD,OAAO,EACL,uBAAuB,EACvB,gBAAgB,EAChB,qBAAqB,EACrB,sBAAsB,EACtB,cAAc,EACd,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,wBAAwB,EACxB,YAAY,EACZ,WAAW,GACZ,MAAM,eAAe,CAAC;AACvB,OAAO,aAAa,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,aAAa,CAAC;AACrD,OAAO,EAAC,eAAe,EAAC,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AAChE,OAAO,mBAAmB,MAAM,gCAAgC,CAAC;AACjE,OAAO,iBAAiB,MAAM,8BAA8B,CAAC;AAC7D,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,EAAC,gBAAgB,EAAC,MAAM,6BAA6B,CAAC;AAE7D,MAAM,MAAM,GAAG,qBAAqB,EAAE,CAAC;AACvC,MAAM,KAAK,GAAG,oBAAoB,EAAE,CAAC;AAErC,MAAM,CAAC,MAAM,sBAAsB,GAAG,aAAa,CAAC;IAClD,YAAY,EAAE,IAAI;IAClB,YAAY,EAAE,EAAE;IAChB,cAAc,EAAE,EAAE;CACnB,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,CAAC,EACjB,OAAO,EACP,QAAQ,EACR,SAAS,EACT,OAAO,EACP,kBAAkB,GACnB,EAAE,EAAE;IACH,MAAM,EAAC,IAAI,EAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAChD,MAAM,EAAC,eAAe,EAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACjE,MAAM,EAAC,aAAa,EAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IACjE,MAAM,EAAC,WAAW,EAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAE7D,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,MAAM,aAAa,GAAG,OAAO,CAC3B,GAAG,EAAE,CACH,sBAAsB,CACpB,qBAAqB,CACnB,wBAAwB,CACtB,uBAAuB,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,CACtD,CACF,EACD,WAAW,CACZ,EACH,CAAC,WAAW,EAAE,aAAa,EAAE,OAAO,EAAE,IAAI,CAAC,CAC5C,CAAC;IAEF,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAC9C,gBAAgB,CAAC,aAAa,EAAE,QAAQ,CAAC,CAC1C,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAC9B,QAAQ,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAC7B,QAAQ,CAAC,eAAe,EAAE,CAAC,CAAC;IAC9B,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,MAAM,kBAAkB,GAAG,WAAW,CACpC,UAAU,CAAC,EAAE;QACX,eAAe,CACb,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,CAAC,CAC3D,CAAC;IACJ,CAAC,EACD,CAAC,aAAa,CAAC,CAChB,CAAC;IAEF,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE;QAChC,OAAO,aAAa;aACjB,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,qBAAqB,CAAC,OAAO,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC;aACrE,MAAM,CAAC,cAAc,CAAC;aACtB,MAAM,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,EAAC,GAAG,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACpE,CAAC,EAAE,CAAC,aAAa,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC;IAE3C,MAAM,cAAc,GAAG,OAAO,CAC5B,GAAG,EAAE,CACH,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAC,GAAG,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,EAAC,CAAC,EAAE;QACrE,mBAAmB,EAAE;YACnB,KAAK,EAAE,oBAAoB;YAC3B,SAAS,EAAE,mBAAmB;YAC9B,QAAQ,EAAE,4BAA4B;YACtC,OAAO,EAAE;gBACP,YAAY,EAAE,KAAK;aACpB;SACF;QACD,iBAAiB,EAAE;YACjB,KAAK,EAAE,mBAAmB;YAC1B,SAAS,EAAE,iBAAiB;YAC5B,QAAQ,EAAE,0BAA0B;YACpC,OAAO,EAAE;gBACP,YAAY,EAAE,KAAK;aACpB;SACF;KACF,CAAC,EACJ,CAAC,OAAO,CAAC,CACV,CAAC;IAEF,MAAM,4BAA4B,GAAG,WAAW,CAC9C,CAAC,EAAC,gBAAgB,EAAE,GAAG,IAAI,EAAC,EAAE,EAAE,CAAC,CAC/B,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,CAAC,gBAAgB,CAAC,CAAC,gBAAgB,CAAC,CAC5D;QAAA,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,GAAG,CACjC,CAAC,CACC,GAAG,EACH,EAAC,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,GAAG,EAAC,YAAY,EAAE,IAAI,EAAC,EAAC,EAC7D,EAAE,EAAE;YACH,OAAO,CACL,CAAC,KAAK,CAAC,MAAM,CACX,GAAG,CAAC,CAAC,GAAG,CAAC,CACT,IAAI,CAAC,CAAC,GAAG,CAAC,CACV,SAAS,CAAC,CAAC,SAAS,CAAC,CACrB,OAAO,CAAC,CAAC;oBACP,WAAW,EAAE;wBACX;4BACE,SAAS,EAAE,CAAC;yBACb;wBACD,QAAQ,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC,OAAO,EAAE,YAAY;4BAC7C,CAAC,CAAC;gCACE,aAAa,EAAE,CAAC;6BACjB;4BACH,CAAC,CAAC,IAAI;qBACT;oBACD,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI;oBACtB,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI;oBACvB,gBAAgB,EAAE,EAAC,KAAK,EAAE,MAAM,EAAC;oBACjC,WAAW,EAAE,GAAG,EAAE,CAAC,CACjB,CAAC,MAAM,CACL,UAAU,CAAC,CAAC,gBAAgB,KAAK,GAAG,CAAC,CACrC,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,YAAY,CAAC,CAAC,OAAO,EAAE,YAAY,CAAC,EACpC,CACH;iBACF,CAAC,EACF,CACH,CAAC;QACJ,CAAC,CACF,CACH;MAAA,EAAE,KAAK,CAAC,SAAS,CAAC,CACnB,EACD,CAAC,cAAc,CAAC,CACjB,CAAC;IAEF,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC;IACnD,MAAM,aAAa,GAAG,WAAW,IAAI,GAAG,CAAC;IAEzC,OAAO,CACL,CAAC,sBAAsB,CAAC,QAAQ,CAC9B,KAAK,CAAC,CAAC,EAAC,YAAY,EAAE,YAAY,EAAE,cAAc,EAAC,CAAC,CACpD;MAAA,CAAC,MAAM,CAAC,SAAS,CACf,gBAAgB,CAAC,CAAC,QAAQ,CAAC,CAC3B,aAAa,CAAC,CAAC;YACb,WAAW,EAAE,KAAK;YAClB,WAAW,EAAE;gBACX,eAAe,EAAE,MAAM,CAAC,eAAe;gBACvC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,WAAW,GAAG,GAAG,CAAC,CAAC,CAAC,WAAW,GAAG,GAAG;aAC7D;SACF,CAAC,CACF,aAAa,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CACtB,CAAC,aAAa,CACZ,IAAI,KAAK,CAAC,CACV,OAAO,CAAC,CAAC,aAAa,CAAC,CACvB,aAAa,CAAC,CAAC,kBAAkB,CAAC,CAClC,SAAS,CAAC,CAAC,SAAS,CAAC,CACrB,OAAO,CAAC,CAAC,OAAO,CAAC,CACjB,kBAAkB,CAAC,CAAC,kBAAkB,CAAC,EACvC,CACH,CAAC,CACF;QAAA,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE;YACvD,OAAO,CACL,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CACzB;cAAA,CAAC,MAAM,CAAC,MAAM,CACZ,GAAG,CAAC,CAAC,GAAG,CAAC,CACT,IAAI,CAAC,CAAC,GAAG,CAAC,CACV,OAAO,CAAC,CAAC;oBACP,KAAK,EAAE,YAAY,CAAC,IAAI,EAAE,EAAC,IAAI,EAAC,CAAC;iBAClC,CAAC,CACF;gBAAA,CAAC,KAAK,CAAC,EAAE,CACP,IAAI,CAAC,MAAM,IAAI,CACb,CAAC,4BAA4B,CAC3B,IAAI,KAAK,CAAC,CACV,gBAAgB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAC9B,CACH,CAEL;cAAA,EAAE,MAAM,CAAC,MAAM,CACf;cAAA,CAAC,WAAW,CAAC,IAAI,CAAC;oBAChB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,EAAE;wBAC1D,OAAO,CACL,CAAC,MAAM,CAAC,MAAM,CACZ,GAAG,CAAC,CAAC,UAAU,CAAC,CAChB,IAAI,CAAC,CAAC,UAAU,CAAC,CACjB,OAAO,CAAC,CAAC;gCACP,KAAK,EAAE,YAAY,CAAC,OAAO,EAAE,EAAC,IAAI,EAAC,CAAC;6BACrC,CAAC,CACF;sBAAA,CAAC,KAAK,CAAC,EAAE,CAAC,CACR,CAAC,4BAA4B,CAC3B,IAAI,KAAK,CAAC,CACV,gBAAgB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EACjC,CACH,CACH;oBAAA,EAAE,MAAM,CAAC,MAAM,CAAC,CACjB,CAAC;oBACJ,CAAC,CAAC,CACN;YAAA,EAAE,KAAK,CAAC,QAAQ,CAAC,CAClB,CAAC;QACJ,CAAC,CAAC,CACJ;MAAA,EAAE,MAAM,CAAC,SAAS,CACpB;IAAA,EAAE,sBAAsB,CAAC,QAAQ,CAAC,CACnC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/lib/navigator/drawer/DrawerContent.js CHANGED Viewed

@@ -30,24 +30,31 @@ import AuthMenuIconButton from './AuthMenuIconButton';
 import { useSelector } from '../../redux/hooks';
 import { PopupApplicationNotConfigured, PopupMinimalRequiredVersion, } from '../../components';
 import MenuTitle from './MenuTitle';
+import { formatVersionString } from '../../utils/string';
+import { getDefaultMenuKey, hasSubMenus } from '../menu.helper';
 const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, version, versionCheckConfig, }) => {
     useEffect(() => {
+        const generateRoutes = _state => {
+            return [...modules]
+                ?.filter(_module => _module.menus)
+                ?.flatMap(_module => {
+                const result = [];
+                for (const [key, menu] of Object.entries(_module.menus)) {
+                    result.push(key);
+                    if (hasSubMenus(menu)) {
+                        Object.keys(menu.subMenus).forEach(_key => {
+                            result.push(_key);
+                        });
+                    }
+                }
+                return result;
+            })
+                .map(_key => _state.routes.find(_item => _item.name === _key));
+        };
         navigation.dispatch(_state => {
             return CommonActions.reset({
                 ..._state,
-                routes: modules
-                    ?.filter(_module => _module.menus)
-                    ?.flatMap(_module => {
-                    const moduleMenus = _module.menus;
-                    return Object.entries(moduleMenus)
-                        .map((item, index) => ({
-                        ...item[1],
-                        order: item[1]?.order != null ? item[1]?.order : index * 10,
-                        key: item[0],
-                    }))
-                        .sort((a, b) => a.order - b.order)
-                        .map(item => _state.routes.find(stateItem => stateItem.name === item.key));
-                }),
+                routes: generateRoutes(_state),
             });
         });
     }, [modules, navigation]);
@@ -58,16 +65,8 @@ const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, v
     const secondaryMenusLeft = useRef(new Animated.Value(0)).current;
     const { activeModule } = useContext(ModuleNavigatorContext);
     const { mobileSettings } = useSelector(_state => _state.config);
-    const mobileVersion = Number(version.replace(/\D/g, ''));
-    const minimalRequiredVersion = useMemo(() => {
-        const formattedRequiredApp = mobileSettings?.minimalRequiredMobileAppVersion?.replace(/\D/g, '');
-        if (formattedRequiredApp?.length === 3) {
-            return formattedRequiredApp;
-        }
-        else {
-            return null;
-        }
-    }, [mobileSettings]);
+    const mobileVersion = formatVersionString(version);
+    const minimalRequiredVersion = useMemo(() => formatVersionString(mobileSettings?.minimalRequiredMobileAppVersion), [mobileSettings]);
     const innerMenuIsVisible = useMemo(() => activeModule.name !== authModule.name, [activeModule]);
     const drawerModules = useMemo(() => modules
         .filter(moduleHasMenus)
@@ -101,9 +100,21 @@ const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, v
             outputRange: ['0%', '100%'],
         })
         : 0, [externalMenuIsVisible, secondaryMenusLeft]);
-    const handleAuthModuleClick = () => {
-        onModuleClick(authModule.name);
-        const route = state.routes.find(_route => (_route.name = Object.keys(authModule.menus)[0]));
+    const handleModuleClick = _module => {
+        onModuleClick(_module.name);
+        navigateToDefaultMenu(_module);
+    };
+    const navigateToDefaultMenu = selectedModule => {
+        const defaultMenuKey = getDefaultMenuKey(selectedModule);
+        if (defaultMenuKey) {
+            navigateToMenu(defaultMenuKey);
+        }
+    };
+    const navigateToMenu = menuKey => {
+        const route = state.routes.find(_route => _route.name === menuKey);
+        if (route == null) {
+            return;
+        }
         const focused = state.routes.indexOf(route) === state.index &&
             Object.keys(activeModule.menus).includes(route.name);
         const event = navigation.emit({
@@ -133,16 +144,16 @@ const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, v
             {drawerModules.map(_module => (<View key={_module.name} style={styles.menuItemContainer}>
                 <MenuIconButton key={_module.title} icon={_module.icon} subtitle={showSubtitles && I18n.t(_module.subtitle)} disabled={_module.disabled} color={_module === activeModule
                     ? Colors.primaryColor.background_light
-                    : null} onPress={() => onModuleClick(_module.name)} compatibility={_module.compatibilityAOS}/>
+                    : null} onPress={() => handleModuleClick(_module)} compatibility={_module.compatibilityAOS}/>
               </View>))}
           </View>
           <View style={styles.otherIconsContainer}>
-            <AuthMenuIconButton isActive={authModule.name === activeModule.name} showModulesSubtitle={showSubtitles} onPress={handleAuthModuleClick}/>
+            <AuthMenuIconButton isActive={authModule.name === activeModule.name} showModulesSubtitle={showSubtitles} onPress={() => handleModuleClick(authModule)}/>
           </View>
         </View>)}
       <View style={styles.menusContainer}>
         <View>
-          {drawerModules.map(_module => (<MenuTitle key={_module.name} module={_module} onPress={() => onModuleClick(_module.name)}/>))}
+          {drawerModules.map(_module => (<MenuTitle key={_module.name} module={_module} onPress={() => handleModuleClick(_module)}/>))}
         </View>
         <Animated.View style={[
             styles.secondaryMenusContainer,
@@ -150,9 +161,9 @@ const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, v
                 left: innerMenuPosition,
             },
         ]}>
-          <Menu activeModule={externalMenuIsVisible ? activeModule : drawerModules[0]} state={state} navigation={navigation} authMenu={!externalMenuIsVisible ? (<AuthMenuIconButton isActive={authModule.name === activeModule.name} showModulesSubtitle={showSubtitles} onPress={handleAuthModuleClick}/>) : null} onItemClick={externalMenuIsVisible
+          <Menu activeModule={externalMenuIsVisible ? activeModule : drawerModules[0]} state={state} navigation={navigation} authMenu={!externalMenuIsVisible ? (<AuthMenuIconButton isActive={authModule.name === activeModule.name} showModulesSubtitle={showSubtitles} onPress={() => handleModuleClick(authModule)}/>) : null} onItemClick={externalMenuIsVisible
             ? () => { }
-            : () => onModuleClick(drawerModules[0]?.name)}/>
+            : () => onModuleClick(drawerModules[0]?.name)} compatibility={externalMenuIsVisible ? null : drawerModules[0].compatibilityAOS}/>
         </Animated.View>
       </View>
     </SafeAreaView>);

package/lib/navigator/drawer/DrawerContent.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"DrawerContent.js","sourceRoot":"","sources":["../../../src/navigator/drawer/DrawerContent.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EACZ,MAAM,EACN,UAAU,EACV,OAAO,EACP,SAAS,EACT,WAAW,GACZ,MAAM,OAAO,CAAC;AACf,OAAO,EAAC,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAC,MAAM,cAAc,CAAC;AACxD,OAAO,EAAC,YAAY,EAAC,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAC,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACtE,OAAO,EAAC,aAAa,EAAE,SAAS,EAAC,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAC,sBAAsB,EAAC,MAAM,cAAc,CAAC;AACpD,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,EAAC,cAAc,EAAE,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAC,aAAa,EAAC,MAAM,YAAY,CAAC;AACzC,OAAO,EAAC,UAAU,EAAC,MAAM,YAAY,CAAC;AACtC,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EACL,6BAA6B,EAC7B,2BAA2B,GAC5B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,SAAS,MAAM,aAAa,CAAC;~~AAEpC~~,MAAM,aAAa,GAAG,CAAC,EACrB,KAAK,EACL,OAAO,EACP,UAAU,EACV,aAAa,EACb,SAAS,EACT,OAAO,EACP,kBAAkB,GACnB,EAAE,EAAE;IACH,SAAS,CAAC,GAAG,EAAE;QACb,~~UAAU~~,~~CAAC~~,~~QAAQ~~,~~CAAC,~~MAAM,CAAC,EAAE;~~YAC3B~~,OAAO,~~aAAa,~~CAAC,~~KAAK,CAAC;gBACzB,~~GAAG,~~MAAM;gBACT~~,~~MAAM,EAAE,OAAO~~;~~oBACb~~,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;~~oBAClC~~,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;~~oBAClB~~,MAAM,~~WAAW~~,GAAG,~~OAAO~~,CAAC,KAAK,~~CAAC;oBAElC,OAAO,~~MAAM,CAAC,~~OAAO~~,~~CAAC~~,~~WAAW~~,CAAC~~;yBAC/B~~,~~GAAG~~,CAAC,CAAC,~~IAAI~~,~~EAAE~~,KAAK,~~EAAE~~,EAAE,~~CAAC~~,CAAC~~;wBACrB~~,~~GAAG,~~IAAI,CAAC,CAAC,CAAC;~~wBACV~~,~~KAAK,EAAE,~~IAAI,~~CAAC~~,CAAC,CAAC,EAAE,~~KAAK~~,IAAI,IAAI,CAAC,CAAC,CAAC,~~IAAI~~,CAAC,~~CAAC~~,CAAC,EAAE,~~KAAK~~,CAAC,~~CAAC~~,CAAC,~~KAAK~~,~~GAAG~~,~~EAAE~~;~~wBAC3D~~,~~GAAG~~,~~EAAE,IAAI,~~CAAC,CAAC,CAAC;~~qBACb~~,CAAC,CAAC;~~yBACF~~,~~IAAI~~,CAAC,~~CAAC~~,CAAC,EAAE,CAAC,~~EAAE~~,~~EAAE,~~CAAC,CAAC,CAAC,KAAK,~~GAAG,~~CAAC,CAAC,KAAK,CAAC~~;yBACjC~~,~~GAAG~~,~~CAAC~~,IAAI,CAAC,~~EAAE~~,~~CACV~~,~~MAAM~~,CAAC,~~MAAM~~,CAAC,~~IAAI~~,CAAC,~~SAAS~~,CAAC,EAAE,~~CAAC~~,~~SAAS~~,CAAC,~~IAAI,~~KAAK,~~IAAI,~~CAAC,GAAG,~~CAAC~~,~~CAC7D~~,~~CAAC;gBACN~~,CAAC,CAAC;~~aACL~~,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;IAE1B,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,MAAM,EAAC,aAAa,EAAC,GAAG,SAAS,EAAE,CAAC;IAEpC,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1D,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IACjE,MAAM,EAAC,YAAY,EAAC,GAAG,UAAU,CAAC,sBAAsB,CAAC,CAAC;IAC1D,MAAM,EAAC,cAAc,EAAC,GAAG,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC9D,MAAM,aAAa,GAAG,~~MAAM~~,CAAC,OAAO,CAAC,~~OAAO,~~CAAC~~,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC~~;~~IAEzD~~,MAAM,sBAAsB,GAAG,OAAO,~~CAAC~~,GAAG,EAAE~~;QAC1C~~,~~MAAM~~,~~oBAAoB~~,~~GACxB~~,cAAc,EAAE,+BAA+B,~~EAAE,OAAO,~~CAAC,~~KAAK~~,~~EAAE,EAAE,~~CAAC,~~CAAC;QACtE,IAAI,oBAAoB,EAAE,MAAM,KAAK,CAAC,EAAE;YACtC,OAAO,oBAAoB,CAAC;SAC7B;aAAM;YACL,OAAO,IAAI,CAAC;SACb;IACH,CAAC,EAAE,CAAC,~~cAAc,CAAC,~~CAAC~~,CAAC;~~IAErB~~,MAAM,kBAAkB,GAAG,OAAO,CAChC,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,EAC3C,CAAC,YAAY,CAAC,CACf,CAAC;IAEF,MAAM,aAAa,GAAG,OAAO,CAC3B,GAAG,EAAE,CACH,OAAO;SACJ,MAAM,CAAC,cAAc,CAAC;SACtB,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,CAAC,EACxD,CAAC,OAAO,CAAC,CACV,CAAC;IAEF,MAAM,qBAAqB,GAAG,OAAO,CACnC,GAAG,EAAE,CAAC,eAAe,CAAC,aAAa,CAAC,GAAG,CAAC,EACxC,CAAC,aAAa,CAAC,CAChB,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,kBAAkB,EAAE;YACtB,iBAAiB,EAAE,CAAC;SACrB;aAAM;YACL,kBAAkB,EAAE,CAAC;SACtB;IACH,CAAC,EAAE,CAAC,kBAAkB,EAAE,kBAAkB,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAEhE,MAAM,iBAAiB,GAAG,WAAW,CAAC,GAAG,EAAE;QACzC,QAAQ,CAAC,MAAM,CAAC,kBAAkB,EAAE;YAClC,OAAO,EAAE,CAAC;YACV,QAAQ,EAAE,GAAG;YACb,eAAe,EAAE,KAAK;SACvB,CAAC,CAAC,KAAK,EAAE,CAAC;IACb,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAEzB,MAAM,kBAAkB,GAAG,WAAW,CAAC,GAAG,EAAE;QAC1C,QAAQ,CAAC,MAAM,CAAC,kBAAkB,EAAE;YAClC,OAAO,EAAE,GAAG;YACZ,QAAQ,EAAE,CAAC;YACX,eAAe,EAAE,KAAK;SACvB,CAAC,CAAC,KAAK,EAAE,CAAC;IACb,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAEzB,MAAM,iBAAiB,GAAG,OAAO,CAC/B,GAAG,EAAE,CACH,qBAAqB;QACnB,CAAC,CAAC,kBAAkB,CAAC,WAAW,CAAC;YAC7B,UAAU,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC;YACpB,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC;SAC5B,CAAC;QACJ,CAAC,CAAC,CAAC,EACP,CAAC,qBAAqB,EAAE,kBAAkB,CAAC,CAC5C,CAAC;IAEF,MAAM,~~qBAAqB~~,GAAG,~~GAAG~~,EAAE;~~QACjC~~,aAAa,CAAC,~~UAAU~~,CAAC,IAAI,CAAC,CAAC;~~QAE/B~~,MAAM,~~KAAK~~,GAAG,~~KAAK~~,CAAC,MAAM,CAAC,IAAI,~~CAC7B~~,~~MAAM~~,CAAC,~~EAAE~~,CAAC,CAAC,MAAM,CAAC,~~IAAI~~,GAAG,MAAM,CAAC,IAAI,CAAC,~~UAAU~~,CAAC,~~KAAK~~,CAAC,~~CAAC~~,CAAC,CAAC,CAAC,~~CAC3D~~,~~CAAC~~;~~QAEF~~,MAAM,OAAO,GACX,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,KAAK;YAC3C,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEvD,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC;YAC5B,IAAI,EAAE,iBAAiB;YACvB,MAAM,EAAE,KAAK,CAAC,GAAG;YACjB,iBAAiB,EAAE,IAAI;SACxB,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE;YAC3B,UAAU,CAAC,QAAQ,CAAC;gBAClB,GAAG,CAAC,OAAO;oBACT,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE;oBAC7B,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAC,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC;gBAC5D,MAAM,EAAE,KAAK,CAAC,GAAG;aAClB,CAAC,CAAC;SACJ;IACH,CAAC,CAAC;IAEF,IAAI,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;QACxC,OAAO,CAAC,6BAA6B,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,EAAG,CAAC;KAChE;IAED,IACE,kBAAkB,EAAE,QAAQ,KAAK,IAAI;QACrC,aAAa,GAAG,sBAAsB,EACtC;QACA,OAAO,CACL,CAAC,2BAA2B,CAC1B,kBAAkB,CAAC,CAAC,kBAAkB,CAAC,CACvC,SAAS,CAAC,CAAC,SAAS,CAAC,EACrB,CACH,CAAC;KACH;IAED,OAAO,CACL,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CACpC;MAAA,CAAC,qBAAqB,IAAI,CACxB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CACjC;UAAA,CAAC,IAAI,CACH;YAAA,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAC5B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CACvD;gBAAA,CAAC,cAAc,CACb,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CACnB,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CACnB,QAAQ,CAAC,CAAC,aAAa,IAAI,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CACpD,QAAQ,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAC3B,KAAK,CAAC,CACJ,OAAO,KAAK,YAAY;oBACtB,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,gBAAgB;oBACtC,CAAC,CAAC,IAAI,CACT,CACD,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,~~aAAa~~,CAAC,OAAO,CAAC,~~IAAI,~~CAAC,~~CAAC~~,~~CAC3C,~~aAAa,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAE5C;cAAA,EAAE,IAAI,CAAC,CACR,CAAC,CACJ;UAAA,EAAE,IAAI,CACN;UAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,CACtC;YAAA,CAAC,kBAAkB,CACjB,QAAQ,CAAC,CAAC,UAAU,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,CAAC,CAChD,mBAAmB,CAAC,CAAC,aAAa,CAAC,CACnC,OAAO,CAAC,CAAC,~~qBAAqB~~,CAAC,~~EAEnC~~;UAAA,EAAE,IAAI,CACR;QAAA,EAAE,IAAI,CAAC,CACR,CACD;MAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CACjC;QAAA,CAAC,IAAI,CACH;UAAA,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAC5B,CAAC,SAAS,CACR,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAClB,MAAM,CAAC,CAAC,OAAO,CAAC,CAChB,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,~~aAAa~~,CAAC,OAAO,CAAC,~~IAAI,~~CAAC,~~CAAC~~,~~EAC3C,~~CACH,CAAC,CACJ;QAAA,EAAE,IAAI,CACN;QAAA,CAAC,QAAQ,CAAC,IAAI,CACZ,KAAK,CAAC,CAAC;YACL,MAAM,CAAC,uBAAuB;YAC9B;gBACE,IAAI,EAAE,iBAAiB;aACxB;SACF,CAAC,CACF;UAAA,CAAC,IAAI,CACH,YAAY,CAAC,CACX,qBAAqB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CACxD,CACD,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,UAAU,CAAC,CAAC,UAAU,CAAC,CACvB,QAAQ,CAAC,CACP,CAAC,qBAAqB,CAAC,CAAC,CAAC,CACvB,CAAC,kBAAkB,CACjB,QAAQ,CAAC,CAAC,UAAU,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,CAAC,CAChD,mBAAmB,CAAC,CAAC,aAAa,CAAC,CACnC,OAAO,CAAC,CAAC,~~qBAAqB~~,CAAC,~~EAC/B~~,CACH,CAAC,CAAC,CAAC,IAAI,CACT,CACD,WAAW,CAAC,CACV,qBAAqB;YACnB,CAAC,CAAC,GAAG,EAAE,GAAE,CAAC;YACV,CAAC,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAChD,EAEL;QAAA,EAAE,QAAQ,CAAC,IAAI,CACjB;MAAA,EAAE,IAAI,CACR;IAAA,EAAE,YAAY,CAAC,CAChB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,MAAM,CAAC,EAAE,CACzB,UAAU,CAAC,MAAM,CAAC;IAChB,SAAS,EAAE;QACT,IAAI,EAAE,CAAC;QACP,aAAa,EAAE,KAAK;QACpB,eAAe,EAAE,MAAM,CAAC,qBAAqB;QAC7C,QAAQ,EAAE,QAAQ;QAClB,MAAM,EAAE,CAAC;KACV;IACD,cAAc,EAAE;QACd,IAAI,EAAE,CAAC;KACR;IACD,cAAc,EAAE;QACd,cAAc,EAAE,eAAe;QAC/B,UAAU,EAAE,QAAQ;QACpB,gBAAgB,EAAE,EAAE;QACpB,MAAM,EAAE,CAAC;KACV;IACD,mBAAmB,EAAE;QACnB,cAAc,EAAE,CAAC;KAClB;IACD,iBAAiB,EAAE;QACjB,MAAM,EAAE,EAAE;QACV,cAAc,EAAE,CAAC;QACjB,cAAc,EAAE,QAAQ;QACxB,MAAM,EAAE,CAAC;KACV;IACD,uBAAuB,EAAE;QACvB,QAAQ,EAAE,UAAU;QACpB,eAAe,EAAE,MAAM,CAAC,eAAe;QACvC,IAAI,EAAE,CAAC;QACP,GAAG,EAAE,CAAC;QACN,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,MAAM;QACd,SAAS,EAAE,CAAC;QACZ,aAAa,EAAE,GAAG;QAClB,WAAW,EAAE,MAAM,CAAC,cAAc,CAAC,UAAU;QAC7C,YAAY,EAAE,EAAC,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC;KACpC;CACF,CAAC,CAAC;AAEL,eAAe,aAAa,CAAC"}
1	+ {"version":3,"file":"DrawerContent.js","sourceRoot":"","sources":["../../../src/navigator/drawer/DrawerContent.js"],"names":[],"mappings":"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"}

package/lib/navigator/drawer/Header.js CHANGED Viewed

@@ -15,30 +15,50 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import React, { useMemo } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Dimensions, Platform, StyleSheet, View } from 'react-native';
 import { Text, useThemeColor } from '@axelor/aos-mobile-ui';
 import DrawerToggleButton from './DrawerToggleButton';
 import BackIcon from './BackIcon';
 import { useTranslator } from '../../i18n';
 import { HeaderOptionsMenu } from '../../components';
-import { headerActionsProvider, useHeaderOptions } from '../../header';
+import { fetchOptionsOfHeaderKey, headerActionsProvider, useHeaderActions, } from '../../header';
+const TIME_BEFORE_RETRY = 500;
 const Header = ({ mainScreen, title, actionID = null, shadedHeader = true }) => {
     const Colors = useThemeColor();
     const I18n = useTranslator();
-    const { options } = useHeaderOptions(actionID);
-    const headerOptions = useMemo(() => options || headerActionsProvider.getHeaderOptions(actionID), [actionID, options]);
+    let timeOutRequestCall = useRef();
+    const { headers } = useHeaderActions();
+    const [options, setOptions] = useState();
+    useEffect(() => {
+        setOptions(fetchOptionsOfHeaderKey(headers, actionID));
+    }, [actionID, headers]);
+    const handleTimeOut = useCallback(() => {
+        setOptions(_current => {
+            if (_current == null) {
+                return headerActionsProvider.getHeaderOptions(actionID);
+            }
+            return _current;
+        });
+    }, [actionID]);
+    useEffect(() => {
+        const id = setTimeout(handleTimeOut, TIME_BEFORE_RETRY);
+        timeOutRequestCall.current = id;
+        return () => {
+            clearTimeout(timeOutRequestCall.current);
+        };
+    }, [handleTimeOut]);
     const styles = useMemo(() => getHeaderStyles(Colors), [Colors]);
     return (<View style={[styles.header, shadedHeader ? styles.shadedHeader : null]}>
       <View style={styles.options}>
         {mainScreen ? (<DrawerToggleButton tintColor={Colors.primaryColor.background}/>) : (<BackIcon tintColor={Colors.primaryColor.background}/>)}
         <View>
           <Text fontSize={20} adjustsFontSizeToFit={true} numberOfLines={1}>
-            {headerOptions?.headerTitle || I18n.t(title)}
+            {options?.headerTitle || I18n.t(title)}
           </Text>
         </View>
       </View>
-      {headerOptions != null ? (<HeaderOptionsMenu model={headerOptions.model} modelId={headerOptions.modelId} actions={headerOptions.actions} attachedFileScreenTitle={headerOptions.attachedFileScreenTitle} disableMailMessages={headerOptions.disableMailMessages}/>) : null}
+      {options != null ? (<HeaderOptionsMenu model={options.model} modelId={options.modelId} actions={options.actions} attachedFileScreenTitle={options.attachedFileScreenTitle} disableMailMessages={options.disableMailMessages}/>) : null}
     </View>);
 };
 const getHeaderStyles = Colors => StyleSheet.create({

package/lib/navigator/drawer/Header.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Header.js","sourceRoot":"","sources":["../../../src/navigator/drawer/Header.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;~~AACrC~~,OAAO,EAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AACpE,OAAO,EAAC,IAAI,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAC1D,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AACtD,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,EAAC,aAAa,EAAC,MAAM,YAAY,CAAC;AACzC,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AACnD,OAAO,~~EAAC~~,qBAAqB,~~EAAE~~,gBAAgB,~~EAAC~~,MAAM,cAAc,CAAC;~~AAErE~~,MAAM,MAAM,GAAG,CAAC,EAAC,UAAU,EAAE,KAAK,EAAE,QAAQ,GAAG,IAAI,EAAE,YAAY,GAAG,IAAI,EAAC,EAAE,EAAE;IAC3E,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,MAAM,EAAC,OAAO,EAAC,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;~~IAE7C~~,MAAM,aAAa,GAAG,~~OAAO~~,~~CAC3B~~,GAAG,EAAE,CAAC,~~OAAO~~,IAAI,qBAAqB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,~~EACjE~~,CAAC,QAAQ,EAAE,OAAO,CAAC,~~CACpB~~,CAAC;~~IAEF~~,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEhE,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CACtE;MAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAC1B;QAAA,CAAC,UAAU,CAAC,CAAC,CAAC,CACZ,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,EAAG,CAClE,CAAC,CAAC,CAAC,CACF,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,EAAG,CACxD,CACD;QAAA,CAAC,IAAI,CACH;UAAA,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAC/D;YAAA,CAAC,~~aAAa~~,EAAE,WAAW,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,~~CAC9C~~;UAAA,EAAE,IAAI,CACR;QAAA,EAAE,IAAI,CACR;MAAA,EAAE,IAAI,CACN;MAAA,CAAC,~~aAAa~~,IAAI,IAAI,CAAC,CAAC,CAAC,~~CACvB~~,CAAC,iBAAiB,CAChB,KAAK,CAAC,CAAC,~~aAAa~~,CAAC,KAAK,CAAC,~~CAC3B~~,OAAO,CAAC,CAAC,~~aAAa~~,CAAC,OAAO,CAAC,~~CAC/B~~,OAAO,CAAC,CAAC,~~aAAa~~,CAAC,OAAO,CAAC,~~CAC/B~~,uBAAuB,CAAC,CAAC,~~aAAa~~,CAAC,uBAAuB,CAAC,~~CAC/D~~,mBAAmB,CAAC,CAAC,~~aAAa~~,CAAC,mBAAmB,CAAC,~~EACvD~~,CACH,CAAC,CAAC,CAAC,IAAI,CACV;IAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,MAAM,CAAC,EAAE,CAC/B,UAAU,CAAC,MAAM,CAAC;IAChB,WAAW,EAAE;QACX,KAAK,EAAE,MAAM,CAAC,IAAI;QAClB,UAAU,EAAE,CAAC,EAAE;KAChB;IACD,MAAM,EAAE;QACN,QAAQ,EAAE,UAAU;QACpB,GAAG,EAAE,CAAC;QACN,IAAI,EAAE,QAAQ,CAAC,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE;QACzE,eAAe,EAAE,MAAM,CAAC,eAAe;QACvC,MAAM,EAAE,MAAM;QACd,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK;QACrC,aAAa,EAAE,KAAK;QACpB,cAAc,EAAE,eAAe;QAC/B,UAAU,EAAE,QAAQ;QACpB,YAAY,EAAE,QAAQ;KACvB;IACD,YAAY,EAAE;QACZ,SAAS,EAAE,CAAC;QACZ,aAAa,EAAE,GAAG;QAClB,WAAW,EAAE,MAAM,CAAC,cAAc,CAAC,UAAU;QAC7C,YAAY,EAAE,EAAC,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC;KACpC;IACD,OAAO,EAAE;QACP,aAAa,EAAE,KAAK;QACpB,UAAU,EAAE,QAAQ;QACpB,YAAY,EAAE,QAAQ;KACvB;CACF,CAAC,CAAC;AAEL,eAAe,MAAM,CAAC"}
1	+ {"version":3,"file":"Header.js","sourceRoot":"","sources":["../../../src/navigator/drawer/Header.js"],"names":[],"mappings":"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"}

package/lib/navigator/drawer/Menu.d.ts CHANGED Viewed

@@ -1,8 +1,9 @@
 export default Menu;
-declare function Menu({ state, navigation, authMenu, activeModule, onItemClick }: {
+declare function Menu({ state, navigation, authMenu, activeModule, onItemClick, compatibility, }: {
     state: any;
     navigation: any;
     authMenu: any;
     activeModule: any;
     onItemClick: any;
+    compatibility: any;
 }): JSX.Element;

package/lib/navigator/drawer/Menu.js CHANGED Viewed

@@ -15,51 +15,76 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import React, { useContext, useMemo } from 'react';
+import React, { useMemo } from 'react';
 import { View, StyleSheet } from 'react-native';
 import { CommonActions, DrawerActions } from '@react-navigation/native';
-import { Text } from '@axelor/aos-mobile-ui';
-import { ModuleNavigatorContext } from '../Navigator';
+import { Text, WarningCard } from '@axelor/aos-mobile-ui';
 import MenuItem from './MenuItem';
-import { getMenuTitle } from '../menu.helper';
+import { findIndexAndRouteOfMenu, getMenuTitle, hasSubMenus, isMenuIncompatible, isModuleNotFound, } from '../menu.helper';
 import useTranslator from '../../i18n/hooks/use-translator';
-const MenuItemList = ({ state, navigation, activeModule, onItemClick }) => {
-    const I18n = useTranslator();
-    const { modulesMenus } = useContext(ModuleNavigatorContext);
-    return state.routes.map((route, i) => {
-        if (activeModule.menus[route.name] == null) {
-            return null;
+import { formatCompatibilityToDisplay } from '../module.helper';
+const MenuItemList = ({ state, navigation, activeModule, onItemClick, disabled, }) => {
+    const generateSubRoutes = menuItem => {
+        if (hasSubMenus(menuItem)) {
+            const { subMenus } = menuItem;
+            return state.routes.filter(subRoute => subRoute.name in subMenus);
         }
+        return [];
+    };
+    const moduleEntries = useMemo(() => {
+        return state.routes
+            .filter(_route => activeModule.menus[_route.name] != null)
+            .map(route => ({ ...activeModule.menus[route.name], key: route.name }))
+            .map((item, index) => {
+            if (item.order != null) {
+                return item;
+            }
+            return { ...item, order: index * 10 };
+        })
+            .sort((a, b) => a.order - b.order);
+    }, [activeModule, state.routes]);
+    return moduleEntries.map(menuItem => {
+        const { route, index: i } = findIndexAndRouteOfMenu(state.routes, menuItem.key);
         const focused = i === state.index && Object.keys(activeModule.menus).includes(route.name);
-        const menu = modulesMenus[route.name];
-        const onPress = () => {
+        const onPress = _route => {
+            if (_route == null) {
+                return null;
+            }
             onItemClick();
             const event = navigation.emit({
                 type: 'drawerItemPress',
-                target: route.key,
+                target: _route.key,
                 canPreventDefault: true,
             });
             if (!event.defaultPrevented) {
                 navigation.dispatch({
                     ...(focused
                         ? DrawerActions.closeDrawer()
-                        : CommonActions.navigate({ name: route.name, merge: true })),
+                        : CommonActions.navigate({ name: _route.name, merge: true })),
                     target: state.key,
                 });
             }
         };
-        return (<MenuItem key={route.key} title={getMenuTitle(menu, { I18n })} icon={menu.icon} disabled={menu.disabled} onPress={onPress} isActive={focused}/>);
+        const subRoutes = generateSubRoutes(menuItem);
+        return (<MenuItem key={route.key} state={state} route={route} navigation={navigation} menuItem={menuItem} subRoutes={subRoutes} onPress={onPress} isActive={focused} disabled={disabled}/>);
     });
 };
-const Menu = ({ state, navigation, authMenu, activeModule, onItemClick }) => {
+const Menu = ({ state, navigation, authMenu, activeModule, onItemClick, compatibility, }) => {
     const I18n = useTranslator();
     const title = useMemo(() => getMenuTitle(activeModule, { I18n }), [I18n, activeModule]);
+    const moduleNotFound = useMemo(() => isModuleNotFound(compatibility), [compatibility]);
+    const compatibilityError = useMemo(() => isMenuIncompatible(compatibility), [compatibility]);
     return (<View style={styles.menuContainer}>
       <View style={styles.moduleMenuContainer}>
         <View style={styles.menuTitleContainer}>
           <Text style={styles.menuTitle}>{title}</Text>
         </View>
-        <MenuItemList state={state} navigation={navigation} activeModule={activeModule} onItemClick={onItemClick}/>
+        {compatibilityError && (<WarningCard errorMessage={I18n.t(moduleNotFound
+                ? 'Base_Compatibily_NotFoundDetails'
+                : 'Base_Compatibily_ErrorDetails', {
+                compatibility: formatCompatibilityToDisplay(compatibility),
+            })}/>)}
+        <MenuItemList state={state} navigation={navigation} activeModule={activeModule} onItemClick={onItemClick} disabled={compatibilityError}/>
       </View>
       <View style={styles.authMenuIcon}>{authMenu}</View>
     </View>);

package/lib/navigator/drawer/Menu.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Menu.js","sourceRoot":"","sources":["../../../src/navigator/drawer/Menu.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,~~UAAU,EAAE,~~OAAO,EAAC,MAAM,OAAO,CAAC;~~AACjD~~,OAAO,EAAC,IAAI,EAAE,UAAU,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACtE,OAAO,EAAC,IAAI,EAAC,MAAM,uBAAuB,CAAC;~~AAC3C~~,OAAO,~~EAAC~~,~~sBAAsB,EAAC,~~MAAM,~~cAAc~~,CAAC;~~AACpD~~,OAAO,~~QAAQ~~,~~MAAM~~,YAAY,~~CAAC;AAClC~~,~~OAAO~~,~~EAAC~~,~~YAAY~~,~~EAAC~~,MAAM,gBAAgB,CAAC;~~AAC5C~~,OAAO,aAAa,MAAM,iCAAiC,CAAC;~~AAE5D~~,MAAM,YAAY,GAAG,CAAC,~~EAAC~~,KAAK,~~EAAE~~,UAAU,~~EAAE~~,YAAY,~~EAAE~~,WAAW,~~EAAC~~,EAAE,EAAE;~~IACtE~~,MAAM,~~IAAI~~,GAAG,~~aAAa~~,EAAE,CAAC;~~IAC7B~~,MAAM,EAAC,~~YAAY~~,EAAC,GAAG,~~UAAU~~,CAAC,~~sBAAsB~~,CAAC,CAAC;~~IAE1D~~,OAAO,~~KAAK~~,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,~~KAAK~~,EAAE,CAAC,~~EAAE~~,~~EAAE;QACnC~~,IAAI,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE;~~YAC1C~~,OAAO,IAAI,CAAC;~~SACb~~;~~QAED~~,~~MAAM,~~OAAO,~~GACX~~,~~CAAC~~,KAAK,KAAK,CAAC,~~KAAK~~,IAAI,~~MAAM~~,CAAC,~~IAAI~~,CAAC,~~YAAY~~,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,~~IAAI~~,CAAC,CAAC;~~QAC5E~~,MAAM,IAAI,~~GAAG~~,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;~~QAEtC~~,MAAM,OAAO,GAAG,~~GAAG~~,EAAE;~~YACnB~~,WAAW,EAAE,CAAC;YAEd,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC;gBAC5B,IAAI,EAAE,iBAAiB;gBACvB,MAAM,EAAE,~~KAAK~~,CAAC,GAAG;~~gBACjB~~,iBAAiB,EAAE,IAAI;aACxB,CAAC,CAAC;YAEH,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE;gBAC3B,UAAU,CAAC,QAAQ,CAAC;oBAClB,GAAG,CAAC,OAAO;wBACT,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE;wBAC7B,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAC,IAAI,EAAE,~~KAAK~~,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC;~~oBAC5D~~,MAAM,EAAE,KAAK,CAAC,GAAG;iBAClB,CAAC,CAAC;aACJ;QACH,CAAC,CAAC;QAEF,OAAO,CACL,CAAC,QAAQ,CACP,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CACf,KAAK,CAAC,CAAC,~~YAAY~~,CAAC,~~IAAI~~,~~EAAE~~,~~EAAC~~,~~IAAI~~,~~EAAC~~,CAAC,~~CAAC~~,~~CAClC~~,~~IAAI,~~CAAC,CAAC,~~IAAI~~,CAAC,~~IAAI~~,CAAC,~~CAChB~~,QAAQ,CAAC,~~CAAC~~,~~IAAI~~,CAAC,~~QAAQ~~,CAAC,~~CACxB~~,OAAO,CAAC,CAAC,OAAO,CAAC,CACjB,QAAQ,CAAC,CAAC,OAAO,CAAC,~~EAClB~~,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,IAAI,GAAG,CAAC,~~EAAC~~,KAAK,~~EAAE~~,UAAU,~~EAAE~~,QAAQ,~~EAAE~~,YAAY,~~EAAE~~,WAAW,~~EAAC~~,EAAE,EAAE;~~IACxE~~,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,MAAM,KAAK,GAAG,OAAO,CACnB,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,EAAC,IAAI,EAAC,CAAC,EACxC,CAAC,IAAI,EAAE,YAAY,CAAC,CACrB,CAAC;IAEF,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAChC;MAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,CACtC;QAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,CACrC;UAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,IAAI,CAC9C;QAAA,EAAE,IAAI,CACN;QAAA,CAAC,YAAY,CACX,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,UAAU,CAAC,CAAC,UAAU,CAAC,CACvB,YAAY,CAAC,CAAC,YAAY,CAAC,CAC3B,WAAW,CAAC,CAAC,WAAW,CAAC,~~EAE7B~~;MAAA,EAAE,IAAI,CACN;MAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,IAAI,CACpD;IAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,aAAa,EAAE;QACb,aAAa,EAAE,QAAQ;QACvB,cAAc,EAAE,eAAe;QAC/B,MAAM,EAAE,MAAM;KACf;IACD,mBAAmB,EAAE;QACnB,aAAa,EAAE,QAAQ;QACvB,eAAe,EAAE,CAAC;KACnB;IACD,kBAAkB,EAAE;QAClB,iBAAiB,EAAE,EAAE;QACrB,YAAY,EAAE,CAAC;KAChB;IACD,SAAS,EAAE;QACT,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,MAAM;KACnB;IACD,YAAY,EAAE;QACZ,YAAY,EAAE,EAAE;QAChB,UAAU,EAAE,EAAE;KACf;CACF,CAAC,CAAC;AAEH,eAAe,IAAI,CAAC"}
1	+ {"version":3,"file":"Menu.js","sourceRoot":"","sources":["../../../src/navigator/drawer/Menu.js"],"names":[],"mappings":"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"}

package/lib/navigator/drawer/MenuItem.d.ts CHANGED Viewed

@@ -1,8 +1,11 @@
 export default MenuItem;
-declare function MenuItem({ icon, title, isActive, onPress, disabled }: {
-    icon: any;
-    title: any;
-    isActive: any;
-    onPress: any;
+declare function MenuItem({ state, route, navigation, menuItem, subRoutes, onPress, isActive, disabled, }: {
+    state: any;
+    route: any;
+    navigation: any;
+    menuItem: any;
+    subRoutes: any;
+    onPress?: () => void;
+    isActive?: boolean;
     disabled: any;
 }): JSX.Element;

package/lib/navigator/drawer/MenuItem.js CHANGED Viewed

@@ -15,57 +15,17 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import React, { useMemo } from 'react';
-import { View, StyleSheet, TouchableOpacity } from 'react-native';
-import { Icon, Text, useThemeColor } from '@axelor/aos-mobile-ui';
-const MenuItem = ({ icon, title, isActive, onPress, disabled }) => {
-    const Colors = useThemeColor();
-    const styles = useMemo(() => getStyles(Colors, disabled), [Colors, disabled]);
-    const backgroundColor = useMemo(() => getIndicatorColor(isActive ? Colors.primaryColor.background : Colors.backgroundColor).container, [Colors.backgroundColor, Colors.primaryColor.background, isActive]);
-    return (<TouchableOpacity onPress={onPress} disabled={disabled}>
-      <View style={[styles.menuItemContainer]}>
-        <View style={[styles.menuItemActive, backgroundColor]}/>
-        {icon && (<Icon style={styles.menuItemIcon} name={icon} size={24} color={disabled
-                ? Colors.secondaryColor.background_light
-                : Colors.secondaryColor_dark.background}/>)}
-        <View style={styles.menuItemTextContainer}>
-          <Text style={styles.menuItemTitle}>{title}</Text>
-        </View>
-      </View>
-    </TouchableOpacity>);
+import React from 'react';
+import { getMenuTitle, hasSubMenus } from '../menu.helper';
+import useTranslator from '../../i18n/hooks/use-translator';
+import SubMenuItemList from './SubMenuItemList';
+import MenuItemEntry from './MenuItemEntry';
+const MenuItem = ({ state, route, navigation, menuItem, subRoutes, onPress = () => { }, isActive = false, disabled, }) => {
+    const I18n = useTranslator();
+    if (hasSubMenus(menuItem)) {
+        return (<SubMenuItemList state={state} route={route} navigation={navigation} onPress={onPress} menuItem={menuItem} subRoutes={subRoutes} disabled={disabled}/>);
+    }
+    return (<MenuItemEntry onPress={() => onPress(route)} title={getMenuTitle(menuItem, { I18n })} icon={menuItem.icon} disabled={menuItem.disabled || disabled} isActive={isActive}/>);
 };
-const getIndicatorColor = color => {
-    return StyleSheet.create({
-        container: {
-            backgroundColor: color,
-        },
-    });
-};
-const getStyles = (Colors, disabled) => StyleSheet.create({
-    menuItemContainer: {
-        flexDirection: 'row',
-        paddingVertical: 8,
-    },
-    menuItemActive: {
-        width: 7,
-        height: 32,
-        borderTopRightRadius: 8,
-        borderBottomRightRadius: 8,
-    },
-    menuItemIcon: {
-        marginLeft: 12,
-        marginRight: 18,
-    },
-    menuItemTextContainer: {
-        flex: 1,
-        alignSelf: 'center',
-        paddingRight: 16,
-    },
-    menuItemTitle: {
-        fontSize: 16,
-        fontWeight: 'bold',
-        color: disabled ? Colors.secondaryColor.background_light : Colors.text,
-    },
-});
 export default MenuItem;
 //# sourceMappingURL=MenuItem.js.map