Skip to content

Commit 57dc961

Browse files
committed
Merge pull request mui#4198 from mbrookes/drawer-fix-theme-key
[Drawer] Fix muiTheme key name
2 parents 8d62d0b + 2f97476 commit 57dc961

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

docs/src/app/components/AppNavDrawer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ class AppNavDrawer extends Component {
118118
docked={docked}
119119
open={open}
120120
onRequestChange={onRequestChangeNavDrawer}
121-
containerStyle={{zIndex: zIndex.navDrawer - 100}}
121+
containerStyle={{zIndex: zIndex.drawer - 100}}
122122
>
123123
<div style={styles.logo} onTouchTap={this.handleTouchTapHeader}>
124124
Material-UI

src/Drawer/Drawer.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ class Drawer extends Component {
139139

140140
getStyles() {
141141
const muiTheme = this.context.muiTheme;
142-
const theme = muiTheme.navDrawer;
142+
const theme = muiTheme.drawer;
143143

144144
const x = this.getTranslateMultiplier() * (this.state.open ? 0 : this.getMaxTranslateX());
145145

@@ -148,7 +148,7 @@ class Drawer extends Component {
148148
height: '100%',
149149
width: this.props.width || theme.width,
150150
position: 'fixed',
151-
zIndex: muiTheme.zIndex.navDrawer,
151+
zIndex: muiTheme.zIndex.drawer,
152152
left: 0,
153153
top: 0,
154154
transform: `translate3d(${x}px, 0, 0)`,
@@ -198,7 +198,7 @@ class Drawer extends Component {
198198
};
199199

200200
getMaxTranslateX() {
201-
const width = this.props.width || this.context.muiTheme.navDrawer.width;
201+
const width = this.props.width || this.context.muiTheme.drawer.width;
202202
return width + 10;
203203
}
204204

src/styles/getMuiTheme.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ export default function getMuiTheme(muiTheme, ...more) {
126126
inkBar: {
127127
backgroundColor: palette.accent1Color,
128128
},
129-
navDrawer: {
129+
drawer: {
130130
width: spacing.desktopKeylineIncrement * 4,
131131
color: palette.canvasColor,
132132
},

src/styles/zIndex.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ export default {
22
menu: 1000,
33
appBar: 1100,
44
drawerOverlay: 1200,
5-
navDrawer: 1300,
5+
drawer: 1300,
66
dialogOverlay: 1400,
77
dialog: 1500,
88
layer: 2000,

0 commit comments

Comments
 (0)