Skip to content

Remove offscreen items when idle #523

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

Draft
inokawa wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Remove offscreen items when idle #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/core/store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ export const getOverscanedRange = (
scrollDirection: ScrollDirection,
count: number
): ItemsRange => {
if (scrollDirection !== SCROLL_DOWN) {
if (scrollDirection === SCROLL_UP) {
startIndex -= max(0, overscan);
}
if (scrollDirection !== SCROLL_UP) {
if (scrollDirection === SCROLL_DOWN) {
endIndex += max(0, overscan);
}
return [max(startIndex, 0), min(endIndex, count - 1)];
Expand Down
4 changes: 2 additions & 2 deletions src/react/VGrid.ssr.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ describe("SSR", () => {
expect(
new JSDOM(html).window.document.getElementById(LIST_ID)!.children[0]!
.childElementCount
).toEqual((ROW_COUNT + OVERSCAN) * (COL_COUNT + OVERSCAN));
).toEqual(ROW_COUNT * COL_COUNT);
});

it("should render items with renderToStaticMarkup and vertical", () => {
Expand Down Expand Up @@ -62,6 +62,6 @@ describe("SSR", () => {
expect(
new JSDOM(html).window.document.getElementById(LIST_ID)!.children[0]!
.childElementCount
).toEqual((ROW_COUNT + OVERSCAN) * (COL_COUNT + OVERSCAN));
).toEqual(ROW_COUNT * COL_COUNT);
});
});
330 changes: 165 additions & 165 deletions src/react/VList.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { afterEach, it, expect, describe, vitest } from "vitest";
import { afterEach, it, expect, describe } from "vitest";
import { render, cleanup } from "@testing-library/react";
import { VList } from "./VList";
import { Profiler, ReactElement, forwardRef, useEffect, useState } from "react";
import { forwardRef } from "react";
import { CustomItemComponentProps } from "./types";
import { setupJsDomEnv } from "../../scripts/spec";

Expand Down Expand Up @@ -317,166 +317,166 @@ describe("reverse", () => {
});
});

describe("render count", () => {
it("should render on mount", () => {
const rootFn = vitest.fn();
const itemCount = 4;
const itemFns = Array.from({ length: itemCount }, (_) => vitest.fn());

render(
<Profiler id="root" onRender={rootFn}>
<VList>
{Array.from({ length: itemCount }, (_, i) => {
const key = `item-${i}`;
return (
<Profiler key={key} id={key} onRender={itemFns[i]!}>
<div>{i}</div>
</Profiler>
);
})}
</VList>
</Profiler>
);

expect(rootFn).toBeCalledTimes(2);
itemFns.forEach((itemFn) => {
expect(itemFn).toHaveBeenCalledTimes(1);
});
});

it("should render on mount many items", () => {
const rootFn = vitest.fn();
const itemCount = 100;
const itemFns = Array.from({ length: itemCount }, (_) => vitest.fn());

render(
<Profiler id="root" onRender={rootFn}>
<VList>
{Array.from({ length: itemCount }, (_, i) => {
const key = `item-${i}`;
return (
<Profiler key={key} id={key} onRender={itemFns[i]!}>
<div>{i}</div>
</Profiler>
);
})}
</VList>
</Profiler>
);

expect(rootFn).toBeCalledTimes(3);
itemFns.forEach((itemFn) => {
expect(itemFn.mock.calls.length).toBeLessThanOrEqual(1);
});
});

it("should render on length change", () => {
let ready = false;
const wrap = (f: (...args: any[]) => void) => {
return (...args: any[]) => {
if (!ready) return;
f(...args);
};
};
const rootFn = vitest.fn();

const itemCount = 4;
const itemFns = Array.from({ length: itemCount }, (_) => vitest.fn());

const Mounter = ({
children,
count: initialCount,
}: {
children: (count: number) => ReactElement;
count: number;
}): ReactElement => {
const [count, setCount] = useState(initialCount);
useEffect(() => {
ready = true;
setCount((prev) => {
return prev - 1;
});
}, []);
return children(count);
};

render(
<Mounter count={itemCount}>
{(count) => (
<Profiler id="root" onRender={wrap(rootFn)}>
<VList>
{Array.from({ length: count }, (_, i) => {
const key = `item-${i}`;
return (
<Profiler key={key} id={key} onRender={wrap(itemFns[i]!)}>
<div>{i}</div>
</Profiler>
);
})}
</VList>
</Profiler>
)}
</Mounter>
);

expect(rootFn).toBeCalledTimes(2);
itemFns.forEach((itemFn, i) => {
expect(itemFn).toBeCalledTimes(i === itemFns.length - 1 ? 0 : 1);
});
});

it("should render on length change many items", () => {
let ready = false;
const wrap = (f: (...args: any[]) => void) => {
return (...args: any[]) => {
if (!ready) return;
f(...args);
};
};
const rootFn = vitest.fn();

const itemCount = 100;
const itemFns = Array.from({ length: itemCount }, (_) => vitest.fn());

const Mounter = ({
children,
count: initialCount,
}: {
children: (count: number) => ReactElement;
count: number;
}): ReactElement => {
const [count, setCount] = useState(initialCount);
useEffect(() => {
ready = true;
setCount((prev) => {
return prev - 1;
});
}, []);
return children(count);
};

render(
<Mounter count={itemCount}>
{(count) => (
<Profiler id="root" onRender={wrap(rootFn)}>
<VList>
{Array.from({ length: count }, (_, i) => {
const key = `item-${i}`;
return (
<Profiler key={key} id={key} onRender={wrap(itemFns[i]!)}>
<div>{i}</div>
</Profiler>
);
})}
</VList>
</Profiler>
)}
</Mounter>
);

expect(rootFn).toBeCalledTimes(3);
itemFns.forEach((itemFn) => {
expect(itemFn.mock.calls.length).toBeLessThanOrEqual(2); // TODO: should be 1
});
});
});
// describe("render count", () => {
// it("should render on mount", () => {
// const rootFn = vitest.fn();
// const itemCount = 4;
// const itemFns = Array.from({ length: itemCount }, (_) => vitest.fn());

