diff --git a/apps/mantine-react-table-docs/pages/changelog.mdx b/apps/mantine-react-table-docs/pages/changelog.mdx
index 4715902af..bf037c0d1 100644
--- a/apps/mantine-react-table-docs/pages/changelog.mdx
+++ b/apps/mantine-react-table-docs/pages/changelog.mdx
@@ -1,4 +1,6 @@
import Head from 'next/head';
+import { Alert, Anchor } from '@mantine/core';
+import { IconInfoCircle } from '@tabler/icons-react';
Changelog and Roadmap - Mantine React Table Docs
@@ -10,8 +12,36 @@ import Head from 'next/head';
## Changelog
+}
+>
+ {'Mantine React Table V2 for Mantine V7 is currently in development. See '}
+
+ {'v2.mantine-react-table.com'}
+
+ {' for more info.'}
+
+ {'Or join the '}
+
+ {'MRT Discord'}
+
+ {' to follow along with development.'}
+
+
### V1
+#### V1.3.2 - 2023-10-03
+
+- Fixed `creatingRow` state not able to be properly self managed when using `onCreatingRowChange`
+- Fixed French selected rows translation error
+
#### V1.3.1 - 2023-09-25
- Upgraded to latest TanStack Table `v8.10.3` various performance improvements and bug fixes
@@ -176,4 +206,4 @@ import Head from 'next/head';
## Roadmap
-Mantine React Table v1 is slated to release a stable v1.0 based on Mantine v6.0+ by the end of June 2023.
+Mantine React Table V2 will be released by the end of 2023 and will be compatible with Mantine V7.
diff --git a/apps/mantine-react-table-docs/pages/index.tsx b/apps/mantine-react-table-docs/pages/index.tsx
index 173879cba..6be74000d 100644
--- a/apps/mantine-react-table-docs/pages/index.tsx
+++ b/apps/mantine-react-table-docs/pages/index.tsx
@@ -1,7 +1,16 @@
import Link from 'next/link';
import Image from 'next/image';
-import { Anchor, Box, Button, Paper, Stack, Text, Title } from '@mantine/core';
-import { IconChevronRight } from '@tabler/icons-react';
+import {
+ Alert,
+ Anchor,
+ Box,
+ Button,
+ Paper,
+ Stack,
+ Text,
+ Title,
+} from '@mantine/core';
+import { IconChevronRight, IconInfoCircle } from '@tabler/icons-react';
import { HomeCards } from '../components/mdx/HomeCards';
import { LinkCards } from '../components/mdx/LinkCards';
import { StatBadges } from '../components/mdx/StatBadges';
@@ -17,6 +26,19 @@ import BasicExamples from '../example-groups/BasicExamples';
const HomePage = () => {
return (
+ }>
+ {
+ 'Mantine React Table V2 for Mantine V7 is currently in development. See '
+ }
+
+ {'v2.mantine-react-table.com'}
+
+ {' for more info.'}
+
= {}>(
};
const setCreatingRow = (row: MRT_Updater<MRT_Row<TData> | null | true>) => {
+ let _row = row;
if (row === true) {
- table.setCreatingRow(createRow(table));
- } else {
- _setCreatingRow(row as MRT_Row<TData> | null);
+ _row = createRow(table);
}
+ tableOptions?.onCreatingRowChange?.(_row as MRT_Row<TData> | null) ??
+ _setCreatingRow(_row as MRT_Row<TData> | null);
};
table.setCreatingRow = setCreatingRow;
diff --git a/packages/mantine-react-table/src/locales/fr.ts b/packages/mantine-react-table/src/locales/fr.ts
index cfbfb09a6..345da16bb 100644
--- a/packages/mantine-react-table/src/locales/fr.ts
+++ b/packages/mantine-react-table/src/locales/fr.ts
@@ -70,7 +70,7 @@ export const MRT_Localization_FR: MRT_Localization = {
save: 'Sauvegarder',
search: 'Rechercher',
selectedCountOfRowCountRowsSelected:
- '{selectedCount} de {rowCount} ligne(s) sélectionnée(s)',
+ '{selectedCount} sur {rowCount} ligne(s)',
select: 'Sélectionner',
showAll: 'Afficher tous',
showAllColumns: 'Afficher toutes les colonnes',