Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitfe820b3

Browse files
committed
chore: update MoreMenu to use DropdownMenu
1 parent82b9b09 commitfe820b3

File tree

2 files changed

+31
-29
lines changed

2 files changed

+31
-29
lines changed

‎site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AnnouncementBannerItem.tsx‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@ import TableCell from "@mui/material/TableCell";
44
importTableRowfrom"@mui/material/TableRow";
55
importtype{BannerConfig}from"api/typesGenerated";
66
import{Button}from"components/Button/Button";
7-
import{DropdownMenu,DropdownMenuContent,DropdownMenuItem,DropdownMenuTrigger}from"components/DropdownMenu/DropdownMenu";
7+
import{
8+
DropdownMenu,
9+
DropdownMenuContent,
10+
DropdownMenuItem,
11+
DropdownMenuTrigger,
12+
}from"components/DropdownMenu/DropdownMenu";
813
import{EllipsisVertical}from"lucide-react";
914
importtype{FC}from"react";
1015

@@ -46,19 +51,13 @@ export const AnnouncementBannerItem: FC<AnnouncementBannerItemProps> = ({
4651
<TableCell>
4752
<DropdownMenu>
4853
<DropdownMenuTriggerasChild>
49-
<Button
50-
size="icon-lg"
51-
variant="subtle"
52-
aria-label="Open menu"
53-
>
54+
<Buttonsize="icon-lg"variant="subtle"aria-label="Open menu">
5455
<EllipsisVerticalaria-hidden="true"/>
5556
<spanclassName="sr-only">Open menu</span>
5657
</Button>
5758
</DropdownMenuTrigger>
5859
<DropdownMenuContentalign="end">
59-
<DropdownMenuItem
60-
onClick={()=>onEdit()}
61-
>
60+
<DropdownMenuItemonClick={()=>onEdit()}>
6261
Edit&hellip;
6362
</DropdownMenuItem>
6463
<DropdownMenuItem

‎site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@ import type {
1818
}from"api/typesGenerated";
1919
import{ErrorAlert}from"components/Alert/ErrorAlert";
2020
import{Avatar}from"components/Avatar/Avatar";
21-
import{Loader}from"components/Loader/Loader";
21+
import{Button}from"components/Button/Button";
2222
import{
23-
MoreMenu,
24-
MoreMenuContent,
25-
MoreMenuItem,
26-
MoreMenuTrigger,
27-
ThreeDotsButton,
28-
}from"components/MoreMenu/MoreMenu";
23+
DropdownMenu,
24+
DropdownMenuContent,
25+
DropdownMenuItem,
26+
DropdownMenuTrigger,
27+
}from"components/DropdownMenu/DropdownMenu";
28+
import{Loader}from"components/Loader/Loader";
2929
import{Stack}from"components/Stack/Stack";
3030
import{TableEmpty}from"components/TableEmpty/TableEmpty";
31+
import{EllipsisVertical}from"lucide-react";
3132
importtype{ExternalAuthPollingState}from"pages/CreateWorkspacePage/CreateWorkspacePage";
3233
import{typeFC,useCallback,useEffect,useState}from"react";
3334
import{useQuery}from"react-query";
@@ -178,12 +179,15 @@ const ExternalAuthRow: FC<ExternalAuthRowProps> = ({
178179
</LoadingButton>
179180
</TableCell>
180181
<TableCell>
181-
<MoreMenu>
182-
<MoreMenuTrigger>
183-
<ThreeDotsButtonsize="small"disabled={!authenticated}/>
184-
</MoreMenuTrigger>
185-
<MoreMenuContent>
186-
<MoreMenuItem
182+
<DropdownMenu>
183+
<DropdownMenuTriggerasChild>
184+
<Buttonsize="icon-lg"variant="subtle"aria-label="Open menu">
185+
<EllipsisVerticalaria-hidden="true"/>
186+
<spanclassName="sr-only">Open menu</span>
187+
</Button>
188+
</DropdownMenuTrigger>
189+
<DropdownMenuContentalign="end">
190+
<DropdownMenuItem
187191
onClick={async()=>{
188192
onValidateExternalAuth();
189193
// This is kinda jank. It does a refetch of the thing
@@ -194,19 +198,18 @@ const ExternalAuthRow: FC<ExternalAuthRowProps> = ({
194198
}}
195199
>
196200
Test Validate&hellip;
197-
</MoreMenuItem>
198-
<Divider/>
199-
<MoreMenuItem
200-
danger
201+
</DropdownMenuItem>
202+
<DropdownMenuItem
203+
className="text-content-destructive focus:text-content-destructive"
201204
onClick={async()=>{
202205
onUnlinkExternalAuth();
203206
awaitrefetch();
204207
}}
205208
>
206209
Unlink&hellip;
207-
</MoreMenuItem>
208-
</MoreMenuContent>
209-
</MoreMenu>
210+
</DropdownMenuItem>
211+
</DropdownMenuContent>
212+
</DropdownMenu>
210213
</TableCell>
211214
</TableRow>
212215
);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp