mirror of
https://github.com/nextui-org/nextui.git
synced 2025-12-08 19:26:11 +00:00
fix(listbox): unexpected scrollShadow on virtualized listbox (#4784)
* fix(listbox): add scroll height & scroll top to listbox * fix(use-data-scroll-overflow): handle scrollHeight & scrollTop in virtualization * chore(changeset): add changeset
This commit is contained in:
parent
eb92904fad
commit
f7c2be0a53
6
.changeset/ninety-flowers-teach.md
Normal file
6
.changeset/ninety-flowers-teach.md
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
"@heroui/use-data-scroll-overflow": patch
|
||||||
|
"@heroui/listbox": patch
|
||||||
|
---
|
||||||
|
|
||||||
|
fixed unexpected scrollShadow on virtualized listbox (#4553)
|
||||||
@ -105,7 +105,10 @@ const VirtualizedListbox = (props: Props) => {
|
|||||||
|
|
||||||
const virtualItems = rowVirtualizer.getVirtualItems();
|
const virtualItems = rowVirtualizer.getVirtualItems();
|
||||||
|
|
||||||
/* Here we need the base props for scroll shadow, contains the className (scrollbar-hide and scrollshadow config based on the user inputs on select props) */
|
const virtualScrollHeight = rowVirtualizer.getTotalSize();
|
||||||
|
|
||||||
|
// Here we need the base props for scroll shadow,
|
||||||
|
// contains the className (scrollbar-hide and scrollshadow config based on the user inputs on select props)
|
||||||
const {getBaseProps: getBasePropsScrollShadow} = useScrollShadow({...scrollShadowProps});
|
const {getBaseProps: getBasePropsScrollShadow} = useScrollShadow({...scrollShadowProps});
|
||||||
|
|
||||||
const renderRow = (virtualItem: VirtualItem) => {
|
const renderRow = (virtualItem: VirtualItem) => {
|
||||||
@ -162,6 +165,7 @@ const VirtualizedListbox = (props: Props) => {
|
|||||||
return listboxItem;
|
return listboxItem;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||||
const [scrollState, setScrollState] = useState({
|
const [scrollState, setScrollState] = useState({
|
||||||
isTop: false,
|
isTop: false,
|
||||||
isBottom: true,
|
isBottom: true,
|
||||||
@ -169,7 +173,11 @@ const VirtualizedListbox = (props: Props) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const content = (
|
const content = (
|
||||||
<Component {...getListProps()}>
|
<Component
|
||||||
|
{...getListProps()}
|
||||||
|
data-virtual-scroll-height={virtualScrollHeight}
|
||||||
|
data-virtual-scroll-top={parentRef?.current?.scrollTop}
|
||||||
|
>
|
||||||
{!state.collection.size && !hideEmptyContent && (
|
{!state.collection.size && !hideEmptyContent && (
|
||||||
<li>
|
<li>
|
||||||
<div {...getEmptyContentProps()} />
|
<div {...getEmptyContentProps()} />
|
||||||
@ -178,9 +186,6 @@ const VirtualizedListbox = (props: Props) => {
|
|||||||
<div
|
<div
|
||||||
{...filterDOMProps(getBasePropsScrollShadow())}
|
{...filterDOMProps(getBasePropsScrollShadow())}
|
||||||
ref={parentRef}
|
ref={parentRef}
|
||||||
data-bottom-scroll={scrollState.isTop}
|
|
||||||
data-top-bottom-scroll={scrollState.isMiddle}
|
|
||||||
data-top-scroll={scrollState.isBottom}
|
|
||||||
style={{
|
style={{
|
||||||
height: maxListboxHeight,
|
height: maxListboxHeight,
|
||||||
overflow: "auto",
|
overflow: "auto",
|
||||||
@ -192,7 +197,7 @@ const VirtualizedListbox = (props: Props) => {
|
|||||||
{listHeight > 0 && itemHeight > 0 && (
|
{listHeight > 0 && itemHeight > 0 && (
|
||||||
<div
|
<div
|
||||||
style={{
|
style={{
|
||||||
height: `${rowVirtualizer.getTotalSize()}px`,
|
height: `${virtualScrollHeight}px`,
|
||||||
width: "100%",
|
width: "100%",
|
||||||
position: "relative",
|
position: "relative",
|
||||||
}}
|
}}
|
||||||
|
|||||||
@ -112,12 +112,22 @@ export function useDataScrollOverflow(props: UseDataScrollOverflowProps = {}) {
|
|||||||
{type: "horizontal", prefix: "left", suffix: "right"},
|
{type: "horizontal", prefix: "left", suffix: "right"},
|
||||||
];
|
];
|
||||||
|
|
||||||
|
const listbox = el.querySelector('ul[data-slot="list"]');
|
||||||
|
|
||||||
|
// in virtualized listbox, el.scrollHeight is the height of the visible listbox
|
||||||
|
const scrollHeight = +(
|
||||||
|
listbox?.getAttribute("data-virtual-scroll-height") ?? el.scrollHeight
|
||||||
|
);
|
||||||
|
|
||||||
|
// in virtualized listbox, el.scrollTop is always 0
|
||||||
|
const scrollTop = +(listbox?.getAttribute("data-virtual-scroll-top") ?? el.scrollTop);
|
||||||
|
|
||||||
for (const {type, prefix, suffix} of directions) {
|
for (const {type, prefix, suffix} of directions) {
|
||||||
if (overflowCheck === type || overflowCheck === "both") {
|
if (overflowCheck === type || overflowCheck === "both") {
|
||||||
const hasBefore = type === "vertical" ? el.scrollTop > offset : el.scrollLeft > offset;
|
const hasBefore = type === "vertical" ? scrollTop > offset : el.scrollLeft > offset;
|
||||||
const hasAfter =
|
const hasAfter =
|
||||||
type === "vertical"
|
type === "vertical"
|
||||||
? el.scrollTop + el.clientHeight + offset < el.scrollHeight
|
? scrollTop + el.clientHeight + offset < scrollHeight
|
||||||
: el.scrollLeft + el.clientWidth + offset < el.scrollWidth;
|
: el.scrollLeft + el.clientWidth + offset < el.scrollWidth;
|
||||||
|
|
||||||
setAttributes(type, hasBefore, hasAfter, prefix, suffix);
|
setAttributes(type, hasBefore, hasAfter, prefix, suffix);
|
||||||
@ -132,8 +142,7 @@ export function useDataScrollOverflow(props: UseDataScrollOverflowProps = {}) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// auto
|
// auto
|
||||||
checkOverflow();
|
el.addEventListener("scroll", checkOverflow, true);
|
||||||
el.addEventListener("scroll", checkOverflow);
|
|
||||||
|
|
||||||
// controlled
|
// controlled
|
||||||
if (visibility !== "auto") {
|
if (visibility !== "auto") {
|
||||||
@ -152,7 +161,7 @@ export function useDataScrollOverflow(props: UseDataScrollOverflowProps = {}) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
el.removeEventListener("scroll", checkOverflow);
|
el.removeEventListener("scroll", checkOverflow, true);
|
||||||
clearOverflow();
|
clearOverflow();
|
||||||
};
|
};
|
||||||
}, [...updateDeps, isEnabled, visibility, overflowCheck, onVisibilityChange, domRef]);
|
}, [...updateDeps, isEnabled, visibility, overflowCheck, onVisibilityChange, domRef]);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user