migrate typography to material-ui v3.2.0

mui · Oct 12, 2018 · 8b35d65 · 8b35d65
1 parent d7cd2d3
commit 8b35d65
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 151 deletions.
diff --git a/lib/package-lock.json b/lib/package-lock.json
diff --git a/lib/package.json b/lib/package.json
@@ -84,7 +84,7 @@
     "@babel/plugin-transform-runtime": "^7.1.0",
     "@babel/preset-env": "^7.1.0",
     "@babel/preset-react": "^7.0.0",
-    "@material-ui/core": "^3.1.1",
+    "@material-ui/core": "^3.2.0",
     "@types/classnames": "^2.2.6",
     "@types/jest": "^22.2.3",
     "@types/jss": "^9.5.6",

diff --git a/lib/src/DatePicker/DatePicker.tsx b/lib/src/DatePicker/DatePicker.tsx
@@ -114,14 +114,14 @@ export class DatePicker extends React.PureComponent<
       <>
         <PickerToolbar>
           <ToolbarButton
-            variant="subheading"
+            variant="subtitle1"
             onClick={this.openYearSelection}
             selected={showYearSelection}
             label={utils.getYearText(this.date)}
           />
 
           <ToolbarButton
-            variant="display1"
+            variant="h4"
             onClick={this.openCalendar}
             selected={!showYearSelection}
             label={utils.getDatePickerHeaderText(this.date)}

diff --git a/lib/src/DatePicker/components/CalendarHeader.tsx b/lib/src/DatePicker/components/CalendarHeader.tsx
@@ -60,7 +60,7 @@ export const CalendarHeader: React.SFC<CalendarHeaderProps> = ({
           transKey={currentMonth.toString()}
           className={classes.transitionContainer}
         >
-          <Typography align="center" variant="body1">
+          <Typography align="center" variant="body2">
             {utils.getCalendarHeaderText(currentMonth)}
           </Typography>
         </SlideTransition>

diff --git a/lib/src/DatePicker/components/Year.tsx b/lib/src/DatePicker/components/Year.tsx
@@ -56,7 +56,7 @@ export class Year extends React.PureComponent<YearProps> {
         onClick={this.handleClick}
         onKeyPress={this.handleClick}
         color={selected ? 'primary' : 'default'}
-        variant={selected ? 'headline' : 'subheading'}
+        variant={selected ? 'h5' : 'subtitle1'}
         {...other}
       >
         {children}

diff --git a/lib/src/DateTimePicker/components/DateTimePickerHeader.tsx b/lib/src/DateTimePicker/components/DateTimePickerHeader.tsx
@@ -47,14 +47,14 @@ export const DateTimePickerHeader: React.SFC<
     <PickerToolbar className={classes.toolbar}>
       <div className={classes.dateHeader}>
         <ToolbarButton
-          variant="subheading"
+          variant="subtitle1"
           onClick={changeOpenView(DateTimePickerView.YEAR)}
           selected={openView === DateTimePickerView.YEAR}
           label={utils.getYearText(date)}
         />
 
         <ToolbarButton
-          variant="display1"
+          variant="h4"
           onClick={changeOpenView(DateTimePickerView.DATE)}
           selected={openView === DateTimePickerView.DATE}
           label={utils.getDateTimePickerHeaderText(date)}
@@ -64,21 +64,21 @@ export const DateTimePickerHeader: React.SFC<
       <div className={classes.timeHeader}>
         <div className={hourMinuteClassName}>
           <ToolbarButton
-            variant="display2"
+            variant="h3"
             onClick={changeOpenView(DateTimePickerView.HOUR)}
             selected={openView === DateTimePickerView.HOUR}
             label={utils.getHourText(date, ampm!)}
           />
 
           <ToolbarButton
-            variant="display2"
+            variant="h3"
             label=":"
             selected={false}
             className={classes.separator}
           />
 
           <ToolbarButton
-            variant="display2"
+            variant="h3"
             onClick={changeOpenView(DateTimePickerView.MINUTES)}
             selected={openView === DateTimePickerView.MINUTES}
             label={utils.getMinuteText(date)}
@@ -90,15 +90,15 @@ export const DateTimePickerHeader: React.SFC<
             <ToolbarButton
               className={classes.ampmLabel}
               selected={meridiemMode === 'am'}
-              variant="subheading"
+              variant="subtitle1"
               label={utils.getMeridiemText('am')}
               onClick={setMeridiemMode('am')}
             />
 
             <ToolbarButton
               className={classes.ampmLabel}
               selected={meridiemMode === 'pm'}
-              variant="subheading"
+              variant="subtitle1"
               label={utils.getMeridiemText('pm')}
               onClick={setMeridiemMode('pm')}
             />