Skip to content

Commit

Permalink
Merge branch 'master' into determine-first-last-buttons-in-button-group
Browse files Browse the repository at this point in the history
  • Loading branch information
ZeeshanTamboli committed Sep 8, 2023
2 parents e76692f + 3d2fb8a commit c5f8b76
Show file tree
Hide file tree
Showing 833 changed files with 48,849 additions and 49,228 deletions.
16 changes: 8 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 2.1
orbs:
aws-cli: circleci/aws-cli@4.0
aws-cli: circleci/aws-cli@4.1
aws-s3: circleci/[email protected]

parameters:
Expand Down Expand Up @@ -228,7 +228,7 @@ jobs:
name: 'Write "use client" directive'
command: yarn rsc:build
- run:
name: '`yarn rsc:build` changes detected, "use client" missing from exports'
name: '`yarn rsc:build` changes committed?'
command: git add -A && git diff --exit-code --staged
- run:
name: Generate the documentation
Expand Down Expand Up @@ -689,9 +689,9 @@ jobs:
value: << pipeline.git.branch >>
steps:
- aws-cli/setup:
aws_access_key_id: AWS_ACCESS_KEY_ID_ARTIFACTS
region: AWS_REGION_ARTIFACTS
aws_secret_access_key: AWS_SECRET_ACCESS_KEY_ARTIFACTS
aws_access_key_id: $AWS_ACCESS_KEY_ID_ARTIFACTS
region: $AWS_REGION_ARTIFACTS
aws_secret_access_key: $AWS_SECRET_ACCESS_KEY_ARTIFACTS
# Upload distributables to S3
- aws-s3/copy:
from: mui-material.tgz
Expand All @@ -718,9 +718,9 @@ jobs:
value: << pipeline.git.branch >>
steps:
- aws-cli/setup:
aws_access_key_id: AWS_ACCESS_KEY_ID_ARTIFACTS
region: AWS_REGION_ARTIFACTS
aws_secret_access_key: AWS_SECRET_ACCESS_KEY_ARTIFACTS
aws_access_key_id: $AWS_ACCESS_KEY_ID_ARTIFACTS
region: $AWS_REGION_ARTIFACTS
aws_secret_access_key: $AWS_SECRET_ACCESS_KEY_ARTIFACTS
# persist size snapshot on S3
- aws-s3/copy:
arguments: --content-type application/json
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
os: [macos-latest, windows-latest, ubuntu-latest]
steps:
- run: echo "${{ github.actor }}"
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
with:
# fetch all tags which are required for `yarn release:changelog`
fetch-depth: 0
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
security-events: write
steps:
- name: Checkout repository
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4
uses: github/codeql-action/init@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5
with:
languages: typescript
config-file: ./.github/codeql/codeql-config.yml
Expand All @@ -30,4 +30,4 @@ jobs:
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4
uses: github/codeql-action/analyze@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5
4 changes: 2 additions & 2 deletions .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
with:
persist-credentials: false

Expand All @@ -43,6 +43,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: Upload to code-scanning
uses: github/codeql-action/upload-sarif@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4
uses: github/codeql-action/upload-sarif@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5
with:
sarif_file: results.sarif
140 changes: 137 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,139 @@
# [Versions](https://mui.com/versions/)

## 5.14.8

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

_Sep 5, 2023_

A big thanks to the 25 contributors who made this release possible.

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

- &#8203;<!-- 53 -->ImageItemList fix incorrect (below) rendering (#38452) @omriklein
- &#8203;<!-- 42 -->[Button] Add demo for file upload (#38786) @anle9650
- &#8203;<!-- 12 -->[Slider] Add missing classes for `Slider` `InputLabel` `InputBase` `Radio` (#38401) @sai6855
- &#8203;<!-- 11 -->[Select] Merge slotProps.paper with internal Paper props (#38703) @michaldudak
- &#8203;<!-- 09 -->[Tabs] Fix `ref` type (#38717) @ZeeshanTamboli
- &#8203;<!-- 08 -->[TabScrollButton] Extend ButtonBase types (#38719) @ZeeshanTamboli

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

