Skip to content

Commit 79a13ed

Browse files
authored
Merge pull request TEAM-BEAT#227 from TEAM-BEAT/fix/TEAM-BEAT#208/FixQADesign
[Fix/TEAM-BEAT#208] 디자인 QA 사항 일부 반영
2 parents 6c17b6f + 804ffd3 commit 79a13ed

File tree

3 files changed

+23
-16
lines changed

3 files changed

+23
-16
lines changed

src/components/commons/bottomSheet/BottomSheet.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
import { ReactNode } from "react";
1+
import React, { ReactNode } from "react";
22
import * as S from "./BottomSheet.styled";
33

44
export interface BottomSheetPropType {
5+
onClick?: React.MouseEventHandler<HTMLButtonElement>;
56
isOpen: boolean;
67
children?: ReactNode;
78
title?: string;
89
}
910

1011
const BottomSheet = ({ isOpen, title, children }: BottomSheetPropType) => {
1112
return (
12-
<S.BottomSheetWrapper $isOpen={isOpen}>
13+
<S.BottomSheetWrapper $isOpen={isOpen} onClick={(e) => e.stopPropagation()}>
1314
<S.BottomSheetLayout>
1415
<S.Title>{title}</S.Title>
1516
{children}

src/pages/main/components/floating/Floating.styled.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,14 @@ const float = keyframes`
1313
}
1414
`;
1515

16+
export const Layer = styled.section`
17+
position: relative;
18+
`;
19+
1620
export const FloatingWrapper = styled.section`
1721
position: fixed;
1822
right: 0.3rem;
19-
bottom: 12rem;
23+
bottom: 15rem;
2024
z-index: 25;
2125
display: flex;
2226
flex-direction: column;

src/pages/main/components/floating/Floating.tsx

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,21 @@ const Floating = () => {
55
const navigate = useNavigate();
66

77
return (
8-
<S.FloatingWrapper>
9-
<S.FloatingContainer>
10-
<S.UnionIcon></S.UnionIcon>
11-
<S.UnionText>공연을 등록해보세요!</S.UnionText>
12-
<S.FloatingBtnWrapper
13-
onClick={() => {
14-
navigate("/gig-register");
15-
}}
16-
>
17-
<S.FloatingBtn />
18-
</S.FloatingBtnWrapper>
19-
</S.FloatingContainer>
20-
</S.FloatingWrapper>
8+
<S.Layer>
9+
<S.FloatingWrapper>
10+
<S.FloatingContainer>
11+
<S.UnionIcon></S.UnionIcon>
12+
<S.UnionText>공연을 등록해보세요!</S.UnionText>
13+
<S.FloatingBtnWrapper
14+
onClick={() => {
15+
navigate("/register");
16+
}}
17+
>
18+
<S.FloatingBtn />
19+
</S.FloatingBtnWrapper>
20+
</S.FloatingContainer>
21+
</S.FloatingWrapper>
22+
</S.Layer>
2123
);
2224
};
2325

0 commit comments

Comments
 (0)