Skip to content

Commit

Permalink
Merge branch 'next' into feat/move-to-emotion
Browse files Browse the repository at this point in the history
  • Loading branch information
mnajdova committed Jul 8, 2021
2 parents c0b4758 + c6642e3 commit 2debed8
Show file tree
Hide file tree
Showing 161 changed files with 3,049 additions and 441 deletions.
8 changes: 4 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ Big thanks to the 18 contributors who made this release possible. Here are some

<a href="https://next.material-ui.com/components/slider/#continuous-sliders"><img width="247" alt="" src="https://user-images.githubusercontent.com/3165635/121884800-a8808600-cd13-11eb-8cdf-e25de8f1ba73.png" style="margin: auto"></a>

- 💡 `IconButton` now supports 3 sizes (`small, medium, large`). [See demo](/components/buttons/#sizes-2).
- 💡 `IconButton` now supports 3 sizes (`small, medium, large`). [See demo](https://next.material-ui.com/components/buttons/#sizes-2).
- ♿️ We have improved the default style of the `Link` to be more accessible (#26145) @ahmed-28

<a href="https://next.material-ui.com/components/links/"><img width="543" alt="" src="https://user-images.githubusercontent.com/3165635/123097983-ef1b6200-d430-11eb-97da-b491fba5df49.png"></a>
Expand Down Expand Up @@ -2338,7 +2338,7 @@ Big thanks to the 23 contributors who made this release possible. Here are some
### Docs

- <!-- 86 --> [examples] Patch preact example not working (#24616)
- <!-- 78 --> [docs] Add missing newline in component JSDOC (#24610) @eps1lon
- <!-- 78 --> [docs] Add missing newline in component JSDoc (#24610) @eps1lon
- <!-- 70 --> [docs] Add API of picker components (#24497) @eps1lon
- <!-- 63 --> [examples] Add `locale` prop to the Nextjs Link component (#24596) @CyanoFresh
- <!-- 52 --> [docs] List required props first in /api/* (#24526) @eps1lon
Expand Down Expand Up @@ -4791,7 +4791,7 @@ Here are some highlights ✨:
- [docs] Add 'size' prop to ToggleButton API docs (#22052) @zenje
- [docs] Add ClassKeys migration description for Renaming API (#22061) @kodai3
- [docs] Add a label to the TreeView demos (#21900) @joshwooding
- [docs] Add missing JSDOC for various props (#22005) @eps1lon
- [docs] Add missing JSDoc for various props (#22005) @eps1lon
- [docs] Add the services that support MUI in readme (#22137) @naineet
- [docs] Add trailingSlash: true (#22008) @oliviertassinari
- [docs] Add visibility to TypeScript examples (#22013) @esemeniuc
Expand Down Expand Up @@ -5930,7 +5930,7 @@ Here are some highlights ✨:
- [Tooltip] Fix TextField integration (#20252) @ShehryarShoukat96
- [Tooltip] Remove superfluous argument in handleBlur call (#20271) @CptWesley
- [TypeScript] Enable module augmentation of CommonColors (#20212) @eps1lon
- [TypeScript] Add JSDOC to ListItem TypeScript props (#20171) @eps1lon
- [TypeScript] Add JSDoc to ListItem TypeScript props (#20171) @eps1lon
- [TypeScript] Fix Checkbox and Radio type propType (#20293) @eps1lon
- [TypeScript] Fix incorrect typings regarding transition components a… (#20306) @eps1lon
- [TypeScript] Link to demos and API in IntelliSense (#20078) @eps1lon
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ on _Details_ to find out more about them.

### Updating the component API documentation

The component API in the component `propTypes` and under `docs/pages/api-docs` is auto-generated from the [JSDOC](https://jsdoc.app/about-getting-started.html) in the TypeScript declarations.
The component API in the component `propTypes` and under `docs/pages/api-docs` is auto-generated from the [JSDoc](https://jsdoc.app/about-getting-started.html) in the TypeScript declarations.
Be sure to update the documentation in the corresponding `.d.ts` files (e.g. `packages/material-ui/src/Button/Button.d.ts` for `<Button>`) and the run:

```sh
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ via [OpenCollective](https://opencollective.com/material-ui)
<a data-ga-event-category="sponsor" data-ga-event-action="logo" data-ga-event-label="textemall" href="https://www.text-em-all.com" rel="noopener sponsored" target="_blank" style="margin-right: 16px;"><img src="https://images.opencollective.com/callemall/a6946da/logo/96.png" srcset="https://images.opencollective.com/callemall/a6946da/logo/192.png 2x" alt="call-em-all" title="Mass Text Messaging & Automated Calling" height="96" width="96" loading="lazy"></a>
<a data-ga-event-category="sponsor" data-ga-event-action="logo" data-ga-event-label="canadacasino" href="https://www.canadacasino.ca/" rel="noopener sponsored" target="_blank" style="margin-right: 16px;"><img height="96" width="96" src="https://images.opencollective.com/canadacasino/5b19004/logo/96.png" srcset="https://images.opencollective.com/canadacasino/5b19004/logo/192.png 2x" alt="canadacasino" loading="lazy" /></a>
<a data-ga-event-category="sponsor" data-ga-event-action="logo" data-ga-event-label="hoodiebees" href="https://hoodiebees.com/" rel="noopener sponsored" target="_blank" style="margin-right: 16px;"><img height="96" width="96" src="https://images.opencollective.com/hoodiebees1/617b451/logo/96.png" srcset="https://images.opencollective.com/hoodiebees1/617b451/logo/192.png 2x" alt="hoodiebees" loading="lazy" /></a>
<a data-ga-event-category="sponsor" data-ga-event-action="logo" data-ga-event-label="movavi" href="https://www.movavi.com/" rel="noopener sponsored" target="_blank" style="margin-right: 16px;"><img height="96" width="96" src="https://images.opencollective.com/movavi-software/a1d0167/logo/96.png" srcset="https://images.opencollective.com/movavi-software/a1d0167/logo/192.png 2x" alt="hoodiebees" loading="lazy" /></a>
<a data-ga-event-category="sponsor" data-ga-event-action="logo" data-ga-event-label="movavi" href="https://www.movavi.com/" rel="noopener sponsored" target="_blank" style="margin-right: 16px;"><img height="96" width="96" src="https://images.opencollective.com/movavi-software/a1d0167/logo/96.png" srcset="https://images.opencollective.com/movavi-software/a1d0167/logo/192.png 2x" alt="Screen recorder for Mac" loading="lazy" /></a>
</p>

Direct
Expand Down
1 change: 0 additions & 1 deletion docs/packages/markdown/parseMarkdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ const externs = [
* @property {string} hash
* @property {number} level
* @property {string} text
*
* @param {object} context
* @param {Record<string, string>} context.headingHashes - WILL BE MUTATED
* @param {TableOfContentsEntry[]} context.toc - WILL BE MUTATED
Expand Down
12 changes: 6 additions & 6 deletions docs/pages/api-docs/date-picker.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
"default": "/\\dap/gi"
},
"allowSameDateSelection": { "type": { "name": "bool" } },
"cancelText": { "type": { "name": "node" }, "default": "\"CANCEL\"" },
"cancelText": { "type": { "name": "node" }, "default": "'Cancel'" },
"className": { "type": { "name": "string" } },
"clearable": { "type": { "name": "bool" } },
"clearText": { "type": { "name": "node" }, "default": "\"CLEAR\"" },
"clearText": { "type": { "name": "node" }, "default": "'Clear'" },
"components": {
"type": {
"name": "shape",
Expand Down Expand Up @@ -46,7 +46,7 @@
"leftArrowButtonText": { "type": { "name": "string" } },
"loading": { "type": { "name": "bool" } },
"mask": { "type": { "name": "string" } },
"okText": { "type": { "name": "node" }, "default": "\"OK\"" },
"okText": { "type": { "name": "node" }, "default": "'OK'" },
"onAccept": { "type": { "name": "func" } },
"onClose": { "type": { "name": "func" } },
"onError": { "type": { "name": "func" } },
Expand Down Expand Up @@ -83,11 +83,11 @@
"showDaysOutsideCurrentMonth": { "type": { "name": "bool" } },
"showTodayButton": { "type": { "name": "bool" } },
"showToolbar": { "type": { "name": "bool" } },
"todayText": { "type": { "name": "node" }, "default": "\"TODAY\"" },
"todayText": { "type": { "name": "node" }, "default": "'Today'" },
"ToolbarComponent": { "type": { "name": "elementType" }, "default": "DatePickerToolbar" },
"toolbarFormat": { "type": { "name": "string" } },
"toolbarPlaceholder": { "type": { "name": "node" }, "default": "\"\"" },
"toolbarTitle": { "type": { "name": "node" }, "default": "\"SELECT DATE\"" },
"toolbarPlaceholder": { "type": { "name": "node" }, "default": "'–'" },
"toolbarTitle": { "type": { "name": "node" }, "default": "'Select date'" },
"TransitionComponent": { "type": { "name": "elementType" } },
"value": {
"type": {
Expand Down
14 changes: 7 additions & 7 deletions docs/pages/api-docs/date-range-picker.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
"type": { "name": "enum", "description": "1<br>&#124;&nbsp;2<br>&#124;&nbsp;3" },
"default": "2"
},
"cancelText": { "type": { "name": "node" }, "default": "\"CANCEL\"" },
"cancelText": { "type": { "name": "node" }, "default": "'Cancel'" },
"className": { "type": { "name": "string" } },
"clearable": { "type": { "name": "bool" } },
"clearText": { "type": { "name": "node" }, "default": "\"CLEAR\"" },
"clearText": { "type": { "name": "node" }, "default": "'Clear'" },
"components": {
"type": {
"name": "shape",
Expand All @@ -33,7 +33,7 @@
"defaultCalendarMonth": { "type": { "name": "any" } },
"desktopModeMediaQuery": {
"type": { "name": "string" },
"default": "\"@media (pointer: fine)\""
"default": "'@media (pointer: fine)'"
},
"DialogProps": { "type": { "name": "object" } },
"disableAutoMonthSwitching": { "type": { "name": "bool" } },
Expand Down Expand Up @@ -61,7 +61,7 @@
"mask": { "type": { "name": "string" }, "default": "'__/__/____'" },
"maxDate": { "type": { "name": "any" }, "default": "defaultMaxDate" },
"minDate": { "type": { "name": "any" }, "default": "defaultMinDate" },
"okText": { "type": { "name": "node" }, "default": "\"OK\"" },
"okText": { "type": { "name": "node" }, "default": "'OK'" },
"onAccept": { "type": { "name": "func" } },
"onClose": { "type": { "name": "func" } },
"onError": { "type": { "name": "func" } },
Expand Down Expand Up @@ -92,11 +92,11 @@
"showTodayButton": { "type": { "name": "bool" } },
"showToolbar": { "type": { "name": "bool" } },
"startText": { "type": { "name": "node" }, "default": "'Start'" },
"todayText": { "type": { "name": "node" }, "default": "\"TODAY\"" },
"todayText": { "type": { "name": "node" }, "default": "'Today'" },
"ToolbarComponent": { "type": { "name": "elementType" } },
"toolbarFormat": { "type": { "name": "string" } },
"toolbarPlaceholder": { "type": { "name": "node" }, "default": "\"\"" },
"toolbarTitle": { "type": { "name": "node" }, "default": "\"SELECT DATE\"" },
"toolbarPlaceholder": { "type": { "name": "node" }, "default": "'–'" },
"toolbarTitle": { "type": { "name": "node" }, "default": "'Select date range'" },
"TransitionComponent": { "type": { "name": "elementType" } }
},
"name": "DateRangePicker",
Expand Down
12 changes: 6 additions & 6 deletions docs/pages/api-docs/date-time-picker.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"allowSameDateSelection": { "type": { "name": "bool" } },
"ampm": { "type": { "name": "bool" } },
"ampmInClock": { "type": { "name": "bool" } },
"cancelText": { "type": { "name": "node" }, "default": "\"CANCEL\"" },
"cancelText": { "type": { "name": "node" }, "default": "'Cancel'" },
"className": { "type": { "name": "string" } },
"clearable": { "type": { "name": "bool" } },
"clearText": { "type": { "name": "node" }, "default": "\"CLEAR\"" },
"clearText": { "type": { "name": "node" }, "default": "'Clear'" },
"components": {
"type": {
"name": "shape",
Expand Down Expand Up @@ -68,7 +68,7 @@
}
},
"minutesStep": { "type": { "name": "number" }, "default": "1" },
"okText": { "type": { "name": "node" }, "default": "\"OK\"" },
"okText": { "type": { "name": "node" }, "default": "'OK'" },
"onAccept": { "type": { "name": "func" } },
"onClose": { "type": { "name": "func" } },
"onError": { "type": { "name": "func" } },
Expand Down Expand Up @@ -107,11 +107,11 @@
"showTodayButton": { "type": { "name": "bool" } },
"showToolbar": { "type": { "name": "bool" } },
"timeIcon": { "type": { "name": "node" } },
"todayText": { "type": { "name": "node" }, "default": "\"TODAY\"" },
"todayText": { "type": { "name": "node" }, "default": "'Today'" },
"ToolbarComponent": { "type": { "name": "elementType" }, "default": "DateTimePickerToolbar" },
"toolbarFormat": { "type": { "name": "string" } },
"toolbarPlaceholder": { "type": { "name": "node" }, "default": "\"\"" },
"toolbarTitle": { "type": { "name": "node" }, "default": "\"SELECT DATE\"" },
"toolbarPlaceholder": { "type": { "name": "node" }, "default": "'–'" },
"toolbarTitle": { "type": { "name": "node" }, "default": "'Select date & time'" },
"TransitionComponent": { "type": { "name": "elementType" } },
"value": {
"type": {
Expand Down
4 changes: 2 additions & 2 deletions docs/pages/api-docs/desktop-date-picker.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@
"showToolbar": { "type": { "name": "bool" } },
"ToolbarComponent": { "type": { "name": "elementType" }, "default": "DatePickerToolbar" },
"toolbarFormat": { "type": { "name": "string" } },
"toolbarPlaceholder": { "type": { "name": "node" }, "default": "\"\"" },
"toolbarTitle": { "type": { "name": "node" }, "default": "\"SELECT DATE\"" },
"toolbarPlaceholder": { "type": { "name": "node" }, "default": "'–'" },
"toolbarTitle": { "type": { "name": "node" }, "default": "'Select date'" },
"TransitionComponent": { "type": { "name": "elementType" } },
"value": {
"type": {
Expand Down
4 changes: 2 additions & 2 deletions docs/pages/api-docs/desktop-date-range-picker.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@
"startText": { "type": { "name": "node" }, "default": "'Start'" },
"ToolbarComponent": { "type": { "name": "elementType" } },
"toolbarFormat": { "type": { "name": "string" } },
"toolbarPlaceholder": { "type": { "name": "node" }, "default": "\"\"" },
"toolbarTitle": { "type": { "name": "node" }, "default": "\"SELECT DATE\"" },
"toolbarPlaceholder": { "type": { "name": "node" }, "default": "'–'" },
"toolbarTitle": { "type": { "name": "node" }, "default": "'Select date range'" },
"TransitionComponent": { "type": { "name": "elementType" } }
},
"name": "DesktopDateRangePicker",
Expand Down
4 changes: 2 additions & 2 deletions docs/pages/api-docs/desktop-date-time-picker.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@
"timeIcon": { "type": { "name": "node" } },
"ToolbarComponent": { "type": { "name": "elementType" }, "default": "DateTimePickerToolbar" },
"toolbarFormat": { "type": { "name": "string" } },
"toolbarPlaceholder": { "type": { "name": "node" }, "default": "\"\"" },
"toolbarTitle": { "type": { "name": "node" }, "default": "\"SELECT DATE\"" },
"toolbarPlaceholder": { "type": { "name": "node" }, "default": "'–'" },
"toolbarTitle": { "type": { "name": "node" }, "default": "'Select date & time'" },
"TransitionComponent": { "type": { "name": "elementType" } },
"value": {
"type": {
Expand Down
4 changes: 2 additions & 2 deletions docs/pages/api-docs/desktop-time-picker.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
"showToolbar": { "type": { "name": "bool" } },
"ToolbarComponent": { "type": { "name": "elementType" }, "default": "TimePickerToolbar" },
"toolbarFormat": { "type": { "name": "string" } },
"toolbarPlaceholder": { "type": { "name": "node" }, "default": "\"\"" },
"toolbarTitle": { "type": { "name": "node" }, "default": "\"SELECT DATE\"" },
"toolbarPlaceholder": { "type": { "name": "node" }, "default": "'–'" },
"toolbarTitle": { "type": { "name": "node" }, "default": "'Select time'" },
"TransitionComponent": { "type": { "name": "elementType" } },
"value": {
"type": {
Expand Down
12 changes: 6 additions & 6 deletions docs/pages/api-docs/mobile-date-picker.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
"default": "/\\dap/gi"
},
"allowSameDateSelection": { "type": { "name": "bool" } },
"cancelText": { "type": { "name": "node" }, "default": "\"CANCEL\"" },
"cancelText": { "type": { "name": "node" }, "default": "'Cancel'" },
"className": { "type": { "name": "string" } },
"clearable": { "type": { "name": "bool" } },
"clearText": { "type": { "name": "node" }, "default": "\"CLEAR\"" },
"clearText": { "type": { "name": "node" }, "default": "'Clear'" },
"components": {
"type": {
"name": "shape",
Expand Down Expand Up @@ -42,7 +42,7 @@
"leftArrowButtonText": { "type": { "name": "string" } },
"loading": { "type": { "name": "bool" } },
"mask": { "type": { "name": "string" } },
"okText": { "type": { "name": "node" }, "default": "\"OK\"" },
"okText": { "type": { "name": "node" }, "default": "'OK'" },
"onAccept": { "type": { "name": "func" } },
"onClose": { "type": { "name": "func" } },
"onError": { "type": { "name": "func" } },
Expand Down Expand Up @@ -78,11 +78,11 @@
"showDaysOutsideCurrentMonth": { "type": { "name": "bool" } },
"showTodayButton": { "type": { "name": "bool" } },
"showToolbar": { "type": { "name": "bool" } },
"todayText": { "type": { "name": "node" }, "default": "\"TODAY\"" },
"todayText": { "type": { "name": "node" }, "default": "'Today'" },
"ToolbarComponent": { "type": { "name": "elementType" }, "default": "DatePickerToolbar" },
"toolbarFormat": { "type": { "name": "string" } },
"toolbarPlaceholder": { "type": { "name": "node" }, "default": "\"\"" },
"toolbarTitle": { "type": { "name": "node" }, "default": "\"SELECT DATE\"" },
"toolbarPlaceholder": { "type": { "name": "node" }, "default": "'–'" },
"toolbarTitle": { "type": { "name": "node" }, "default": "'Select date'" },
"value": {
"type": {
"name": "union",
Expand Down
12 changes: 6 additions & 6 deletions docs/pages/api-docs/mobile-date-range-picker.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
"type": { "name": "enum", "description": "1<br>&#124;&nbsp;2<br>&#124;&nbsp;3" },
"default": "2"
},
"cancelText": { "type": { "name": "node" }, "default": "\"CANCEL\"" },
"cancelText": { "type": { "name": "node" }, "default": "'Cancel'" },
"className": { "type": { "name": "string" } },
"clearable": { "type": { "name": "bool" } },
"clearText": { "type": { "name": "node" }, "default": "\"CLEAR\"" },
"clearText": { "type": { "name": "node" }, "default": "'Clear'" },
"components": {
"type": {
"name": "shape",
Expand Down Expand Up @@ -57,7 +57,7 @@
"mask": { "type": { "name": "string" }, "default": "'__/__/____'" },
"maxDate": { "type": { "name": "any" }, "default": "defaultMaxDate" },
"minDate": { "type": { "name": "any" }, "default": "defaultMinDate" },
"okText": { "type": { "name": "node" }, "default": "\"OK\"" },
"okText": { "type": { "name": "node" }, "default": "'OK'" },
"onAccept": { "type": { "name": "func" } },
"onClose": { "type": { "name": "func" } },
"onError": { "type": { "name": "func" } },
Expand Down Expand Up @@ -87,11 +87,11 @@
"showTodayButton": { "type": { "name": "bool" } },
"showToolbar": { "type": { "name": "bool" } },
"startText": { "type": { "name": "node" }, "default": "'Start'" },
"todayText": { "type": { "name": "node" }, "default": "\"TODAY\"" },
"todayText": { "type": { "name": "node" }, "default": "'Today'" },
"ToolbarComponent": { "type": { "name": "elementType" } },
"toolbarFormat": { "type": { "name": "string" } },
"toolbarPlaceholder": { "type": { "name": "node" }, "default": "\"\"" },
"toolbarTitle": { "type": { "name": "node" }, "default": "\"SELECT DATE\"" }
"toolbarPlaceholder": { "type": { "name": "node" }, "default": "'–'" },
"toolbarTitle": { "type": { "name": "node" }, "default": "'Select date range'" }
},
"name": "MobileDateRangePicker",
"styles": { "classes": [], "globalClasses": {}, "name": null },
Expand Down
Loading

0 comments on commit 2debed8

Please sign in to comment.