Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into baseui-css-classes
Browse files Browse the repository at this point in the history
  • Loading branch information
michaldudak committed Jan 3, 2024
2 parents 3e0fb5e + 9fa4e47 commit fd962f6
Show file tree
Hide file tree
Showing 29 changed files with 316 additions and 242 deletions.
74 changes: 72 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,75 @@
# [Versions](https://mui.com/versions/)

## 5.15.3

<!-- generated comparing v5.15.2..master -->

_Jan 3, 2024_

A big thanks to the 11 contributors who made this release possible.
This release was mostly about 🐛 bug fixes and 📚 documentation improvements.

### `@mui/[email protected]`

- &#8203;<!-- 06 -->[material-nextjs] Fix order of emotion server (#40409) @siriwatknp

### `@mui/[email protected]`

- &#8203;<!-- 40 -->[useSlider] Rearrange passive option in eventlisteners (#40235) @Kamino0

### `@mui/[email protected]`

- &#8203;<!-- 14 -->Add use client directive (#40358) @DiegoAndai

### `@mui/[email protected]`

- &#8203;<!-- 13 -->[List] Copy all List\* components to material-next package (#40367) @sai6855
- &#8203;<!-- 12 -->Update CONTRIBUTING guide given v6/v7 rescheduling (#40363) @DiegoAndai
- &#8203;<!-- 11 -->[MenuItem] Fix spec import (#40271) @DiegoAndai
- &#8203;<!-- 10 -->[Option] Add Option component (#40270) @DiegoAndai
- &#8203;<!-- 09 -->[Slider] Replace lodash with internal utils (#40261) @DiegoAndai
- &#8203;<!-- 08 -->[Switch] Change files to TypeScript (#39894) @lhilgert9
- &#8203;<!-- 07 -->[theme] Move ref palette out of color schemes (#40341) @DiegoAndai

### Docs

- &#8203;<!-- 41 -->[base-ui] Polish the Table Pagination demos (#40281) @danilo-leal
- &#8203;<!-- 22 -->[joy-ui] Fix dashboard template console errors (#40316) @oliviertassinari
- &#8203;<!-- 21 -->[joy-ui] Fix image size on the Files template (#40315) @oliviertassinari
- &#8203;<!-- 20 -->[material-ui] Revise the Divider page (#40356) @danilo-leal
- &#8203;<!-- 19 -->[material-ui] Polish the Next.js integration page (#40317) @oliviertassinari
- &#8203;<!-- 18 -->[material-ui] Adding autoFocus on Virtual Popover (#40239) @aacevski
- &#8203;<!-- 17 -->[material-ui] Revise the Roadmap page (#40054) @danilo-leal
- &#8203;<!-- 16 -->[material-ui] Update the "showing and hiding" section on the Tooltip page (#40283) @anle9650
- &#8203;<!-- 05 -->[material-ui] Fix Slider's customized iOS demo to use updated official colors (#39813) @Super-Kenil
- &#8203;<!-- 15 -->[examples] Simplify Next.js example (#40318) @oliviertassinari

### Core

- &#8203;<!-- 39 -->[blog] Update open-graph cards for all posts (#40328) @danilo-leal
- &#8203;<!-- 38 -->[blog] Correct git diff @oliviertassinari
- &#8203;<!-- 37 -->[code-infra] Update lerna and unpin its version (#40399) @michaldudak
- &#8203;<!-- 36 -->[code-infra] Break package dependency cycle between @mui/material and @mui/icons-material (#40400) @michaldudak
- &#8203;<!-- 35 -->[code-infra] Break package dependency cycles (#40398) @michaldudak
- &#8203;<!-- 34 -->[code-infra] Sync bug issue template (#40305) @oliviertassinari
- &#8203;<!-- 33 -->[docs] Fix 301 link to Base UI (#40396) @oliviertassinari
- &#8203;<!-- 32 -->[docs] Link new MUI X components in sidnav (#40345) @oliviertassinari
- &#8203;<!-- 31 -->[docs] Fix 301 links to Toolpad @oliviertassinari
- &#8203;<!-- 30 -->[docs] Remove old notifications @oliviertassinari
- &#8203;<!-- 29 -->[docs] Always mention the npm tag with npx (#40335) @oliviertassinari
- &#8203;<!-- 28 -->[docs] Reduce network use on the All Components pages (#40313) @oliviertassinari
- &#8203;<!-- 27 -->[docs-infra] Fix missing button aria-label (#40394) @oliviertassinari
- &#8203;<!-- 26 -->[docs-infra] Fix a11y violation rule (#40393) @oliviertassinari
- &#8203;<!-- 25 -->[docs-infra] Prefetch pages on hover (#40314) @oliviertassinari
- &#8203;<!-- 24 -->[docs-infra] Fix footer links to link to the main domain (#40373) @oliviertassinari
- &#8203;<!-- 23 -->[docs-infra] Add stray design adjustments (#40347) @danilo-leal
- &#8203;<!-- 04 -->[website] Fix Base UI page's component section imports & styles (#40231) @danilo-leal
- &#8203;<!-- 03 -->[website] Fix outdated Nhost image link @oliviertassinari
- &#8203;<!-- 02 -->[website] Shorten Joy UI description, 7 chars too long @oliviertassinari
- &#8203;<!-- 01 -->[website] Update some social preview images (#40282) @danilo-leal

All contributors of this release in alphabetical order: @aacevski, @anle9650, @danilo-leal, @DiegoAndai, @Kamino0, @lhilgert9, @michaldudak, @oliviertassinari, @sai6855, @siriwatknp, @Super-Kenil

## 5.15.2

