Skip to content

Commit

Permalink
Merge branch 'master' into depracate-drawer-classes
Browse files Browse the repository at this point in the history
  • Loading branch information
yash49 authored Dec 27, 2024
2 parents 81bb871 + 16ff52a commit ccebcdd
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion docs/data/joy/customization/dark-mode/dark-mode.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ export default class MyDocument extends Document {

### Next.js App Router

To use the Joy UI API with a Next.js project with the App Router, add the following code to the [root layout](https://nextjs.org/docs/app/building-your-application/routing/layouts-and-templates#root-layout-required) file in order to prevent flickering:
To use the Joy UI API with a Next.js project with the App Router, add the following code to the [root layout](https://nextjs.org/docs/app/api-reference/file-conventions/layout#root-layouts) file in order to prevent flickering:

```jsx title="app/layout.js"
import InitColorSchemeScript from '@mui/joy/InitColorSchemeScript';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ createTheme({

### Next.js App Router

Add the following code to the [root layout](https://nextjs.org/docs/app/building-your-application/routing/layouts-and-templates#root-layout-required) file:
Add the following code to the [root layout](https://nextjs.org/docs/app/api-reference/file-conventions/layout#root-layouts) file:

```jsx title="app/layout.js"
import InitColorSchemeScript from '@mui/material/InitColorSchemeScript';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1255,7 +1255,7 @@ This component has been removed.

You can get a reference to the underlying DOM node of our components via `ref` prop.

The component relied on [`ReactDOM.findDOMNode`](https://react.dev/reference/react-dom/findDOMNode) which is [deprecated in `React.StrictMode`](https://react.dev/reference/react/StrictMode#warning-about-deprecated-finddomnode-usage).
The component relied on [`ReactDOM.findDOMNode`](https://legacy.reactjs.org/docs/react-dom.html#finddomnode) which is [deprecated in `React.StrictMode`](https://react.dev/reference/react/StrictMode#warning-about-deprecated-finddomnode-usage).

:::success
This is handled in the [preset-safe codemod](#preset-safe) by applying fake `RootRef` component to prevent application crash, but further fixes are required.
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/blog/material-ui-v6-is-out.md
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ This means you no longer have to clutter the DOM with wrappers like Box or Stack
## React 19 support

Material UI v6 is ready for React 19.
We've been testing Material UI with the latest [React 19 RC](https://react.dev/blog/2024/04/25/react-19) versions to ensure compatibility once the stable release of React 19 is out.
We've been testing Material UI with the latest [React 19 RC](https://react.dev/blog/2024/12/05/react-19) versions to ensure compatibility once the stable release of React 19 is out.

We're also working on backporting React 19 support to Material UI v5—stay tuned.

Expand Down
2 changes: 1 addition & 1 deletion docs/translations/api-docs/app-bar/app-bar.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"description": "If true, the <code>color</code> prop is applied in dark mode."
},
"position": {
"description": "The positioning type. The behavior of the different options is described <a href=\"https://developer.mozilla.org/en-US/docs/Learn/CSS/CSS_layout/Positioning\">in the MDN web docs</a>. Note: <code>sticky</code> is not universally supported and will fall back to <code>static</code> when unavailable."
"description": "The positioning type. The behavior of the different options is described <a href=\"https://developer.mozilla.org/en-US/docs/Web/CSS/position\">in the MDN web docs</a>. Note: <code>sticky</code> is not universally supported and will fall back to <code>static</code> when unavailable."
},
"sx": {
"description": "The system prop that allows defining system overrides as well as additional CSS styles."
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material/src/AppBar/AppBar.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export interface AppBarOwnProps {
enableColorOnDark?: boolean;
/**
* The positioning type. The behavior of the different options is described
* [in the MDN web docs](https://developer.mozilla.org/en-US/docs/Learn/CSS/CSS_layout/Positioning).
* [in the MDN web docs](https://developer.mozilla.org/en-US/docs/Web/CSS/position).
* Note: `sticky` is not universally supported and will fall back to `static` when unavailable.
* @default 'fixed'
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material/src/AppBar/AppBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ AppBar.propTypes /* remove-proptypes */ = {
enableColorOnDark: PropTypes.bool,
/**
* The positioning type. The behavior of the different options is described
* [in the MDN web docs](https://developer.mozilla.org/en-US/docs/Learn/CSS/CSS_layout/Positioning).
* [in the MDN web docs](https://developer.mozilla.org/en-US/docs/Web/CSS/position).
* Note: `sticky` is not universally supported and will fall back to `static` when unavailable.
* @default 'fixed'
*/
Expand Down

0 comments on commit ccebcdd

Please sign in to comment.