Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 다짐메시지, 환영배너, 프로필 등록 완료 QA 반영 #1572

Merged
merged 10 commits into from
Sep 26, 2024
Merged

fix: 다짐메시지, 환영배너, 프로필 등록 완료 QA 반영 #1572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9ac9028
fix: 목표 칩 내 텍스트 가운데 정렬
simeunseo Sep 25, 2024
04f52e6
fix: 다짐메시지 모달 내 스크롤바 안보이도록 처리
simeunseo Sep 25, 2024
a38158f
fix: 에러메시지 위치 조정
simeunseo Sep 25, 2024
3621c4d
fix: 자동 포커스 제거
simeunseo Sep 25, 2024
43f8234
fix: 처음에만 자동 포커스를 해제하고 이후부터는 클릭시 포커스가 가능하도록 수정
simeunseo Sep 25, 2024
71baa58
fix: CTA 호버 색상 변경
simeunseo Sep 25, 2024
a108205
fix: 명예회원 대상 일반 배너는 fixed 처리 해제
simeunseo Sep 25, 2024
7991573
fix: 프로필 등록완료 카드 뒷면 로고를 inline SVG로 변경하여 빠른 렌더링
simeunseo Sep 25, 2024
aebb36a
fix: onFocus로 관리하던 자동 포커스 해제 처리를 radix ui Modal.Content에 onOpenAutoFo…
simeunseo Sep 25, 2024
129fd49
fix: 테스트를 위해 isRegistration 값을 반전시켜놓았던 것을 되돌림
simeunseo Sep 26, 2024
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
10 changes: 7 additions & 3 deletions src/components/common/Banner/WelcomeBanner/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const WelcomeBanner = ({ is35 }: WelcomeBannerProp) => {

return (
<WelcomeBannerContainer>
<WelcomeBannerWrapper>
<WelcomeBannerWrapper is35={is35}>
{isMounted && (
<>
{is35 ? (
Expand Down Expand Up @@ -137,6 +137,10 @@ const ResolutionButton = styled.button`
background: linear-gradient(90deg, #8fc0ff 0%, #5ba3ff 100%);
padding: 10px 16px;

&:hover {
background: linear-gradient(0deg, rgb(255 255 255 / 40%) 0%, rgb(255 255 255 / 40%) 100%),
linear-gradient(90deg, #8fc0ff 0%, #5ba3ff 100%);
}
@media ${MOBILE_MEDIA_QUERY} {
margin-bottom: 28px;
}
Expand All @@ -153,9 +157,9 @@ const WelcomeBannerContainer = styled.header`
overflow: hidden;
`;

const WelcomeBannerWrapper = styled.div`
const WelcomeBannerWrapper = styled.div<{ is35: boolean }>`
display: flex;
position: fixed;
position: ${({ is35 }) => (is35 ? 'fixed' : 'relative')};
justify-content: center;
z-index: 2;
border-bottom: 1px solid ${colors.gray800};
Expand Down
5 changes: 3 additions & 2 deletions src/components/common/Modal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@ export interface ModalProps extends PropsWithChildren<HTMLAttributes<HTMLDivElem
onClose: () => void;
hideCloseButton?: boolean;
zIndex?: number;
onOpenAutoFocus?: (e: Event) => void;
}

const ModalComponent: FC<ModalProps> = (props) => {
const { children, hideCloseButton, isOpen, onClose, ...restProps } = props;
const { children, hideCloseButton, isOpen, onClose, onOpenAutoFocus, ...restProps } = props;

if (!isOpen) {
return null;
Expand All @@ -34,7 +35,7 @@ const ModalComponent: FC<ModalProps> = (props) => {
<DialogPortal>
<StyledBackground zIndex={props.zIndex} asChild>
<m.div initial={{ opacity: 0 }} animate={{ opacity: 1 }} transition={{ duration: 0.2 }}>
<StyledModalContainer asChild {...restProps}>
<StyledModalContainer onOpenAutoFocus={onOpenAutoFocus} asChild {...restProps}>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

원인 파악 어려웠을텐데 넘 고생했어요!!ㅜㅜ 옵셔널로 props준 거라서 공통 컴포넌트에 큰 문제는 없어보입니다!혹시 이 함수가 없는 다른 모달에도 영향이 없는지 한 번만 더 확인 부탁드려요!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

넵! 다른 모달들 정상 동작하는 것 확인 했씁니다!

<m.div initial={{ scale: 0.9 }} animate={{ scale: 1 }} transition={{ duration: 0.2 }}>
{children}
{!hideCloseButton && (
Expand Down
Loading
Loading