Skip to content

Commit

Permalink
Merge pull request #6 from icflorescu/next
Browse files Browse the repository at this point in the history
Next
  • Loading branch information
icflorescu committed Nov 6, 2023
2 parents 97e7179 + 6b65f26 commit ff4e99b
Show file tree
Hide file tree
Showing 7 changed files with 184 additions and 228 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
[![Language][language-image]][repo-url]
[![Sponsor the author][sponsor-image]][sponsor-url]

⚠️ Mantine DataTable V6 supports Mantine V6.
💡 Mantine V7 support is in the works, and I could really use your help to speed things up. Please consider [sponsoring my work](https://github.com/sponsors/icflorescu) 🙏
⚠️ Mantine DataTable V6 is compatible with [Mantine V6](https://v6.mantine.dev/).
💡 If you're using Mantine V7, please use [Mantine DataTable V7](https://icflorescu.github.io/mantine-datatable/).

The lightweight, dependency-free, "dark-theme aware" [**table component**](https://icflorescu.github.io/mantine-datatable-v6/) 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 context menu, row expansion, nesting, and more.

Expand Down
3 changes: 1 addition & 2 deletions docs/components/AppHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { HEADER_HEIGHT, NAVBAR_BREAKPOINT, NAVBAR_WIDTH } from '~/config';
import ColorSchemeActionIcon from './appHeader/ColorSchemeActionIcon';
import ColorSchemeControl from './appHeader/ColorSchemeControl';
import NpmLinkButton from './appHeader/NpmLinkButton';
import SearchButton from './appHeader/SearchButton';
import SourceLinkActionIcon from './appHeader/SourceLinkActionIcon';
import SourceLinkButton from './appHeader/SourceLinkButton';
import SponsorsLinkActionIcon from './appHeader/SponsorsLinkActionIcon';
Expand Down Expand Up @@ -107,7 +106,7 @@ export default function AppHeader({ onShowNavbarClick }: { onShowNavbarClick: ()
<Logo className={classes.logo} insideHeader />
</Group>
<Group spacing="xs">
<SearchButton />
{/* <SearchButton /> */}
<Group className={classes.actionIcons} spacing="xs">
<SourceLinkActionIcon />
<SponsorsLinkActionIcon />
Expand Down
10 changes: 5 additions & 5 deletions docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mantine-datatable-docs",
"version": "6.0.3",
"version": "6.0.4",
"description": "Docs website for mantine-datatable; see ../package/package.json for more info",
"private": true,
"scripts": {
Expand All @@ -22,20 +22,20 @@
"@mantine/next": "^6.0.21",
"@mantine/notifications": "^6.0.21",
"@mantine/prism": "^6.0.21",
"@tabler/icons-react": "^2.39.0",
"@tabler/icons-react": "^2.40.0",
"@tanstack/react-query": "^4.36.1",
"dayjs": "^1.11.10",
"lodash": "^4.17.21",
"mantine-datatable": "*",
"next": "^13.5.6",
"next": "^14.0.1",
"next-sitemap": "^4.2.3",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@types/lodash": "^4.14.200",
"@types/node": "^20.8.8",
"@types/react": "^18.2.31",
"@types/node": "^20.8.10",
"@types/react": "^18.2.36",
"typescript": "^5.2.2",
"webpack": "^5.89.0"
}
Expand Down
55 changes: 6 additions & 49 deletions docs/pages/mantine-v7-support.tsx
Original file line number Diff line number Diff line change
@@ -1,68 +1,25 @@
import { Code, Container } from '@mantine/core';
import { Container } from '@mantine/core';
import ExternalLink from '~/components/ExternalLink';
import InternalLink from '~/components/InternalLink';
import PageNavigation from '~/components/PageNavigation';
import PageText from '~/components/PageText';
import PageTitle from '~/components/PageTitle';
import { AUTHOR_LINK, MANTINE_LINK, SPONSOR_LINK } from '~/config';
import { MANTINE_LINK, SPONSOR_LINK } from '~/config';

const PATH = 'mantine-v7-support';

export default function Page() {
return (
<Container>
<PageTitle of={PATH} />
<PageText idea>
<PageText>
Mantine DataTable V6 supports <ExternalLink to="https://v6.mantine.dev/">Mantine V6</ExternalLink>.
<br />
<ExternalLink to={MANTINE_LINK}>Mantine V7</ExternalLink> support is under development. You can help speed up
the process by <ExternalLink to={SPONSOR_LINK}>sponsoring me on GitHub</ExternalLink>.
</PageText>
<PageText>
As most of you already know, Mantine v7 came up with{' '}
<ExternalLink to="https://mantine.dev/changelog/7-0-0/">
a significant number of breaking changes, most of them referring to how styling is implemented
</ExternalLink>
.
</PageText>
<PageText>
As some of you know, Mantine-DataTable is one of my dearest open-source projects. I’ve dedicated a sizeable
amount of my own free time to build it and I’m doing my best to maintain it.
</PageText>
<PageText>
While this library has over 650 GitHub stars and 35k <Code>npm</Code> downloads per month (as of October 1st
2023) and is being used by lots of startups and developers worldwide, I’m still struggling with raising enough
funds to be able to dedicate as much time as I’d like to the project.
</PageText>
<PageText>
To put it bluntly, building and maintaining successful open-source projects doesn’t pay my bills, or maybe I’m
simply not yet good enough at raising awareness and converting it into sponsorship income.
</PageText>
<PageText>
Also, I’d like to mention that this is not the only open-source project I’m working on. I’m also the author of{' '}
<ExternalLink to="https://icflorescu.github.io/mantine-contextmenu">Mantine-ContextMenu</ExternalLink>,{' '}
<ExternalLink to="https://pocketbase-uml.github.io/">PocketBaseUML</ExternalLink>,{' '}
<ExternalLink to="https://icflorescu.github.io/trpc-sveltekit">tRPC-SvelteKit</ExternalLink>,{' '}
<ExternalLink to="https://github.com/icflorescu/expose-wsl">Expose-WSL</ExternalLink> and a few{' '}
<ExternalLink to={AUTHOR_LINK}>others</ExternalLink>.
<br />
But I can’t be a full-time open-source developer; I wasn’t born rich (on the contrary).
<br />
Therefore, I have to make a living, so I have to spend most of my time working on commercial projects as a{' '}
<InternalLink to="/hire-the-author">freelancer or contractor</InternalLink>.
</PageText>
<PageText>
Please understand that this is not a rant, but a simple explanation of why I can’t dedicate as much time as I
(and you) would like to this project.
</PageText>
<PageText warning>
To sum it up, Mantine V7 support is under development, but I can’t do it alone. I need{' '}
<ExternalLink to={SPONSOR_LINK}>your help</ExternalLink>.
</PageText>
<PageText>
Thank you for your support and understanding,
<br />
<ExternalLink to={AUTHOR_LINK}>Ionut-Cristian Florescu</ExternalLink>
<PageText info>
If you are using <ExternalLink to={MANTINE_LINK}>Mantine V7</ExternalLink>, please use{' '}
<ExternalLink to="https://icflorescu.github.io/mantine-datatable/">Mantine DataTable V7</ExternalLink>.
</PageText>
<PageNavigation of={PATH} />
</Container>
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mantine-datatable-turborepo",
"version": "6.0.3",
"version": "6.0.4",
"description": "Monorepo for mantine-datatable; see package/package.json for more info",
"private": true,
"workspaces": [
Expand All @@ -26,12 +26,12 @@
"@testing-library/react": "^14.0.0",
"@testing-library/react-hooks": "^8.0.1",
"@testing-library/user-event": "^14.5.1",
"@types/jest": "^29.5.6",
"@typescript-eslint/eslint-plugin": "^6.9.0",
"@typescript-eslint/parser": "^6.9.0",
"@types/jest": "^29.5.7",
"@typescript-eslint/eslint-plugin": "^6.9.1",
"@typescript-eslint/parser": "^6.9.1",
"babel-jest": "^29.7.0",
"eslint": "^8.52.0",
"eslint-config-next": "^13.5.6",
"eslint": "^8.53.0",
"eslint-config-next": "^14.0.1",
"eslint-config-prettier": "^9.0.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
Expand Down
6 changes: 3 additions & 3 deletions package/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mantine-datatable",
"version": "6.0.3",
"version": "6.0.4",
"description": "The dependency-free 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": [
"mantine",
Expand Down Expand Up @@ -58,8 +58,8 @@
"devDependencies": {
"@mantine/core": "^6.0.21",
"@mantine/hooks": "^6.0.21",
"@tabler/icons-react": "^2.39.0",
"@types/react": "^18.2.31",
"@tabler/icons-react": "^2.40.0",
"@types/react": "^18.2.36",
"@types/react-dom": "^18.2.14",
"esbuild": "^0.19.5",
"react": "^18.2.0",
Expand Down
Loading

0 comments on commit ff4e99b

Please sign in to comment.