Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mui/material-ui
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 685c72dfaf840f4d5b7a3ab738ddcabd74418823
Choose a base ref
...
head repository: mui/material-ui
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a2e552314847b4d52498538d7ca171763067a5d0
Choose a head ref

Commits on Jan 18, 2023

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f13e534 View commit details

Commits on Jan 20, 2023

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    3bde8db View commit details
  2. [InputUnstyled] Fix externally provided inputRef is ignored (#35807)

    Co-authored-by: Zeeshan Tamboli <zeeshan.tamboli@gmail.com>
    sai6855 and ZeeshanTamboli authored Jan 20, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4aeda27 View commit details
  3. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    628b532 View commit details
  4. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    44eceb5 View commit details

Commits on Jan 21, 2023

  1. Verified

    This commit was signed with the committer’s verified signature.
    oliviertassinari Olivier Tassinari
    Copy the full SHA
    340b5eb View commit details
  2. [docs] Fix typos in the docs of Joy UI (#35876)

    Co-authored-by: Victor He <victor.he@insigniafinancial.com.au>
    Co-authored-by: ZeeshanTamboli <zeeshan.tamboli@gmail.com>
    3 people authored Jan 21, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    8ec664c View commit details

Commits on Jan 22, 2023

  1. Verified

    This commit was signed with the committer’s verified signature.
    oliviertassinari Olivier Tassinari
    Copy the full SHA
    860590f View commit details

Commits on Jan 23, 2023

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7c1c73f View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    07d6161 View commit details
  3. [blog] Date and time pickers revamped (#35486)

    Signed-off-by: José Rodolfo Freitas <joserodolfo.freitas@gmail.com>
    Co-authored-by: Sam Sycamore <71297412+samuelsycamore@users.noreply.github.com>
    Co-authored-by: Flavien DELANGLE <flaviendelangle@gmail.com>
    3 people authored Jan 23, 2023

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    dac670b View commit details
  4. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    732bca8 View commit details
  5. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    0725d8b View commit details
  6. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9c0f037 View commit details
  7. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    0ff044d View commit details
  8. [SliderUnstyled] Improved logic for displaying the value label (#35805)

    Signed-off-by: Zeeshan Tamboli <zeeshan.tamboli@gmail.com>
    Co-authored-by: Marija Najdova <mnajdova@gmail.com>
    Co-authored-by: Sam Sycamore <71297412+samuelsycamore@users.noreply.github.com>
    3 people authored Jan 23, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    6311da5 View commit details
  9. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    160e66c View commit details
  10. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b138022 View commit details
  11. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9d1a4d6 View commit details
  12. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d10c737 View commit details
  13. [release] v5.11.6 (#35925)

    mnajdova authored Jan 23, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a2e5523 View commit details
Showing with 1,814 additions and 958 deletions.
  1. +74 −0 CHANGELOG.md
  2. +1 −1 benchmark/package.json
  3. +15 −5 docs/data/base/components/slider/DiscreteSlider.js
  4. +14 −5 docs/data/base/components/slider/DiscreteSlider.tsx
  5. +1 −1 docs/data/base/components/slider/DiscreteSlider.tsx.preview
  6. +0 −10 docs/data/base/components/slider/DiscreteSliderMarks.js
  7. +0 −10 docs/data/base/components/slider/DiscreteSliderMarks.tsx
  8. +0 −10 docs/data/base/components/slider/DiscreteSliderValues.js
  9. +0 −10 docs/data/base/components/slider/DiscreteSliderValues.tsx
  10. +135 −0 docs/data/base/components/slider/LabeledValuesSlider.js
  11. +134 −0 docs/data/base/components/slider/LabeledValuesSlider.tsx
  12. +1 −0 docs/data/base/components/slider/LabeledValuesSlider.tsx.preview
  13. +0 −10 docs/data/base/components/slider/RangeSlider.js
  14. +0 −10 docs/data/base/components/slider/RangeSlider.tsx
  15. +1 −0 docs/data/base/components/slider/UnstyledSliderValueLabel.tsx.preview
  16. +12 −0 docs/data/base/components/slider/slider.md
  17. +1 −1 docs/data/joy/components/aspect-ratio/aspect-ratio-zh.md
  18. +1 −1 docs/data/joy/components/autocomplete/AutocompleteError.js
  19. +1 −1 docs/data/joy/components/autocomplete/AutocompleteError.tsx
  20. +1 −1 docs/data/joy/components/autocomplete/AutocompleteError.tsx.preview
  21. +1 −1 docs/data/joy/components/avatar/avatar-pt.md
  22. +1 −1 docs/data/joy/components/avatar/avatar-zh.md
  23. +1 −1 docs/data/joy/components/chip/chip-pt.md
  24. +1 −1 docs/data/joy/customization/approaches/approaches-pt.md
  25. +1 −1 docs/data/joy/customization/approaches/approaches-zh.md
  26. +1 −1 docs/data/joy/customization/approaches/approaches.md
  27. +1 −1 docs/data/joy/getting-started/templates/team/App.tsx
  28. +1 −1 docs/data/joy/main-features/automatic-adjustment/automatic-adjustment-pt.md
  29. +1 −1 docs/data/joy/main-features/automatic-adjustment/automatic-adjustment-zh.md
  30. +1 −1 docs/data/material/components/lists/lists.md
  31. +5 −5 docs/data/material/components/menus/AccountMenu.js
  32. +5 −5 docs/data/material/components/menus/AccountMenu.tsx
  33. +89 −190 docs/data/material/components/tables/ReactVirtualizedTable.js
  34. +99 −205 docs/data/material/components/tables/ReactVirtualizedTable.tsx
  35. +8 −0 docs/data/material/components/tables/ReactVirtualizedTable.tsx.preview
  36. +1 −1 docs/data/material/components/tables/tables.md
  37. +1 −1 docs/data/material/customization/color/color.md
  38. +7 −8 docs/package.json
  39. +1 −13 docs/pages/base/api/slider-unstyled.json
  40. +7 −0 docs/pages/blog/v6-beta-pickers.js
  41. +135 −0 docs/pages/blog/v6-beta-pickers.md
  42. +7 −7 docs/pages/material-ui/api/slider.json
  43. +4 −0 docs/pages/material-ui/api/swipeable-drawer.json
  44. BIN docs/public/static/blog/v6-beta-pickers/basic-date-field.mp4
  45. BIN docs/public/static/blog/v6-beta-pickers/date-field-navigation.mp4
  46. BIN docs/public/static/blog/v6-beta-pickers/date-range-shortcuts.png
  47. BIN docs/public/static/blog/v6-beta-pickers/edit-drag-nocrop.mp4
  48. BIN docs/public/static/blog/v6-beta-pickers/edit-drag.mp4
  49. BIN docs/public/static/blog/v6-beta-pickers/masked-input-bad-ux.mp4
  50. BIN docs/public/static/blog/v6-beta-pickers/masked-input.mp4
  51. BIN docs/public/static/blog/v6-beta-pickers/quick-comparison-fields.mp4
  52. BIN docs/public/static/blog/v6-beta-pickers/smart-field.mp4
  53. +1 −1 docs/src/pages/careers/lead-designer.md
  54. +8 −12 docs/src/pages/careers/product-marketing-manager.md
  55. +1 −1 docs/src/pages/premium-themes/onepirate/modules/views/ProductHero.js
  56. +1 −1 docs/src/pages/premium-themes/onepirate/modules/views/ProductHero.tsx
  57. +0 −18 docs/translations/api-docs/slider-unstyled/slider-unstyled.json
  58. +27 −27 docs/translations/api-docs/slider/slider.json
  59. +1 −0 docs/translations/api-docs/swipeable-drawer/swipeable-drawer-pt.json
  60. +1 −0 docs/translations/api-docs/swipeable-drawer/swipeable-drawer-zh.json
  61. +1 −0 docs/translations/api-docs/swipeable-drawer/swipeable-drawer.json
  62. +5 −5 package.json
  63. +1 −1 packages/docs-utilities/index.d.ts
  64. +1 −1 packages/mui-base/package.json
  65. +7 −0 packages/mui-base/src/InputUnstyled/InputUnstyled.test.tsx
  66. +0 −1 packages/mui-base/src/InputUnstyled/InputUnstyled.tsx
  67. +23 −0 packages/mui-base/src/InputUnstyled/useInput.test.tsx
  68. +2 −1 packages/mui-base/src/InputUnstyled/useInput.ts
  69. +16 −6 packages/mui-base/src/SliderUnstyled/SliderUnstyled.test.tsx
  70. +41 −70 packages/mui-base/src/SliderUnstyled/SliderUnstyled.tsx
  71. +1 −20 packages/mui-base/src/SliderUnstyled/SliderUnstyled.types.ts
  72. +0 −52 packages/mui-base/src/SliderUnstyled/SliderValueLabelUnstyled.tsx
  73. +0 −23 packages/mui-base/src/SliderUnstyled/SliderValueLabelUnstyled.types.ts
  74. +5 −5 packages/mui-base/src/SliderUnstyled/index.ts
  75. +0 −12 packages/mui-base/src/SliderUnstyled/sliderUnstyledClasses.ts
  76. +18 −0 packages/mui-codemod/README.md
  77. +1 −1 packages/mui-codemod/package.json
  78. +92 −0 packages/mui-codemod/src/v5.0.0/joy-avatar-remove-imgProps.js
  79. +29 −0 packages/mui-codemod/src/v5.0.0/joy-avatar-remove-imgProps.test.js
  80. +13 −0 packages/mui-codemod/src/v5.0.0/joy-avatar-remove-imgProps.test/actual.js
  81. +16 −0 packages/mui-codemod/src/v5.0.0/joy-avatar-remove-imgProps.test/expected.js
  82. +0 −1 packages/mui-codemod/src/v5.0.0/joy-text-field-to-input.js
  83. +1 −1 packages/mui-core-downloads-tracker/package.json
  84. +3 −3 packages/mui-joy/package.json
  85. +0 −8 packages/mui-joy/src/Avatar/Avatar.tsx
  86. +0 −7 packages/mui-joy/src/Avatar/AvatarProps.ts
  87. +9 −0 packages/mui-joy/src/Slider/SliderProps.ts
  88. +2 −2 packages/mui-lab/package.json
  89. +3 −3 packages/mui-material-next/package.json
  90. +3 −3 packages/mui-material/package.json
  91. +3 −2 packages/mui-material/src/Box/Box.d.ts
  92. +0 −4 packages/mui-material/src/Button/Button.js
  93. +215 −35 packages/mui-material/src/Slider/Slider.d.ts
  94. +7 −7 packages/mui-material/src/Slider/Slider.js
  95. +52 −0 packages/mui-material/src/Slider/Slider.spec.tsx
  96. +4 −0 packages/mui-material/src/Slider/SliderValueLabel.tsx
  97. +1 −1 packages/mui-material/src/Slider/SliderValueLabel.types.ts
  98. +2 −0 packages/mui-material/src/Slider/index.d.ts
  99. +2 −0 packages/mui-material/src/Slider/index.js
  100. +90 −12 packages/mui-material/src/Slider/sliderClasses.ts
  101. +15 −0 packages/mui-material/src/SwipeableDrawer/SwipeableDrawer.d.ts
  102. +65 −23 packages/mui-material/src/SwipeableDrawer/SwipeableDrawer.js
  103. +181 −8 packages/mui-material/src/SwipeableDrawer/SwipeableDrawer.test.js
  104. +19 −2 scripts/releaseChangelog.mjs
  105. +54 −57 yarn.lock
74 changes: 74 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,79 @@
# [Versions](https://mui.com/versions/)

## 5.11.6

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

_Jan 23, 2023_

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

- @ZeeshanTamboli improved the logic for handling the value label in the `SliderUnstyled` (#35805)
- many other 🐛 bug fixes and 📚 documentation improvements

### `@mui/material@5.11.6`

- &#8203;<!-- 15 -->[Box] Fix usage of not supported features in TypeScript 3.5 (#35877) @mnajdova
- &#8203;<!-- 14 -->[Button] Fix border color for secondary disabled button (#35866) @SaidMarar
- &#8203;<!-- 03 -->[SwipeableDrawer] Add callback to customise touchstart ignore for swipeable drawer (#30759) @tech-meppem

### `@mui/base@5.0.0-alpha.115`

#### Breaking changes

- &#8203;<!-- 04 -->[SliderUnstyled] Improved logic for displaying the value label (#35805) @ZeeshanTamboli

- The `valueLabelDisplay` prop is removed from `SliderUnstyled`. The prop was not working as intended in `SliderUnstyled` (See #35398). You can instead provide a `valueLabel` slot with the `slots` prop API to show the value label:

```diff
- <SliderUnstyled valueLabelDisplay="on" />
+ <SliderUnstyled slots={{ valueLabel: SliderValueLabel }} />
```

The following demo shows how to show a value label when it is hovered over with the thumb: https://mui.com/base/react-slider/#value-label

- The following classes are removed from `sliderUnstyledClasses` since they are not needed for the value label:

```diff
- valueLabel
- valueLabelOpen
- valueLabelCircle
- valueLabelLabel
```

In the custom value label component, you can define your own classNames and target them with CSS.

- The `SliderValueLabelUnstyled` component is removed from SliderUnstyled. You should provide your own custom component for the value label.

- To avoid using `React.cloneElement` API in value label, the component hierarchy structure of the value label is changed. The value label is now inside the Thumb slot - `Thumb` -> `Input`, `ValueLabel`.

#### Changes

- &#8203;<!-- 05 -->[InputUnstyled] Fix externally provided `inputRef` is ignored (#35807) @sai6855

### `@mui/joy@5.0.0-alpha.64`

- &#8203;<!-- 17 -->[Avatar][joy] Remove `imgProps` prop and add Codemod script for migration (#35859) @hbjORbj

### Docs

- &#8203;<!-- 16 -->[blog] Date and time pickers revamped (#35486) @joserodolfofreitas
- &#8203;<!-- 10 -->[docs] Fix incorrect breakpoint use (#34948) @rosita-dmello
- &#8203;<!-- 09 -->[docs] Replace react-virtualized with react-virtuoso in Table (#35700) @petyosi
- &#8203;<!-- 08 -->[docs] Fix account menu demo not closing with keyboard. (#35870) @mj12albert
- &#8203;<!-- 07 -->[docs] Fix typos in the docs of Joy UI (#35876) @HeVictor
- &#8203;<!-- 06 -->[docs] Fix wording in `Color` page (#35873) @oliv37

### Core

- &#8203;<!-- 13 -->[core] Fix release changelog to handle commits with empty author field (#35921) @mnajdova
- &#8203;<!-- 12 -->[core] Revert `docs-utilities` migration to TypeScript and fix type (#35881) @ZeeshanTamboli
- &#8203;<!-- 11 -->[core] Migrate internal `docs-utilities` package to TypeScript (#35846) @ZeeshanTamboli
- &#8203;<!-- 02 -->[website] Designer don't spend their time writing code @oliviertassinari
- &#8203;<!-- 01 -->[website] Emphasis the technical background need for this role @oliviertassinari

All contributors of this release in alphabetical order: @HeVictor, @hbjORbj, @joserodolfofreitas, @mj12albert, @mnajdova, @oliv37, @oliviertassinari, @petyosi, @rosita-dmello, @sai6855, @SaidMarar, @tech-meppem, @ZeeshanTamboli

## 5.11.5

<!-- generated comparing v5.11.4..master -->
2 changes: 1 addition & 1 deletion benchmark/package.json
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@mdx-js/react": "^2.2.1",
"@mui/material": "^5.11.5",
"@mui/material": "^5.11.6",
"@mui/styles": "^5.11.2",
"@mui/system": "^5.11.5",
"@styled-system/css": "^5.1.5",
20 changes: 15 additions & 5 deletions docs/data/base/components/slider/DiscreteSlider.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react';
import PropTypes from 'prop-types';
import { styled, alpha, Box } from '@mui/system';
import SliderUnstyled, { sliderUnstyledClasses } from '@mui/base/SliderUnstyled';

@@ -77,6 +78,8 @@ const StyledSlider = styled(SliderUnstyled)(
outline: 0;
border: 3px solid currentColor;
background-color: #fff;
display: flex;
flex-direction: column-reverse;
:hover,
&.${sliderUnstyledClasses.focusVisible} {
@@ -109,18 +112,25 @@ const StyledSlider = styled(SliderUnstyled)(
background-color: #fff;
}
& .${sliderUnstyledClasses.valueLabel} {
& .valueLabel {
font-family: IBM Plex Sans;
font-size: 14px;
display: block;
position: relative;
top: -1.6em;
top: -1em;
text-align: center;
transform: translateX(-50%);
align-self: center;
}
`,
);

function SliderValueLabel({ children }) {
return <span className="valueLabel">{children}</span>;
}

SliderValueLabel.propTypes = {
children: PropTypes.element.isRequired,
};

function valuetext(value) {
return `${value}°C`;
}
@@ -132,11 +142,11 @@ export default function DiscreteSlider() {
aria-label="Temperature"
defaultValue={30}
getAriaValueText={valuetext}
valueLabelDisplay="auto"
step={10}
marks
min={10}
max={110}
slots={{ valueLabel: SliderValueLabel }}
/>
</Box>
);
19 changes: 14 additions & 5 deletions docs/data/base/components/slider/DiscreteSlider.tsx
Original file line number Diff line number Diff line change
@@ -77,6 +77,8 @@ const StyledSlider = styled(SliderUnstyled)(
outline: 0;
border: 3px solid currentColor;
background-color: #fff;
display: flex;
flex-direction: column-reverse;
:hover,
&.${sliderUnstyledClasses.focusVisible} {
@@ -109,18 +111,25 @@ const StyledSlider = styled(SliderUnstyled)(
background-color: #fff;
}
& .${sliderUnstyledClasses.valueLabel} {
& .valueLabel {
font-family: IBM Plex Sans;
font-size: 14px;
display: block;
position: relative;
top: -1.6em;
top: -1em;
text-align: center;
transform: translateX(-50%);
align-self: center;
}
`,
);

interface SliderValueLabelProps {
children: React.ReactElement;
}

function SliderValueLabel({ children }: SliderValueLabelProps) {
return <span className="valueLabel">{children}</span>;
}

function valuetext(value: number) {
return `${value}°C`;
}
@@ -132,11 +141,11 @@ export default function DiscreteSlider() {
aria-label="Temperature"
defaultValue={30}
getAriaValueText={valuetext}
valueLabelDisplay="auto"
step={10}
marks
min={10}
max={110}
slots={{ valueLabel: SliderValueLabel }}
/>
</Box>
);
Original file line number Diff line number Diff line change
@@ -2,9 +2,9 @@
aria-label="Temperature"
defaultValue={30}
getAriaValueText={valuetext}
valueLabelDisplay="auto"
step={10}
marks
min={10}
max={110}
slots={{ valueLabel: SliderValueLabel }}
/>
10 changes: 0 additions & 10 deletions docs/data/base/components/slider/DiscreteSliderMarks.js
Original file line number Diff line number Diff line change
@@ -109,16 +109,6 @@ const StyledSlider = styled(SliderUnstyled)(
background-color: #fff;
}
& .${sliderUnstyledClasses.valueLabel} {
font-family: IBM Plex Sans;
font-size: 14px;
display: block;
position: relative;
top: -1.6em;
text-align: center;
transform: translateX(-50%);
}
& .${sliderUnstyledClasses.markLabel} {
font-family: IBM Plex Sans;
font-size: 12px;
10 changes: 0 additions & 10 deletions docs/data/base/components/slider/DiscreteSliderMarks.tsx
Original file line number Diff line number Diff line change
@@ -109,16 +109,6 @@ const StyledSlider = styled(SliderUnstyled)(
background-color: #fff;
}
& .${sliderUnstyledClasses.valueLabel} {
font-family: IBM Plex Sans;
font-size: 14px;
display: block;
position: relative;
top: -1.6em;
text-align: center;
transform: translateX(-50%);
}
& .${sliderUnstyledClasses.markLabel} {
font-family: IBM Plex Sans;
font-size: 12px;
10 changes: 0 additions & 10 deletions docs/data/base/components/slider/DiscreteSliderValues.js
Original file line number Diff line number Diff line change
@@ -109,16 +109,6 @@ const StyledSlider = styled(SliderUnstyled)(
background-color: #fff;
}
& .${sliderUnstyledClasses.valueLabel} {
font-family: IBM Plex Sans;
font-size: 14px;
display: block;
position: relative;
top: -1.6em;
text-align: center;
transform: translateX(-50%);
}
& .${sliderUnstyledClasses.markLabel} {
font-family: IBM Plex Sans;
font-size: 12px;
10 changes: 0 additions & 10 deletions docs/data/base/components/slider/DiscreteSliderValues.tsx
Original file line number Diff line number Diff line change
@@ -109,16 +109,6 @@ const StyledSlider = styled(SliderUnstyled)(
background-color: #fff;
}
& .${sliderUnstyledClasses.valueLabel} {
font-family: IBM Plex Sans;
font-size: 14px;
display: block;
position: relative;
top: -1.6em;
text-align: center;
transform: translateX(-50%);
}
& .${sliderUnstyledClasses.markLabel} {
font-family: IBM Plex Sans;
font-size: 12px;
Loading