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

Commitcfb15b2

Browse files
committed
chore: update MoreMenu to use DropdownMenu
1 parent17cd758 commitcfb15b2

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
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 & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import{useTheme}from"@emotion/react";
22
importAutorenewIconfrom"@mui/icons-material/Autorenew";
33
importLoadingButtonfrom"@mui/lab/LoadingButton";
4-
importBadgefrom"@mui/material/Badge";
5-
importDividerfrom"@mui/material/Divider";
64
importTablefrom"@mui/material/Table";
75
importTableBodyfrom"@mui/material/TableBody";
86
importTableCellfrom"@mui/material/TableCell";
@@ -21,16 +19,17 @@ import type {
2119
}from"api/typesGenerated";
2220
import{ErrorAlert}from"components/Alert/ErrorAlert";
2321
import{Avatar}from"components/Avatar/Avatar";
24-
import{Loader}from"components/Loader/Loader";
22+
import{Button}from"components/Button/Button";
2523
import{
26-
MoreMenu,
27-
MoreMenuContent,
28-
MoreMenuItem,
29-
MoreMenuTrigger,
30-
ThreeDotsButton,
31-
}from"components/MoreMenu/MoreMenu";
24+
DropdownMenu,
25+
DropdownMenuContent,
26+
DropdownMenuItem,
27+
DropdownMenuTrigger,
28+
}from"components/DropdownMenu/DropdownMenu";
29+
import{Loader}from"components/Loader/Loader";
3230
import{Stack}from"components/Stack/Stack";
3331
import{TableEmpty}from"components/TableEmpty/TableEmpty";
32+
import{EllipsisVertical}from"lucide-react";
3433
importtype{ExternalAuthPollingState}from"pages/CreateWorkspacePage/CreateWorkspacePage";
3534
import{typeFC,useCallback,useEffect,useState}from"react";
3635
import{useQuery}from"react-query";
@@ -181,12 +180,15 @@ const ExternalAuthRow: FC<ExternalAuthRowProps> = ({
181180
</LoadingButton>
182181
</TableCell>
183182
<TableCell>
184-
<MoreMenu>
185-
<MoreMenuTrigger>
186-
<ThreeDotsButtonsize="small"disabled={!authenticated}/>
187-
</MoreMenuTrigger>
188-
<MoreMenuContent>
189-
<MoreMenuItem
183+
<DropdownMenu>
184+
<DropdownMenuTriggerasChild>
185+
<Buttonsize="icon-lg"variant="subtle"aria-label="Open menu">
186+
<EllipsisVerticalaria-hidden="true"/>
187+
<spanclassName="sr-only">Open menu</span>
188+
</Button>
189+
</DropdownMenuTrigger>
190+
<DropdownMenuContentalign="end">
191+
<DropdownMenuItem
190192
onClick={async()=>{
191193
onValidateExternalAuth();
192194
// This is kinda jank. It does a refetch of the thing
@@ -197,19 +199,18 @@ const ExternalAuthRow: FC<ExternalAuthRowProps> = ({
197199
}}
198200
>
199201
Test Validate&hellip;
200-
</MoreMenuItem>
201-
<Divider/>
202-
<MoreMenuItem
203-
danger
202+
</DropdownMenuItem>
203+
<DropdownMenuItem
204+
className="text-content-destructive focus:text-content-destructive"
204205
onClick={async()=>{
205206
onUnlinkExternalAuth();
206207
awaitrefetch();
207208
}}
208209
>
209210
Unlink&hellip;
210-
</MoreMenuItem>
211-
</MoreMenuContent>
212-
</MoreMenu>
211+
</DropdownMenuItem>
212+
</DropdownMenuContent>
213+
</DropdownMenu>
213214
</TableCell>
214215
</TableRow>
215216
);

0 commit comments

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