@codebit-programando-solucoes/codebit-web-antd 1.1.24 → 1.1.25

package/dist/index.cjs

@@ -1027,7 +1027,7 @@ var __webpack_exports__ = {};
         menuDescription: "menuDescription-d6BFBO",
         menuSpacer: "menuSpacer-RIB3II",
         versionMenu: "versionMenu-NM4uyG",
-        logoutMenu: "logoutMenu-_RLfGo",
+        bottomMenu: "bottomMenu-VtOktS",
         header: "header-vgc67L",
         mobile: "mobile-mKGxb5",
         headerSpace: "headerSpace-Fd_iha",
@@ -1036,7 +1036,7 @@ var __webpack_exports__ = {};
     const { Header, Sider, Content } = external_antd_namespaceObject.Layout;
     const { Text } = external_antd_namespaceObject.Typography;
     function LoggedMainContainer({ children }) {
-        const [collapsed, setCollapsed] = (0, external_react_.useState)(false);
+        const [collapsed, setCollapsed] = (0, external_react_.useState)(true);
         const [isMobile, setIsMobile] = (0, external_react_.useState)(false);
         const [drawerVisible, setDrawerVisible] = (0, external_react_.useState)(false);
         const [secondarySidebarDrawerVisible, setSecondarySidebarDrawerVisible] = (0, external_react_.useState)(false);
@@ -1051,7 +1051,7 @@ var __webpack_exports__ = {};
         const systemTheme = isDarkMode ? 'dark' : 'light';
         const filteredMenuItems = (0, external_react_.useMemo)(()=>menuItems(user).filter((item)=>{
                 if (!item.roles) return true;
-                if (!user || !user.roles) return false;
+                if (!user?.roles) return false;
                 if (item.roles) return item.roles.some((role)=>user.roles.includes(role));
                 return false;
             }), [
@@ -1105,16 +1105,16 @@ var __webpack_exports__ = {};
                     disabled: true,
                     items: [
                         {
-                            icon: collapsed ? `${t('LoggedMainContainer.version')}: ${version}` : version,
+                            icon: collapsed ? version : `${t('LoggedMainContainer.version')}: ${version}`,
                             title: ''
                         }
                     ]
                 }),
                 /*#__PURE__*/ (0, jsx_runtime.jsx)(external_antd_namespaceObject.Menu, {
                     theme: systemTheme,
-                    mode: 'horizontal',
+                    mode: 'inline',
                     onClick: handleLogout,
-                    className: LoggedMainContainer_module.logoutMenu,
+                    className: LoggedMainContainer_module.bottomMenu,
                     items: [
                         {
                             key: 'logout',
@@ -1126,51 +1126,60 @@ var __webpack_exports__ = {};
                 })
             ]
         });
