Skip to content

Commit

Permalink
release v2.9.1 - fix row selection highlighting logic on grouped rows
Browse files Browse the repository at this point in the history
  • Loading branch information
@KevinVandy
KevinVandy committed Jan 25, 2024
1 parent 9dd680e commit 7e83646
Show file tree
Hide file tree
Showing 9 changed files with 1,189 additions and 565 deletions.
20 changes: 10 additions & 10 deletions apps/material-react-table-docs/package.json
View file
Expand Up @@ -16,19 +16,19 @@
"@docsearch/js": "3.5.2",
"@emotion/react": "^11.11.3",
"@emotion/styled": "^11.11.0",
"@faker-js/faker": "^8.3.1",
"@faker-js/faker": "^8.4.0",
"@fortawesome/fontawesome-svg-core": "^6.5.1",
"@fortawesome/free-solid-svg-icons": "^6.5.1",
"@fortawesome/react-fontawesome": "^0.2.0",
"@mdx-js/loader": "^3.0.0",
"@mdx-js/react": "^3.0.0",
"@mui/icons-material": "^5.15.5",
"@mui/material": "^5.15.5",
"@mui/icons-material": "^5.15.6",
"@mui/material": "^5.15.6",
"@mui/x-charts": "^6.19.1",
"@mui/x-date-pickers": "^6.19.0",
"@mui/x-date-pickers": "^6.19.2",
"@next/mdx": "^14.1.0",
"@tanstack/react-query": "^5.17.15",
"@tanstack/react-table-devtools": "^8.11.6",
"@tanstack/react-query": "^5.17.19",
"@tanstack/react-table-devtools": "^8.11.7",
"@types/mdx": "^2.0.10",
"dayjs": "^1.11.10",
"export-to-csv": "^1.2.2",
Expand All @@ -43,12 +43,12 @@
"zod": "^3.22.4"
},
"devDependencies": {
"@tanstack/eslint-plugin-query": "^5.17.7",
"@types/node": "^20.11.5",
"@tanstack/eslint-plugin-query": "^5.17.20",
"@types/node": "^20.11.6",
"@types/react": "^18.2.48",
"@types/react-dom": "^18.2.18",
"@typescript-eslint/eslint-plugin": "^6.19.0",
"@typescript-eslint/parser": "^6.19.0",
"@typescript-eslint/eslint-plugin": "^6.19.1",
"@typescript-eslint/parser": "^6.19.1",
"eslint": "8.56.0",
"eslint-config-next": "14.1.0",
"next-plausible": "^3.12.0",
Expand Down
4 changes: 4 additions & 0 deletions apps/material-react-table-docs/pages/changelog.mdx
View file
Expand Up @@ -12,6 +12,10 @@ import Head from 'next/head';

### Version 2

#### Version 2.9.1 - 2024-01-25

- Fixed row selection highlighting logic on grouped/aggregated rows

#### Version 2.9.0 - 2024-01-24

- Added new `renderCaption` table option to allow for a `<caption>` element to be rendered within the table
Expand Down
8 changes: 4 additions & 4 deletions apps/test-cra/package.json
View file
Expand Up @@ -5,10 +5,10 @@
"dependencies": {
"@emotion/react": "^11.11.3",
"@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.15.5",
"@mui/material": "^5.15.5",
"@mui/x-date-pickers": "^6.19.0",
"@testing-library/jest-dom": "^6.2.0",
"@mui/icons-material": "^5.15.6",
"@mui/material": "^5.15.6",
"@mui/x-date-pickers": "^6.19.2",
"@testing-library/jest-dom": "^6.3.0",
"@testing-library/react": "^14.1.2",
"@testing-library/user-event": "^14.5.2",
"material-react-table": "workspace:*",
Expand Down
6 changes: 3 additions & 3 deletions apps/test-remix/package.json
View file
Expand Up @@ -12,9 +12,9 @@
"dependencies": {
"@emotion/react": "^11.11.3",
"@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.15.5",
"@mui/material": "^5.15.5",
"@mui/x-date-pickers": "^6.19.0",
"@mui/icons-material": "^5.15.6",
"@mui/material": "^5.15.6",
"@mui/x-date-pickers": "^6.19.2",
"@remix-run/css-bundle": "^2.5.1",
"@remix-run/node": "^2.5.1",
"@remix-run/react": "^2.5.1",
Expand Down
10 changes: 5 additions & 5 deletions apps/test-vite/package.json
View file
Expand Up @@ -12,18 +12,18 @@
"dependencies": {
"@emotion/react": "^11.11.3",
"@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.15.5",
"@mui/material": "^5.15.5",
"@mui/x-date-pickers": "^6.19.0",
"@mui/icons-material": "^5.15.6",
"@mui/material": "^5.15.6",
"@mui/x-date-pickers": "^6.19.2",
"material-react-table": "workspace:*",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@types/react": "^18.2.48",
"@types/react-dom": "^18.2.18",
"@typescript-eslint/eslint-plugin": "^6.19.0",
"@typescript-eslint/parser": "^6.19.0",
"@typescript-eslint/eslint-plugin": "^6.19.1",
"@typescript-eslint/parser": "^6.19.1",
"@vitejs/plugin-react": "^4.2.1",
"eslint": "^8.56.0",
"eslint-plugin-react-hooks": "^4.6.0",
Expand Down
22 changes: 11 additions & 11 deletions packages/material-react-table/package.json
View file
@@ -1,5 +1,5 @@
{
"version": "2.9.0",
"version": "2.9.1",
"license": "MIT",
"name": "material-react-table",
"description": "A fully featured Material UI V5 implementation of TanStack React Table V8, written from the ground up in TypeScript.",
Expand Down Expand Up @@ -61,14 +61,14 @@
"storybook:dev": "storybook dev -p 6006"
},
"devDependencies": {
"@babel/core": "^7.23.7",
"@babel/core": "^7.23.9",
"@babel/preset-react": "^7.23.3",
"@emotion/react": "^11.11.3",
"@emotion/styled": "^11.11.0",
"@faker-js/faker": "^8.3.1",
"@mui/icons-material": "^5.15.5",
"@mui/material": "^5.15.5",
"@mui/x-date-pickers": "^6.19.0",
"@faker-js/faker": "^8.4.0",
"@mui/icons-material": "^5.15.6",
"@mui/material": "^5.15.6",
"@mui/x-date-pickers": "^6.19.2",
"@rollup/plugin-typescript": "^11.1.6",
"@size-limit/preset-small-lib": "^11.0.2",
"@storybook/addon-a11y": "^7.6.10",
Expand All @@ -80,11 +80,11 @@
"@storybook/react": "^7.6.10",
"@storybook/react-vite": "^7.6.10",
"@storybook/testing-library": "^0.2.2",
"@types/node": "^20.11.5",
"@types/node": "^20.11.6",
"@types/react": "^18.2.48",
"@types/react-dom": "^18.2.18",
"@typescript-eslint/eslint-plugin": "^6.19.0",
"@typescript-eslint/parser": "^6.19.0",
"@typescript-eslint/eslint-plugin": "^6.19.1",
"@typescript-eslint/parser": "^6.19.1",
"@vitejs/plugin-react": "^4.2.1",
"eslint": "^8.56.0",
"eslint-plugin-mui-path-imports": "^0.0.15",
Expand Down Expand Up @@ -115,8 +115,8 @@
"react-dom": ">=18.0"
},
"dependencies": {
"@tanstack/match-sorter-utils": "8.11.3",
"@tanstack/react-table": "8.11.6",
"@tanstack/match-sorter-utils": "8.11.7",
"@tanstack/react-table": "8.11.7",
"@tanstack/react-virtual": "3.0.2",
"highlight-words": "1.2.2"
}
Expand Down
Empty file removed packages/material-react-table/src/utils.ts
View file
Empty file.
5 changes: 4 additions & 1 deletion packages/material-react-table/src/utils/row.utils.ts
View file
Expand Up @@ -12,7 +12,10 @@ export const getIsRowSelected = <TData extends MRT_RowData>({
row: MRT_Row<TData>;
table: MRT_TableInstance<TData>;
}) => {
const { options: enableRowSelection } = table;
const {
options: { enableRowSelection },
} = table;

return (
row.getIsSelected() ||
(parseFromValuesOrFunc(enableRowSelection, row) &&
Expand Down

1 comment on commit 7e83646

@vercel
Copy link

@vercel vercel bot commented on 7e83646 Jan 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

material-react-table – ./apps/material-react-table-docs

material-react-table-kevinvandy-s-team.vercel.app
v2.material-react-table.com
www.material-react-table.com
material-react-table.com
material-react-table-git-v2-kevinvandy-s-team.vercel.app
material-react-table.vercel.app

Please sign in to comment.