Skip to content

Commit 7d7e33d

Browse files
committed
update
1 parent ac85032 commit 7d7e33d

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

src/VirtualTable/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ const renderBody: CustomizeScrollBody<any> = (rawData, props) => {
1616
};
1717

1818
export interface VirtualTableProps<RecordType> extends Omit<TableProps<RecordType>, 'scroll'> {
19-
scroll: { x?: number; y: number };
2019
listItemHeight?: number;
20+
scroll: { x?: number; y?: number };
2121
}
2222

2323
const VirtualTable = <RecordType,>(

src/stickyScrollBar.tsx

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -144,28 +144,28 @@ const StickyScrollBar: React.ForwardRefRenderFunction<unknown, StickyScrollBarPr
144144

145145
// Loop for scroll event check
146146
React.useEffect(() => {
147-
if (!scrollBodyRef.current) {
148-
return;
149-
}
150-
151-
const scrollParents: (HTMLElement | SVGElement)[] = [];
152-
let parent = getDOM(scrollBodyRef.current);
153-
while (parent) {
154-
scrollParents.push(parent);
155-
parent = parent.parentElement;
147+
if (scrollBodyRef.current) {
148+
const scrollParents: (HTMLElement | SVGElement)[] = [];
149+
let parent = getDOM(scrollBodyRef.current);
150+
while (parent) {
151+
scrollParents.push(parent);
152+
parent = parent.parentElement;
153+
}
154+
scrollParents.forEach(p => {
155+
p.addEventListener(SCROLL_EVENT, checkScrollBarVisible, false);
156+
});
157+
window.addEventListener(RESIZE_EVENT, checkScrollBarVisible, false);
158+
window.addEventListener(SCROLL_EVENT, checkScrollBarVisible, false);
159+
container.addEventListener(SCROLL_EVENT, checkScrollBarVisible, false);
160+
return () => {
161+
scrollParents.forEach(p => {
162+
p.removeEventListener(SCROLL_EVENT, checkScrollBarVisible);
163+
});
164+
window.removeEventListener(RESIZE_EVENT, checkScrollBarVisible);
165+
window.removeEventListener(SCROLL_EVENT, checkScrollBarVisible);
166+
container.removeEventListener(SCROLL_EVENT, checkScrollBarVisible);
167+
};
156168
}
157-
158-
scrollParents.forEach(p => p.addEventListener(SCROLL_EVENT, checkScrollBarVisible, false));
159-
window.addEventListener(RESIZE_EVENT, checkScrollBarVisible, false);
160-
window.addEventListener(SCROLL_EVENT, checkScrollBarVisible, false);
161-
container.addEventListener(SCROLL_EVENT, checkScrollBarVisible, false);
162-
163-
return () => {
164-
scrollParents.forEach(p => p.removeEventListener(SCROLL_EVENT, checkScrollBarVisible));
165-
window.removeEventListener(RESIZE_EVENT, checkScrollBarVisible);
166-
window.removeEventListener(SCROLL_EVENT, checkScrollBarVisible);
167-
container.removeEventListener(SCROLL_EVENT, checkScrollBarVisible);
168-
};
169169
}, [container]);
170170

171171
React.useEffect(() => {

0 commit comments

Comments
 (0)