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.

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

Fire 277 fe 모달창 interactions 추가하기 #41

Merged
merged 3 commits into from
Jul 11, 2022
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
1 change: 1 addition & 0 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
</head>
<body>
<div id="root"></div>
<div id="modal"></div>
<script type="text/html" src="/src/index.tsx"></script>
</body>
</html>
8 changes: 8 additions & 0 deletions src/components/atoms/ModalPotal.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import ReactDOM from 'react-dom';

const ModalPortal = ({ children }) => {
const el = document.getElementById('modal');
return ReactDOM.createPortal(children, el);
};

export default ModalPortal;
40 changes: 21 additions & 19 deletions src/components/atoms/Modal.tsx → src/components/layout/Modal.tsx
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
import React from 'react';
import styled from 'styled-components';
import vectors from './Vectors';
import ModalPortal from '../atoms/ModalPotal';
import vectors from '../atoms/Vectors';

export default function Modal({
modalHandler,
children,
}: {
modalHandler: () => void;
type Props = {
children: any;
}) {
modalHandler: () => void;
};

export default function Modal({ modalHandler, children }: Props) {
return (
<ModalBackground onClick={modalHandler}>
<ModalBox onClick={(e) => e.stopPropagation()}>
<VectorX
src={vectors.X}
left={93}
top={6}
size={2}
onClick={modalHandler}
/>
{children}
</ModalBox>
</ModalBackground>
<ModalPortal>
<ModalBackground onClick={modalHandler}>
<ModalBox onClick={(e) => e.stopPropagation()}>
<VectorX
src={vectors.X}
left={93}
top={6}
size={2}
onClick={modalHandler}
/>
{children}
</ModalBox>
</ModalBackground>
</ModalPortal>
);
}

Expand Down
20 changes: 16 additions & 4 deletions src/components/login/InputNickname.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ import { v4 as uuidv4 } from 'uuid';
import UserStore from '../../stores/userStore';
import vectors from '../atoms/Vectors';

export default function InputNickname() {
export default function InputNickname({
modalHandler,
}: {
modalHandler: () => void;
}) {
const navigate = useNavigate();
const { nickname, uid, setNickname, setUid } = UserStore();
useEffect(() => {
Expand Down Expand Up @@ -56,6 +60,13 @@ export default function InputNickname() {
setNickname(event.target.value);
};

const onKeyPress = (event: React.KeyboardEvent<HTMLInputElement>) => {
if (event.key === 'Enter') {
setNickname(event.target.value);
modalHandler();
}
};

return (
<>
<Vector src={vectors.Lamp} left={0} top={0} size={40} />
Expand All @@ -71,7 +82,8 @@ export default function InputNickname() {
autoComplete="off"
value={nickname}
onChange={onChange}
placeholder="Enter ID"
onKeyPress={onKeyPress}
placeholder="Enter Nickname"
id="nickname"
/>
<Button disabled={nickname === null || !nickname.length}>Enter</Button>
Expand Down Expand Up @@ -113,7 +125,7 @@ const TitleLogo = styled.div`
`;

const TitleStart = styled.div`
font-family: Pretendard;
font-family: PretendardRegular;
font-weight: 500;
font-size: 4rem;
margin-top: 2rem;
Expand All @@ -128,7 +140,7 @@ const Form = styled.form`
z-index: 1001;
button,
input {
font-family: Pretendard;
font-family: PretendardRegular;
font-weight: 600;
height: 6rem;
width: 40rem;
Expand Down
12 changes: 8 additions & 4 deletions src/pages/Login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,19 @@ import vectors from '../components/atoms/Vectors';
import Blocks from '../components/lobby/Blocks';
import Search from '../components/lobby/Search';
import InputNickname from '../components/login/InputNickname';
import Modal from '../components/atoms/Modal';
import Modal from '../components/layout/Modal';

export default function Main() {
const navigate = useNavigate();
const [isModal, setIsModal] = useState(true);
const modalHandler = () => {
const closeModalHandler = () => {
setIsModal(false);
};

// const openModalHandler = () => {
// setIsModal(true);
// };

const randomEnter = () => {
navigate(`/room/random`);
};
Expand Down Expand Up @@ -43,8 +47,8 @@ export default function Main() {
</ScrollMenu>
</ScrollContainer>
{isModal && (
<Modal modalHandler={modalHandler}>
<InputNickname />
<Modal modalHandler={closeModalHandler}>
<InputNickname modalHandler={closeModalHandler} />
</Modal>
)}
</Container>
Expand Down