-
-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ref(feedback): De-couple button from modal (#7876)
De-couple the feedback button from the modal so that we can show the modal using other components as the actor. This change does the following: * Move the form in `<FeedbackModal>` to `<FeedbackForm>` * Move business logic of the modal/form into `<FeedbackModal>` (from `<FeedbackWidget>`) * `<FeedbackModal>` requires `children` as a render function * `<FeedbackWidget>` is refactored to use new `<FeedbackModal>` and remains the same (shows our `<FeedbackButton>` which controls the modal)
- Loading branch information
Showing
5 changed files
with
304 additions
and
265 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,166 @@ | ||
import React, {FormEvent, useRef} from 'react'; | ||
import {css} from '@emotion/react'; | ||
import styled from '@emotion/styled'; | ||
|
||
interface FeedbackFormProps { | ||
onClose: () => void; | ||
onSubmit: (data: {comment: string; email: string; name: string}) => void; | ||
} | ||
|
||
const retrieveStringValue = (formData: FormData, key: string) => { | ||
const value = formData.get(key); | ||
if (typeof value === 'string') { | ||
return value.trim(); | ||
} | ||
return ''; | ||
}; | ||
|
||
export function FeedbackForm({onClose, onSubmit}: FeedbackFormProps) { | ||
const formRef = useRef<HTMLFormElement>(null); | ||
|
||
const handleSubmit = (e: FormEvent<HTMLFormElement>) => { | ||
e.preventDefault(); | ||
const formData = new FormData(e.target as HTMLFormElement); | ||
onSubmit({ | ||
name: retrieveStringValue(formData, 'name'), | ||
email: retrieveStringValue(formData, 'email'), | ||
comment: retrieveStringValue(formData, 'comment'), | ||
}); | ||
}; | ||
|
||
const user = window.Sentry?.getCurrentHub().getScope()?.getUser(); | ||
|
||
return ( | ||
<Form ref={formRef} onSubmit={handleSubmit}> | ||
<FlexColumns> | ||
<Label htmlFor="sentry-feedback-name"> | ||
Your Name | ||
<Input | ||
type="text" | ||
id="sentry-feedback-name" | ||
name="name" | ||
placeholder="Anonymous" | ||
defaultValue={user?.username} | ||
/> | ||
</Label> | ||
<Label htmlFor="sentry-feedback-email"> | ||
Your Email | ||
<Input | ||
type="text" | ||
id="sentry-feedback-email" | ||
name="email" | ||
placeholder="you@test.com" | ||
defaultValue={user?.email} | ||
/> | ||
</Label> | ||
</FlexColumns> | ||
<Label htmlFor="sentry-feedback-comment"> | ||
Comment | ||
<TextArea | ||
onKeyDown={event => { | ||
if (event.key === 'Enter' && event.ctrlKey) { | ||
formRef.current.requestSubmit(); | ||
} | ||
}} | ||
id="sentry-feedback-comment" | ||
name="comment" | ||
placeholder="Explain what bothers you" | ||
/> | ||
</Label> | ||
<ModalFooter> | ||
<CancelButton type="button" onClick={onClose}> | ||
Cancel | ||
</CancelButton> | ||
<SubmitButton type="submit">Submit</SubmitButton> | ||
</ModalFooter> | ||
</Form> | ||
); | ||
} | ||
|
||
const Form = styled.form` | ||
display: flex; | ||
overflow: auto; | ||
flex-direction: column; | ||
gap: 16px; | ||
padding: 24px; | ||
`; | ||
|
||
const Label = styled.label` | ||
display: flex; | ||
flex-direction: column; | ||
gap: 4px; | ||
margin: 0px; | ||
`; | ||
|
||
const inputStyles = css` | ||
border: 1px solid #ccc; | ||
border-radius: 4px; | ||
font-size: 14px; | ||
padding: 6px 8px; | ||
&:focus { | ||
outline: 1px solid rgba(108, 95, 199, 1); | ||
border-color: rgba(108, 95, 199, 1); | ||
} | ||
`; | ||
|
||
const Input = styled.input` | ||
${inputStyles} | ||
`; | ||
|
||
const TextArea = styled.textarea` | ||
${inputStyles} | ||
min-height: 64px; | ||
resize: vertical; | ||
`; | ||
|
||
const ModalFooter = styled.div` | ||
display: flex; | ||
justify-content: flex-end; | ||
gap: 8px; | ||
margin-top: 8px; | ||
`; | ||
|
||
const buttonStyles = css` | ||
border: 1px solid #ccc; | ||
border-radius: 4px; | ||
cursor: pointer; | ||
font-size: 14px; | ||
font-weight: 600; | ||
padding: 6px 16px; | ||
`; | ||
|
||
const SubmitButton = styled.button` | ||
${buttonStyles} | ||
background-color: rgba(108, 95, 199, 1); | ||
color: #fff; | ||
&:hover { | ||
background-color: rgba(88, 74, 192, 1); | ||
} | ||
&:focus-visible { | ||
outline: 1px solid rgba(108, 95, 199, 1); | ||
background-color: rgba(88, 74, 192, 1); | ||
} | ||
`; | ||
|
||
const CancelButton = styled.button` | ||
${buttonStyles} | ||
background-color: #fff; | ||
color: #231c3d; | ||
font-weight: 500; | ||
&:hover { | ||
background-color: #eee; | ||
} | ||
&:focus-visible { | ||
outline: 1px solid rgba(108, 95, 199, 1); | ||
background-color: #eee; | ||
} | ||
`; | ||
|
||
const FlexColumns = styled.div` | ||
display: flex; | ||
flex-direction: row; | ||
gap: 16px; | ||
& > * { | ||
flex: 1; | ||
} | ||
`; |
Oops, something went wrong.
94e8a2b
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Successfully deployed to the following URLs:
sentry-docs – ./
docs.sentry.io
sentry-docs-git-master.sentry.dev
sentry-docs.sentry.dev