+        console.debug('secondarySidebar', secondarySidebar);
+        const renderMenuContent = ()=>{
+            if (isMobile) return /*#__PURE__*/ (0, jsx_runtime.jsx)(external_antd_namespaceObject.Drawer, {
+                placement: 'left',
+                onClose: ()=>setDrawerVisible(false),
+                open: drawerVisible,
+                width: 250,
+                className: LoggedMainContainer_module.drawer,
+                classNames: {
+                    body: LoggedMainContainer_module.drawerBody
+                },
+                children: /*#__PURE__*/ (0, jsx_runtime.jsx)(external_antd_namespaceObject.Flex, {
+                    vertical: true,
+                    className: LoggedMainContainer_module.drawerFlex,
+                    children: menuContent
+                })
+            });
+            return /*#__PURE__*/ (0, jsx_runtime.jsx)(Sider, {
+                theme: systemTheme,
+                trigger: null,
+                collapsible: true,
+                collapsed: collapsed,
+                breakpoint: 'lg',
+                collapsedWidth: 80,
+                className: LoggedMainContainer_module.sider,
+                children: /*#__PURE__*/ (0, jsx_runtime.jsx)(external_antd_namespaceObject.Layout, {
+                    className: LoggedMainContainer_module.siderLayout,
+                    children: menuContent
+                })
+            });
+        };
+        const renderSecondarySidebar = ()=>{
+            if (!secondarySidebar) return null;
+            if (isMobile) return /*#__PURE__*/ (0, jsx_runtime.jsx)(external_antd_namespaceObject.Drawer, {
+                placement: 'right',
+                onClose: ()=>setSecondarySidebarDrawerVisible(false),
+                open: secondarySidebarDrawerVisible,
+                width: 280,
+                className: LoggedMainContainer_module.drawer,
+                title: null,
+                closeIcon: /*#__PURE__*/ (0, jsx_runtime.jsx)(icons_namespaceObject.CloseOutlined, {}),
+                children: secondarySidebar(user)
+            });
+            return /*#__PURE__*/ (0, jsx_runtime.jsx)(Sider, {
+                theme: systemTheme,
+                width: secondarySidebarWidth,
+                children: secondarySidebar(user)
+            });
+        };
         return /*#__PURE__*/ (0, jsx_runtime.jsxs)(external_antd_namespaceObject.Layout, {
             className: LoggedMainContainer_module.layout,
             children: [
-                isMobile ? /*#__PURE__*/ (0, jsx_runtime.jsx)(external_antd_namespaceObject.Drawer, {
-                    placement: 'left',
-                    onClose: ()=>setDrawerVisible(false),
-                    open: drawerVisible,
-                    width: 250,
-                    className: LoggedMainContainer_module.drawer,
-                    classNames: {
-                        body: LoggedMainContainer_module.drawerBody
-                    },
-                    children: /*#__PURE__*/ (0, jsx_runtime.jsx)(external_antd_namespaceObject.Flex, {
-                        vertical: true,
-                        className: LoggedMainContainer_module.drawerFlex,
-                        children: menuContent
-                    })
-                }) : /*#__PURE__*/ (0, jsx_runtime.jsx)(Sider, {
-                    theme: systemTheme,
-                    trigger: null,
-                    collapsible: true,
-                    collapsed: !collapsed,
-                    breakpoint: 'lg',
-                    collapsedWidth: 80,
-                    className: LoggedMainContainer_module.sider,
-                    children: /*#__PURE__*/ (0, jsx_runtime.jsx)(external_antd_namespaceObject.Layout, {
-                        className: LoggedMainContainer_module.siderLayout,
-                        children: menuContent
-                    })
-                }),
-                secondarySidebar && !isMobile ? /*#__PURE__*/ (0, jsx_runtime.jsx)(Sider, {
-                    theme: systemTheme,
-                    width: secondarySidebarWidth,
-                    className: `${LoggedMainContainer_module.secondarySidebar} ${isDarkMode ? LoggedMainContainer_module.secondarySidebarDark : ''}`,
-                    children: secondarySidebar(user)
-                }) : /*#__PURE__*/ (0, jsx_runtime.jsx)(external_antd_namespaceObject.Drawer, {
-                    placement: 'right',
-                    onClose: ()=>setSecondarySidebarDrawerVisible(false),
-                    open: secondarySidebarDrawerVisible,
-                    width: 280,
-                    className: LoggedMainContainer_module.drawer,
-                    title: null,
-                    closeIcon: /*#__PURE__*/ (0, jsx_runtime.jsx)(icons_namespaceObject.CloseOutlined, {}),
-                    children: secondarySidebar(user)
-                }),
+                renderMenuContent(),
+                renderSecondarySidebar(),
                 /*#__PURE__*/ (0, jsx_runtime.jsxs)(external_antd_namespaceObject.Layout, {
                     children: [
                         /*#__PURE__*/ (0, jsx_runtime.jsxs)(Header, {
@@ -1193,7 +1202,7 @@ var __webpack_exports__ = {};
                                     children: [
                                         secondarySidebar && isMobile && /*#__PURE__*/ (0, jsx_runtime.jsx)(external_antd_namespaceObject.Button, {
                                             type: 'text',
-                                            icon: /*#__PURE__*/ (0, jsx_runtime.jsx)(icons_namespaceObject.MenuOutlined, {}),
+                                            icon: /*#__PURE__*/ (0, jsx_runtime.jsx)(icons_namespaceObject.WechatOutlined, {}),
                                             onClick: ()=>setSecondarySidebarDrawerVisible(true)
                                         }),
                                         !isMobile && /*#__PURE__*/ (0, jsx_runtime.jsx)(Text, {

package/dist/index.css

@@ -151,13 +151,9 @@ html.dark-theme {
   display: flex;
 }
 
-.logoutMenu-_RLfGo {
+.bottomMenu-VtOktS {
   border-top: 1px solid var(--antd-color-split);
   background: none;
-  justify-content: center;
-  align-items: center;
-  margin-top: auto;
-  display: flex;
 }
 
 .header-vgc67L {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codebit-programando-solucoes/codebit-web-antd",
-  "version": "1.1.24",
+  "version": "1.1.25",
   "main": "./dist/index.cjs",
   "type": "module",
   "types": "./src/index.d.ts",