From a22b043af9695e1ba7aedf386b74d30b9dbdeda3 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Mon, 12 Sep 2022 12:30:07 +0500
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD=20?=
 =?UTF-8?q?=D0=B2=D0=B8=D0=B4=20UserView?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/views/UserView.tsx | 73 +++++++++++++++++++++----------
 1 file changed, 49 insertions(+), 24 deletions(-)

diff --git a/src/components/views/UserView.tsx b/src/components/views/UserView.tsx
index 51156f4..fbfeffe 100755
--- a/src/components/views/UserView.tsx
+++ b/src/components/views/UserView.tsx
@@ -1,4 +1,4 @@
-import { memo } from 'react'
+import { HTMLProps, memo } from 'react'
 import { Tooltip } from 'antd'
 import { UserOutlined } from '@ant-design/icons'
 
@@ -6,33 +6,58 @@ import { UserDto } from '@api'
 import { Grid, GridItem } from '@components/Grid'
 import { CompanyView } from './CompanyView'
 
-export type UserViewProps = {
-  user?: UserDto
+export type UserViewProps = HTMLProps<HTMLSpanElement> & {
+    user?: UserDto
 }
 
-export const UserView = memo<UserViewProps>(({ user }) => user ? (
-  <Tooltip title={(
-    <Grid style={{ columnGap: '8px' }}>
-      <GridItem row={1} col={1}>Фамилия:</GridItem>
-      <GridItem row={1} col={2}>{user?.surname}</GridItem>
+export const UserView = memo<UserViewProps>(({ user, ...other }) =>
+    user ? (
+        <Tooltip
+            title={
+                <Grid style={{ columnGap: '8px' }}>
+                    <GridItem row={1} col={1}>
+                        Фамилия:
+                    </GridItem>
+                    <GridItem row={1} col={2}>
+                        {user?.surname}
+                    </GridItem>
 
-      <GridItem row={2} col={1}>Имя:</GridItem>
-      <GridItem row={2} col={2}>{user?.name}</GridItem>
+                    <GridItem row={2} col={1}>
+                        Имя:
+                    </GridItem>
+                    <GridItem row={2} col={2}>
+                        {user?.name}
+                    </GridItem>
 
-      <GridItem row={3} col={1}>Отчество:</GridItem>
-      <GridItem row={3} col={2}>{user?.patronymic}</GridItem>
+                    <GridItem row={3} col={1}>
+                        Отчество:
+                    </GridItem>
+                    <GridItem row={3} col={2}>
+                        {user?.patronymic}
+                    </GridItem>
 
-      <GridItem row={4} col={1}>Компания:</GridItem>
-      <GridItem row={4} col={2}>
-        <CompanyView company={user?.company}/>
-      </GridItem>
-    </Grid>
-  )}>
-    <UserOutlined style={{ marginRight: 8 }}/>
-    {user?.login}
-  </Tooltip>
-) : (
-  <Tooltip title='нет пользователя'>-</Tooltip>
-))
+                    <GridItem row={4} col={1}>
+                        Компания:
+                    </GridItem>
+                    <GridItem row={4} col={2}>
+                        <CompanyView company={user?.company} />
+                    </GridItem>
+                </Grid>
+            }
+        >
+            <span {...other}>
+                <UserOutlined style={{ marginRight: 8 }} />
+                {user?.login}
+            </span>
+        </Tooltip>
+    ) : (
+        <Tooltip title={'нет пользователя'}>
+            <span {...other}>
+                <UserOutlined style={{ marginRight: 8 }} />
+                ---
+            </span>
+        </Tooltip>
+    )
+)
 
 export default UserView