Skip to content

Support array syntax for keep-alive include and exclude #5956

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

Merged
merged 6 commits into from
Jun 30, 2017
Merged

Support array syntax for keep-alive include and exclude #5956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9380508
allow array index on keep-alive:include/exclude
jkzing Jun 19, 2017
b7ba9b2
add Array in patternTypes
jkzing Jun 23, 2017
9388881
Merge branch 'dev' of github.com:vuejs/vue into keep-alive-array
jkzing Jun 23, 2017
a201b25
fix flow type
jkzing Jun 23, 2017
8dd8708
add flow type for include/exclude in watch
jkzing Jun 23, 2017
762523d
add test case
jkzing Jun 23, 2017
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
12 changes: 7 additions & 5 deletions src/core/components/keep-alive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@ import { getFirstComponentChild } from 'core/vdom/helpers/index'

type VNodeCache = { [key: string]: ?VNode };

const patternTypes: Array<Function> = [String, RegExp]
const patternTypes: Array<Function> = [String, RegExp, Array]

function getComponentName (opts: ?VNodeComponentOptions): ?string {
return opts && (opts.Ctor.options.name || opts.tag)
}

function matches (pattern: string | RegExp, name: string): boolean {
if (typeof pattern === 'string') {
function matches (pattern: string | RegExp | Array<string>, name: string): boolean {
if (Array.isArray(pattern)) {
return pattern.indexOf(name) > -1
} else if (typeof pattern === 'string') {
return pattern.split(',').indexOf(name) > -1
} else if (isRegExp(pattern)) {
return pattern.test(name)
Expand Down Expand Up @@ -62,10 +64,10 @@ export default {
},

watch: {
include (val: string | RegExp) {
include (val: string | RegExp | Array<string>) {
pruneCache(this.cache, this._vnode, name => matches(val, name))
},
exclude (val: string | RegExp) {
exclude (val: string | RegExp | Array<string>) {
pruneCache(this.cache, this._vnode, name => !matches(val, name))
}
},
Expand Down
36 changes: 36 additions & 0 deletions test/unit/features/component/component-keep-alive.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,24 @@ describe('Component keep-alive', () => {
sharedAssertions(vm, done)
})

it('include (array)', done => {
const vm = new Vue({
template: `
<div v-if="ok">
<keep-alive :include="['one']">
<component :is="view"></component>
</keep-alive>
</div>
`,
data: {
view: 'one',
ok: true
},
components
}).$mount()
sharedAssertions(vm, done)
})

it('exclude (string)', done => {
const vm = new Vue({
template: `
Expand Down Expand Up @@ -308,6 +326,24 @@ describe('Component keep-alive', () => {
sharedAssertions(vm, done)
})

it('exclude (array)', done => {
const vm = new Vue({
template: `
<div v-if="ok">
<keep-alive :exclude="['two']">
<component :is="view"></component>
</keep-alive>
</div>
`,
data: {
view: 'one',
ok: true
},
components
}).$mount()
sharedAssertions(vm, done)
})

it('include + exclude', done => {
const vm = new Vue({
template: `
Expand Down