Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
fsd-niraj authored Oct 27, 2024
2 parents d4c46b4 + fbcee92 commit a6a4453
Show file tree
Hide file tree
Showing 22 changed files with 83 additions and 95 deletions.
29 changes: 8 additions & 21 deletions apps/mantine.dev/src/pages/guides/next.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ import { ColorSchemeScript } from '@mantine/core';

export default function Document() {
return (
<Html lang="en">
<Html lang="en" suppressHydrationWarning>
<Head>
<ColorSchemeScript defaultColorScheme="auto" />
</Head>
Expand Down Expand Up @@ -125,7 +125,7 @@ export default function RootLayout({
children: React.ReactNode;
}) {
return (
<html lang="en">
<html lang="en" suppressHydrationWarning>
<head>
<ColorSchemeScript />
</head>
Expand All @@ -150,25 +150,6 @@ and `app/layout.tsx` files as described above.

## Next.js Link with polymorphic components

Next.js `Link` does not work in the same way as other similar components in all Next.js versions.

With Next.js 12 and below:

```tsx
import Link from 'next/link';
import { Button } from '@mantine/core';

function Demo() {
return (
<Link href="/hello" passHref>
<Button component="a">Next link button</Button>
</Link>
);
}
```

With Next.js 13 and above:

```tsx
import Link from 'next/link';
import { Button } from '@mantine/core';
Expand Down Expand Up @@ -264,3 +245,9 @@ export default {
},
};
```

## Troubleshooting

If you have any issues with Mantine in your Next.js application, please check
[Help Center article](https://help.mantine.dev/q/server-components) that covers
most common issues with app router and server components.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mantine-a91763c0e2",
"version": "7.13.3",
"version": "7.13.4",
"description": "Mantine Components Monorepo",
"packageManager": "[email protected]",
"license": "MIT",
Expand Down
6 changes: 3 additions & 3 deletions packages/@mantine/carousel/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mantine/carousel",
"version": "7.13.3",
"version": "7.13.4",
"description": "Embla based carousel",
"homepage": "https://mantine.dev/x/carousel/",
"license": "MIT",
Expand Down Expand Up @@ -44,8 +44,8 @@
"directory": "packages/@mantine/carousel"
},
"peerDependencies": {
"@mantine/core": "7.13.3",
"@mantine/hooks": "7.13.3",
"@mantine/core": "7.13.4",
"@mantine/hooks": "7.13.4",
"embla-carousel-react": ">=7.0.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
Expand Down
6 changes: 3 additions & 3 deletions packages/@mantine/charts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mantine/charts",
"version": "7.13.3",
"version": "7.13.4",
"description": "Charts components built with recharts and Mantine",
"homepage": "https://mantine.dev/",
"license": "MIT",
Expand Down Expand Up @@ -35,8 +35,8 @@
"directory": "packages/@mantine/charts"
},
"peerDependencies": {
"@mantine/core": "7.13.3",
"@mantine/hooks": "7.13.3",
"@mantine/core": "7.13.4",
"@mantine/hooks": "7.13.4",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"recharts": "^2.10.3"
Expand Down
6 changes: 3 additions & 3 deletions packages/@mantine/code-highlight/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mantine/code-highlight",
"version": "7.13.3",
"version": "7.13.4",
"description": "Code highlight with Mantine theme",
"homepage": "https://mantine.dev/x/code-highlight/",
"license": "MIT",
Expand Down Expand Up @@ -45,8 +45,8 @@
"directory": "packages/@mantine/code-highlight"
},
"peerDependencies": {
"@mantine/core": "7.13.3",
"@mantine/hooks": "7.13.3",
"@mantine/core": "7.13.4",
"@mantine/hooks": "7.13.4",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@mantine/colors-generator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mantine/colors-generator",
"version": "7.13.3",
"version": "7.13.4",
"description": "A library to generate 10 shades of color based on provided color value",
"homepage": "https://mantine.dev",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions packages/@mantine/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mantine/core",
"version": "7.13.3",
"version": "7.13.4",
"description": "React components library focused on usability, accessibility and developer experience",
"homepage": "https://mantine.dev/",
"license": "MIT",
Expand Down Expand Up @@ -43,7 +43,7 @@
"directory": "packages/@mantine/core"
},
"peerDependencies": {
"@mantine/hooks": "7.13.3",
"@mantine/hooks": "7.13.4",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable no-console */
import { useState } from 'react';
import { Box, MantineThemeProvider } from '../../core';
import { Group } from '../Group';
Expand Down
6 changes: 3 additions & 3 deletions packages/@mantine/dates/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mantine/dates",
"version": "7.13.3",
"version": "7.13.4",
"description": "Calendars, date and time pickers based on Mantine components",
"homepage": "https://mantine.dev/dates/getting-started/",
"license": "MIT",
Expand Down Expand Up @@ -45,8 +45,8 @@
"directory": "packages/@mantine/dates"
},
"peerDependencies": {
"@mantine/core": "7.13.3",
"@mantine/hooks": "7.13.3",
"@mantine/core": "7.13.4",
"@mantine/hooks": "7.13.4",
"dayjs": ">=1.0.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ export const DateTimePicker = factory<DateTimePickerFactory>((_props, ref) => {
return (
<PickerInputBase
formattedValue={formattedValue}
dropdownOpened={dropdownOpened}
dropdownOpened={!rest.disabled ? dropdownOpened : false}
dropdownHandlers={dropdownHandlers}
classNames={resolvedClassNames}
styles={resolvedStyles}
Expand Down
6 changes: 3 additions & 3 deletions packages/@mantine/dropzone/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mantine/dropzone",
"version": "7.13.3",
"version": "7.13.4",
"description": "Dropzone component built with Mantine theme and components",
"homepage": "https://mantine.dev/x/dropzone/",
"license": "MIT",
Expand Down Expand Up @@ -44,8 +44,8 @@
"directory": "packages/@mantine/dropzone"
},
"peerDependencies": {
"@mantine/core": "7.13.3",
"@mantine/hooks": "7.13.3",
"@mantine/core": "7.13.4",
"@mantine/hooks": "7.13.4",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/@mantine/emotion/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mantine/emotion",
"version": "7.13.3",
"version": "7.13.4",
"description": "Emotion bindings for Mantine",
"homepage": "https://mantine.dev/",
"license": "MIT",
Expand Down Expand Up @@ -35,8 +35,8 @@
"@emotion/react": "^11.11.4",
"@emotion/serialize": "^1.1.4",
"@emotion/utils": "^1.2.1",
"@mantine/core": "7.13.3",
"@mantine/hooks": "7.13.3",
"@mantine/core": "7.13.4",
"@mantine/hooks": "7.13.4",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@mantine/form/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mantine/form",
"version": "7.13.3",
"version": "7.13.4",
"description": "Mantine form management library",
"homepage": "https://mantine.dev",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/@mantine/hooks/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mantine/hooks",
"version": "7.13.3",
"version": "7.13.4",
"description": "A collection of 50+ hooks for state and UI management",
"homepage": "https://mantine.dev",
"license": "MIT",
Expand Down
6 changes: 3 additions & 3 deletions packages/@mantine/modals/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mantine/modals",
"version": "7.13.3",
"version": "7.13.4",
"description": "Modals manager based on Mantine components",
"homepage": "https://mantine.dev/x/modals/",
"license": "MIT",
Expand Down Expand Up @@ -39,8 +39,8 @@
"directory": "packages/@mantine/modals"
},
"peerDependencies": {
"@mantine/core": "7.13.3",
"@mantine/hooks": "7.13.3",
"@mantine/core": "7.13.4",
"@mantine/hooks": "7.13.4",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/@mantine/notifications/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mantine/notifications",
"version": "7.13.3",
"version": "7.13.4",
"description": "Mantine notifications system",
"homepage": "https://mantine.dev",
"license": "MIT",
Expand Down Expand Up @@ -44,13 +44,13 @@
"directory": "packages/@mantine/notifications"
},
"peerDependencies": {
"@mantine/core": "7.13.3",
"@mantine/hooks": "7.13.3",
"@mantine/core": "7.13.4",
"@mantine/hooks": "7.13.4",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"dependencies": {
"@mantine/store": "7.13.3",
"@mantine/store": "7.13.4",
"react-transition-group": "4.4.5"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions packages/@mantine/nprogress/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mantine/nprogress",
"version": "7.13.3",
"version": "7.13.4",
"description": "Navigation progress bar",
"homepage": "https://mantine.dev/x/nprogress/",
"license": "MIT",
Expand Down Expand Up @@ -43,13 +43,13 @@
"directory": "packages/@mantine/nprogress"
},
"peerDependencies": {
"@mantine/core": "7.13.3",
"@mantine/hooks": "7.13.3",
"@mantine/core": "7.13.4",
"@mantine/hooks": "7.13.4",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"dependencies": {
"@mantine/store": "7.13.3"
"@mantine/store": "7.13.4"
},
"devDependencies": {
"@mantine-tests/core": "workspace:*",
Expand Down
8 changes: 4 additions & 4 deletions packages/@mantine/spotlight/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mantine/spotlight",
"version": "7.13.3",
"version": "7.13.4",
"description": "Command center components for react and Mantine",
"homepage": "https://mantine.dev",
"license": "MIT",
Expand Down Expand Up @@ -41,13 +41,13 @@
"directory": "packages/@mantine/spotlight"
},
"peerDependencies": {
"@mantine/core": "7.13.3",
"@mantine/hooks": "7.13.3",
"@mantine/core": "7.13.4",
"@mantine/hooks": "7.13.4",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"dependencies": {
"@mantine/store": "7.13.3"
"@mantine/store": "7.13.4"
},
"devDependencies": {
"@mantine-tests/core": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/@mantine/store/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mantine/store",
"version": "7.13.3",
"version": "7.13.4",
"description": "A library to sync external React state updates",
"homepage": "https://mantine.dev",
"license": "MIT",
Expand Down
6 changes: 3 additions & 3 deletions packages/@mantine/tiptap/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mantine/tiptap",
"version": "7.13.3",
"version": "7.13.4",
"description": "Rich text editor based on tiptap",
"homepage": "https://mantine.dev/x/tiptap",
"license": "MIT",
Expand Down Expand Up @@ -44,8 +44,8 @@
"directory": "packages/@mantine/tiptap"
},
"peerDependencies": {
"@mantine/core": "7.13.3",
"@mantine/hooks": "7.13.3",
"@mantine/core": "7.13.4",
"@mantine/hooks": "7.13.4",
"@tiptap/extension-link": ">=2.1.12",
"@tiptap/react": ">=2.1.12",
"react": "^18.2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/@mantine/vanilla-extract/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mantine/vanilla-extract",
"version": "7.13.3",
"version": "7.13.4",
"description": "Vanilla Extract integration for Mantine theme",
"homepage": "https://mantine.dev",
"license": "MIT",
Expand Down Expand Up @@ -35,6 +35,6 @@
"directory": "packages/@mantine/vanilla-extract"
},
"peerDependencies": {
"@mantine/core": "7.13.3"
"@mantine/core": "7.13.4"
}
}
Loading

0 comments on commit a6a4453

Please sign in to comment.