Skip to content

Commit

Permalink
fix(ssr): properly render textarea value
Browse files Browse the repository at this point in the history
partial fix for #6986
  • Loading branch information
yyx990803 committed Nov 3, 2017
1 parent 53b77f8 commit 79c0d7b
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/platforms/web/server/modules/dom-props.js
Expand Up @@ -27,7 +27,10 @@ export default function renderDOMProps (node: VNodeWithData): string {
setText(node, props[key], true)
} else if (key === 'textContent') {
setText(node, props[key], false)
} else if (key === 'value' && node.tag === 'textarea') {
setText(node, props[key], false)
} else {
// $flow-disable-line (WTF?)
const attr = propsToAttrMap[key] || key.toLowerCase()
if (isRenderableAttr(attr) &&
// avoid rendering double-bound props/attrs twice
Expand Down
3 changes: 3 additions & 0 deletions src/server/optimizing-compiler/codegen.js
Expand Up @@ -205,6 +205,9 @@ function childrenToSegments (el, state): Array<StringSegment> {
if ((binding = el.attrsMap['v-text'])) {
return [{ type: INTERPOLATION, value: `_s(${binding})` }]
}
if (el.tag === 'textarea' && (binding = el.attrsMap['v-model'])) {
return [{ type: INTERPOLATION, value: `_s(${binding})` }]
}
return el.children
? nodesToSegments(el.children, state)
: []
Expand Down
4 changes: 4 additions & 0 deletions src/server/optimizing-compiler/modules.js
Expand Up @@ -31,6 +31,10 @@ export function applyModelTransform (el: ASTElement, state: CodegenState) {
const dir = el.directives[i]
if (dir.name === 'model') {
state.directives.model(el, dir, state.warn)
// remove value for textarea as its converted to text
if (el.tag === 'textarea' && el.props) {
el.props = el.props.filter(p => p.name !== 'value')
}
break
}
}
Expand Down
25 changes: 25 additions & 0 deletions test/ssr/ssr-string.spec.js
Expand Up @@ -1009,6 +1009,31 @@ describe('SSR: renderToString', () => {
done()
})
})

it('render v-model with textarea', done => {
renderVmWithOptions({
data: { foo: 'bar' },
template: '<div><textarea v-model="foo"></textarea></div>'
}, result => {
expect(result).toContain('<textarea>bar</textarea>')
done()
})
})

it('render v-model with textarea (non-optimized)', done => {
renderVmWithOptions({
render (h) {
return h('textarea', {
domProps: {
value: 'foo'
}
})
}
}, result => {
expect(result).toContain('<textarea data-server-rendered="true">foo</textarea>')
done()
})
})
})

function renderVmWithOptions (options, cb) {
Expand Down

0 comments on commit 79c0d7b

Please sign in to comment.