<!-- generated comparing v5.15.1..master -->
Expand All @@ -11,12 +81,12 @@ A big thanks to the 13 contributors who made this release possible. Here are som
- 🚀 Added support for callbacks in the [variant's props definition](https://mui.com/material-ui/customization/theme-components/#creating-new-component-variants) (#40094) @mnajdova
- 💫 Published a [blogpost](https://mui.com/blog/2023-material-ui-v6-and-beyond/) for the 2024's plan about Material UI

### `@mui/[email protected].1`
### `@mui/[email protected].2`

- &#8203;<!-- 31 -->[Badge] Use the variants API in the styled call (#40213) @mnajdova
- &#8203;<!-- 04 -->[Paper] Add missing Paper classes descriptions (#40300) @sai6855

### `@mui/[email protected].1`
### `@mui/[email protected].2`

- &#8203;<!-- 03 -->Support props callback in the variant's definition (#40094) @mnajdova

Expand Down
6 changes: 3 additions & 3 deletions benchmark/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
"@emotion/react": "^11.11.3",
"@emotion/server": "^11.11.0",
"@emotion/styled": "^11.11.0",
"@mui/material": "^5.15.2",
"@mui/styles": "^5.15.2",
"@mui/system": "^5.15.2",
"@mui/material": "^5.15.3",
"@mui/styles": "^5.15.3",
"@mui/system": "^5.15.3",
"@styled-system/css": "^5.1.5",
"benchmark": "^2.1.4",
"docs": "^5.0.0",
Expand Down
26 changes: 13 additions & 13 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,20 @@
"@fortawesome/fontawesome-svg-core": "^6.5.1",
"@fortawesome/free-solid-svg-icons": "^6.5.1",
"@fortawesome/react-fontawesome": "^0.2.0",
"@mui/base": "5.0.0-beta.29",
"@mui/docs": "^5.15.2",
"@mui/icons-material": "^5.15.2",
"@mui/joy": "5.0.0-beta.20",
"@mui/lab": "5.0.0-alpha.158",
"@mui/base": "5.0.0-beta.30",
"@mui/docs": "^5.15.3",
"@mui/icons-material": "^5.15.3",
"@mui/joy": "5.0.0-beta.21",
"@mui/lab": "5.0.0-alpha.159",
"@mui/markdown": "^5.0.0",
"@mui/material": "^5.15.2",
"@mui/material-next": "6.0.0-alpha.115",
"@mui/styled-engine": "^5.15.2",
"@mui/styled-engine-sc": "6.0.0-alpha.10",
"@mui/styles": "^5.15.2",
"@mui/system": "^5.15.2",
"@mui/types": "^7.2.11",
"@mui/utils": "^5.15.2",
"@mui/material": "^5.15.3",
"@mui/material-next": "6.0.0-alpha.116",
"@mui/styled-engine": "^5.15.3",
"@mui/styled-engine-sc": "6.0.0-alpha.11",
"@mui/styles": "^5.15.3",
"@mui/system": "^5.15.3",
"@mui/types": "^7.2.12",
"@mui/utils": "^5.15.3",
"@mui/x-charts": "6.18.4",
"@mui/x-data-grid": "6.18.6",
"@mui/x-data-grid-generator": "6.18.6",
Expand Down
10 changes: 5 additions & 5 deletions docs/src/components/productBaseUI/components/BaseInputDemo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react';
import clsx from 'clsx';
import { unstable_useId } from '@mui/material/utils';
import Box from '@mui/material/Box';
import { Input as InputUnstyled } from '@mui/base/Input';
import { Input } from '@mui/base/Input';
import { styled, GlobalStyles } from '@mui/system';

const fieldStyles = `
Expand Down Expand Up @@ -158,7 +158,7 @@ export default function BaseInputDemo({ styling }: { styling?: 'system' | 'tailw
}}
>
{styling === 'system' && (
<InputUnstyled
<Input
placeholder="Type something here"
slots={{
root: Field,
Expand All @@ -169,11 +169,11 @@ export default function BaseInputDemo({ styling }: { styling?: 'system' | 'tailw
{styling === 'css' && (
<React.Fragment>
<GlobalStyles styles={CSS} />
<InputUnstyled placeholder="Type something here" slots={{ input: FloatingLabelInput }} />
<Input placeholder="Type something here" slots={{ input: FloatingLabelInput }} />
</React.Fragment>
)}
{styling === 'tailwindcss' && (
<InputUnstyled
<Input
placeholder="Type something here"
className=" p-[0px_0.75rem][box-shadow:var(--shadow)] relative inline-flex h-[--TextInput-height] w-[320px] rounded-[--muidocs-shape-borderRadius] border border-solid border-[--muidocs-palette-grey-300] bg-[--muidocs-palette-background-paper] outline-transparent [--TextInput-height:64px] [--TextInput-labelLineHeight:20px] [--TextInput-labelScale:0.75] [--TextInput-paddingTop:2rem] focus-within:!border-[--palette-primary] focus-within:[outline:3px_solid_var(--focus-ring)] hover:border-[--muidocs-palette-grey-400] dark:border-[--muidocs-palette-grey-800] dark:shadow-[0_2px_4px_0_rgba(0_0_0/0.8)] dark:focus-within:!border-[--palette-primary] dark:focus-within:[outline:3px_solid_var(--focus-ring)] dark:hover:border-[--muidocs-palette-grey-700]"
slots={{ input: TailwindFloatingLabelInput }}
Expand Down Expand Up @@ -283,7 +283,7 @@ const FloatingLabelInput = React.forwardRef(
);
});
<InputUnstyled
<Input
placeholder="Type something here"
className="relative inline-flex h-[--TextInput-height] w-[320px]
rounded-[--muidocs-shape-borderRadius] border border-solid
Expand Down
Loading

0 comments on commit fd962f6

Please sign in to comment.