Merge pull request 'Add HideScrollbar. Fix unique prop warning.' (#9) from FatttSnake into dev
Reviewed-on: FatttSnake/fatweb-ui#9
This commit was merged in pull request #9.
This commit is contained in:
15
src/assets/css/hide-scrollbar.scss
Normal file
15
src/assets/css/hide-scrollbar.scss
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
body {
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
#root {
|
||||||
|
height: 100vh;
|
||||||
|
width: 100vw;
|
||||||
|
}
|
||||||
|
|
||||||
|
#hide-scrollbar {
|
||||||
|
position: relative;
|
||||||
|
height: 100vh;
|
||||||
|
width: 100vw;
|
||||||
|
overflow: scroll;
|
||||||
|
}
|
||||||
47
src/components/HideScrollbar.tsx
Normal file
47
src/components/HideScrollbar.tsx
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
import React, { PropsWithChildren } from 'react'
|
||||||
|
import '@/assets/css/hide-scrollbar.scss'
|
||||||
|
|
||||||
|
const HideScrollbar: React.FC<PropsWithChildren> = (prop: PropsWithChildren) => {
|
||||||
|
const hideScrollbarRef = useRef<HTMLDivElement>(null)
|
||||||
|
const [verticalScrollbarWidth, setVerticalScrollbarWidth] = useState(0)
|
||||||
|
const [horizontalScrollbarWidth, setHorizontalScrollbarWidth] = useState(0)
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const hideScrollbarElement = hideScrollbarRef.current
|
||||||
|
|
||||||
|
const windowResizeListener = () => {
|
||||||
|
setVerticalScrollbarWidth(
|
||||||
|
(hideScrollbarElement?.offsetWidth ?? 0) - (hideScrollbarElement?.clientWidth ?? 0)
|
||||||
|
)
|
||||||
|
setHorizontalScrollbarWidth(
|
||||||
|
(hideScrollbarElement?.offsetHeight ?? 0) -
|
||||||
|
(hideScrollbarElement?.clientHeight ?? 0)
|
||||||
|
)
|
||||||
|
|
||||||
|
return windowResizeListener
|
||||||
|
}
|
||||||
|
|
||||||
|
window.addEventListener('resize', windowResizeListener())
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
window.removeEventListener('resize', windowResizeListener())
|
||||||
|
}
|
||||||
|
}, [])
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<div
|
||||||
|
ref={hideScrollbarRef}
|
||||||
|
id={'hide-scrollbar'}
|
||||||
|
style={{
|
||||||
|
width: `calc(100vw + ${verticalScrollbarWidth}px)`,
|
||||||
|
height: `calc(100vh + ${horizontalScrollbarWidth}px`
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{prop.children}
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default HideScrollbar
|
||||||
@@ -44,6 +44,7 @@ const Home: React.FC = () => {
|
|||||||
</div>
|
</div>
|
||||||
</FitCenter>
|
</FitCenter>
|
||||||
</FitFullScreen>
|
</FitFullScreen>
|
||||||
|
<FitFullScreen />
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import React, { createContext } from 'react'
|
|||||||
import '@/assets/css/header.scss'
|
import '@/assets/css/header.scss'
|
||||||
import LoadingMask from '@/components/LoadingMask.tsx'
|
import LoadingMask from '@/components/LoadingMask.tsx'
|
||||||
import router from '@/router'
|
import router from '@/router'
|
||||||
|
import HideScrollbar from '@/components/HideScrollbar.tsx'
|
||||||
|
|
||||||
export const MainFrameworkContext = createContext<{
|
export const MainFrameworkContext = createContext<{
|
||||||
navbarHiddenState: {
|
navbarHiddenState: {
|
||||||
@@ -22,6 +23,7 @@ const MainFramework: React.FC = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
|
<HideScrollbar>
|
||||||
<div className={'body'}>
|
<div className={'body'}>
|
||||||
<header className={'nav ' + (navbarHidden ? 'hide' : '')}>
|
<header className={'nav ' + (navbarHidden ? 'hide' : '')}>
|
||||||
<a className={'logo'} href={'https://fatweb.top'}>
|
<a className={'logo'} href={'https://fatweb.top'}>
|
||||||
@@ -31,7 +33,7 @@ const MainFramework: React.FC = () => {
|
|||||||
<ul className={'menu'}>
|
<ul className={'menu'}>
|
||||||
{routeChildren?.map((route) => {
|
{routeChildren?.map((route) => {
|
||||||
return (
|
return (
|
||||||
<li className={'item'}>
|
<li className={'item'} key={route.id}>
|
||||||
<NavLink
|
<NavLink
|
||||||
to={route.path ?? ''}
|
to={route.path ?? ''}
|
||||||
className={({ isActive, isPending }) =>
|
className={({ isActive, isPending }) =>
|
||||||
@@ -61,6 +63,7 @@ const MainFramework: React.FC = () => {
|
|||||||
</Suspense>
|
</Suspense>
|
||||||
</MainFrameworkContext.Provider>
|
</MainFrameworkContext.Provider>
|
||||||
</div>
|
</div>
|
||||||
|
</HideScrollbar>
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user