Skip to content

Commit

Permalink
Merge branch 'v2' into fix-column-resizing
Browse files Browse the repository at this point in the history
  • Loading branch information
KevinVandy committed Oct 11, 2023
2 parents ee4cc38 + 7574558 commit be28a2f
Show file tree
Hide file tree
Showing 244 changed files with 3,684 additions and 2,512 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ build

# mrt
packages/mantine-react-table/locales
packages/mantine-react-table/mrt.css
packages/mantine-react-table/styles.css
.cache
/dist
dist
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export const tableOptions: TableOption[] = [
type: 'Array<MRT_ColumnDef<TData>>',
},
{
tableOption: 'columnVirtualizerProps',
tableOption: 'columnVirtualizerOptions',
defaultValue: '',
description: '',
link: '',
Expand Down Expand Up @@ -2090,7 +2090,7 @@ export const tableOptions: TableOption[] = [
type: 'Partial<MRT_TableState<TData>>',
},
{
tableOption: 'rowVirtualizerProps',
tableOption: 'rowVirtualizerOptions',
defaultValue: '',
description: '',
link: '',
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@mantine/hooks": "^6.0.21",
"@tabler/icons-react": "2.34.0",
"dayjs": "^1.11.9",
"mantine-react-table": "^1.3.3",
"mantine-react-table": "^2.0.0-alpha.1",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@mantine/hooks": "^6.0.21",
"@tabler/icons-react": "2.34.0",
"dayjs": "^1.11.9",
"mantine-react-table": "^1.3.3",
"mantine-react-table": "^2.0.0-alpha.1",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@mantine/hooks": "^6.0.21",
"@tabler/icons-react": "2.34.0",
"dayjs": "^1.11.9",
"mantine-react-table": "^1.3.3",
"mantine-react-table": "^2.0.0-alpha.1",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit be28a2f

Please sign in to comment.