handle the second review

Author: oliviertassinari

docs/src/pages/style/typography/typography.md

@@ -103,6 +103,5 @@ Deprecation warnings are logged when:
   - They will be restyled and `useNextVariants` is falsy. This includes: body2, body1, caption, button
 
 In some cases the deprecation warnings can break your test suite which might be inconvenient.
-In those cases you can set the environment variable `MUI_SUPPRESS_DEPRECATION_WARNINGS` to
-a truthy value. Passing `suppressDeprecationWarnings: true` to the typography options in
-`createMuiTheme` is equivalent.
+In those cases you can set the environment variable `MUI_SUPPRESS_DEPRECATION_WARNINGS` to a truthy value.
+Passing `suppressDeprecationWarnings: true` to the typography options in `createMuiTheme` is equivalent.

packages/material-ui/src/CardHeader/CardHeader.js

@@ -56,7 +56,8 @@ function CardHeader(props) {
   if (title != null && title.type !== Typography && !disableTypography) {
     title = (
       <Typography
-        variant={avatar ? 'body2' : 'h5'}
+        variant={avatar ? 'body2' : 'headline'}
+        suppressDeprecationWarnings
         className={classes.title}
         component="span"
         {...titleTypographyProps}

packages/material-ui/src/CardHeader/CardHeader.test.js

@@ -59,7 +59,7 @@ describe('<CardHeader />', () => {
     it('should render the title as headline text', () => {
       const title = wrapper.childAt(0);
       assert.strictEqual(title.type(), Typography);
-      assert.strictEqual(title.props().variant, 'h5');
+      assert.strictEqual(title.props().variant, 'headline');
     });
 
     it('should render the subheader as body1 secondary text', () => {

packages/material-ui/src/DialogContentText/DialogContentText.js

@@ -11,7 +11,7 @@ export const styles = {
 };
 
 function DialogContentText(props) {
-  return <Typography component="p" variant="subtitle1" color="textSecondary" {...props} />;
+  return <Typography component="p" variant="subheading" color="textSecondary" {...props} />;
 }
 
 DialogContentText.propTypes = {

packages/material-ui/src/DialogTitle/DialogTitle.js

@@ -18,7 +18,13 @@ function DialogTitle(props) {
 
   return (
     <div className={classNames(classes.root, className)} {...other}>
-      {disableTypography ? children : <Typography variant="h6">{children}</Typography>}
+      {disableTypography ? (
+        children
+      ) : (
+        <Typography variant="title" suppressDeprecationWarnings>
+          {children}
+        </Typography>
+      )}
     </div>
   );
 }

packages/material-ui/src/ListItemText/ListItemText.js

@@ -59,7 +59,8 @@ function ListItemText(props, context) {
   if (primary != null && primary.type !== Typography && !disableTypography) {
     primary = (
       <Typography
-        variant="subtitle1"
+        variant="subheading"
+        suppressDeprecationWarnings
         className={classNames(classes.primary, { [classes.textDense]: dense })}
         component="span"
         {...primaryTypographyProps}

packages/material-ui/src/ListItemText/ListItemText.test.js

@@ -41,7 +41,7 @@ describe('<ListItemText />', () => {
       const wrapper = shallow(<ListItemText primary="This is the primary text" />);
       assert.strictEqual(wrapper.children().length, 1, 'should have 1 child');
       assert.strictEqual(wrapper.childAt(0).type(), Typography);
-      assert.strictEqual(wrapper.childAt(0).props().variant, 'subtitle1');
+      assert.strictEqual(wrapper.childAt(0).props().variant, 'subheading');
       assert.strictEqual(
         wrapper
           .childAt(0)
@@ -111,7 +111,7 @@ describe('<ListItemText />', () => {
 
       assert.strictEqual(wrapper.children().length, 2, 'should have 2 children');
       assert.strictEqual(wrapper.childAt(0).type(), Typography);
-      assert.strictEqual(wrapper.childAt(0).props().variant, 'subtitle1');
+      assert.strictEqual(wrapper.childAt(0).props().variant, 'subheading');
       assert.strictEqual(
         wrapper
           .childAt(0)
@@ -152,7 +152,7 @@ describe('<ListItemText />', () => {
 
     assert.strictEqual(wrapper.children().length, 2, 'should have 2 children');
     assert.strictEqual(wrapper.childAt(0).type(), Typography);
-    assert.strictEqual(wrapper.childAt(0).props().variant, 'subtitle1');
+    assert.strictEqual(wrapper.childAt(0).props().variant, 'subheading');
     assert.strictEqual(
       wrapper
         .childAt(0)

packages/material-ui/src/MenuItem/MenuItem.js

@@ -9,7 +9,7 @@ import ListItem from '../ListItem';
 export const styles = theme => ({
   /* Styles applied to the root element. */
   root: {
-    ...theme.typography.subtitle1,
+    ...theme.typography.subheading,
     height: 24,
     boxSizing: 'content-box',
     width: 'auto',

packages/material-ui/src/Modal/Modal.test.js

@@ -219,8 +219,8 @@ describe('<Modal />', () => {
         2,
         'should have 2 children, the backdrop and the test container',
       );
-      assert.strictEqual(typeof modal.children[0], 'object');
-      assert.strictEqual(modal.children[1], container, 'should be the container');
+      assert.strictEqual(modal.children[0] != null, true);
+      assert.strictEqual(modal.children[1], container);
     });
   });
 

packages/material-ui/src/Typography/Typography.d.ts

@@ -12,6 +12,7 @@ export interface TypographyProps
   gutterBottom?: boolean;
   headlineMapping?: { [type in Style]: string };
   noWrap?: boolean;
+  suppressDeprecationWarnings?: boolean;
   paragraph?: boolean;
   variant?: Style | 'inherit';
 }