Skip to content

Commit 9aeca2b

Browse files
authored
Merge pull request #178 from codeit-sprint-part3-6team/#177_인풋-수정
🐛 돋보기 위치 수정 및 누락된 모달 딤처리
2 parents 787cd4d + 27daf8d commit 9aeca2b

File tree

5 files changed

+26
-7
lines changed

5 files changed

+26
-7
lines changed

src/components/common/modal/comment/CommentModal.tsx

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,18 @@ import CDSButton from '../../button/CDSButton';
22
import OverlayContainer from '../overlay-container/OverlayContainer';
33
import styles from './CommentModal.module.css';
44

5-
function CommentModal({ message, handleCancelClick, handleConfirmClick }) {
5+
function CommentModal({
6+
message,
7+
handleCancelClick,
8+
handleConfirmClick,
9+
onclose,
10+
}) {
611
return (
7-
<OverlayContainer>
8-
<div className={styles['comment-modal']}>
12+
<OverlayContainer onClose={onclose}>
13+
<div
14+
className={styles['comment-modal']}
15+
onClick={(e) => e.stopPropagation()}
16+
>
917
<p className={styles.message}>{message}</p>
1018

1119
<div>

src/components/common/modal/delete-cards/DeleteCardsModal.tsx

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,18 @@ import CDSButton from '../../button/CDSButton';
22
import OverlayContainer from '../overlay-container/OverlayContainer';
33
import styles from './DeleteCardsModal.module.css';
44

5-
function DeleteCardsModal({ message, handleCancelClick, handleDeleteClick }) {
5+
function DeleteCardsModal({
6+
message,
7+
handleCancelClick,
8+
handleDeleteClick,
9+
onClose,
10+
}) {
611
return (
7-
<OverlayContainer>
8-
<div className={styles.deleteCardsModal_section}>
12+
<OverlayContainer onClose={onClose}>
13+
<div
14+
className={styles.deleteCardsModal_section}
15+
onClick={(e) => e.stopPropagation()}
16+
>
917
<p className={styles.message}>{message}</p>
1018

1119
<div>

src/components/dashboard/column/Column.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ function Column({
184184
{/* 모달창 - 삭제 */}
185185
{isConfirmModalOpen && (
186186
<DeleteCardsModal
187+
onClose={closeConfirmModal}
187188
message="컬럼의 모든 카드가 삭제됩니다."
188189
handleCancelClick={() => closeConfirmModal()}
189190
handleDeleteClick={handleDeleteClick}

src/components/dashboard/comment/Comment.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ function Comment({
126126
{/* 모달창 - 수정 */}
127127
{isEditModalOpen && (
128128
<CommentModal
129+
onclose={closeEditModal}
129130
message="댓글을 수정하시겠습니까?"
130131
handleCancelClick={handleCancel}
131132
handleConfirmClick={handleSave}
@@ -135,6 +136,7 @@ function Comment({
135136
{/* 모달창 - 삭제 */}
136137
{isDeleteModalOpen && (
137138
<CommentModal
139+
onclose={closeDeleteModal}
138140
message="댓글을 삭제하시겠습니까?"
139141
handleCancelClick={closeDeleteModal}
140142
handleConfirmClick={handleDelete}

src/components/product/mydashboard/InvitationList.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
}
1212

1313
.icon {
14-
position: fixed;
14+
position: absolute;
1515
margin-left: 16px;
1616
cursor: pointer;
1717
margin-top: 8px;

0 commit comments

Comments
 (0)