Skip to content

Commit

Permalink
upgrade to Mantine 7.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
KevinVandy committed Jan 12, 2024
1 parent 64e2b5e commit 575eb53
Show file tree
Hide file tree
Showing 5 changed files with 279 additions and 219 deletions.
18 changes: 9 additions & 9 deletions apps/mantine-react-table-docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
"@fortawesome/fontawesome-svg-core": "^6.5.1",
"@fortawesome/free-solid-svg-icons": "^6.5.1",
"@fortawesome/react-fontawesome": "^0.2.0",
"@mantine/code-highlight": "7.3.2",
"@mantine/core": "7.3.2",
"@mantine/dates": "7.3.2",
"@mantine/hooks": "7.3.2",
"@mantine/modals": "7.3.2",
"@mantine/code-highlight": "7.4.1",
"@mantine/core": "7.4.1",
"@mantine/dates": "7.4.1",
"@mantine/hooks": "7.4.1",
"@mantine/modals": "7.4.1",
"@mdx-js/loader": "^3.0.0",
"@mdx-js/react": "^3.0.0",
"@next/mdx": "^14.0.4",
"@tabler/icons-react": "2.45.0",
"@tanstack/react-query": "^5.17.8",
"@tanstack/react-query": "^5.17.9",
"@types/mdx": "^2.0.10",
"clsx": "^2.1.0",
"dayjs": "^1.11.10",
Expand All @@ -41,11 +41,11 @@
"react-dom": "18.2.0"
},
"devDependencies": {
"@types/node": "^20.10.7",
"@types/node": "^20.11.0",
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@typescript-eslint/eslint-plugin": "^6.18.0",
"@typescript-eslint/parser": "^6.18.0",
"@typescript-eslint/eslint-plugin": "^6.18.1",
"@typescript-eslint/parser": "^6.18.1",
"eslint": "8.56.0",
"eslint-config-next": "14.0.4",
"next-plausible": "^3.12.0",
Expand Down
18 changes: 9 additions & 9 deletions packages/mantine-react-table/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@
"@babel/core": "^7.23.7",
"@babel/preset-react": "^7.23.3",
"@faker-js/faker": "^8.3.1",
"@mantine/core": "7.3.2",
"@mantine/dates": "7.3.2",
"@mantine/hooks": "7.3.2",
"@mantine/core": "7.4.1",
"@mantine/dates": "7.4.1",
"@mantine/hooks": "7.4.1",
"@rollup/plugin-babel": "^6.0.4",
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-typescript": "^11.1.5",
"@rollup/plugin-typescript": "^11.1.6",
"@size-limit/preset-small-lib": "^11.0.1",
"@storybook/addon-a11y": "^7.6.7",
"@storybook/addon-essentials": "^7.6.7",
Expand All @@ -91,11 +91,11 @@
"@storybook/react-vite": "^7.6.7",
"@storybook/testing-library": "^0.2.2",
"@tabler/icons-react": "2.45.0",
"@types/node": "^20.10.7",
"@types/node": "^20.11.0",
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@typescript-eslint/eslint-plugin": "^6.18.0",
"@typescript-eslint/parser": "^6.18.0",
"@typescript-eslint/eslint-plugin": "^6.18.1",
"@typescript-eslint/parser": "^6.18.1",
"@vitejs/plugin-react": "^4.2.1",
"dayjs": "^1.11.10",
"eslint": "^8.56.0",
Expand All @@ -107,7 +107,7 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-is": "^18.2.0",
"rollup": "^4.9.4",
"rollup": "^4.9.5",
"rollup-plugin-copy": "^3.5.0",
"rollup-plugin-delete": "^2.0.0",
"rollup-plugin-dts": "^6.1.0",
Expand All @@ -123,7 +123,7 @@
},
"dependencies": {
"@tanstack/match-sorter-utils": "8.11.3",
"@tanstack/react-table": "8.11.3",
"@tanstack/react-table": "8.11.6",
"@tanstack/react-virtual": "3.0.1",
"clsx": "^2.1.0"
},
Expand Down
12 changes: 6 additions & 6 deletions packages/mantine-react-table/src/hooks/useMRT_TableInstance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,12 @@ export const useMRT_TableInstance: <TData extends MRT_RowData>(
const [grouping, setGrouping] = useState<MRT_GroupingState>(
initialState.grouping ?? [],
);
const [hoveredColumn, setHoveredColumn] = useState<
{ id: string } | MRT_Column<TData> | null
>(initialState.hoveredColumn ?? null);
const [hoveredRow, setHoveredRow] = useState<
{ id: string } | MRT_Row<TData> | null
>(initialState.hoveredRow ?? null);
const [hoveredColumn, setHoveredColumn] = useState<Partial<
MRT_Column<TData>
> | null>(initialState.hoveredColumn ?? null);
const [hoveredRow, setHoveredRow] = useState<Partial<MRT_Row<TData>> | null>(
initialState.hoveredRow ?? null,
);
const [isFullScreen, setIsFullScreen] = useState<boolean>(
initialState?.isFullScreen ?? false,
);
Expand Down
6 changes: 2 additions & 4 deletions packages/mantine-react-table/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -321,9 +321,7 @@ export type MRT_TableInstance<TData extends MRT_RowData> = Omit<
setEditingCell: Dispatch<SetStateAction<MRT_Cell<TData> | null>>;
setEditingRow: Dispatch<SetStateAction<MRT_Row<TData> | null>>;
setGlobalFilterFn: Dispatch<SetStateAction<MRT_FilterOption>>;
setHoveredColumn: Dispatch<
SetStateAction<{ id: string } | MRT_Column<TData> | null>
>;
setHoveredColumn: Dispatch<SetStateAction<Partial<MRT_Column<TData>> | null>>;
setHoveredRow: Dispatch<SetStateAction<Partial<MRT_Row<TData>> | null>>;
setIsFullScreen: Dispatch<SetStateAction<boolean>>;
setShowAlertBanner: Dispatch<SetStateAction<boolean>>;
Expand Down Expand Up @@ -1133,7 +1131,7 @@ export type MRT_TableOptions<TData extends MRT_RowData> = Omit<
values: Record<LiteralUnion<string & DeepKeys<TData>>, any>;
}) => Promise<void> | void;
onGlobalFilterFnChange?: OnChangeFn<MRT_FilterOption>;
onHoveredColumnChange?: OnChangeFn<{ id: string } | MRT_Column<TData> | null>;
onHoveredColumnChange?: OnChangeFn<Partial<MRT_Column<TData>> | null>;
onHoveredRowChange?: OnChangeFn<Partial<MRT_Row<TData>> | null>;
onIsFullScreenChange?: OnChangeFn<boolean>;
onShowAlertBannerChange?: OnChangeFn<boolean>;
Expand Down
Loading

0 comments on commit 575eb53

Please sign in to comment.