Skip to content

Commit 4860103

Browse files
committed
Refactor: BottomSheetPrpos 제너릭 타입으로 수정 & 관련 코드 수정
1 parent feed0a4 commit 4860103

10 files changed

Lines changed: 21 additions & 19 deletions

File tree

src/components/BottomSheet/dto.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
export interface BottomSheetProps {
1+
export interface BottomSheetProps<T = any> {
22
isOpenBottomSheet: boolean; // BottomSheet state
3-
isHandlerVisible?: boolean; // 핸들러 여부 설정
4-
Component: React.ComponentType<any>; // BottomSheet 내부에 전달할 컴포넌트
5-
componentProps?: any; // props가 있는 경우 객체 형태로 전달
3+
isHandlerVisible?: boolean; // 핸들러 가시성 설정(기본값 true)
4+
Component: React.ComponentType<T>; // BottomSheet 내부에 전달할 컴포넌트
5+
componentProps?: T; // props가 있는 경우 객체 형태로 전달
66
onCloseBottomSheet: () => void; // BottomSheet을 닫는 함수
77
initialTab?: 'likes' | 'comments'; // 추가: initialTab 속성
88
}

src/pages/Chats/ChatRoom/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ const ChatRoom: React.FC = () => {
211211
},
212212
};
213213

214-
const kebabMenuBottomSheet: BottomSheetProps = {
214+
const kebabMenuBottomSheet: BottomSheetProps<BottomSheetMenuProps> = {
215215
isOpenBottomSheet: isOpenMenu,
216216
isHandlerVisible: true,
217217
Component: BottomSheetMenu,

src/pages/Home/BottomSheets/HeartBottomSheet.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const HeartBottomSheet: React.FC = () => {
4646
},
4747
};
4848

49-
const heartBottomSheet: BottomSheetProps = {
49+
const heartBottomSheet: BottomSheetProps<CommentProps> = {
5050
isOpenBottomSheet: isOpenHeartBottomSheet,
5151
Component: Comment,
5252
componentProps: requestCommentProps,

src/pages/Home/BottomSheets/MeatballBottomSheet.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const MeatballBottomSheet: React.FC = () => {
3535
marginBottom: '3.125rem',
3636
};
3737

38-
const meatballBottomSheet: BottomSheetProps = {
38+
const meatballBottomSheet: BottomSheetProps<BottomSheetMenuProps> = {
3939
isOpenBottomSheet: isOpenMeatballBottomSheet,
4040
Component: BottomSheetMenu,
4141
componentProps: meatballBottomSheetMenuProps,

src/pages/Home/BottomSheets/PostCommentBottomSheet.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const PostCommentBottomSheet: React.FC = () => {
4646
},
4747
};
4848

49-
const postCommentBottomSheet: BottomSheetProps = {
49+
const postCommentBottomSheet: BottomSheetProps<CommentProps> = {
5050
isOpenBottomSheet: isOpenPostCommentBottomSheet,
5151
Component: Comment,
5252
componentProps: postCommentProps,

src/pages/Home/BottomSheets/ReportBottomSheet.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ const ReportBottomSheet: React.FC = () => {
9595
)}
9696
</div>
9797
),
98-
componentProps: reportBottomSheetMenuProps,
9998
onCloseBottomSheet: () => {
10099
setIsOpenReportBottomSheet(false);
101100
setShowInput(false);

src/pages/MyPost/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ const MyPost: React.FC = () => {
145145
const bottomSheetProps: BottomSheetProps = {
146146
isOpenBottomSheet: isBottomSheetOpen,
147147
isHandlerVisible: true,
148+
// TODO: 컴포넌트 분리에 따라 BottomSheetProps 제너릭 타입 추후 수정
148149
Component: () => {
149150
if (activeTab === 'menu') {
150151
return <BottomSheetMenu {...bottomSheetMenuProps} />;

src/pages/Mypage/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ const MyPage: React.FC = () => {
6464
marginBottom: '50px',
6565
};
6666

67-
const bottomSheetProps: BottomSheetProps = {
67+
const bottomSheetProps: BottomSheetProps<BottomSheetMenuProps> = {
6868
isOpenBottomSheet: isBottomSheetOpen,
6969
isHandlerVisible: true,
7070
Component: BottomSheetMenu,

src/pages/Post/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ const Post: React.FC = () => {
169169
marginBottom: '3.125rem',
170170
};
171171

172-
const bottomSheetProps: BottomSheetProps = {
172+
const bottomSheetProps: BottomSheetProps<BottomSheetMenuProps> = {
173173
isOpenBottomSheet: isOpenBottomSheet,
174174
isHandlerVisible: true,
175175
Component: BottomSheetMenu,
@@ -185,7 +185,7 @@ const Post: React.FC = () => {
185185
sendComment: sendComment, // API 함수 전달
186186
};
187187

188-
const commentSheetProps: BottomSheetProps = {
188+
const commentSheetProps: BottomSheetProps<CommentProps> = {
189189
isOpenBottomSheet: isCommentModalOpen,
190190
isHandlerVisible: true,
191191
Component: Comment,

src/pages/Upload/PostUploadModal/index.tsx

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import pin from '../../../assets/Upload/pin.svg';
2626
import next from '../../../assets/Upload/next.svg';
2727
import next_up from '../../../assets/Upload/next_up.svg';
2828
import { PostUploadModalProps, ClothingInfo } from '../dto';
29-
import { Styletag, Post } from './dto';
29+
import { Styletag, Post, SearchBottomSheetProps } from './dto';
3030
import { ref, uploadBytes, getDownloadURL } from 'firebase/storage';
3131
import { storage } from '../firebaseConfig';
3232
import request, { BaseResponse } from '../../../apis/core';
@@ -90,7 +90,7 @@ const PostUploadModal: React.FC<PostUploadModalProps> = ({
9090
setClothingInfos(deletedClothingInfo);
9191
};
9292

93-
const bottomSheetProps: BottomSheetProps = {
93+
const bottomSheetProps: BottomSheetProps<SearchBottomSheetProps> = {
9494
isOpenBottomSheet: isSearchBottomSheetOpen,
9595
isHandlerVisible: false,
9696
Component: SearchBottomSheetContent,
@@ -124,11 +124,13 @@ const PostUploadModal: React.FC<PostUploadModalProps> = ({
124124
console.log(2);
125125
const storageRef = ref(storage, `ootd/images/${Date.now()}`);
126126
console.log(3);
127-
await uploadBytes(storageRef, blob).then(()=>{
128-
console.log("success")
129-
}).catch((error)=>{
130-
console.log(JSON.stringify(error))
131-
});
127+
await uploadBytes(storageRef, blob)
128+
.then(() => {
129+
console.log('success');
130+
})
131+
.catch((error) => {
132+
console.log(JSON.stringify(error));
133+
});
132134
console.log(4);
133135
return getDownloadURL(storageRef);
134136
};

0 commit comments

Comments
 (0)