Commitb6c384d

authored and

committed

fix(core): static trees should be cached on options (vuejs#6826) (vuejs#6837)

* test(once): failing test forvuejs#6826* fix(core): static trees should be cached on options (vuejs#6826)

1 parent9caed00 commitb6c384dCopy full SHA for b6c384d

File tree

+25

-3

lines changed

+25

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ export function renderStatic (`
`11`	`11`	`):VNode\|Array<VNode>{`
`12`	`12`	`// static trees can be rendered once and cached on the contructor options`
`13`	`13`	`// so every instance shares the same cached trees`
`14`		`-constrenderFns=this.$options.staticRenderFns`
`15`		`-constcached=renderFns.cached\|\|(renderFns.cached=[])`
	`14`	`+constoptions=this.$options`
	`15`	`+constcached=options.cached\|\|(options.cached=[])`
`16`	`16`	`lettree=cached[index]`
`17`	`17`	`// if has already-rendered static tree and not inside v-for,`
`18`	`18`	`// we can reuse the same tree by doing a shallow clone.`
`@@ -22,7 +22,7 @@ export function renderStatic (`
`22`	`22`	`:cloneVNode(tree)`
`23`	`23`	`}`
`24`	`24`	`// otherwise, render a fresh tree.`
`25`		`-tree=cached[index]=renderFns[index].call(this._renderProxy,null,this)`
	`25`	`+tree=cached[index]=options.staticRenderFns[index].call(this._renderProxy,null,this)`
`26`	`26`	markStatic(tree,`__static__${index}`,false)
`27`	`27`	`returntree`
`28`	`28`	`}`

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -335,6 +335,28 @@ describe('Directive v-once', () => {`
`335`	`335`	`vm.ok=false// teardown component with v-once`
`336`	`336`	`}).then(done)// should not throw`
`337`	`337`	`})`
	`338`	`+`
	`339`	`+// #6826`
	`340`	`+it('should render different component instances properly',done=>{`
	`341`	`+constvm=newVue({`
	`342`	`+components:{`
	`343`	`+foo:{`
	`344`	`+props:['name'],`
	`345`	`+template:'<div v-once>{{ name }}</div>'`
	`346`	`+}`
	`347`	`+},`
	`348`	+template:`
	`349`	`+ <div>`
	`350`	`+ <foo name="a" v-once></foo>`
	`351`	`+ <foo name="b" v-once></foo>`
	`352`	`+ </div>`
	`353`	+ `
	`354`	`+}).$mount()`
	`355`	`+waitForUpdate(()=>{`
	`356`	`+expect(vm.$el.children[0].innerHTML).toBe('a')`
	`357`	`+expect(vm.$el.children[1].innerHTML).toBe('b')`
	`358`	`+}).then(done)`
	`359`	`+})`
`338`	`360`	`})`
`339`	`361`
`340`	`362`	`functionexpectTextContent(vm,text){`

Comments

(0)