Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
11 changes: 9 additions & 2 deletions examples/basic.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ const MyItem: React.ForwardRefRenderFunction<any, Item> = ({ id }, ref) => (
<span
ref={ref}
style={{
height: 30 + (id % 2 ? 0 : 10),
// height: 30 + (id % 2 ? 0 : 10),
height: 100,
}}
className="fixed-item"
onClick={() => {
Expand Down Expand Up @@ -44,7 +45,7 @@ const TYPES = [
];

const onScroll: React.UIEventHandler<HTMLElement> = (e) => {
console.log('scroll:', e.currentTarget.scrollTop);
// console.log('scroll:', e.currentTarget.scrollTop);
};

const Demo = () => {
Expand All @@ -53,6 +54,12 @@ const Demo = () => {
const [type, setType] = React.useState('dom');
const listRef = React.useRef<ListRef>(null);

React.useEffect(() => {
listRef.current.scrollTo({
index: 99999999,
});
}, []);

return (
<React.StrictMode>
<div style={{ height: '200vh' }}>
Expand Down
20 changes: 20 additions & 0 deletions src/List.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,26 @@ export function RawList<T>(props: ListProps<T>, ref: React.Ref<ListRef>) {
rangeRef.current.start = start;
rangeRef.current.end = end;

// When scroll up, first visible item get real height may not same as `itemHeight`,
// Which will make scroll jump.
// Let's sync scroll top to avoid jump
React.useLayoutEffect(() => {
const changedRecord = heights.getRecord();
if (changedRecord.size === 1) {
const recordKey = Array.from(changedRecord)[0];
const startIndexKey = getKey(mergedData[start]);
if (startIndexKey === recordKey) {
const realStartHeight = heights.get(recordKey);
const diffHeight = realStartHeight - itemHeight;
syncScrollTop((ori) => {
return ori + diffHeight;
});
}
}

heights.resetRecord();
}, [scrollHeight]);

// ================================= Size =================================
const [size, setSize] = React.useState({ width: 0, height });

Expand Down
14 changes: 10 additions & 4 deletions src/hooks/useHeights.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import findDOMNode from 'rc-util/lib/Dom/findDOMNode';
import raf from 'rc-util/lib/raf';
import * as React from 'react';
import { useEffect, useRef } from 'react';
import type { GetKey } from '../interface';
Expand All @@ -23,10 +22,11 @@ export default function useHeights<T>(
const [updatedMark, setUpdatedMark] = React.useState(0);
const instanceRef = useRef(new Map<React.Key, HTMLElement>());
const heightsRef = useRef(new CacheMap());
const collectRafRef = useRef<number>();

const promiseIdRef = useRef<number>(0);

function cancelRaf() {
raf.cancel(collectRafRef.current);
promiseIdRef.current += 1;
}

function collectHeight(sync = false) {
Expand Down Expand Up @@ -56,7 +56,13 @@ export default function useHeights<T>(
if (sync) {
doCollect();
} else {
collectRafRef.current = raf(doCollect);
promiseIdRef.current += 1;
const id = promiseIdRef.current;
Promise.resolve().then(() => {
if (id === promiseIdRef.current) {
doCollect();
}
});
}
}

Expand Down
15 changes: 15 additions & 0 deletions src/utils/CacheMap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,33 @@ class CacheMap {
// `useMemo` no need to update if `id` not change
id: number = 0;

diffKeys = new Set<React.Key>();

constructor() {
this.maps = Object.create(null);
}

set(key: React.Key, value: number) {
this.maps[key as string] = value;
this.id += 1;
this.diffKeys.add(key as string);
}

get(key: React.Key) {
return this.maps[key as string];
}

/**
* CacheMap will record the key changed.
* To help to know what's update in the next render.
*/
resetRecord() {
this.diffKeys.clear();
}

getRecord() {
return this.diffKeys;
}
}

export default CacheMap;
Loading