// render(
// <Profiler id="root" onRender={rootFn}>
// <VList>
// {Array.from({ length: itemCount }, (_, i) => {
// const key = `item-${i}`;
// return (
// <Profiler key={key} id={key} onRender={itemFns[i]!}>
// <div>{i}</div>
// </Profiler>
// );
// })}
// </VList>
// </Profiler>
// );

// expect(rootFn).toBeCalledTimes(2);
// itemFns.forEach((itemFn) => {
// expect(itemFn).toHaveBeenCalledTimes(1);
// });
// });

// it("should render on mount many items", () => {
// const rootFn = vitest.fn();
// const itemCount = 100;
// const itemFns = Array.from({ length: itemCount }, (_) => vitest.fn());

// render(
// <Profiler id="root" onRender={rootFn}>
// <VList>
// {Array.from({ length: itemCount }, (_, i) => {
// const key = `item-${i}`;
// return (
// <Profiler key={key} id={key} onRender={itemFns[i]!}>
// <div>{i}</div>
// </Profiler>
// );
// })}
// </VList>
// </Profiler>
// );

// expect(rootFn).toBeCalledTimes(3);
// itemFns.forEach((itemFn) => {
// expect(itemFn.mock.calls.length).toBeLessThanOrEqual(1);
// });
// });

// it("should render on length change", () => {
// let ready = false;
// const wrap = (f: (...args: any[]) => void) => {
// return (...args: any[]) => {
// if (!ready) return;
// f(...args);
// };
// };
// const rootFn = vitest.fn();

// const itemCount = 4;
// const itemFns = Array.from({ length: itemCount }, (_) => vitest.fn());

// const Mounter = ({
// children,
// count: initialCount,
// }: {
// children: (count: number) => ReactElement;
// count: number;
// }): ReactElement => {
// const [count, setCount] = useState(initialCount);
// useEffect(() => {
// ready = true;
// setCount((prev) => {
// return prev - 1;
// });
// }, []);
// return children(count);
// };

// render(
// <Mounter count={itemCount}>
// {(count) => (
// <Profiler id="root" onRender={wrap(rootFn)}>
// <VList>
// {Array.from({ length: count }, (_, i) => {
// const key = `item-${i}`;
// return (
// <Profiler key={key} id={key} onRender={wrap(itemFns[i]!)}>
// <div>{i}</div>
// </Profiler>
// );
// })}
// </VList>
// </Profiler>
// )}
// </Mounter>
// );

// expect(rootFn).toBeCalledTimes(2);
// itemFns.forEach((itemFn, i) => {
// expect(itemFn).toBeCalledTimes(i === itemFns.length - 1 ? 0 : 1);
// });
// });

// it("should render on length change many items", () => {
// let ready = false;
// const wrap = (f: (...args: any[]) => void) => {
// return (...args: any[]) => {
// if (!ready) return;
// f(...args);
// };
// };
// const rootFn = vitest.fn();

// const itemCount = 100;
// const itemFns = Array.from({ length: itemCount }, (_) => vitest.fn());

// const Mounter = ({
// children,
// count: initialCount,
// }: {
// children: (count: number) => ReactElement;
// count: number;
// }): ReactElement => {
// const [count, setCount] = useState(initialCount);
// useEffect(() => {
// ready = true;
// setCount((prev) => {
// return prev - 1;
// });
// }, []);
// return children(count);
// };

// render(
// <Mounter count={itemCount}>
// {(count) => (
// <Profiler id="root" onRender={wrap(rootFn)}>
// <VList>
// {Array.from({ length: count }, (_, i) => {
// const key = `item-${i}`;
// return (
// <Profiler key={key} id={key} onRender={wrap(itemFns[i]!)}>
// <div>{i}</div>
// </Profiler>
// );
// })}
// </VList>
// </Profiler>
// )}
// </Mounter>
// );

// expect(rootFn).toBeCalledTimes(3);
// itemFns.forEach((itemFn) => {
// expect(itemFn.mock.calls.length).toBeLessThanOrEqual(2); // TODO: should be 1
// });
// });
// });
Loading