v1.0-230926 #27

Merged
FatttSnake merged 81 commits from dev into master 2023-09-26 11:06:08 +08:00
4 changed files with 103 additions and 37 deletions
Showing only changes of commit e191881a33 - Show all commits

View File

@@ -0,0 +1,15 @@
body {
overflow: hidden;
}
#root {
height: 100vh;
width: 100vw;
}
#hide-scrollbar {
position: relative;
height: 100vh;
width: 100vw;
overflow: scroll;
}

View 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

View File

@@ -44,6 +44,7 @@ const Home: React.FC = () => {
</div> </div>
</FitCenter> </FitCenter>
</FitFullScreen> </FitFullScreen>
<FitFullScreen />
</> </>
) )
} }

View File

@@ -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'}>
@@ -61,6 +63,7 @@ const MainFramework: React.FC = () => {
</Suspense> </Suspense>
</MainFrameworkContext.Provider> </MainFrameworkContext.Provider>
</div> </div>
</HideScrollbar>
</> </>
) )
} }