Skip to content

Commit c4962da

Browse files
[core] Batch small changes (#18539)
1 parent 8dc0be9 commit c4962da

38 files changed

+68
-2591
lines changed

docs/pages/components/integrated-autocomplete.js

Lines changed: 0 additions & 18 deletions
This file was deleted.

docs/src/modules/components/Demo.js

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,33 @@ const styles = theme => ({
5656
margin: 'auto',
5757
display: 'flex',
5858
justifyContent: 'center',
59+
[theme.breakpoints.up('sm')]: {
60+
borderRadius: theme.shape.borderRadius,
61+
},
62+
},
63+
/* Isolate the demo with an outline. */
64+
demoBgOutlined: {
65+
padding: theme.spacing(3),
66+
border: `1px solid ${fade(theme.palette.action.active, 0.12)}`,
5967
borderLeftWidth: 0,
6068
borderRightWidth: 0,
61-
border: `1px solid ${fade(theme.palette.action.active, 0.12)}`,
62-
padding: theme.spacing(3),
6369
[theme.breakpoints.up('sm')]: {
64-
borderRadius: theme.shape.borderRadius,
6570
borderLeftWidth: 1,
6671
borderRightWidth: 1,
6772
},
6873
},
69-
demoBg: {
70-
border: 'none',
74+
/* Prepare the background to display an inner elevation. */
75+
demoBgTrue: {
76+
padding: theme.spacing(3),
7177
backgroundColor: theme.palette.background.level2,
7278
},
79+
/* Make no difference between the demo and the markdown. */
80+
demoBgInline: {
81+
// Maintain alignment with the markdown text
82+
[theme.breakpoints.down('xs')]: {
83+
padding: theme.spacing(3),
84+
},
85+
},
7386
demoHiddenHeader: {
7487
paddingTop: theme.spacing(2),
7588
[theme.breakpoints.up('sm')]: {
@@ -250,6 +263,10 @@ function Demo(props) {
250263
[demoOptions.height, demoOptions.maxWidth],
251264
);
252265

266+
if (demoOptions.bg == null) {
267+
demoOptions.bg = 'outlined';
268+
}
269+
253270
if (demoOptions.iframe) {
254271
demoOptions.bg = true;
255272
}
@@ -298,7 +315,9 @@ function Demo(props) {
298315
<div
299316
className={clsx(classes.demo, {
300317
[classes.demoHiddenHeader]: demoOptions.hideHeader,
301-
[classes.demoBg]: demoOptions.bg,
318+
[classes.demoBgOutlined]: demoOptions.bg === 'outlined',
319+
[classes.demoBgTrue]: demoOptions.bg === true,
320+
[classes.demoBgInline]: demoOptions.bg === 'inline',
302321
})}
303322
tabIndex={-1}
304323
onMouseEnter={handleDemoHover}

docs/src/modules/components/MarkdownElement.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,8 @@ const styles = theme => ({
213213
},
214214
},
215215
'& table': {
216+
// Trade display table for scroll overflow
217+
display: 'block',
216218
width: '100%',
217219
overflowX: 'auto',
218220
WebkitOverflowScrolling: 'touch', // iOS momentum scrolling.

docs/src/pages.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ const pages = [
4242
{ pathname: '/components/switches' },
4343
{ pathname: '/components/text-fields' },
4444
{ pathname: '/components/transfer-list' },
45-
{ pathname: '/components/integrated-autocomplete' },
4645
],
4746
},
4847
{

docs/src/pages/components/autocomplete/GoogleMaps.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ export default function GoogleMaps() {
8989
<Autocomplete
9090
id="google-map-demo"
9191
style={{ width: 300 }}
92-
getOptionLabel={option => option.description}
92+
getOptionLabel={option => (typeof option === 'string' ? option : option.description)}
9393
filterOptions={x => x}
9494
options={options}
9595
autoComplete

docs/src/pages/components/autocomplete/GoogleMaps.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ export default function GoogleMaps() {
101101
<Autocomplete
102102
id="google-map-demo"
103103
style={{ width: 300 }}
104-
getOptionLabel={option => option.description}
104+
getOptionLabel={option => (typeof option === 'string' ? option : option.description)}
105105
filterOptions={x => x}
106106
options={options}
107107
autoComplete

docs/src/pages/components/integrated-autocomplete/IntegrationAutosuggest.js

Lines changed: 0 additions & 230 deletions
This file was deleted.

0 commit comments

Comments
 (0)