Skip to content

Commit

Permalink
Merge pull request #240 from icflorescu/next
Browse files Browse the repository at this point in the history
  • Loading branch information
icflorescu committed Apr 3, 2023
2 parents 940b410 + e52e37f commit e15284d
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 16 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 2.3.2 (2023-04-03)

- Prevent row click when clicking the selector cell (issue #238)

## 2.3.0 (2023-04-01)

- Export utility functions: `differenceBy`, `getValueAtPath`, `humanize`, `uniqBy`
Expand Down
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mantine-datatable-docs",
"version": "2.3.1",
"version": "2.3.2",
"description": "Docs website for mantine-datatable; see ../package/package.json for more info",
"private": true,
"scripts": {
Expand All @@ -19,7 +19,7 @@
"@mantine/next": "^6.0.5",
"@mantine/notifications": "^6.0.5",
"@mantine/prism": "^6.0.5",
"@tabler/icons-react": "^2.13.1",
"@tabler/icons-react": "^2.13.2",
"@tanstack/react-query": "^4.28.0",
"dayjs": "^1.11.7",
"lodash": "^4.17.21",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mantine-datatable-turborepo",
"version": "2.3.1",
"version": "2.3.2",
"description": "This is a monorepo; see package/package.json for more info",
"private": true,
"workspaces": [
Expand Down
7 changes: 5 additions & 2 deletions package/DataTableRowSelectorCell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,11 @@ type DataTableRowSelectorCellProps = {
export default function DataTableRowSelectorCell({ withRightShadow, ...otherProps }: DataTableRowSelectorCellProps) {
const { cx, classes } = useStyles();
return (
<td className={cx(classes.root, { [classes.withRightShadow]: withRightShadow })}>
<Checkbox classNames={{ input: classes.checkbox }} {...otherProps} onClick={(e) => e.stopPropagation()} />
<td
className={cx(classes.root, { [classes.withRightShadow]: withRightShadow })}
onClick={(e) => e.stopPropagation()}
>
<Checkbox classNames={{ input: classes.checkbox }} {...otherProps} />
</td>
);
}
4 changes: 2 additions & 2 deletions package/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mantine-datatable",
"version": "2.3.1",
"version": "2.3.2",
"description": "Datatable component for Mantine UI, featuring asynchronous data loading support, pagination, multple rows selection, column sorting, custom cell data rendering, row context menu, row expansion and more",
"keywords": [
"ui",
Expand Down Expand Up @@ -44,7 +44,7 @@
"devDependencies": {
"@mantine/core": "^6.0.5",
"@mantine/hooks": "^6.0.5",
"@tabler/icons-react": "^2.13.1",
"@tabler/icons-react": "^2.13.2",
"@types/react": "^18.0.32",
"@types/react-dom": "^18.0.11",
"esbuild": "^0.17.15",
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2068,18 +2068,18 @@
dependencies:
tslib "^2.4.0"

"@tabler/icons-react@^2.13.1":
version "2.13.1"
resolved "https://registry.yarnpkg.com/@tabler/icons-react/-/icons-react-2.13.1.tgz#9cead65d6208bd4eb3d33ed8d0906d87c8b2d39b"
integrity sha512-YPqwdEj5T/ld5Ub00yY96rbJbys5IrmssG8f+mzSUaj3zic4DEezZhRRslRk/9gnVeUW3Qfi4p16tiBdBMdxFQ==
"@tabler/icons-react@^2.13.2":
version "2.13.2"
resolved "https://registry.yarnpkg.com/@tabler/icons-react/-/icons-react-2.13.2.tgz#21a463147087526ec68a6fb509edc9f90c959c74"
integrity sha512-orkRLOOA3jpHE5prNhBzKEBlVCc5sO5SuRBRk9mjNen2uqoIeBJTkJqquhWIIR2uHqmhP+PUls0MtEqW+qjbIA==
dependencies:
"@tabler/icons" "2.13.1"
"@tabler/icons" "2.13.2"
prop-types "^15.7.2"

"@tabler/icons@2.13.1":
version "2.13.1"
resolved "https://registry.yarnpkg.com/@tabler/icons/-/icons-2.13.1.tgz#5bfff89d595a3553ddc7ff8bb92530c5fe7ff26f"
integrity sha512-hQkYW9+tnRUlnm3WDpNGLEB2FS6gyMdDb7eubmGjaWOtc9SK4CdBus465UGfx3M8FahlcOoS5BdzuaABrl/OMw==
"@tabler/icons@2.13.2":
version "2.13.2"
resolved "https://registry.yarnpkg.com/@tabler/icons/-/icons-2.13.2.tgz#caba1546f78deda5f2002912632dca66f106c745"
integrity sha512-sMqkSTAwkLIYIV+Uu/B7MdomR7tHPpwE9YzMtBJgqhK/seiUk5iPoQbTHdS7lbEHqNluAsx2velLCVtM7QilWw==

"@tanstack/query-core@4.27.0":
version "4.27.0"
Expand Down

0 comments on commit e15284d

Please sign in to comment.