Skip to content

refactor(examples): improve React examples code quality #1121

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

Open
liwenka1 wants to merge 1 commit into
base: main
Choose a base branch
from
+59 −48
Open

refactor(examples): improve React examples code quality #1121

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
1 change: 0 additions & 1 deletion examples/react/fixed/src/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,6 @@ function GridVirtualizerFixed() {
)
}

// eslint-disable-next-line
ReactDOM.createRoot(document.getElementById('root')!).render(
<React.StrictMode>
<App />
Expand Down
34 changes: 19 additions & 15 deletions examples/react/padding/src/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ function App() {
)
}

function RowVirtualizerDynamic({ rows }: { rows: Array<number> }) {
function RowVirtualizerDynamic({ rows: rowSizes }: { rows: Array<number> }) {
const parentRef = React.useRef<HTMLDivElement>(null)

const rowVirtualizer = useVirtualizer({
count: rows.length,
count: rowSizes.length,
getScrollElement: () => parentRef.current,
estimateSize: () => 50,
paddingStart: 100,
Expand Down Expand Up @@ -79,7 +79,7 @@ function RowVirtualizerDynamic({ rows }: { rows: Array<number> }) {
top: 0,
left: 0,
width: '100%',
height: `${rows[virtualRow.index]}px`,
height: `${rowSizes[virtualRow.index]}px`,
transform: `translateY(${virtualRow.start}px)`,
}}
>
Expand All @@ -92,12 +92,16 @@ function RowVirtualizerDynamic({ rows }: { rows: Array<number> }) {
)
}

function ColumnVirtualizerDynamic({ columns }: { columns: Array<number> }) {
function ColumnVirtualizerDynamic({
columns: columnSizes,
}: {
columns: Array<number>
}) {
const parentRef = React.useRef<HTMLDivElement>(null)

const columnVirtualizer = useVirtualizer({
horizontal: true,
count: columns.length,
count: columnSizes.length,
getScrollElement: () => parentRef.current,
estimateSize: () => 50,
paddingStart: 100,
Expand Down Expand Up @@ -135,7 +139,7 @@ function ColumnVirtualizerDynamic({ columns }: { columns: Array<number> }) {
top: 0,
left: 0,
height: '100%',
width: `${columns[virtualColumn.index]}px`,
width: `${columnSizes[virtualColumn.index]}px`,
transform: `translateX(${virtualColumn.start}px)`,
}}
>
Expand All @@ -149,16 +153,16 @@ function ColumnVirtualizerDynamic({ columns }: { columns: Array<number> }) {
}

function GridVirtualizerDynamic({
rows,
columns,
rows: rowSizes,
columns: columnSizes,
}: {
rows: Array<number>
columns: Array<number>
}) {
const parentRef = React.useRef<HTMLDivElement>(null)

const rowVirtualizer = useVirtualizer({
count: rows.length,
count: rowSizes.length,
getScrollElement: () => parentRef.current,
estimateSize: () => 50,
paddingStart: 200,
Expand All @@ -168,7 +172,7 @@ function GridVirtualizerDynamic({

const columnVirtualizer = useVirtualizer({
horizontal: true,
count: columns.length,
count: columnSizes.length,
getScrollElement: () => parentRef.current,
estimateSize: () => 50,
paddingStart: 200,
Expand All @@ -178,16 +182,16 @@ function GridVirtualizerDynamic({

const [show, setShow] = React.useState(true)

const halfWay = Math.floor(rows.length / 2)
const halfWay = Math.floor(rowSizes.length / 2)

return (
<>
<button onClick={() => setShow((old) => !old)}>Toggle</button>
<button onClick={() => rowVirtualizer.scrollToIndex(halfWay)}>
Scroll to index {halfWay}
</button>
<button onClick={() => rowVirtualizer.scrollToIndex(rows.length - 1)}>
Scroll to index {rows.length - 1}
<button onClick={() => rowVirtualizer.scrollToIndex(rowSizes.length - 1)}>
Scroll to index {rowSizes.length - 1}
</button>
{show ? (
<div
Expand Down Expand Up @@ -230,8 +234,8 @@ function GridVirtualizerDynamic({
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)`,
}}
>
Expand Down
2 changes: 1 addition & 1 deletion examples/react/scroll-padding/src/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ function App() {
}}
>
<td>#{virtualRow.index}</td>
<td>{virtualRow.key}</td>
<td>{String(virtualRow.key)}</td>
</tr>
))}
</tbody>
Expand Down
4 changes: 2 additions & 2 deletions examples/react/table/src/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions examples/react/table/src/makeData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export type Person = {
}

const range = (len: number) => {
const arr: number[] = []
const arr: Array<number> = []
for (let i = 0; i < len; i++) {
arr.push(i)
}
Expand All @@ -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<number>) {
const makeDataLevel = (depth = 0): Array<Person> => {
const len = lens[depth]
return range(len).map((d): Person => {
return {
...newPerson(d),
Expand Down
56 changes: 32 additions & 24 deletions examples/react/variable/src/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ function App() {
)
}

function RowVirtualizerVariable({ rows }: { rows: Array<number> }) {
function RowVirtualizerVariable({ rows: rowSizes }: { rows: Array<number> }) {
const parentRef = React.useRef<HTMLDivElement>(null)

const rowVirtualizer = useVirtualizer({
count: rows.length,
count: rowSizes.length,
getScrollElement: () => parentRef.current,
estimateSize: (i) => rows[i],
estimateSize: (i) => rowSizes[i],
overscan: 5,
})

Expand Down Expand Up @@ -91,7 +91,7 @@ function RowVirtualizerVariable({ rows }: { rows: Array<number> }) {
top: 0,
left: 0,
width: '100%',
height: `${rows[virtualRow.index]}px`,
height: `${rowSizes[virtualRow.index]}px`,
transform: `translateY(${virtualRow.start}px)`,
}}
>
Expand All @@ -104,14 +104,18 @@ function RowVirtualizerVariable({ rows }: { rows: Array<number> }) {
)
}

function ColumnVirtualizerVariable({ columns }: { columns: Array<number> }) {
function ColumnVirtualizerVariable({
columns: columnSizes,
}: {
columns: Array<number>
}) {
const parentRef = React.useRef<HTMLDivElement>(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,
})

Expand Down Expand Up @@ -144,7 +148,7 @@ function ColumnVirtualizerVariable({ columns }: { columns: Array<number> }) {
top: 0,
left: 0,
height: '100%',
width: `${columns[virtualColumn.index]}px`,
width: `${columnSizes[virtualColumn.index]}px`,
transform: `translateX(${virtualColumn.start}px)`,
}}
>
Expand All @@ -158,26 +162,26 @@ function ColumnVirtualizerVariable({ columns }: { columns: Array<number> }) {
}

function GridVirtualizerVariable({
rows,
columns,
rows: rowSizes,
columns: columnSizes,
}: {
rows: Array<number>
columns: Array<number>
}) {
const parentRef = React.useRef<HTMLDivElement>(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,
})

Expand Down Expand Up @@ -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)`,
}}
>
Expand All @@ -233,13 +237,17 @@ function GridVirtualizerVariable({
)
}

function MasonryVerticalVirtualizerVariable({ rows }: { rows: Array<number> }) {
function MasonryVerticalVirtualizerVariable({
rows: rowSizes,
}: {
rows: Array<number>
}) {
const parentRef = React.useRef<HTMLDivElement>(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,
})
Expand Down Expand Up @@ -271,7 +279,7 @@ function MasonryVerticalVirtualizerVariable({ rows }: { rows: Array<number> }) {
top: 0,
left: `${virtualRow.lane * 25}%`,
width: '25%',
height: `${rows[virtualRow.index]}px`,
height: `${rowSizes[virtualRow.index]}px`,
transform: `translateY(${virtualRow.start}px)`,
}}
>
Expand All @@ -285,17 +293,17 @@ function MasonryVerticalVirtualizerVariable({ rows }: { rows: Array<number> }) {
}

function MasonryHorizontalVirtualizerVariable({
rows,
rows: columnSizes,
}: {
rows: Array<number>
}) {
const parentRef = React.useRef<HTMLDivElement>(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,
lanes: 4,
})
Expand Down Expand Up @@ -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)`,
}}
>
Expand Down