Commit79c0d7b

committed

fix(ssr): properly render textarea value

partial fix forvuejs#6986

1 parent53b77f8 commit79c0d7bCopy full SHA for 79c0d7b

File tree

+35

-0

lines changed

+35

-0

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,10 @@ export default function renderDOMProps (node: VNodeWithData): string {`
`27`	`27`	`setText(node,props[key],true)`
`28`	`28`	`}elseif(key==='textContent'){`
`29`	`29`	`setText(node,props[key],false)`
	`30`	`+}elseif(key==='value'&&node.tag==='textarea'){`
	`31`	`+setText(node,props[key],false)`
`30`	`32`	`}else{`
	`33`	`+// $flow-disable-line (WTF?)`
`31`	`34`	`constattr=propsToAttrMap[key]\|\|key.toLowerCase()`
`32`	`35`	`if(isRenderableAttr(attr)&&`
`33`	`36`	`// avoid rendering double-bound props/attrs twice`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -205,6 +205,9 @@ function childrenToSegments (el, state): Array<StringSegment> {`
`205`	`205`	`if((binding=el.attrsMap['v-text'])){`
`206`	`206`	return[{type:INTERPOLATION,value:`_s(${binding})`}]
`207`	`207`	`}`
	`208`	`+if(el.tag==='textarea'&&(binding=el.attrsMap['v-model'])){`
	`209`	+return[{type:INTERPOLATION,value:`_s(${binding})`}]
	`210`	`+}`
`208`	`211`	`returnel.children`
`209`	`212`	`?nodesToSegments(el.children,state)`
`210`	`213`	`:[]`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,10 @@ export function applyModelTransform (el: ASTElement, state: CodegenState) {`
`31`	`31`	`constdir=el.directives[i]`
`32`	`32`	`if(dir.name==='model'){`
`33`	`33`	`state.directives.model(el,dir,state.warn)`
	`34`	`+// remove value for textarea as its converted to text`
	`35`	`+if(el.tag==='textarea'&&el.props){`
	`36`	`+el.props=el.props.filter(p=>p.name!=='value')`
	`37`	`+}`
`34`	`38`	`break`
`35`	`39`	`}`
`36`	`40`	`}`

Lines changed: 25 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1009,6 +1009,31 @@ describe('SSR: renderToString', () => {`
`1009`	`1009`	`done()`
`1010`	`1010`	`})`
`1011`	`1011`	`})`
	`1012`	`+`
	`1013`	`+it('render v-model with textarea',done=>{`
	`1014`	`+renderVmWithOptions({`
	`1015`	`+data:{foo:'bar'},`
	`1016`	`+template:'<div><textarea v-model="foo"></textarea></div>'`
	`1017`	`+},result=>{`
	`1018`	`+expect(result).toContain('<textarea>bar</textarea>')`
	`1019`	`+done()`
	`1020`	`+})`
	`1021`	`+})`
	`1022`	`+`
	`1023`	`+it('render v-model with textarea (non-optimized)',done=>{`
	`1024`	`+renderVmWithOptions({`
	`1025`	`+render(h){`
	`1026`	`+returnh('textarea',{`
	`1027`	`+domProps:{`
	`1028`	`+value:'foo'`
	`1029`	`+}`
	`1030`	`+})`
	`1031`	`+}`
	`1032`	`+},result=>{`
	`1033`	`+expect(result).toContain('<textarea data-server-rendered="true">foo</textarea>')`
	`1034`	`+done()`
	`1035`	`+})`
	`1036`	`+})`
`1012`	`1037`	`})`
`1013`	`1038`
`1014`	`1039`	`functionrenderVmWithOptions(options,cb){`

Comments

(0)