From 7c8945769174a8e77046e14e82b6cf115c479792 Mon Sep 17 00:00:00 2001 From: Ionut-Cristian Florescu Date: Mon, 13 Nov 2023 13:02:51 +0200 Subject: [PATCH 1/3] Update dev deps --- package.json | 18 +++++----- yarn.lock | 92 ++++++++++++++++++++++++++-------------------------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/package.json b/package.json index cf7647ba0..a747cbc90 100644 --- a/package.json +++ b/package.json @@ -75,14 +75,14 @@ "@ducanh2912/next-pwa": "^9.7.2", "@faker-js/faker": "^8.2.0", "@formkit/auto-animate": "^0.8.1", - "@mantine/code-highlight": "^7.2.1", - "@mantine/core": "^7.2.1", - "@mantine/dates": "^7.2.1", - "@mantine/hooks": "^7.2.1", - "@mantine/modals": "^7.2.1", - "@mantine/notifications": "^7.2.1", + "@mantine/code-highlight": "^7.2.2", + "@mantine/core": "^7.2.2", + "@mantine/dates": "^7.2.2", + "@mantine/hooks": "^7.2.2", + "@mantine/modals": "^7.2.2", + "@mantine/notifications": "^7.2.2", "@tabler/icons-react": "^2.40.0", - "@tanstack/react-query": "^5.8.1", + "@tanstack/react-query": "^5.8.3", "@types/lodash": "^4.14.201", "@types/node": "^20.9.0", "@types/react": "^18.2.37", @@ -101,9 +101,9 @@ "postcss": "^8.4.31", "postcss-cli": "^10.1.0", "postcss-import": "^15.1.0", - "postcss-preset-mantine": "^1.10.0", + "postcss-preset-mantine": "^1.11.0", "postcss-simple-vars": "^7.0.1", - "prettier": "^3.0.3", + "prettier": "^3.1.0", "react": "^18.2.0", "react-dom": "^18.2.0", "sharp": "^0.32.6", diff --git a/yarn.lock b/yarn.lock index 6da55741d..63d6a3d24 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1362,18 +1362,18 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" -"@mantine/code-highlight@^7.2.1": - version "7.2.1" - resolved "https://registry.yarnpkg.com/@mantine/code-highlight/-/code-highlight-7.2.1.tgz#2545ad40150f465e06c2c287e49e0a41ee3c9c84" - integrity sha512-CTBSpMSxbnjSLSjcV65pwwmx3Hbl2eLrRGaMzuvSQYwXw7LlZ9xYVMGzndAw3PQkBQPyr5AzuRjdWJrL0kJZAw== +"@mantine/code-highlight@^7.2.2": + version "7.2.2" + resolved "https://registry.yarnpkg.com/@mantine/code-highlight/-/code-highlight-7.2.2.tgz#9f7d7efba52318482e3529554838db38fa95c609" + integrity sha512-zR3J8TvHVZjXESTLNd49pZobhJIZcXUr0CGLs8F4TdnslIoN4SNWipQCPa0kDw7qO5CJhfMqgMeEYNh/slPpPg== dependencies: clsx "2.0.0" highlight.js "^11.7.0" -"@mantine/core@^7.2.1": - version "7.2.1" - resolved "https://registry.yarnpkg.com/@mantine/core/-/core-7.2.1.tgz#1f927836b2ac2c78534cdf0d3528dc4d0fbfac8e" - integrity sha512-vB5nMip/8fm+/9V49C856AGWEGocNzks6+KO/ocz4EKgd665F663Bs8x6cvop2onbZyVxhX/5Zge93ndX4UNFA== +"@mantine/core@^7.2.2": + version "7.2.2" + resolved "https://registry.yarnpkg.com/@mantine/core/-/core-7.2.2.tgz#fd7df20f4020fb4c96557f7ec06bb912dfb211ca" + integrity sha512-cVGmLjYyKIzjn0LRwamj71O4HT43qCxPGAzMZqkMYGOako7xwBLYQNe7HjL/J0FXJDyfX8OdMylVhgsePWYbng== dependencies: "@floating-ui/react" "^0.24.8" clsx "2.0.0" @@ -1382,35 +1382,35 @@ react-textarea-autosize "8.5.3" type-fest "^3.13.1" -"@mantine/dates@^7.2.1": - version "7.2.1" - resolved "https://registry.yarnpkg.com/@mantine/dates/-/dates-7.2.1.tgz#f77b9fbc80c5bd91c8b2401dc076d699bc1e86bc" - integrity sha512-wOLbWU0DJGG3kC7GdoIXdUSvCq9ggFjyDfOuHwRLa0rpWoytsgn9X59ab/4kO341tcqvkMa4F9Yq90Vhyj//rA== +"@mantine/dates@^7.2.2": + version "7.2.2" + resolved "https://registry.yarnpkg.com/@mantine/dates/-/dates-7.2.2.tgz#9e1fcc24d8cc229130d617cf306f6bdcf5b2c550" + integrity sha512-MgUy2qODhXEkdK5OQE3talThrbXKfBK6V0AJ8iwPcrxMoQ77u4aMzTv4+47bEjQeUFyjrT8u916VFd82mn59SA== dependencies: clsx "2.0.0" -"@mantine/hooks@^7.2.1": - version "7.2.1" - resolved "https://registry.yarnpkg.com/@mantine/hooks/-/hooks-7.2.1.tgz#00c4f53e4b9e5d0d6dadc62fe6ee90461d60192a" - integrity sha512-v7GKjVQ6SV6dQ+hrs6HDHB50UB+ZXS5hhGp1bo2k6QGF3wcndws+eghCFO5hjKIVSLYm2YoaZxwKiQmjsZBXfQ== +"@mantine/hooks@^7.2.2": + version "7.2.2" + resolved "https://registry.yarnpkg.com/@mantine/hooks/-/hooks-7.2.2.tgz#d116d8659f77c5f05f9dc088887c8857fcb456da" + integrity sha512-7CFSVP2aQHrBwLLAVf0q5dgj+6QTZmhLTNcuc3pE1du+HLFUdyVS6vvQC6kieZXxOd6UzwFGBlN4G+aDx95XeA== -"@mantine/modals@^7.2.1": - version "7.2.1" - resolved "https://registry.yarnpkg.com/@mantine/modals/-/modals-7.2.1.tgz#781bbee4a8a71f48f868f9a409e4bcd56d80f3cf" - integrity sha512-zfBhgYi65NyO8KmgNOSOggBPa+7jOsKFxalIXfjiOELnDVKp4blOjdfX3dd+treyC+Sw3uvm5+jXYcvketdZrA== +"@mantine/modals@^7.2.2": + version "7.2.2" + resolved "https://registry.yarnpkg.com/@mantine/modals/-/modals-7.2.2.tgz#5ef974e0c086daa4dec714ea0ec7bb072f4c84c0" + integrity sha512-J65xJ5ZULUG8fvNU+UnHboqEs3ueNDTMITUiVucqw4lupt93JHfamuR/PIV2mrXMYqSaKd4NBnxvkmcpjs0uRg== -"@mantine/notifications@^7.2.1": - version "7.2.1" - resolved "https://registry.yarnpkg.com/@mantine/notifications/-/notifications-7.2.1.tgz#e510c1b2ac4e5577d834746e60a2bc6a03520f6b" - integrity sha512-h19WGE7utzqTrn9js/ZJSlnPpcIAZlt6W8SuG3AybXnFP591We9ZCEUUSdwpeJsZM/Put+fJO27j8rh2H9pN9A== +"@mantine/notifications@^7.2.2": + version "7.2.2" + resolved "https://registry.yarnpkg.com/@mantine/notifications/-/notifications-7.2.2.tgz#1f2370bdeaf70347d7996c113a93f941a1a40936" + integrity sha512-2MQ0jJi9HOspJOAq0sfE5QvacZytYoLB8k0GwnubnFilSACbpDYeoQXZWmKX0joYhHtKR15muTnF+P1s9kmr3Q== dependencies: - "@mantine/store" "7.2.1" + "@mantine/store" "7.2.2" react-transition-group "4.4.5" -"@mantine/store@7.2.1": - version "7.2.1" - resolved "https://registry.yarnpkg.com/@mantine/store/-/store-7.2.1.tgz#9210b56e6186ed9115d62c8df77c9d05aa4b9bb2" - integrity sha512-BoWI+gmwZUEIdjXhpIfTNhKa+yiPGUbCubb5QbATQVWztLU/cyyv3HpGHKS8EUe0HS26MIAcTBK+5pHZduTOIA== +"@mantine/store@7.2.2": + version "7.2.2" + resolved "https://registry.yarnpkg.com/@mantine/store/-/store-7.2.2.tgz#d5948fcc1bb3a4c4ae706692f2a636a9367696b5" + integrity sha512-j8vR8whB332pGI8OXkM2/3rdh4LJxELJQTG+rTsCCd3VQuEJiRTQDKVaOvp9ONja3GU5b1Tk3zhKOrkpgxTJBA== "@next/env@14.0.2": version "14.0.2" @@ -1562,17 +1562,17 @@ resolved "https://registry.yarnpkg.com/@tabler/icons/-/icons-2.40.0.tgz#96cecc990a03412b88194ce3765280d2e63c1be6" integrity sha512-VqKsBSX159cLFTnCzkCmGhZtSPJHNN0lM2sC4xe0HPOfPUnjiex7rDHDdut4oe4iKRecDDpwXwM9BcU6xCPlCg== -"@tanstack/query-core@5.8.1": - version "5.8.1" - resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.8.1.tgz#5215a028370d9b2f32e83787a0ea119e2f977996" - integrity sha512-Y0enatz2zQXBAsd7XmajlCs+WaitdR7dIFkqz9Xd7HL4KV04JOigWVreYseTmNH7YFSBSC/BJ9uuNp1MAf+GfA== +"@tanstack/query-core@5.8.3": + version "5.8.3" + resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.8.3.tgz#7c6d62721518223e8b27f1a0b5e9bd4e3bb7ecd8" + integrity sha512-SWFMFtcHfttLYif6pevnnMYnBvxKf3C+MHMH7bevyYfpXpTMsLB9O6nNGBdWSoPwnZRXFNyNeVZOw25Wmdasow== -"@tanstack/react-query@^5.8.1": - version "5.8.1" - resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-5.8.1.tgz#22a122016e23a39acd90341954a895980ec21ade" - integrity sha512-YMagxS8iNPOLg0pK6WOjdSDlAvWKOf69udLOwQrBVmkC2SRLNLko7elo5Ro3ptlJkXvTVHidxC/h5KGi5bH1XQ== +"@tanstack/react-query@^5.8.3": + version "5.8.3" + resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-5.8.3.tgz#3d5db417a4c62b0e04a9b4091ac748cac1bac06c" + integrity sha512-EDRrsMgUtKM+SjVmhDYBd4jwWWyHAw3kCaurKLIO90OfPQr/UhpwcqM2l/eQOaUYon9lfDB2ejQi1edHK7zEdA== dependencies: - "@tanstack/query-core" "5.8.1" + "@tanstack/query-core" "5.8.3" "@trysound/sax@0.2.0": version "0.2.0" @@ -4822,10 +4822,10 @@ postcss-ordered-values@^6.0.0: cssnano-utils "^4.0.0" postcss-value-parser "^4.2.0" -postcss-preset-mantine@^1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/postcss-preset-mantine/-/postcss-preset-mantine-1.10.0.tgz#fddeb3c700db343ddfb9611996f0a4f5c884b8d4" - integrity sha512-pXe8iExVBzleZTp2VBPwdyJC+l00/cmhbuda6In5O22LL9/KPi57NF8sYgHCsd2u6Tv8AVHoz1rmd8W0GrmESg== +postcss-preset-mantine@^1.11.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/postcss-preset-mantine/-/postcss-preset-mantine-1.11.0.tgz#57271f220069739504635b7e2c0af1156cf10ec0" + integrity sha512-drhCJAd8Rrn5ulRX5cP6DM6nMLrACAsBU73MfXNI3c77p4dodO36KcfEMY0WqaQkd/E2oODkTm7gVYOzjs45Gw== dependencies: postcss-mixins "^9.0.4" postcss-nested "^6.0.1" @@ -4918,10 +4918,10 @@ prelude-ls@^1.2.1: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== -prettier@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643" - integrity sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg== +prettier@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.1.0.tgz#c6d16474a5f764ea1a4a373c593b779697744d5e" + integrity sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw== pretty-bytes@^5.3.0, pretty-bytes@^5.4.1: version "5.6.0" From 495ab254f1f91f7341076b8f062789134ed57436 Mon Sep 17 00:00:00 2001 From: Ionut-Cristian Florescu Date: Mon, 13 Nov 2023 13:09:40 +0200 Subject: [PATCH 2/3] Make sure to omit stickyHeader props... from the underlying table --- CHANGELOG.md | 4 ++++ package/types/DataTableProps.ts | 2 ++ 2 files changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff381bf45..da2806c9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ The following is a list of notable changes to the Mantine DataTable component. Minor versions that are not listed in the changelog are bug fixes and small improvements. +## 7.1.7 (2023-11-13) + +- Make sure to omit `stickyHeader` and `stickyHeaderOffset` properties from inherited Table component props to avoid confusion, since Mantine DataTable header is sticky "as needed" + ## 7.1.6 (2023-11-10) - Add `selectionTrigger` property to allow maximizing the selection area to the entire cell holding the checkbox diff --git a/package/types/DataTableProps.ts b/package/types/DataTableProps.ts index 2a8991e8e..9b565edee 100644 --- a/package/types/DataTableProps.ts +++ b/package/types/DataTableProps.ts @@ -205,6 +205,8 @@ export type DataTableProps> = { | 'borderColor' | 'stripedColor' | 'highlightOnHoverColor' + | 'stickyHeader' + | 'stickyHeaderOffset' > & DataTableColorProps & DataTableColumnProps & From 30e18e39a39613996991b8b3cff5edea38213b77 Mon Sep 17 00:00:00 2001 From: Ionut-Cristian Florescu Date: Mon, 13 Nov 2023 13:11:05 +0200 Subject: [PATCH 3/3] Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a747cbc90..39a7f1055 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mantine-datatable", - "version": "7.1.6", + "version": "7.1.7", "description": "The lightweight, dependency-free, dark-theme aware table component for your Mantine UI data-rich applications, featuring asynchronous data loading support, pagination, intuitive Gmail-style additive batch rows selection, column sorting, custom cell data rendering, row expansion, nesting, context menus, and much more", "keywords": [ "mantine",