Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/features/study/ui/study-done-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,13 @@ export default function StudyDoneModal({

return (
<Modal.Root open={isOpen} onOpenChange={setIsOpen}>
<Modal.Trigger>
<div className="rounded-100 bg-fill-brand-default-default font-designer-16b text-text-inverse hover:bg-fill-brand-default-hover cursor-pointer px-150 py-100">
완료하기
</div>
</Modal.Trigger>
<Button
disabled={data.progressStatus === 'PENDING'}
size="medium"
onClick={() => setIsOpen(true)}
>
완료하기
</Button>

<Modal.Portal>
<Modal.Overlay />
Expand Down Expand Up @@ -149,7 +151,7 @@ function StudyDoneForm({ data, studyDate, onClose }: StudyDoneFormProps) {
<Button
size="large"
color={feedback.trim() && progressStatus ? 'primary' : 'secondary'}
disabled={!feedback.trim() || !progressStatus}
disabled={!feedback.trim() || isPending}
onClick={handleSubmit}
>
작성 완료
Expand Down
8 changes: 3 additions & 5 deletions src/features/study/ui/study-ready-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@ export default function StudyReadyModal({

return (
<Modal.Root open={isOpen} onOpenChange={setIsOpen}>
<Modal.Trigger>
<div className="rounded-100 bg-fill-brand-default-default font-designer-16b text-text-inverse hover:bg-fill-brand-default-hover cursor-pointer px-150 py-100">
준비하기
</div>
<Modal.Trigger asChild>
<Button size="medium">준비하기</Button>
</Modal.Trigger>

<Modal.Portal>
Expand Down Expand Up @@ -136,7 +134,7 @@ function StudyReadyForm({ data, studyDate, onClose }: StudyReadyFormProps) {
<Button
size="large"
color={subject.trim() ? 'primary' : 'secondary'}
disabled={!subject.trim()}
disabled={!subject.trim() || isPending}
onClick={handleSubmit}
>
작성 완료
Expand Down