- &#8203;<!-- 50 -->[Autocomplete] Type multiple values with readonly arrays. (#38253) @pcorpet
- &#8203;<!-- 07 -->[TextField] Fix unstable height of memoized multiline TextField component (#37135) @amal-qb

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

- &#8203;<!-- 53 -->[Accordion] Fix incorrect display of classname (#38695) @sai6855
- &#8203;<!-- 51 -->[AspectRatio] Correct `ratio` prop description (#38743) @sai6855
- &#8203;<!-- 43 -->[Button] Fix disablity of button (#38673) @sai6855
- &#8203;<!-- 35 -->[design] Stray design tweaks to components (#38476) @zanivan
- &#8203;<!-- 05 -->[Typography] Added position only when Skeleton is a direct child (#38799) @siriwatknp

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

- &#8203;<!-- 06 -->[TreeView] Use Tree View from MUI X in the lab (#38261) @flaviendelangle
- &#8203;<!-- 13 -->[LoadingButton] Fix HTML rule button > div forbidden nesting (#38584) @oliviertassinari

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

- &#8203;<!-- 11 -->[system] Fix the inconsistent types of the `mergeBreakpointsInOrder` function (#38749) @imevanc
- &#8203;<!-- 10 -->[system] Fix maxWidth incorrectly resolving breakpoints with non-pixel units (#38633) @mj12albert
- &#8203;<!-- 05 -->[typescript] Introduce \*OwnProps interfaces for components (#36798) @szalonna

### Docs

- &#8203;<!-- 52 -->Update changelog (#38704) @mj12albert
- &#8203;<!-- 49 -->[docs][Autocomplete] Require referentially stable value (#38734) @michaldudak
- &#8203;<!-- 48 -->[docs][base-ui] Add type parameter to the button in prepareForSlot demo (#38640) @michaldudak
- &#8203;<!-- 47 -->[docs][base-ui] Fix the broken image in the Tailwind CSS guide (#38721) @michaldudak
- &#8203;<!-- 46 -->[docs][base-ui]: Working With Tailwind Guide - revises example code to avoid import errors (#38693) @christophermorin
- &#8203;<!-- 45 -->[docs][base] Add Tailwind CSS + plain CSS demo on the Menu page (#38618) @alisasanib
- &#8203;<!-- 44 -->[blog] Clearer blog release title @oliviertassinari
- &#8203;<!-- 43 -->[blog] Add a post for the Tree View migration (#38407) @flaviendelangle
- &#8203;<!-- 34 -->[docs] Fix broken links to Next.js docs (#38764) @ruflair
- &#8203;<!-- 33 -->[docs] Trim trailing whitespace (#38793) @oliviertassinari
- &#8203;<!-- 32 -->[docs] Fix a typo in lab-tree-view-to-mui-x.md @mbrookes
- &#8203;<!-- 31 -->[docs] Clean up not used Usage files (#38715) @danilo-leal
- &#8203;<!-- 30 -->[docs] Improve theme builder exceptions (#38709) @jyash97
- &#8203;<!-- 29 -->[docs] Polish Slider demos (#38759) @oliviertassinari
- &#8203;<!-- 28 -->[docs] Fix Joy UI docs link regression (#38761) @oliviertassinari
- &#8203;<!-- 27 -->[docs] Fix typo @oliviertassinari
- &#8203;<!-- 26 -->[docs] Fix e.g. typo (#38748) @oliviertassinari
- &#8203;<!-- 25 -->[docs] Fix Next.js pages router example redirect link (#38750) @sai6855
- &#8203;<!-- 24 -->[docs] Fix SEO issue broken links @oliviertassinari
- &#8203;<!-- 23 -->[docs] Improve SSR example reference (#38651) @oliviertassinari
- &#8203;<!-- 17 -->[docs][joy-ui] Integrate a count-up feature to the Linear Progress (#38738) @anon-phantom
- &#8203;<!-- 16 -->[docs][joy-ui] Fix Link's `overlay` prop demo (#38702) @danilo-leal
- &#8203;<!-- 15 -->[docs][joy-ui] Polish the Stack page (#38623) @danilo-leal
- &#8203;<!-- 14 -->[docs][material-ui] Adjust simple Slide demo (#38646) @rajgop1

