@axelor/aos-mobile-core 9.1.11 → 9.2.0

package/lib/navigator/components/header/HeaderOptionMenuItem.js

@@ -17,7 +17,7 @@
  */
 import React, { useMemo } from 'react';
 import { StyleSheet, TouchableOpacity } from 'react-native';
-import { Badge, Icon, useThemeColor } from '@axelor/aos-mobile-ui';
+import { Badge, Card, Icon, useThemeColor } from '@axelor/aos-mobile-ui';
 const BADGE_SIZE = 16;
 const HeaderOptionMenuItem = ({ icon, color, indicator = 0, hideIf = false, disableIf = false, onPress, customComponent, }) => {
     const Colors = useThemeColor();
@@ -30,16 +30,13 @@ const HeaderOptionMenuItem = ({ icon, color, indicator = 0, hideIf = false, disa
         }
         return Colors.secondaryColor_dark.background;
     }, [Colors, color, disableIf]);
-    if (hideIf) {
+    if (hideIf)
         return null;
-    }
-    return (<TouchableOpacity style={styles.container} onPress={onPress} disabled={disableIf} activeOpacity={0.7}>
-      {customComponent != null ? (React.cloneElement(customComponent)) : (<Icon name={icon} color={_color} size={22}/>)}
-      {indicator > 0 && (<Badge style={styles.badge} txtStyle={styles.badgeText} color={{
-                background_light: Colors.backgroundColor,
-                foreground: Colors.text,
-                background: Colors.primaryColor.background,
-            }} title={indicator}/>)}
+    return (<TouchableOpacity onPress={onPress} disabled={disableIf} activeOpacity={0.9}>
+      <Card style={styles.container}>
+        {customComponent != null ? (React.cloneElement(customComponent)) : (<Icon name={icon} color={_color} size={18}/>)}
+        {indicator > 0 && (<Badge style={styles.badge} txtStyle={styles.badgeText} color={Colors.errorColor} title={indicator}/>)}
+      </Card>
     </TouchableOpacity>);
 };
 const styles = StyleSheet.create({
@@ -48,17 +45,23 @@ const styles = StyleSheet.create({
         height: BADGE_SIZE,
         borderRadius: Math.ceil(BADGE_SIZE / 2),
         position: 'absolute',
-        top: -4,
-        right: -8,
+        top: -6,
+        right: -6,
         zIndex: 10,
+        paddingVertical: 0,
+        paddingHorizontal: 0,
     },
     badgeText: {
-        fontSize: Math.ceil(BADGE_SIZE / 2),
+        fontSize: Math.ceil(BADGE_SIZE / 1.8),
     },
     container: {
-        marginRight: 5,
-        marginLeft: 15,
+        marginLeft: 8,
+        padding: 10,
+        borderRadius: 10,
         flexDirection: 'row',
+        paddingHorizontal: 10,
+        paddingRight: 10,
+        paddingVertical: 10,
     },
 });
 export default HeaderOptionMenuItem;

package/lib/navigator/components/header/HeaderOptionMenuItem.js.map

@@ -1 +1 @@
-{"version":3,"file":"HeaderOptionMenuItem.js","sourceRoot":"","sources":["../../../../src/navigator/components/header/HeaderOptionMenuItem.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAe,OAAO,EAAC,MAAM,OAAO,CAAC;AACnD,OAAO,EAAC,UAAU,EAAE,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAC,KAAK,EAAE,IAAI,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAYjE,MAAM,UAAU,GAAG,EAAE,CAAC;AAEtB,MAAM,oBAAoB,GAAG,CAAC,EAC5B,IAAI,EACJ,KAAK,EACL,SAAS,GAAG,CAAC,EACb,MAAM,GAAG,KAAK,EACd,SAAS,GAAG,KAAK,EACjB,OAAO,EACP,eAAe,GACW,EAAE,EAAE;IAC9B,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAE/B,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE;QAC1B,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC;QAC1C,CAAC;QAED,OAAO,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAAC;IAC/C,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;IAE/B,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CACL,CAAC,gBAAgB,CACf,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CACxB,OAAO,CAAC,CAAC,OAAO,CAAC,CACjB,QAAQ,CAAC,CAAC,SAAS,CAAC,CACpB,aAAa,CAAC,CAAC,GAAG,CAAC,CACnB;MAAA,CAAC,eAAe,IAAI,IAAI,CAAC,CAAC,CAAC,CACzB,KAAK,CAAC,YAAY,CAAC,eAAe,CAAC,CACpC,CAAC,CAAC,CAAC,CACF,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAG,CAC9C,CACD;MAAA,CAAC,SAAS,GAAG,CAAC,IAAI,CAChB,CAAC,KAAK,CACJ,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CACpB,QAAQ,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAC3B,KAAK,CAAC,CAAC;gBACL,gBAAgB,EAAE,MAAM,CAAC,eAAe;gBACxC,UAAU,EAAE,MAAM,CAAC,IAAI;gBACvB,UAAU,EAAE,MAAM,CAAC,YAAY,CAAC,UAAU;aAC3C,CAAC,CACF,KAAK,CAAC,CAAC,SAAS,CAAC,EACjB,CACH,CACH;IAAA,EAAE,gBAAgB,CAAC,CACpB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,KAAK,EAAE;QACL,KAAK,EAAE,UAAU;QACjB,MAAM,EAAE,UAAU;QAClB,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;QACvC,QAAQ,EAAE,UAAU;QACpB,GAAG,EAAE,CAAC,CAAC;QACP,KAAK,EAAE,CAAC,CAAC;QACT,MAAM,EAAE,EAAE;KACX;IACD,SAAS,EAAE;QACT,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;KACpC;IACD,SAAS,EAAE;QACT,WAAW,EAAE,CAAC;QACd,UAAU,EAAE,EAAE;QACd,aAAa,EAAE,KAAK;KACrB;CACF,CAAC,CAAC;AAEH,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"HeaderOptionMenuItem.js","sourceRoot":"","sources":["../../../../src/navigator/components/header/HeaderOptionMenuItem.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAe,OAAO,EAAC,MAAM,OAAO,CAAC;AACnD,OAAO,EAAC,UAAU,EAAE,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAYvE,MAAM,UAAU,GAAG,EAAE,CAAC;AAEtB,MAAM,oBAAoB,GAAG,CAAC,EAC5B,IAAI,EACJ,KAAK,EACL,SAAS,GAAG,CAAC,EACb,MAAM,GAAG,KAAK,EACd,SAAS,GAAG,KAAK,EACjB,OAAO,EACP,eAAe,GACW,EAAE,EAAE;IAC9B,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAE/B,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE;QAC1B,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC;QAC1C,CAAC;QAED,OAAO,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAAC;IAC/C,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;IAE/B,IAAI,MAAM;QAAE,OAAO,IAAI,CAAC;IAExB,OAAO,CACL,CAAC,gBAAgB,CACf,OAAO,CAAC,CAAC,OAAO,CAAC,CACjB,QAAQ,CAAC,CAAC,SAAS,CAAC,CACpB,aAAa,CAAC,CAAC,GAAG,CAAC,CACnB;MAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAC5B;QAAA,CAAC,eAAe,IAAI,IAAI,CAAC,CAAC,CAAC,CACzB,KAAK,CAAC,YAAY,CAAC,eAAe,CAAC,CACpC,CAAC,CAAC,CAAC,CACF,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAG,CAC9C,CACD;QAAA,CAAC,SAAS,GAAG,CAAC,IAAI,CAChB,CAAC,KAAK,CACJ,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CACpB,QAAQ,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAC3B,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CACzB,KAAK,CAAC,CAAC,SAAS,CAAC,EACjB,CACH,CACH;MAAA,EAAE,IAAI,CACR;IAAA,EAAE,gBAAgB,CAAC,CACpB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,KAAK,EAAE;QACL,KAAK,EAAE,UAAU;QACjB,MAAM,EAAE,UAAU;QAClB,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;QACvC,QAAQ,EAAE,UAAU;QACpB,GAAG,EAAE,CAAC,CAAC;QACP,KAAK,EAAE,CAAC,CAAC;QACT,MAAM,EAAE,EAAE;QACV,eAAe,EAAE,CAAC;QAClB,iBAAiB,EAAE,CAAC;KACrB;IACD,SAAS,EAAE;QACT,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;KACtC;IACD,SAAS,EAAE;QACT,UAAU,EAAE,CAAC;QACb,OAAO,EAAE,EAAE;QACX,YAAY,EAAE,EAAE;QAChB,aAAa,EAAE,KAAK;QACpB,iBAAiB,EAAE,EAAE;QACrB,YAAY,EAAE,EAAE;QAChB,eAAe,EAAE,EAAE;KACpB;CACF,CAAC,CAAC;AAEH,eAAe,oBAAoB,CAAC"}

package/lib/navigator/components/menu/AuthMenu.js

@@ -16,15 +16,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import React from 'react';
+import { StyleSheet } from 'react-native';
 import { authModule } from '../../../auth';
 import { useActiveModule } from '../../providers';
 import MenuIconButton from './MenuIconButton';
 const AuthMenu = ({ isVisible = true, onPress }) => {
     const { activeModule } = useActiveModule();
-    if (!isVisible) {
+    if (!isVisible)
         return null;
-    }
-    return (<MenuIconButton key={authModule.title} icon={authModule.icon} subtitle={authModule.subtitle} disabled={authModule.disabled} isActive={activeModule?.name === authModule.name} onPress={() => onPress(authModule)} rounded/>);
+    return (<MenuIconButton style={styles.align} icon={authModule.icon} subtitle={authModule.subtitle} disabled={authModule.disabled} isActive={activeModule?.name === authModule.name} onPress={() => onPress(authModule)} rounded/>);
 };
+const styles = StyleSheet.create({
+    align: {
+        marginVertical: 8,
+        alignSelf: 'flex-start',
+    },
+});
 export default AuthMenu;
 //# sourceMappingURL=AuthMenu.js.map

package/lib/navigator/components/menu/AuthMenu.js.map

@@ -1 +1 @@
-{"version":3,"file":"AuthMenu.js","sourceRoot":"","sources":["../../../../src/navigator/components/menu/AuthMenu.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAC,eAAe,EAAC,MAAM,iBAAiB,CAAC;AAChD,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAO9C,MAAM,QAAQ,GAAG,CAAC,EAAC,SAAS,GAAG,IAAI,EAAE,OAAO,EAAgB,EAAE,EAAE;IAC9D,MAAM,EAAC,YAAY,EAAC,GAAG,eAAe,EAAE,CAAC;IAEzC,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CACL,CAAC,cAAc,CACb,GAAG,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CACtB,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CACtB,QAAQ,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAC9B,QAAQ,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAC9B,QAAQ,CAAC,CAAC,YAAY,EAAE,IAAI,KAAK,UAAU,CAAC,IAAI,CAAC,CACjD,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CACnC,OAAO,EACP,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"AuthMenu.js","sourceRoot":"","sources":["../../../../src/navigator/components/menu/AuthMenu.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAC,eAAe,EAAC,MAAM,iBAAiB,CAAC;AAChD,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAO9C,MAAM,QAAQ,GAAG,CAAC,EAAC,SAAS,GAAG,IAAI,EAAE,OAAO,EAAgB,EAAE,EAAE;IAC9D,MAAM,EAAC,YAAY,EAAC,GAAG,eAAe,EAAE,CAAC;IAEzC,IAAI,CAAC,SAAS;QAAE,OAAO,IAAI,CAAC;IAE5B,OAAO,CACL,CAAC,cAAc,CACb,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CACpB,IAAI,CAAC,CAAC,UAAU,CAAC,IAAK,CAAC,CACvB,QAAQ,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAC9B,QAAQ,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAC9B,QAAQ,CAAC,CAAC,YAAY,EAAE,IAAI,KAAK,UAAU,CAAC,IAAI,CAAC,CACjD,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CACnC,OAAO,EACP,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,KAAK,EAAE;QACL,cAAc,EAAE,CAAC;QACjB,SAAS,EAAE,YAAY;KACxB;CACF,CAAC,CAAC;AAEH,eAAe,QAAQ,CAAC"}

package/lib/navigator/components/menu/Menu.js

@@ -17,10 +17,11 @@
  */
 import React, { useMemo } from 'react';
 import { View, StyleSheet, ScrollView } from 'react-native';
-import { Icon, Text, useThemeColor, WarningCard } from '@axelor/aos-mobile-ui';
+import { HorizontalRule, Text, useThemeColor, WarningCard, } from '@axelor/aos-mobile-ui';
 import { useTranslator } from '../../../i18n';
 import { getCompatibilityError, getMenuTitle, isMenuIncompatible, } from '../../helpers';
 import MenuItemList from './MenuItemList';
+import MenuIconTile from './MenuIconTile';
 const Menu = ({ state, navigation, authMenu, activeModule, onItemClick, compatibility, showClose = false, onClose, }) => {
     const I18n = useTranslator();
     const Colors = useThemeColor();
@@ -30,8 +31,9 @@ const Menu = ({ state, navigation, authMenu, activeModule, onItemClick, compatib
       <ScrollView contentContainerStyle={styles.moduleMenuContainer} showsVerticalScrollIndicator={false}>
         <View style={styles.menuTitleContainer}>
           <Text style={styles.menuTitle}>{title}</Text>
-          {showClose && (<Icon name="x-lg" size={20} color={Colors.secondaryColor_dark.background} touchable onPress={onClose}/>)}
+          {showClose && (<MenuIconTile icon="x-lg" iconSize={18} size={36} variant="neutral" onPress={onClose}/>)}
         </View>
+        <HorizontalRule style={styles.titleSeparator} color={Colors.secondaryColor.background_light} width={0.5}/>
         {compatibilityError && (<WarningCard errorMessage={getCompatibilityError(compatibility, I18n)}/>)}
         <MenuItemList state={state} navigation={navigation} activeModule={activeModule} onItemClick={onItemClick} disabled={compatibilityError}/>
       </ScrollView>
@@ -53,13 +55,17 @@ const styles = StyleSheet.create({
         justifyContent: 'space-between',
         alignItems: 'center',
         paddingHorizontal: 16,
-        marginBottom: 8,
+        marginBottom: 12,
     },
     menuTitle: {
         flexShrink: 1,
-        fontSize: 21,
+        fontSize: 22,
         fontWeight: 'bold',
     },
+    titleSeparator: {
+        marginHorizontal: 16,
+        marginBottom: 8,
+    },
     authMenuIcon: {
         marginBottom: 12,
         marginLeft: 12,

package/lib/navigator/components/menu/Menu.js.map

@@ -1 +1 @@
-{"version":3,"file":"Menu.js","sourceRoot":"","sources":["../../../../src/navigator/components/menu/Menu.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Menu.js","sourceRoot":"","sources":["../../../../src/navigator/components/menu/Menu.tsx"],"names":[],"mappings":"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"}

package/lib/navigator/components/menu/MenuIconButton.d.ts

@@ -4,11 +4,13 @@ interface MenuIconButtonProps {
     style?: any;
     icon: string;
     onPress: () => void;
+    title?: string;
+    showTitle?: boolean;
     isActive?: boolean;
     subtitle?: string;
     rounded?: boolean;
     disabled?: boolean;
     compatibility?: Compatibility;
 }
-declare const MenuIconButton: ({ style, icon, onPress, isActive, subtitle, rounded, disabled, compatibility, }: MenuIconButtonProps) => React.JSX.Element;
+declare const MenuIconButton: ({ style, icon, onPress, title, showTitle, isActive, subtitle, rounded, disabled, compatibility, }: MenuIconButtonProps) => React.JSX.Element;
 export default MenuIconButton;

package/lib/navigator/components/menu/MenuIconButton.js

@@ -16,65 +16,84 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import React, { useMemo } from 'react';
-import { Dimensions, StyleSheet, TouchableOpacity, View } from 'react-native';
-import { Icon, InfoBubble, Text, useConfig, useThemeColor, } from '@axelor/aos-mobile-ui';
+import { StyleSheet, TouchableOpacity, useWindowDimensions, View, } from 'react-native';
+import { Card, IconTile, InfoBubble, Text, useConfig, useThemeColor, } from '@axelor/aos-mobile-ui';
 import { useTranslator } from '../../../i18n';
 import { getCompatibilityError, isMenuIncompatible } from '../../helpers';
-const WIDTH = 54;
-const HEIGHT = 54;
-const DEFAULT_RADIUS = 8;
-const ROUNDED_RADIUS = WIDTH / 2;
-const MenuIconButton = ({ style, icon, onPress, isActive = false, subtitle, rounded = false, disabled = false, compatibility, }) => {
+const TILE_SIZE = 20;
+const LARGE_SCREEN_WIDTH = 768;
+const DRAWER_HORIZONTAL_SPACING = 32;
+const MenuIconButton = ({ style, icon, onPress, title, showTitle = false, isActive = false, subtitle, rounded = false, disabled = false, compatibility, }) => {
     const Colors = useThemeColor();
     const I18n = useTranslator();
     const { showSubtitles } = useConfig();
-    const _color = useMemo(() => disabled
-        ? Colors.secondaryColor.background_light
-        : isActive
-            ? Colors.primaryColor.background_light
-            : Colors.backgroundColor, [Colors, disabled, isActive]);
-    const styles = useMemo(() => getStyles(Colors, rounded, _color), [Colors, _color, rounded]);
+    const { width } = useWindowDimensions();
+    const expandedWidth = useMemo(() => width * (width >= LARGE_SCREEN_WIDTH ? 0.5 : 0.85) -
+        DRAWER_HORIZONTAL_SPACING, [width]);
+    const styles = useMemo(() => getStyles(width), [width]);
     const compatibilityError = useMemo(() => isMenuIncompatible(compatibility), [compatibility]);
-    return (<TouchableOpacity onPress={onPress} disabled={disabled || compatibilityError} activeOpacity={0.95}>
-      <View style={[styles.container, style]}>
-        <Icon size={32} name={icon} color={disabled
-            ? Colors.secondaryColor.background
-            : Colors.secondaryColor_dark.background}/>
-        {compatibilityError && (<InfoBubble style={styles.infoBubble} usePopup={true} iconName="exclamation-triangle-fill" badgeColor={Colors.errorColor} textIndicationStyle={styles.textIndicationStyle} indication={getCompatibilityError(compatibility, I18n)}/>)}
-      </View>
-      {showSubtitles && (<Text style={styles.moduleSubtitle} numberOfLines={1}>
-          {I18n.t(subtitle)}
+    const isExpanded = useMemo(() => showTitle && title != null, [showTitle, title]);
+    const isPrimary = useMemo(() => isExpanded || isActive, [isActive, isExpanded]);
+    return (<TouchableOpacity onPress={onPress} disabled={disabled || compatibilityError} activeOpacity={0.9}>
+      <Card style={[
+            styles.card,
+            rounded && styles.roundedTile,
+            isExpanded && { width: expandedWidth },
+            style,
+        ]}>
+        <View style={styles.tileContainer}>
+          <IconTile style={rounded && styles.roundedTile} icon={icon} iconSize={TILE_SIZE} color={isPrimary ? Colors.primaryColor : undefined} backgroundColor={isPrimary ? undefined : Colors.backgroundColor} iconColor={isPrimary ? undefined : Colors.secondaryColor_dark.background} disabled={disabled} onPress={onPress}/>
+          {compatibilityError && !isExpanded && (<InfoBubble style={styles.infoBubble} usePopup={true} iconName="exclamation-triangle-fill" badgeColor={Colors.errorColor} textIndicationStyle={styles.textIndicationStyle} indication={getCompatibilityError(compatibility, I18n)}/>)}
+        </View>
+        {isExpanded && (<View style={styles.titleContainer}>
+            <Text writingType="title" textColor={disabled ? Colors.secondaryColor.background : undefined} numberOfLines={2}>
+              {title}
+            </Text>
+            {compatibilityError && (<Text fontSize={10} textColor={Colors.errorColor.background}>
+                {getCompatibilityError(compatibility, I18n, false)}
+              </Text>)}
+          </View>)}
+      </Card>
+      {!isExpanded && showSubtitles && (<Text style={styles.subtitle} fontSize={10} writingType={isActive ? 'important' : undefined} textColor={isActive ? Colors.primaryColor.background : undefined} numberOfLines={1}>
+          {I18n.t(subtitle ?? '')}
         </Text>)}
     </TouchableOpacity>);
 };
-const getStyles = (Colors, rounded, _color) => StyleSheet.create({
-    container: {
-        width: WIDTH,
-        height: HEIGHT,
-        borderRadius: rounded ? ROUNDED_RADIUS : DEFAULT_RADIUS,
+const getStyles = (windowWidth) => StyleSheet.create({
+    card: {
+        paddingVertical: 8,
+        paddingHorizontal: 8,
+        paddingRight: 8,
+        marginVertical: 4,
         flexDirection: 'row',
-        justifyContent: 'center',
-        elevation: 2,
-        shadowOpacity: 0.5,
-        shadowColor: Colors.secondaryColor.background,
-        backgroundColor: _color,
-        shadowOffset: { width: 0, height: 0 },
-        zIndex: 10,
+        alignItems: 'center',
     },
-    moduleSubtitle: {
-        fontSize: 10,
-        maxWidth: 54,
-        alignSelf: 'center',
+    roundedTile: {
+        borderRadius: TILE_SIZE,
+    },
+    tileContainer: {
+        justifyContent: 'center',
+        alignItems: 'center',
     },
     infoBubble: {
         position: 'absolute',
-        bottom: -10,
-        right: -10,
+        bottom: -8,
+        right: -8,
     },
     textIndicationStyle: {
-        width: Dimensions.get('window').width * 0.6,
+        width: windowWidth * 0.6,
         top: 0,
     },
+    titleContainer: {
+        flex: 1,
+        marginLeft: 12,
+        justifyContent: 'center',
+    },
+    subtitle: {
+        width: TILE_SIZE * 2,
+        alignSelf: 'center',
+        textAlign: 'center',
+    },
 });
 export default MenuIconButton;
 //# sourceMappingURL=MenuIconButton.js.map

package/lib/navigator/components/menu/MenuIconButton.js.map

@@ -1 +1 @@
-{"version":3,"file":"MenuIconButton.js","sourceRoot":"","sources":["../../../../src/navigator/components/menu/MenuIconButton.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"MenuIconButton.js","sourceRoot":"","sources":["../../../../src/navigator/components/menu/MenuIconButton.tsx"],"names":[],"mappings":"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"}

package/lib/navigator/components/menu/MenuIconTile.d.ts

@@ -0,0 +1,14 @@
+import React from 'react';
+type MenuIconTileVariant = 'primary' | 'neutral';
+interface MenuIconTileProps {
+    style?: any;
+    icon: string;
+    iconSize?: number;
+    size?: number;
+    variant?: MenuIconTileVariant;
+    highlighted?: boolean;
+    disabled?: boolean;
+    onPress?: () => void;
+}
+declare const MenuIconTile: ({ style, icon, iconSize, size, variant, highlighted, disabled, onPress, }: MenuIconTileProps) => React.JSX.Element;
+export default MenuIconTile;

package/lib/navigator/components/menu/MenuIconTile.js

@@ -0,0 +1,45 @@
+/*
+ * Axelor Business Solutions
+ *
+ * Copyright (C) 2026 Axelor (<http://axelor.com>).
+ *
+ * This program is free software: you can redistribute it and/or  modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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 { IconTile, useThemeColor } from '@axelor/aos-mobile-ui';
+const TILE_SIZE = 40;
+const MenuIconTile = ({ style, icon, iconSize = 20, size = TILE_SIZE, variant = 'primary', highlighted = false, disabled = false, onPress, }) => {
+    const Colors = useThemeColor();
+    const backgroundColor = useMemo(() => {
+        if (variant === 'neutral') {
+            return Colors.secondaryColor.background_light;
+        }
+        return highlighted
+            ? Colors.backgroundColor
+            : Colors.primaryColor.background_light;
+    }, [Colors, variant, highlighted]);
+    const iconColor = useMemo(() => {
+        if (disabled) {
+            return Colors.secondaryColor.background_light;
+        }
+        return variant === 'primary'
+            ? Colors.primaryColor.background
+            : Colors.secondaryColor_dark.background;
+    }, [Colors, disabled, variant]);
+    const borderStyle = useMemo(() => variant === 'primary' && highlighted
+        ? { borderWidth: 1, borderColor: Colors.primaryColor.background }
+        : null, [Colors, variant, highlighted]);
+    return (<IconTile style={[borderStyle, style]} icon={icon} iconSize={iconSize} size={size} backgroundColor={backgroundColor} iconColor={iconColor} disabled={disabled} onPress={onPress}/>);
+};
+export default MenuIconTile;
+//# sourceMappingURL=MenuIconTile.js.map

package/lib/navigator/components/menu/MenuIconTile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MenuIconTile.js","sourceRoot":"","sources":["../../../../src/navigator/components/menu/MenuIconTile.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAI9D,MAAM,SAAS,GAAG,EAAE,CAAC;AAarB,MAAM,YAAY,GAAG,CAAC,EACpB,KAAK,EACL,IAAI,EACJ,QAAQ,GAAG,EAAE,EACb,IAAI,GAAG,SAAS,EAChB,OAAO,GAAG,SAAS,EACnB,WAAW,GAAG,KAAK,EACnB,QAAQ,GAAG,KAAK,EAChB,OAAO,GACW,EAAE,EAAE;IACtB,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAE/B,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,EAAE;QACnC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO,MAAM,CAAC,cAAc,CAAC,gBAAgB,CAAC;QAChD,CAAC;QAED,OAAO,WAAW;YAChB,CAAC,CAAC,MAAM,CAAC,eAAe;YACxB,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,gBAAgB,CAAC;IAC3C,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC;IAEnC,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE;QAC7B,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,MAAM,CAAC,cAAc,CAAC,gBAAgB,CAAC;QAChD,CAAC;QAED,OAAO,OAAO,KAAK,SAAS;YAC1B,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU;YAChC,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAAC;IAC5C,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;IAEhC,MAAM,WAAW,GAAG,OAAO,CACzB,GAAG,EAAE,CACH,OAAO,KAAK,SAAS,IAAI,WAAW;QAClC,CAAC,CAAC,EAAC,WAAW,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,YAAY,CAAC,UAAU,EAAC;QAC/D,CAAC,CAAC,IAAI,EACV,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,CAC/B,CAAC;IAEF,OAAO,CACL,CAAC,QAAQ,CACP,KAAK,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAC5B,IAAI,CAAC,CAAC,IAAI,CAAC,CACX,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,IAAI,CAAC,CAAC,IAAI,CAAC,CACX,eAAe,CAAC,CAAC,eAAe,CAAC,CACjC,SAAS,CAAC,CAAC,SAAS,CAAC,CACrB,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,OAAO,CAAC,CAAC,OAAO,CAAC,EACjB,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/lib/navigator/components/menu/MenuItemEntry.d.ts

@@ -4,7 +4,7 @@ interface MenuItemEntryProps {
     style?: any;
     icon: string;
     title: string;
-    compatibility: Compatibility;
+    compatibility?: Compatibility;
     onPress: () => void;
     isActive?: boolean;
     disabled?: boolean;

package/lib/navigator/components/menu/MenuItemEntry.js

@@ -20,70 +20,54 @@ import { View, StyleSheet, TouchableOpacity } from 'react-native';
 import { Icon, Text, WarningCard, useThemeColor } from '@axelor/aos-mobile-ui';
 import { useTranslator } from '../../../i18n';
 import { getCompatibilityError, isMenuIncompatible } from '../../helpers';
-const MenuItemEntry = ({ style, icon, title, compatibility, onPress, isActive = false, disabled = false, isDropdown = false, dropdown = false, iconSize = 24, }) => {
+import MenuIconTile from './MenuIconTile';
+const MenuItemEntry = ({ style, icon, title, compatibility, onPress, isActive = false, disabled = false, isDropdown = false, dropdown = false, iconSize = 20, }) => {
     const Colors = useThemeColor();
     const I18n = useTranslator();
     const compatibilityError = useMemo(() => isMenuIncompatible(compatibility), [compatibility]);
     const menuDisabled = useMemo(() => disabled || compatibilityError, [compatibilityError, disabled]);
-    return (<TouchableOpacity onPress={onPress} disabled={menuDisabled}>
-      <View style={styles.container}>
-        <View style={[
-            styles.menuItemActive,
-            {
-                backgroundColor: !dropdown && isActive
-                    ? Colors.primaryColor.background
-                    : Colors.backgroundColor,
-            },
-        ]}/>
-        <View style={[styles.menuItemContainer, style]}>
-          <Icon style={styles.menuItemIcon} name={icon} size={iconSize} color={menuDisabled
-            ? Colors.secondaryColor.background_light
-            : Colors.secondaryColor_dark.background} visible={icon != null}/>
-          <View style={styles.menuItemTextContainer}>
-            <Text style={styles.menuItemTitle} textColor={menuDisabled
-            ? Colors.secondaryColor.background_light
-            : Colors.text}>
-              {title}
-            </Text>
-          </View>
-          <Icon name={dropdown ? 'chevron-up' : 'chevron-down'} color={Colors.secondaryColor_dark.background} style={styles.dropdownIcon} visible={isDropdown && !compatibilityError}/>
-          <Icon name="exclamation-triangle-fill" color={Colors.errorColor.background} style={styles.dropdownIcon} visible={compatibilityError}/>
-        </View>
+    const highlighted = useMemo(() => isActive || dropdown, [dropdown, isActive]);
+    return (<TouchableOpacity onPress={onPress} disabled={menuDisabled} activeOpacity={0.9}>
+      <View style={[
+            styles.row,
+            highlighted
+                ? { backgroundColor: Colors.primaryColor.background_light }
+                : null,
+            style,
+        ]}>
+        <MenuIconTile style={styles.iconTile} icon={icon} iconSize={iconSize} highlighted={highlighted} disabled={menuDisabled}/>
+        <Text style={styles.menuItemTitle} fontSize={14} textColor={menuDisabled ? Colors.secondaryColor.background_light : Colors.text}>
+          {title}
+        </Text>
+        <Icon name={dropdown ? 'chevron-up' : 'chevron-down'} color={Colors.primaryColor.background} style={styles.dropdownIcon} visible={isDropdown && !compatibilityError}/>
+        <Icon name="exclamation-triangle-fill" color={Colors.errorColor.background} style={styles.dropdownIcon} visible={compatibilityError}/>
       </View>
       {compatibilityError && (<WarningCard style={styles.compatibilityError} errorMessage={getCompatibilityError(compatibility, I18n, false)}/>)}
     </TouchableOpacity>);
 };
+const TILE_RADIUS = 12;
 const styles = StyleSheet.create({
-    container: {
+    row: {
         flexDirection: 'row',
-        paddingVertical: 8,
+        alignItems: 'center',
+        marginHorizontal: 8,
+        paddingVertical: 5,
+        paddingHorizontal: 5,
+        borderRadius: TILE_RADIUS,
+        overflow: 'hidden',
     },
-    menuItemContainer: {
-        flexDirection: 'row',
-        width: '100%',
-    },
-    menuItemActive: {
-        width: 7,
-        height: 32,
-        borderTopRightRadius: 8,
-        borderBottomRightRadius: 8,
-    },
-    menuItemIcon: {
-        marginLeft: 12,
-        marginRight: 18,
+    iconTile: {
+        marginRight: 8,
     },
-    menuItemTextContainer: {
+    menuItemTitle: {
         flex: 1,
         alignSelf: 'center',
-        paddingRight: 16,
-    },
-    menuItemTitle: {
-        fontSize: 16,
+        paddingRight: 8,
         fontWeight: 'bold',
     },
     dropdownIcon: {
         marginHorizontal: 5,
-        marginRight: 20,
+        marginRight: 5,
     },
     compatibilityError: {
         marginVertical: 0,

package/lib/navigator/components/menu/MenuItemEntry.js.map

@@ -1 +1 @@
-{"version":3,"file":"MenuItemEntry.js","sourceRoot":"","sources":["../../../../src/navigator/components/menu/MenuItemEntry.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"MenuItemEntry.js","sourceRoot":"","sources":["../../../../src/navigator/components/menu/MenuItemEntry.tsx"],"names":[],"mappings":"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"}

package/lib/navigator/components/menu/MenuItemList.js

@@ -20,7 +20,7 @@ import { CommonActions, DrawerActions } from '@react-navigation/native';
 import { findIndexAndRouteOfMenu, hasSubMenus, } from '../../helpers';
 import MenuItem from './MenuItem';
 const MenuItemList = ({ state, navigation, activeModule, onItemClick, disabled, }) => {
-    const generateSubRoutes = menuItem => {
+    const generateSubRoutes = (menuItem) => {
         if (hasSubMenus(menuItem)) {
             const { subMenus } = menuItem;
             return state.routes.filter(subRoute => subRoute.name in subMenus);
@@ -29,23 +29,22 @@ const MenuItemList = ({ state, navigation, activeModule, onItemClick, disabled,
     };
     const moduleEntries = useMemo(() => {
         return state.routes
-            .filter(_route => activeModule.menus[_route.name] != null)
+            .filter(_route => activeModule.menus?.[_route.name] != null)
             .map(route => ({ ...activeModule.menus[route.name], key: route.name }))
             .map((item, index) => {
-            if (item.order != null) {
+            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 focused = i === state.index &&
+            Object.keys(activeModule?.menus ?? {}).includes(route.name);
         const onPress = (_route) => {
-            if (_route == null) {
+            if (_route == null)
                 return null;
-            }
             onItemClick();
             const event = navigation.emit({
                 type: 'drawerItemPress',
@@ -53,10 +52,14 @@ const MenuItemList = ({ state, navigation, activeModule, onItemClick, disabled,
                 canPreventDefault: true,
             });
             if (!event.defaultPrevented) {
+                if (!focused) {
+                    navigation.dispatch({
+                        ...CommonActions.navigate(_route.name, undefined, { merge: true }),
+                        target: state.key,
+                    });
+                }
                 navigation.dispatch({
-                    ...(focused
-                        ? DrawerActions.closeDrawer()
-                        : CommonActions.navigate({ name: _route.name, merge: true })),
+                    ...DrawerActions.closeDrawer(),
                     target: state.key,
                 });
             }

package/lib/navigator/components/menu/MenuItemList.js.map

@@ -1 +1 @@
-{"version":3,"file":"MenuItemList.js","sourceRoot":"","sources":["../../../../src/navigator/components/menu/MenuItemList.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"MenuItemList.js","sourceRoot":"","sources":["../../../../src/navigator/components/menu/MenuItemList.tsx"],"names":[],"mappings":"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"}