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

feat: muti select action #1062

Merged
merged 22 commits into from
Oct 24, 2024
Merged

feat: muti select action #1062

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c8bb6aa
feat: muti select action
hyoban Oct 22, 2024
db1254e
Merge branch 'dev' into feat/muti-select-action
hyoban Oct 23, 2024
7fae600
update
hyoban Oct 23, 2024
7170b52
Merge branch 'dev' into feat/muti-select-action
hyoban Oct 23, 2024
bede5d5
chore: auto-fix linting and formatting issues
hyoban Oct 23, 2024
2126b84
update
hyoban Oct 23, 2024
9a7e02b
support scroll
hyoban Oct 23, 2024
aa9f788
fix select
hyoban Oct 23, 2024
a7b41a7
style
hyoban Oct 23, 2024
7f45b7b
Merge branch 'dev' into feat/muti-select-action
hyoban Oct 23, 2024
e4dc64b
style
hyoban Oct 23, 2024
395460b
update
hyoban Oct 23, 2024
8f07921
update
hyoban Oct 23, 2024
f46798f
unfollow many
hyoban Oct 23, 2024
83678a2
Merge branch 'dev' into feat/muti-select-action
hyoban Oct 23, 2024
cab4041
Merge branch 'dev' into feat/muti-select-action
hyoban Oct 24, 2024
be46328
unfollow manu confirm
hyoban Oct 24, 2024
8b39c9b
Merge branch 'dev' into feat/muti-select-action
hyoban Oct 24, 2024
6fef961
update
hyoban Oct 24, 2024
514cf50
chore: deps
hyoban Oct 24, 2024
6d00adb
fix
hyoban Oct 24, 2024
beab1ca
theme
hyoban Oct 24, 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
Prev Previous commit
Next Next commit
update
  • Loading branch information
@hyoban
hyoban committed Oct 24, 2024
commit 6fef9619ade077408bad0ace670006f599a7950b
53 changes: 34 additions & 19 deletions packages/components/src/ui/scroll-area/ScrollArea.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,24 +125,39 @@ export const ScrollArea = React.forwardRef<
scrollbarClassName?: string
flex?: boolean
mask?: boolean
onScroll?: (e: React.UIEvent<HTMLDivElement>) => void
}
>(({ flex, children, rootClassName, viewportClassName, scrollbarClassName, mask = false }, ref) => {
const [viewportRef, setViewportRef] = React.useState<HTMLDivElement | null>(null)
React.useImperativeHandle(ref, () => viewportRef as HTMLDivElement)
>(
(
{
flex,
children,
rootClassName,
viewportClassName,
scrollbarClassName,
mask = false,
onScroll,
},
ref,
) => {
const [viewportRef, setViewportRef] = React.useState<HTMLDivElement | null>(null)
React.useImperativeHandle(ref, () => viewportRef as HTMLDivElement)

return (
<ScrollElementContext.Provider value={viewportRef}>
<Root className={rootClassName}>
<Viewport
ref={setViewportRef}
onWheel={stopPropagation}
className={cn(flex ? "[&>div]:!flex [&>div]:!flex-col" : "", viewportClassName)}
mask={mask}
>
{children}
</Viewport>
<Scrollbar className={scrollbarClassName} />
</Root>
</ScrollElementContext.Provider>
)
})
return (
<ScrollElementContext.Provider value={viewportRef}>
<Root className={rootClassName}>
<Viewport
ref={setViewportRef}
onWheel={stopPropagation}
className={cn(flex ? "[&>div]:!flex [&>div]:!flex-col" : "", viewportClassName)}
mask={mask}
onScroll={onScroll}
>
{children}
</Viewport>
<Scrollbar className={scrollbarClassName} />
</Root>
</ScrollElementContext.Provider>
)
},
)
Loading