### Core

- &#8203;<!-- 43 -->[core] Re-add nx and setup build caching (#38752) @brijeshb42
- &#8203;<!-- 41 -->[core] Remove dead code seoTitle @oliviertassinari
- &#8203;<!-- 40 -->[core] Use immutable refs (#38762) @oliviertassinari
- &#8203;<!-- 39 -->[core] Rework `typescript-to-proptypes` to share the AST parsing with `parseStyles` (#38517) @flaviendelangle
- &#8203;<!-- 38 -->[core] Fix CI @oliviertassinari
- &#8203;<!-- 37 -->[core] Remove unnecessary `@types/webpack` package (#38720) @ZeeshanTamboli
- &#8203;<!-- 36 -->[core] Remove duplicate prop @oliviertassinari

- &#8203;<!-- 22 -->[docs-infra] Fix mobile display in CodeSandbox (#38767) @oliviertassinari
- &#8203;<!-- 21 -->[docs-infra] Remove legacy GA (#37579) @alexfauquette
- &#8203;<!-- 20 -->[docs-infra] Fix emotion :first-child console log (#38690) @oliviertassinari
- &#8203;<!-- 19 -->[docs-infra] Fix leaking callout content (#38712) @danilo-leal
- &#8203;<!-- 18 -->[docs-infra] Remove emoji from callouts (#38694) @danilo-leal

- &#8203;<!-- 04 -->[website] Fix out of date discount value @oliviertassinari
- &#8203;<!-- 03 -->[website] Fix out-of-date label on Toolpad (#38744) @bharatkashyap
- &#8203;<!-- 02 -->[website] Fine-tune branding buttons box shadows (#38731) @danilo-leal
- &#8203;<!-- 01 -->[website] Fix pricing table style (#38681) @alexfauquette

All contributors of this release in alphabetical order: @alexfauquette, @alisasanib, @amal-qb, @anle9650, @anon-phantom, @bharatkashyap, @brijeshb42, @christophermorin, @danilo-leal, @flaviendelangle, @imevanc, @jyash97, @mbrookes, @michaldudak, @mj12albert, @oliviertassinari, @omriklein, @pcorpet, @rajgop1, @ruflair, @sai6855, @siriwatknp, @szalonna, @zanivan, @ZeeshanTamboli

## 5.14.7

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

_Aug 29, 2023_

A big thanks to the 11 contributors who made this release possible. This release focuses primarily on 🐛 bug fixes, 📚 documentation, and ⚙️ infrastructure improvements.

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

