Skip to content

Commit 7bfea75

Browse files
Merge branch 'main' into feat/angular-flex-render-granular-update
2 parents a9b3c92 + 5de0729 commit 7bfea75

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+2481
-131
lines changed

docs/config.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -728,6 +728,27 @@
728728
{
729729
"to": "framework/vue/examples/filters",
730730
"label": "Column Filters"
731+
},
732+
{
733+
"to": "framework/vue/examples/virtualized-rows",
734+
"label": "Virtualized Rows"
735+
}
736+
]
737+
},
738+
{
739+
"label": "vanilla",
740+
"children": [
741+
{
742+
"to": "framework/vanilla/examples/basic",
743+
"label": "Basic"
744+
},
745+
{
746+
"to": "framework/vanilla/examples/pagination",
747+
"label": "Pagination"
748+
},
749+
{
750+
"to": "framework/vanilla/examples/sorting",
751+
"label": "Sorting"
731752
}
732753
]
733754
}

docs/guide/columns.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Columns Guide
44

55
## API
66

7-
[Header API](../../api/core/column)
7+
[Column API](../../api/core/column)
88

99
## Columns Guide
1010

docs/guide/expanding.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ type Person = {
4949
id: number
5050
name: string
5151
age: number
52-
children: Person[]
52+
children?: Person[] | undefined
5353
}
5454

55-
const data: Person = [
55+
const data: Person[] = [
5656
{ id: 1,
5757
name: 'John',
5858
age: 30,

docs/guide/global-filtering.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ const table = useReactTable({
106106
state: {
107107
globalFilter,
108108
},
109-
onGlobalFilterChange: setGlobalFilte
109+
onGlobalFilterChange: setGlobalFilter
110110
})
111111
```
112112

docs/guide/migrating.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Types are now included in the base package, so you can remove the `@types/react-
7373
### Update column definitions
7474

7575
- accessor was renamed to either `accessorKey` or `accessorFn` (depending on whether you are using a string or function)
76-
- width, minWidth, maxWidth where renamed to size, minSize, maxSize
76+
- width, minWidth, maxWidth were renamed to size, minSize, maxSize
7777
- Optionally, you can use the new `createColumnHelper` function around each column definition for better TypeScript hints. (You can still just use an array of column definitions if you prefer.)
7878
- The first parameter is the accessor function or accessor string.
7979
- The second parameter is an object of column options.

examples/react/filters-fuzzy/src/main.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ function App() {
8484
{
8585
accessorKey: 'firstName',
8686
cell: info => info.getValue(),
87-
filterFn: 'includesStringSensitive', //note: normal non-fuzzy filter column
87+
filterFn: 'includesStringSensitive', //note: normal non-fuzzy filter column - case sensitive
8888
},
8989
{
90-
accessorFn: row => row.lastName, //note: normal non-fuzzy filter column - case sensitive
90+
accessorFn: row => row.lastName,
9191
id: 'lastName',
9292
cell: info => info.getValue(),
9393
header: () => <span>Last Name</span>,

examples/react/kitchen-sink/src/components/ActionButtons.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export function ActionButtons<T extends RowData>({
7676
<input
7777
type="number"
7878
min="1"
79-
max={table.getPageCount()}
79+
max={pageCount}
8080
defaultValue={pageIndex + 1}
8181
onChange={e => {
8282
const page = e.target.value ? Number(e.target.value) - 1 : 0

examples/react/virtualized-infinite-scrolling/src/main.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ function App() {
184184
({flatData.length} of {totalDBRowCount} rows fetched)
185185
<div
186186
className="container"
187-
onScroll={e => fetchMoreOnBottomReached(e.target as HTMLDivElement)}
187+
onScroll={e => fetchMoreOnBottomReached(e.currentTarget)}
188188
ref={tableContainerRef}
189189
style={{
190190
overflow: 'auto', //our scrollable table container

examples/vanilla/basic/.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
node_modules
2+
.DS_Store
3+
dist
4+
dist-ssr
5+
*.local

examples/vanilla/basic/README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Example
2+
3+
To run this example:
4+
5+
- `npm install` or `yarn`
6+
- `npm run start` or `yarn start`

0 commit comments

Comments
 (0)