FatttSnake/oxygen-ui
1
0
Fork 0
Code Pull Requests Activity

Complete main UI #37

Merged
FatttSnake merged 192 commits from FatttSnake into dev 2024-02-23 16:31:17 +08:00
Conversation 0 Commits 192 Files Changed 215 +12 -15
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 380b82f9a9 - Show all commits

9
src/components/common/HideScrollbar.tsx
View File

@@ -486,14 +486,10 @@ const HideScrollbar = forwardRef<HideScrollbarElement, HideScrollbarProps>(
event.preventDefault() event.preventDefault()
return return
} }
let length = verticalScrollbarLength
setVerticalScrollbarLength((prevState) => { setVerticalScrollbarLength((prevState) => {
length = prevState
return prevState
})
if ( if (
!isPreventHorizontalScroll && !isPreventHorizontalScroll &&
length >= 100 && prevState >= 100 &&
!event.shiftKey && !event.shiftKey &&
!event.deltaX !event.deltaX
) { ) {
@@ -502,8 +498,9 @@ const HideScrollbar = forwardRef<HideScrollbarElement, HideScrollbarProps>(
left: rootRef.current?.scrollLeft + event.deltaY, left: rootRef.current?.scrollLeft + event.deltaY,
behavior: 'smooth' behavior: 'smooth'
}) })
return
} }
return prevState
})
} }
} }
wheelListenerRef.current = handleDefaultWheel wheelListenerRef.current = handleDefaultWheel