diff --git a/examples/react/fixed/src/main.tsx b/examples/react/fixed/src/main.tsx index e265fae27..8fbf2ea8f 100644 --- a/examples/react/fixed/src/main.tsx +++ b/examples/react/fixed/src/main.tsx @@ -212,7 +212,6 @@ function GridVirtualizerFixed() { ) } -// eslint-disable-next-line ReactDOM.createRoot(document.getElementById('root')!).render( diff --git a/examples/react/padding/src/main.tsx b/examples/react/padding/src/main.tsx index c3291baae..687185c82 100644 --- a/examples/react/padding/src/main.tsx +++ b/examples/react/padding/src/main.tsx @@ -39,11 +39,11 @@ function App() { ) } -function RowVirtualizerDynamic({ rows }: { rows: Array }) { +function RowVirtualizerDynamic({ rows: rowSizes }: { rows: Array }) { const parentRef = React.useRef(null) const rowVirtualizer = useVirtualizer({ - count: rows.length, + count: rowSizes.length, getScrollElement: () => parentRef.current, estimateSize: () => 50, paddingStart: 100, @@ -79,7 +79,7 @@ function RowVirtualizerDynamic({ rows }: { rows: Array }) { top: 0, left: 0, width: '100%', - height: `${rows[virtualRow.index]}px`, + height: `${rowSizes[virtualRow.index]}px`, transform: `translateY(${virtualRow.start}px)`, }} > @@ -92,12 +92,16 @@ function RowVirtualizerDynamic({ rows }: { rows: Array }) { ) } -function ColumnVirtualizerDynamic({ columns }: { columns: Array }) { +function ColumnVirtualizerDynamic({ + columns: columnSizes, +}: { + columns: Array +}) { const parentRef = React.useRef(null) const columnVirtualizer = useVirtualizer({ horizontal: true, - count: columns.length, + count: columnSizes.length, getScrollElement: () => parentRef.current, estimateSize: () => 50, paddingStart: 100, @@ -135,7 +139,7 @@ function ColumnVirtualizerDynamic({ columns }: { columns: Array }) { top: 0, left: 0, height: '100%', - width: `${columns[virtualColumn.index]}px`, + width: `${columnSizes[virtualColumn.index]}px`, transform: `translateX(${virtualColumn.start}px)`, }} > @@ -149,8 +153,8 @@ function ColumnVirtualizerDynamic({ columns }: { columns: Array }) { } function GridVirtualizerDynamic({ - rows, - columns, + rows: rowSizes, + columns: columnSizes, }: { rows: Array columns: Array @@ -158,7 +162,7 @@ function GridVirtualizerDynamic({ const parentRef = React.useRef(null) const rowVirtualizer = useVirtualizer({ - count: rows.length, + count: rowSizes.length, getScrollElement: () => parentRef.current, estimateSize: () => 50, paddingStart: 200, @@ -168,7 +172,7 @@ function GridVirtualizerDynamic({ const columnVirtualizer = useVirtualizer({ horizontal: true, - count: columns.length, + count: columnSizes.length, getScrollElement: () => parentRef.current, estimateSize: () => 50, paddingStart: 200, @@ -178,7 +182,7 @@ function GridVirtualizerDynamic({ const [show, setShow] = React.useState(true) - const halfWay = Math.floor(rows.length / 2) + const halfWay = Math.floor(rowSizes.length / 2) return ( <> @@ -186,8 +190,8 @@ function GridVirtualizerDynamic({ - {show ? (
diff --git a/examples/react/scroll-padding/src/main.tsx b/examples/react/scroll-padding/src/main.tsx index b430aeae8..3c18d2a62 100644 --- a/examples/react/scroll-padding/src/main.tsx +++ b/examples/react/scroll-padding/src/main.tsx @@ -81,7 +81,7 @@ function App() { }} > #{virtualRow.index} - {virtualRow.key} + {String(virtualRow.key)} ))} diff --git a/examples/react/table/src/main.tsx b/examples/react/table/src/main.tsx index 0bdbe7d69..c9dc87a1f 100644 --- a/examples/react/table/src/main.tsx +++ b/examples/react/table/src/main.tsx @@ -9,7 +9,7 @@ import { useReactTable, } from '@tanstack/react-table' import { makeData } from './makeData' -import type { ColumnDef, Row, SortingState } from '@tanstack/react-table' +import type { ColumnDef, SortingState } from '@tanstack/react-table' import type { Person } from './makeData' import './index.css' @@ -61,7 +61,7 @@ function ReactTableVirtualized() { [], ) - const [data, setData] = React.useState(() => makeData(50_000)) + const [data] = React.useState(() => makeData(50_000)) const table = useReactTable({ data, diff --git a/examples/react/table/src/makeData.ts b/examples/react/table/src/makeData.ts index 9bf52ab8f..b757490c2 100644 --- a/examples/react/table/src/makeData.ts +++ b/examples/react/table/src/makeData.ts @@ -12,7 +12,7 @@ export type Person = { } const range = (len: number) => { - const arr: number[] = [] + const arr: Array = [] for (let i = 0; i < len; i++) { arr.push(i) } @@ -32,13 +32,13 @@ const newPerson = (index: number): Person => { 'relationship', 'complicated', 'single', - ])[0]!, + ])[0], } } -export function makeData(...lens: number[]) { - const makeDataLevel = (depth = 0): Person[] => { - const len = lens[depth]! +export function makeData(...lens: Array) { + const makeDataLevel = (depth = 0): Array => { + const len = lens[depth] return range(len).map((d): Person => { return { ...newPerson(d), diff --git a/examples/react/variable/src/main.tsx b/examples/react/variable/src/main.tsx index 51878a21f..086ec1021 100644 --- a/examples/react/variable/src/main.tsx +++ b/examples/react/variable/src/main.tsx @@ -54,13 +54,13 @@ function App() { ) } -function RowVirtualizerVariable({ rows }: { rows: Array }) { +function RowVirtualizerVariable({ rows: rowSizes }: { rows: Array }) { const parentRef = React.useRef(null) const rowVirtualizer = useVirtualizer({ - count: rows.length, + count: rowSizes.length, getScrollElement: () => parentRef.current, - estimateSize: (i) => rows[i], + estimateSize: (i) => rowSizes[i], overscan: 5, }) @@ -91,7 +91,7 @@ function RowVirtualizerVariable({ rows }: { rows: Array }) { top: 0, left: 0, width: '100%', - height: `${rows[virtualRow.index]}px`, + height: `${rowSizes[virtualRow.index]}px`, transform: `translateY(${virtualRow.start}px)`, }} > @@ -104,14 +104,18 @@ function RowVirtualizerVariable({ rows }: { rows: Array }) { ) } -function ColumnVirtualizerVariable({ columns }: { columns: Array }) { +function ColumnVirtualizerVariable({ + columns: columnSizes, +}: { + columns: Array +}) { const parentRef = React.useRef(null) const columnVirtualizer = useVirtualizer({ horizontal: true, - count: columns.length, + count: columnSizes.length, getScrollElement: () => parentRef.current, - estimateSize: (i) => columns[i], + estimateSize: (i) => columnSizes[i], overscan: 5, }) @@ -144,7 +148,7 @@ function ColumnVirtualizerVariable({ columns }: { columns: Array }) { top: 0, left: 0, height: '100%', - width: `${columns[virtualColumn.index]}px`, + width: `${columnSizes[virtualColumn.index]}px`, transform: `translateX(${virtualColumn.start}px)`, }} > @@ -158,8 +162,8 @@ function ColumnVirtualizerVariable({ columns }: { columns: Array }) { } function GridVirtualizerVariable({ - rows, - columns, + rows: rowSizes, + columns: columnSizes, }: { rows: Array columns: Array @@ -167,17 +171,17 @@ function GridVirtualizerVariable({ const parentRef = React.useRef(null) const rowVirtualizer = useVirtualizer({ - count: rows.length, + count: rowSizes.length, getScrollElement: () => parentRef.current, - estimateSize: (i) => rows[i], + estimateSize: (i) => rowSizes[i], overscan: 5, }) const columnVirtualizer = useVirtualizer({ horizontal: true, - count: columns.length, + count: columnSizes.length, getScrollElement: () => parentRef.current, - estimateSize: (i) => columns[i], + estimateSize: (i) => columnSizes[i], overscan: 5, }) @@ -217,8 +221,8 @@ function GridVirtualizerVariable({ position: 'absolute', top: 0, left: 0, - width: `${columns[virtualColumn.index]}px`, - height: `${rows[virtualRow.index]}px`, + width: `${columnSizes[virtualColumn.index]}px`, + height: `${rowSizes[virtualRow.index]}px`, transform: `translateX(${virtualColumn.start}px) translateY(${virtualRow.start}px)`, }} > @@ -233,13 +237,17 @@ function GridVirtualizerVariable({ ) } -function MasonryVerticalVirtualizerVariable({ rows }: { rows: Array }) { +function MasonryVerticalVirtualizerVariable({ + rows: rowSizes, +}: { + rows: Array +}) { const parentRef = React.useRef(null) const rowVirtualizer = useVirtualizer({ - count: rows.length, + count: rowSizes.length, getScrollElement: () => parentRef.current, - estimateSize: (i) => rows[i], + estimateSize: (i) => rowSizes[i], overscan: 5, lanes: 4, }) @@ -271,7 +279,7 @@ function MasonryVerticalVirtualizerVariable({ rows }: { rows: Array }) { top: 0, left: `${virtualRow.lane * 25}%`, width: '25%', - height: `${rows[virtualRow.index]}px`, + height: `${rowSizes[virtualRow.index]}px`, transform: `translateY(${virtualRow.start}px)`, }} > @@ -285,7 +293,7 @@ function MasonryVerticalVirtualizerVariable({ rows }: { rows: Array }) { } function MasonryHorizontalVirtualizerVariable({ - rows, + rows: columnSizes, }: { rows: Array }) { @@ -293,9 +301,9 @@ function MasonryHorizontalVirtualizerVariable({ const columnVirtualizer = useVirtualizer({ horizontal: true, - count: columns.length, + count: columnSizes.length, getScrollElement: () => parentRef.current, - estimateSize: (i) => columns[i], + estimateSize: (i) => columnSizes[i], overscan: 5, lanes: 4, }) @@ -329,7 +337,7 @@ function MasonryHorizontalVirtualizerVariable({ top: `${virtualColumn.lane * 25}%`, left: 0, height: '25%', - width: `${columns[virtualColumn.index]}px`, + width: `${columnSizes[virtualColumn.index]}px`, transform: `translateX(${virtualColumn.start}px)`, }} >