Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(MdList): expand only one option #1645

Merged
merged 2 commits into from
May 13, 2018
Merged

feat(MdList): expand only one option #1645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8686dcf
feat(MdList): expand only one option
VdustR Mar 29, 2018
5b7d05f
fix(MdList): rename expandOnlyOne to expandSingle
VdustR Apr 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions docs/app/pages/Components/List/List.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
<api-item title="API - md-list">
<p>The following options can be applied to any list:</p>

<api-table :headings="list.props.headings" :props="list.props.props" slot="props" />
<api-table :headings="list.classes.headings" :props="list.classes.props" slot="classes" />
</api-item>

Expand All @@ -82,10 +83,10 @@
headings: ['Name', 'Description', 'Default'],
props: [
{
name: 'id',
type: 'String',
description: 'The item id. Used when changing the selected item dynamically',
defaults: 'a random string'
name: 'md-expand-single',
type: 'Boolean',
description: 'If set true, one expandable list item could be expanded at most at a time. The expanded list item will be collapsed when another is expanded',
defaults: 'false'
}
]
},
Expand Down
99 changes: 62 additions & 37 deletions docs/app/pages/Components/List/examples/ListExpansion.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,51 @@
<template>
<div class="full-control">
<md-list>
<md-list-item md-expand :md-expanded.sync="expandNews">
<md-icon>whatshot</md-icon>
<span class="md-list-item-text">News</span>
<div class="list">
<md-list :md-expand-single="expandSingle">
<md-list-item md-expand :md-expanded.sync="expandNews">
<md-icon>whatshot</md-icon>
<span class="md-list-item-text">News</span>

<md-list slot="md-expand">
<md-list-item class="md-inset">World</md-list-item>
<md-list-item class="md-inset">Europe</md-list-item>
<md-list-item class="md-inset">South America</md-list-item>
</md-list>
</md-list-item>
<md-list slot="md-expand">
<md-list-item class="md-inset">World</md-list-item>
<md-list-item class="md-inset">Europe</md-list-item>
<md-list-item class="md-inset">South America</md-list-item>
</md-list>
</md-list-item>

<md-list-item md-expand>
<md-icon>videogame_asset</md-icon>
<span class="md-list-item-text">Games</span>
<md-list-item md-expand>
<md-icon>videogame_asset</md-icon>
<span class="md-list-item-text">Games</span>

<md-list slot="md-expand">
<md-list-item class="md-inset">Console</md-list-item>
<md-list-item class="md-inset">PC</md-list-item>
<md-list-item class="md-inset">Phone</md-list-item>
</md-list>
</md-list-item>
<md-list slot="md-expand">
<md-list-item class="md-inset">Console</md-list-item>
<md-list-item class="md-inset">PC</md-list-item>
<md-list-item class="md-inset">Phone</md-list-item>
</md-list>
</md-list-item>

<md-list-item md-expand>
<md-icon>video_library</md-icon>
<span class="md-list-item-text">Video</span>
<md-list-item md-expand>
<md-icon>video_library</md-icon>
<span class="md-list-item-text">Video</span>

<md-list slot="md-expand">
<md-list-item class="md-inset">Humor</md-list-item>
<md-list-item class="md-inset">Music</md-list-item>
<md-list-item class="md-inset">Movies</md-list-item>
<md-list-item class="md-inset">TV Shows</md-list-item>
</md-list>
</md-list-item>
<md-list slot="md-expand">
<md-list-item class="md-inset">Humor</md-list-item>
<md-list-item class="md-inset">Music</md-list-item>
<md-list-item class="md-inset">Movies</md-list-item>
<md-list-item class="md-inset">TV Shows</md-list-item>
</md-list>
</md-list-item>

<md-list-item>
<md-icon>shopping_basket</md-icon>
<span class="md-list-item-text">Shop</span>
</md-list-item>
</md-list>
<md-checkbox v-model="expandNews">Expand News</md-checkbox>
<md-list-item>
<md-icon>shopping_basket</md-icon>
<span class="md-list-item-text">Shop</span>
</md-list-item>
</md-list>
</div>
<div class="control">
<md-switch v-model="expandSingle">Expand Only One</md-switch>
<md-checkbox v-model="expandNews">Expand News</md-checkbox>
</div>
</div>
</template>

Expand All @@ -50,20 +55,40 @@

data () {
return {
expandNews: false
expandNews: false,
expandSingle: false
}
}
}
</script>

<style lang="scss" scoped>
$list-width: 320px;

.full-control {
display: flex;
flex-direction: row;
flex-wrap: wrap-reverse;
}

.list {
width: $list-width;
}

.full-control > .md-list {
width: 320px;
width: $list-width;
max-width: 100%;
height: 400px;
display: inline-block;
overflow: auto;
border: 1px solid rgba(#000, .12);
vertical-align: top;
}

.control {
min-width: 250px;
display: flex;
flex-direction: column;
padding: 16px;
}
</style>
44 changes: 43 additions & 1 deletion src/components/MdList/MdList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,49 @@
import MdComponent from 'core/MdComponent'

export default new MdComponent({
name: 'MdList'
name: 'MdList',
data () {
return {
MdList: {
expandable: [],
expandATab: this.expandATab,
pushExpandable: this.pushExpandable,
removeExpandable: this.removeExpandable
}
}
},
provide () {
return {
MdList: this.MdList
}
},
props: {
mdExpandSingle: {
default: false
}
},
methods: {
expandATab (expandedListItem) {
if (this.mdExpandSingle && expandedListItem) {
const otherExpandableListItems = this.MdList.expandable.filter(target => target !== expandedListItem)
otherExpandableListItems.forEach(expandableListItem => expandableListItem.close())
}
},
pushExpandable (expandableListItem) {
let expandableListItems = this.MdList.expandable

if (!expandableListItems.find(target => target === expandableListItem)) {
this.MdList.expandable = expandableListItems.concat([expandableListItem])
}
},
removeExpandable (expandableListItem) {
let expandableListItems = this.MdList.expandable

if (expandableListItems.find(target => target === expandableListItem)) {
this.MdList.expandable = expandableListItems.filter(target => target !== expandableListItem)
}
}
}
})
</script>

Expand Down
11 changes: 11 additions & 0 deletions src/components/MdList/MdListItem/MdListItemExpand.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
MdArrowDownIcon
},
mixins: [MdListItemMixin],
inject: ['MdList'],
data: () => ({
expandStyles: {},
showContent: false
Expand Down Expand Up @@ -98,12 +99,22 @@
let expanded = this.showContent
this.$emit('update:mdExpanded', expanded)
this.$nextTick(() => this.$emit(expanded ? 'md-expanded' : 'md-collapsed'))

if (expanded) {
this.MdList.expandATab(this)
}
}
},
created () {
this.MdList.pushExpandable(this)
},
mounted () {
if (this.mdExpanded) {
this.open()
}
},
beforeDestroy () {
this.MdList.removeExpandable(this)
}
}
</script>
Expand Down