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

Commit1e88668

Browse files
AbhineetJainkylecarbs
authored andcommitted
feat: use ConfirmDialog for ResetPasswordDialog (#2035)
* feat: use ConfirmDialog for ResetPasswordDialog* fix lint* make description typography a div* use paragraph for string description, div otherwise* fix lint
1 parent13de62a commit1e88668

File tree

2 files changed

+30
-25
lines changed

2 files changed

+30
-25
lines changed

‎site/src/components/ConfirmDialog/ConfirmDialog.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,11 @@ export const ConfirmDialog: React.FC<ConfirmDialogProps> = ({
105105
</Typography>
106106

107107
{description&&(
108-
<TypographyclassName={styles.description}variant="body2">
108+
<Typography
109+
component={typeofdescription==="string" ?"p" :"div"}
110+
className={styles.description}
111+
variant="body2"
112+
>
109113
{description}
110114
</Typography>
111115
)}

‎site/src/components/ResetPasswordDialog/ResetPasswordDialog.tsx

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
importDialogActionsfrom"@material-ui/core/DialogActions"
2-
importDialogContentfrom"@material-ui/core/DialogContent"
31
importDialogContentTextfrom"@material-ui/core/DialogContentText"
42
import{makeStyles}from"@material-ui/core/styles"
53
import{FC}from"react"
64
import*asTypesGenfrom"../../api/typesGenerated"
7-
import{CodeBlock}from"../CodeBlock/CodeBlock"
8-
import{Dialog,DialogActionButtons,DialogTitle}from"../Dialog/Dialog"
5+
import{CodeExample}from"../CodeExample/CodeExample"
6+
import{ConfirmDialog}from"../ConfirmDialog/ConfirmDialog"
97

108
exportinterfaceResetPasswordDialogProps{
119
open:boolean
@@ -36,32 +34,35 @@ export const ResetPasswordDialog: FC<ResetPasswordDialogProps> = ({
3634
})=>{
3735
conststyles=useStyles()
3836

39-
return(
40-
<Dialogopen={open}onClose={onClose}>
41-
<DialogTitletitle={Language.title}/>
42-
43-
<DialogContent>
44-
<DialogContentTextvariant="subtitle2">{Language.message(user?.username)}</DialogContentText>
45-
46-
<DialogContentTextcomponent="div">
47-
<CodeBlocklines={[newPassword??""]}className={styles.codeBlock}/>
48-
</DialogContentText>
49-
</DialogContent>
37+
constdescription=(
38+
<>
39+
<DialogContentTextvariant="subtitle2">{Language.message(user?.username)}</DialogContentText>
40+
<DialogContentTextcomponent="div"className={styles.codeBlock}>
41+
<CodeExamplecode={newPassword??""}className={styles.codeExample}/>
42+
</DialogContentText>
43+
</>
44+
)
5045

51-
<DialogActions>
52-
<DialogActionButtons
53-
onCancel={onClose}
54-
confirmText={Language.confirmText}
55-
onConfirm={onConfirm}
56-
confirmLoading={loading}
57-
/>
58-
</DialogActions>
59-
</Dialog>
46+
return(
47+
<ConfirmDialog
48+
type="info"
49+
hideCancel={false}
50+
open={open}
51+
onConfirm={onConfirm}
52+
onClose={onClose}
53+
title={Language.title}
54+
confirmLoading={loading}
55+
confirmText={Language.confirmText}
56+
description={description}
57+
/>
6058
)
6159
}
6260

6361
constuseStyles=makeStyles(()=>({
6462
codeBlock:{
63+
marginBottom:0,
64+
},
65+
codeExample:{
6566
minHeight:"auto",
6667
userSelect:"all",
6768
width:"100%",

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp