From a1f1ce191506611cd7f98542170257bb858f03cf Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Fri, 21 Oct 2022 10:35:13 +0500
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B3=D0=BE=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=BA=D0=B0=20=D0=BA=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D1=8E=20AntD=20=D0=B8=20=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BB=D0=BA=D0=B8=D0=B5=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/LayoutPortal.tsx | 4 ++--
 src/context.ts                  | 2 +-
 src/styles/layout.less          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/LayoutPortal.tsx b/src/components/LayoutPortal.tsx
index e713c8a..052eae4 100644
--- a/src/components/LayoutPortal.tsx
+++ b/src/components/LayoutPortal.tsx
@@ -23,7 +23,7 @@ import '@styles/layout.less'
 
 const { Content, Sider } = Layout
 
-export type LayoutPortalProps = LayoutProps & {
+export type LayoutPortalProps = Omit<LayoutProps, 'children'> & {
     title?: ReactNode
     sheet?: boolean
     showSelector?: boolean
@@ -68,7 +68,7 @@ const _LayoutPortal = memo(() => {
     return (
         <Layout className={`page-layout ${isAdmin ? 'page-layout-admin' : ''}`}>
             {(sider || siderProps) && (
-                <Sider {...siderProps} collapsed={menuCollapsed} trigger={null} collapsible className={`menu-sider ${siderProps?.className || ''}`}>
+                <Sider {...siderProps} collapsedWidth={50} collapsed={menuCollapsed} trigger={null} collapsible className={`menu-sider ${siderProps?.className || ''}`}>
                     <div className={'sider-content'}>
                         <button className={'sider-toogle'} onClick={() => setMenuCollapsed((prev) => !prev)}>
                             {menuCollapsed ? <MenuUnfoldOutlined /> : <MenuFoldOutlined />}
diff --git a/src/context.ts b/src/context.ts
index 83e5f55..5db8820 100644
--- a/src/context.ts
+++ b/src/context.ts
@@ -1,7 +1,7 @@
 import { createContext, useContext, useEffect } from 'react'
 
+import { LayoutPortalProps } from '@components/LayoutPortal'
 import { UserTokenDto, WellDto } from '@api'
-import { LayoutPortalProps } from './components/LayoutPortal'
 
 /** Контекст текущей скважины */
 export const WellContext = createContext<[WellDto, (well: WellDto) => void]>([{}, () => {}])
diff --git a/src/styles/layout.less b/src/styles/layout.less
index e4a17da..7a6f2bf 100644
--- a/src/styles/layout.less
+++ b/src/styles/layout.less
@@ -88,7 +88,7 @@
                 justify-content: center;
                 align-items: center;
                 width: 100%;
-                height: @header-height !important;
+                height: calc(@header-height - 4px) !important;
                 color: @link-color;
                 border: none;
                 outline: none;