- [Autocomplete] Fix listbox opened unexpectedly when component is `disabled` (#38611) @mj12albert
- [Select][material-ui] Fix select menu moving on scroll when disableScrollLock is true (#37773) @VishruthR

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

- [useButton][base-ui] Accept arbitrary props in getRootProps and forward them (#38475) @DiegoAndai

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

- [system][zero][tag] Add support for sx prop (#38535) @brijeshb42

### Docs

- [docs] Number Input docs fixes (#38521) @mj12albert
- [docs] Show all the code in the usage section (#38691) @oliviertassinari
- [docs][joy-ui] Change the customization and how-to guides docs tree (#38396) @danilo-leal
- [docs][lab][LoadingButton] Improve `loading` prop documentation (#38625) @sai6855
- [docs][material-ui] Format `key` prop JSDoc description in `Snackbar` component code correctly (#38603) @jaydenseric

### Core

- [core] Add use-client to custom icons (#38132) @mj12albert
- [core] Remove unnecessary `@types/jsdom` (#38657) @renovate[bot]
- [core] Improve sponsors GA labels (#38649) @oliviertassinari
- [core] Fix ESM issues with regression tests (#37963) @Janpot
- [core] Potential fix for intermittent ci crashes in e2e test (#38614) @Janpot
- [docs-infra] Mark unstable components with a chip in the nav drawer (#38573) @michaldudak
- [docs-infra] Adjust the Material You playground demo design (#38636) @danilo-leal
- [docs-infra] Hide the SkipLink button if user prefers reduced motion (#38632) @DerTimonius
- [website] Add tiny fixes the homepage Sponsors section (#38635) @danilo-leal

All contributors of this release in alphabetical order: @brijeshb42, @danilo-leal, @DerTimonius, @DiegoAndai, @Janpot, @jaydenseric, @mj12albert, @oliviertassinari, @renovate[bot], @sai6855, @VishruthR

## 5.14.6

<!-- generated comparing v5.14.5..master -->
Expand Down Expand Up @@ -539,7 +673,7 @@ A big thanks to the 15 contributors who made this release possible. Here are som
- 💫 Material UI, Joy UI, and Base UI are compatible with [NextJS App Router](https://nextjs.org/docs/app) (#37656) @mj12albert
- 📚 Added new guides for integrating with Next.js 13 App Router (#37656) @mj12albert
- Ⓜ️ [Material UI guide](https://mui.com/material-ui/guides/next-js-app-router/)
- 🅙 [Joy UI guide](https://mui.com/joy-ui/guides/next-js-app-router/)
- 🅙 [Joy UI guide](https://mui.com/joy-ui/integrations/next-js-app-router/)
- 🅱️ [Base UI guide](https://mui.com/base-ui/guides/next-js-app-router/)
- 🐛 bug fixes, 📚 documentation, and ⚙️ infrastructure improvements.

Expand Down Expand Up @@ -1337,7 +1471,7 @@ _Apr 11, 2023_

A big thanks to the 9 contributors who made this release possible. Here are some highlights ✨:

- 💫 Added [theme scope](https://mui.com/material-ui/guides/styled-engine/#theme-scoping) for using multiple design systems (#36664) @siriwatknp
- 💫 Added [theme scope](https://mui.com/material-ui/guides/theme-scoping/) for using multiple design systems (#36664) @siriwatknp
- 🐛 bug fixes and 📚 documentation improvements.

### `@mui/[email protected]`
Expand Down Expand Up @@ -10677,7 +10811,7 @@ A big thanks to the 20 contributors who made this release possible. Here are som
- [Avatar] Fix usage of srcset property (#23286) @matheuspiment
- [ClickAwayListener] Fix mounting behavior in Portals in React 17 (#23315) @eps1lon
- [core] Allow React 17 (#23311) @eps1lon
- [Icon] Fix translation, e.g Google Translate (#23237) @cbeltrangomez84
- [Icon] Fix translation, e.g. Google Translate (#23237) @cbeltrangomez84
- [LinearProgress] Fix Safari's bug during composition of different paint (#23293) @montogeek
- [Radio] Fix dot misalignment in Safari (#23239) @anasufana
- [styled-engine] Fix tagged template syntax with multiple expressions (#23269) @eps1lon
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.old.md
Original file line number Diff line number Diff line change
Expand Up @@ -5540,7 +5540,7 @@ you to add them up quickly in your head without having to worry about decimals.

- [docs] Fix search suggestions on dark mode (#13874) @rfbotto
- [docs] Add accessibility section to selection-controls with demo (#13896) @wyseguyonline
- [docs] Add support for multiple demo variants e.g JS or Hooks (#13873) @adeelibr
- [docs] Add support for multiple demo variants e.g. JS or Hooks (#13873) @adeelibr
- [docs] Remove the withRoot HOC (#13909) @oliviertassinari
- [docs] Add material-ui-pickers in pickers page (#13697) @dmtrKovalenko
- [docs] Continue #13806 and port back some fix from @system (#13917) @oliviertassinari
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ npm install @mui/system @emotion/react @emotion/styled
yarn add @mui/system @emotion/react @emotion/styled
```

Or if you want to use `styled-components` as a styling engine:
Or if you want to use styled-components as the styling engine:

**npm:**

Expand All @@ -112,7 +112,7 @@ npm install @mui/material @mui/styled-engine-sc styled-components
yarn add @mui/material @mui/styled-engine-sc styled-components
```

Visit our [`styled-engine` guide](https://mui.com/material-ui/guides/styled-engine/) for more information about how to configure `styled-components` as the style engine.
Visit our [styled-components guide](https://mui.com/material-ui/guides/styled-components/) for more information on configuration.

## Sponsors

Expand Down
2 changes: 1 addition & 1 deletion apps/zero-runtime-vite-app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ You can either run `yarn release:build` command to build all the packages, or yo
Make sure you have also run `yarn release:build` at least once because we also use `@mui/material` and `@mui/system` packages. On subsequent runs, you can only build the above 2 packages using -

```bash
yarn build:zero
yarn build
```

After building, you can run the project by changing into the directory and then
Expand Down
17 changes: 10 additions & 7 deletions apps/zero-runtime-vite-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,22 @@
"private": true,
"type": "module",
"scripts": {
"dev": "vite"
"dev": "vite",
"build": "vite build"
},
"dependencies": {
"@mui/zero-runtime": "file:../../packages/zero-runtime/build",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@linaria/vite": "^4.5.4",
"@mui/utils": "^5.14.5",
"@mui/material": "^5.14.5",
"@mui/zero-tag-processor": "file:../../packages/zero-tag-processor/build",
"vite": "4.4.9",
"@vitejs/plugin-react": "^4.0.4"
"@mui/utils": "^5.14.8",
"@mui/material": "^5.14.8",
"@mui/zero-vite-plugin": "file:../../packages/zero-vite-plugin/build",
"@vitejs/plugin-react": "^4.0.4",
"vite": "4.4.9"
},
"resolutions": {
"@mui/zero-tag-processor": "file:../../packages/zero-tag-processor/build"
}
}
18 changes: 14 additions & 4 deletions apps/zero-runtime-vite-app/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ const Button = styled('button', {
'color:red',
({ theme }: any) => ({
fontFamily: 'sans-serif',
color: 'primary.main',
backgroundColor: [theme.palette.primary.main, 'text.primary', 'background.paper'],
fontSize: (props: any) => (props.isRed ? 'h1.fontSize' : 'h2.fontSize'),
}),
{
fontFamily: 'sans-serif',
Expand All @@ -34,7 +32,7 @@ const HalfWidth = styled.div({
border: '1px solid #ccc',
});

export default function App() {
export default function App({ isRed }: any) {
const [count, setCount] = React.useState(0);
const [value, setValue] = React.useState(50);
const [isColorPrimary, setIsColorPrimary] = React.useState(true);
Expand Down Expand Up @@ -106,7 +104,19 @@ export default function App() {
</div>
</div>
<div>
<HalfWidth sx={{ color: 'red' }}>
<HalfWidth
sx={({ theme }: any) => ({
color: theme.palette.primary.main,
fontSize: isRed ? 'h1.fontSize' : 'h2.fontSize',
':hover': {
backgroundColor: ['primary.dark', 'secondary.main'],
color: {
sm: 'primary.dark',
md: 'secondary.main',
},
},
})}
>
<Slider
aria-label="Small steps"
defaultValue={50}
Expand Down
Loading

0 comments on commit c5f8b76

Please sign in to comment.