Skip to content

Commit

Permalink
fix(drawer): drawer has no --selected item style
Browse files Browse the repository at this point in the history
remove mdc-drawer-item selected prop and fix demo styles
  • Loading branch information
stasson committed Oct 27, 2017
1 parent 58ce57d commit 16cd196
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 28 deletions.
11 changes: 2 additions & 9 deletions components/drawer/mdc-drawer-item.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<a :href="href" class="mdc-drawer-item mdc-list-item"
:class="[classes, selectedClass]" :style="styles"
:class="classes" :style="styles"
@click="dispatchEvent">
<span class="mdc-list-item__start-detail" v-if="hasStartDetail">
<slot name="start-detail">
Expand All @@ -20,8 +20,7 @@ export default {
mixins: [DispatchEventMixin],
props: {
'start-icon': String,
'href': String,
'selected': Boolean
'href': String
},
data () {
return {
Expand All @@ -32,12 +31,6 @@ export default {
computed: {
hasStartDetail () {
return this.startIcon || this.$slots['start-detail']
},
selectedClass () {
return {
'mdc-drawer-item-selected': this.selected,
[this.mdcDrawer.type+'--selected']: this.selected
}
}
},
mounted () {
Expand Down
21 changes: 19 additions & 2 deletions components/drawer/mdc-drawer-list.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
<template>
<nav class="mdc-list">
<nav class="mdc-drawer-list mdc-list" :class="classes">
<slot></slot>
</nav>
</template>
</template>

<script>
export default {
name: 'mdc-drawer-list',
props: {
'dense': Boolean,
},
data () {
return {
classes: {
'mdc-list--dense': this.dense
}
}
}
}
</script>
19 changes: 4 additions & 15 deletions demo/drawer.vue
Original file line number Diff line number Diff line change
@@ -1,26 +1,15 @@
<template>
<mdc-drawer toggle-on="toggle-drawer">
<mdc-drawer-header temporary></mdc-drawer-header>
<mdc-list dense>
<router-link tag="div" v-for="link of links" :key="link.id"
<mdc-drawer-list dense>
<router-link tag="div" v-for="link in links" :key="link.id"
:to="link.to" >
<mdc-drawer-item :selected="$route.params.id === link.id"
>{{link.name}}</mdc-drawer-item>
<mdc-drawer-item>{{link.name}}</mdc-drawer-item>
</router-link>
</mdc-list>
</mdc-drawer-list>
</mdc-drawer>
</template>

<style>
.mdc-drawer-header {
background-image: url("./assets/logo.png");
background-size: contain;
background-repeat: no-repeat;
background-position: center;
}
</style>


<script>
import links from './links.js'
Expand Down
11 changes: 9 additions & 2 deletions demo/styles.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
@import "@material/typography/mdc-typography";
@import "highlight.js/styles/googlecode";

.mdc-drawer .mdc-drawer-item.mdc-drawer-item-selected {
font-size:1rem;
.mdc-drawer-header {
background-image: url("./assets/logo.png");
background-size: contain;
background-repeat: no-repeat;
background-position: center;
}

.router-link-exact-active .mdc-drawer-item {
font-size: 1.1rem;
}

.content {
Expand Down

0 comments on commit 16cd196

Please sign in to comment.