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

[#509] [레이아웃] BottomNavigation 버그 및 UI 수정 #510

Merged
merged 7 commits into from
Apr 13, 2024
Merged

[#509] [레이아웃] BottomNavigation 버그 및 UI 수정 #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6fcc0d4
feat: TailwindCSS에 h-app 프로퍼티 추가
hanyugeon Apr 12, 2024
fec0513
refactor: Layout 컴포넌트 시멘틱 태그 적용 및 fallback height 추가
hanyugeon Apr 12, 2024
432c276
refactor: Layout 컴포넌트 padding값 수정 및 children props 옵셔널로 변경
hanyugeon Apr 12, 2024
027c420
refactor: Layout 컴포넌트를 layout.tsx로 이동
hanyugeon Apr 12, 2024
a40f25c
fix: BottomNavigation 컴포넌트 position을 fixed로 수정
hanyugeon Apr 12, 2024
dcff9e4
feat: tailwind.config에 battomNav boxShadow 값 추가
hanyugeon Apr 12, 2024
225e481
fix: BottomNavigation UI 수정
hanyugeon Apr 12, 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
15 changes: 7 additions & 8 deletions src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
import ContextProvider from '@/components/ContextProvider';
import { ReactNode } from 'react';
import Layout from '@/v1/layout/Layout';

import { LineSeedKR } from '@/styles/font';
import '@/styles/global.css';

const RootLayout = ({ children }: { children: ReactNode }) => {
const RootLayout = ({ children }: { children: React.ReactNode }) => {
return (
<html lang="ko">
<head>
<title>다독다독</title>
<meta content="width=device-width, initial-scale=1" name="viewport" />
<link rel="icon" href="/favicon.ico" />
</head>
<body className="app-layout">
<ContextProvider>
<main className={`${LineSeedKR.variable} font-lineseed`}>
{children}
</main>
</ContextProvider>
{/* @todo Chakra 제거시 app-layout 프로퍼티 제거. */}
<body className={`${LineSeedKR.variable} app-layout font-lineseed`}>
<Layout>
<ContextProvider>{children}</ContextProvider>
</Layout>
</body>
</html>
);
Expand Down
30 changes: 13 additions & 17 deletions src/components/ContextProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,25 @@
'use client';

import { RecoilRoot } from 'recoil';
import { ReactNode } from 'react';
import { ErrorBoundary } from 'react-error-boundary';
import { RecoilRoot } from 'recoil';

import ErrorPage from '@/app/error';
import ChakraThemeProvider from '@/components/ChakraThemeProvider';
import ReactQueryProvider from '@/components/ReactQueryProvider';
import { ReactNode } from 'react';
import ErrorPage from '@/app/error';
import ToastProvider from '@/v1/base/Toast/ToastProvider';
import Layout from '@/v1/layout/Layout';

const ContextProvider = ({ children }: { children: ReactNode }) => {
return (
<>
<RecoilRoot>
<ReactQueryProvider>
<ChakraThemeProvider>
<ErrorBoundary fallbackRender={ErrorPage}>
<ToastProvider>
<Layout>{children}</Layout>
</ToastProvider>
</ErrorBoundary>
</ChakraThemeProvider>
</ReactQueryProvider>
</RecoilRoot>
</>
<RecoilRoot>
<ReactQueryProvider>
<ChakraThemeProvider>
<ErrorBoundary fallbackRender={ErrorPage}>
<ToastProvider>{children}</ToastProvider>
</ErrorBoundary>
</ChakraThemeProvider>
</ReactQueryProvider>
</RecoilRoot>
);
};

Expand Down
4 changes: 4 additions & 0 deletions src/styles/global.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,8 @@
.w-app {
@apply relative -left-[2rem] w-[calc(100%+4rem)];
}
.h-app {
height: 100vh;
height: 100dvh;
}
}
10 changes: 5 additions & 5 deletions src/v1/base/BottomNavigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
} from '@public/icons';

type BottomNavigationProps = {
pathname: string;
pathname?: string;
};

const icons = [
Expand Down Expand Up @@ -36,20 +36,20 @@ const icons = [

const iconColor = {
active: 'fill-main-900 text-main-900',
inactive: 'fill-placeholder text-placeholder',
inactive: 'fill-black-900 text-black-900',
} as const;

const BottomNavigation = ({ pathname }: BottomNavigationProps) => {
return (
<nav className="absolute bottom-0 left-0 flex h-[6.4rem] w-full max-w-[43rem] justify-between border-t-[0.05rem] border-black-200 bg-white px-[2.6rem] pb-[1.2rem] pt-[0.8rem]">
<nav className="fixed bottom-0 left-[50%] flex h-[7rem] w-full max-w-[43rem] -translate-x-1/2 justify-between rounded-t-[2rem] border-t-[0.05rem] border-black-200 bg-white px-[3.2rem] py-[1.4rem] shadow-bottomNav">
{icons.map(({ icon, label, href }) => (
<Link key={label} type="button" href={href}>
<button
className={`flex h-[4.4rem] w-[4.6rem] flex-col items-center justify-center ${
className={`flex h-[4.4rem] min-w-[4.503rem] flex-col items-center justify-center ${
href === pathname ? iconColor.active : iconColor.inactive
}`}
>
<div className="h-[2.6rem] w-[2.6rem] text-placeholder">{icon}</div>
<div className="h-[2.6rem] w-[2.6rem]">{icon}</div>
<p className="text-xs font-bold">{label}</p>
</button>
</Link>
Expand Down
15 changes: 5 additions & 10 deletions src/v1/layout/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,8 @@ import { usePathname } from 'next/navigation';

import BottomNavigation from '@/v1/base/BottomNavigation';

/**
* @todo
* 크로스 브라우징 - dvh & vh에 대해 고민
*/

type LayoutProps = {
children: React.ReactNode;
children?: React.ReactNode;
};

const rootPaths = ['/bookarchive', '/book/search', '/group', '/profile/me'];
Expand All @@ -20,16 +15,16 @@ const Layout = ({ children }: LayoutProps) => {
const isRootPath = pathname && rootPaths.includes(pathname);

const dynamicClass = isRootPath
? 'pb-[6.4rem] pt-[2rem]'
? 'pb-[9rem] pt-[2rem]'
: 'pt-[5.4rem] pb-[2rem]';

return (
<>
<div
className={`h-screen w-full max-w-[43rem] animate-page-transition overflow-auto px-[2rem] ${dynamicClass}`}
<main
className={`h-app w-full max-w-[43rem] animate-page-transition overflow-auto px-[2rem] ${dynamicClass}`}
>
{children}
</div>
</main>
{isRootPath && <BottomNavigation pathname={pathname} />}
</>
);
Expand Down
1 change: 1 addition & 0 deletions tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ module.exports = {
'0px 0px 2px rgba(0, 0, 0, 0.2), 2px 2px 6px rgba(0, 0, 0, 0.1)',
bookcard: '0px 0px 7px 0px rgba(207, 207, 207, 0.5)',
searchResultItem: '0px 0px 6px 1px rgba(114, 114, 114, 0.10);',
bottomNav: 'rgba(0, 0, 0, 0.05) 0px 0px 10px 1px',
},
keyframes: {
'page-transition': {
Expand Down
Loading