Skip to content

Commit fd090e1

Browse files
authored
Merge pull request #612 from actiontech/fix/issue-359
[fix](Nav): Display optimization for usernames that are too long
2 parents ca7ec36 + 4dd7219 commit fd090e1

File tree

5 files changed

+24
-8
lines changed

5 files changed

+24
-8
lines changed

packages/base/src/page/Nav/SideMenu/UserMenu/components/ContextMenu/index.tsx

+8-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,14 @@ const ContextMenu: React.FC<ContextMenuProps> = ({
3232
onOpenChange={onOpenChange}
3333
content={
3434
<PopoverInnerStyleWrapper>
35-
{header && <div className="header">{header}</div>}
35+
{header && (
36+
<div
37+
className="header"
38+
title={typeof header === 'string' ? header : undefined}
39+
>
40+
{header}
41+
</div>
42+
)}
3643
<div className="content">
3744
{items.map((menu) => {
3845
return (

packages/base/src/page/Nav/SideMenu/UserMenu/components/__tests__/__snapshots__/GlobalSetting.test.tsx.snap

+2-1
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,11 @@ exports[`base/page/Nav/SideMenu/GlobalSetting render snap when is "checkPagePerm
8282
class="ant-popover-inner-content"
8383
>
8484
<div
85-
class="css-1uknfyo"
85+
class="css-1lz0wpv"
8686
>
8787
<div
8888
class="header"
89+
title="全局设置"
8990
>
9091
全局设置
9192
</div>

packages/base/src/page/Nav/SideMenu/UserMenu/components/__tests__/__snapshots__/UserNavigate.ce.test.tsx.snap

+4-2
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,11 @@ exports[`base/page/Nav/SideMenu/UserNavigate-ce render snap 2`] = `
4848
class="ant-popover-inner-content"
4949
>
5050
<div
51-
class="css-1uknfyo"
51+
class="css-1lz0wpv"
5252
>
5353
<div
5454
class="header"
55+
title="Test name"
5556
>
5657
Test name
5758
</div>
@@ -201,10 +202,11 @@ exports[`base/page/Nav/SideMenu/UserNavigate-ce render snap 3`] = `
201202
class="ant-popover-inner-content"
202203
>
203204
<div
204-
class="css-1uknfyo"
205+
class="css-1lz0wpv"
205206
>
206207
<div
207208
class="header"
209+
title="Test name"
208210
>
209211
Test name
210212
</div>

packages/base/src/page/Nav/SideMenu/UserMenu/components/__tests__/__snapshots__/UserNavigate.test.tsx.snap

+7-4
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,11 @@ exports[`base/page/Nav/SideMenu/UserNavigate-ee render snap 2`] = `
4848
class="ant-popover-inner-content"
4949
>
5050
<div
51-
class="css-1uknfyo"
51+
class="css-1lz0wpv"
5252
>
5353
<div
5454
class="header"
55+
title="Test name"
5556
>
5657
Test name
5758
</div>
@@ -229,10 +230,11 @@ exports[`base/page/Nav/SideMenu/UserNavigate-ee render snap 3`] = `
229230
class="ant-popover-inner-content"
230231
>
231232
<div
232-
class="css-1uknfyo"
233+
class="css-1lz0wpv"
233234
>
234235
<div
235236
class="header"
237+
title="Test name"
236238
>
237239
Test name
238240
</div>
@@ -410,10 +412,11 @@ exports[`base/page/Nav/SideMenu/UserNavigate-ee should update the user's languag
410412
class="ant-popover-inner-content"
411413
>
412414
<div
413-
class="css-1uknfyo"
415+
class="css-1lz0wpv"
414416
>
415417
<div
416418
class="header"
419+
title="Test name"
417420
>
418421
Test name
419422
</div>
@@ -475,7 +478,7 @@ exports[`base/page/Nav/SideMenu/UserNavigate-ee should update the user's languag
475478
class="ant-popover-inner-content"
476479
>
477480
<div
478-
class="css-1uknfyo"
481+
class="css-1lz0wpv"
479482
>
480483
<div
481484
class="content"

packages/shared/lib/styleWrapper/nav.ts

+3
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,9 @@ export const PopoverInnerStyleWrapper = styled('div')`
251251
font-style: normal;
252252
font-weight: 500;
253253
line-height: 20px;
254+
overflow: hidden;
255+
text-overflow: ellipsis;
256+
white-space: nowrap;
254257
}
255258
256259
.content {

0 commit comments

Comments
 (0)