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.

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

fix SSR v-show render. #5224

Merged
merged 4 commits into from
Mar 21, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 26 additions & 2 deletions src/server/render.js
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,22 @@ function hasAncestorData (node: VNode) {
return parentNode && (parentNode.data || hasAncestorData(parentNode))
}

function getVShowDirectiveInfo (node: VNode): ?VNodeDirective {
let dir: VNodeDirective
let tmp

while (node) {
if (node.data && node.data.directives) {
tmp = node.data.directives.find(dir => dir.name === 'show')
if (tmp) {
dir = tmp
}
}
node = node.parent
}
return dir
}

function renderStartingTag (node: VNode, context) {
let markup = `<${node.tag}`
const { directives, modules } = context
Expand All @@ -158,14 +174,22 @@ function renderStartingTag (node: VNode, context) {
const dirs = node.data.directives
if (dirs) {
for (let i = 0; i < dirs.length; i++) {
const dirRenderer = directives[dirs[i].name]
if (dirRenderer) {
const name = dirs[i].name
const dirRenderer = directives[name]
if (dirRenderer && name !== 'show') {
// directives mutate the node's data
// which then gets rendered by modules
dirRenderer(node, dirs[i])
}
}
}

// v-show directive needs to be merged from parent to child
const vshowDirectiveInfo = getVShowDirectiveInfo(node)
if (vshowDirectiveInfo) {
directives.show(node, vshowDirectiveInfo)
}

// apply other modules
for (let i = 0; i < modules.length; i++) {
const res = modules[i](node)
Expand Down
69 changes: 69 additions & 0 deletions test/ssr/ssr-string.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,75 @@ describe('SSR: renderToString', () => {
})
})

it('v-show directive render', done => {
renderVmWithOptions({
template: '<div v-show="false"><span>inner</span></div>'
}, res => {
expect(res).toContain(
'<div server-rendered="true" style="display:none;"><span>inner</span></div>'
)
done()
})
})

it('v-show directive not passed to child', done => {
renderVmWithOptions({
template: '<foo v-show="false"></foo>',
components: {
foo: {
template: '<div><span>inner</span></div>'
}
}
}, res => {
expect(res).toContain(
'<div server-rendered="true" style="display:none;"><span>inner</span></div>'
)
done()
})
})

it('v-show directive not passed to slot', done => {
renderVmWithOptions({
template: '<foo v-show="false"><span>inner</span></foo>',
components: {
foo: {
template: '<div><slot></slot></div>'
}
}
}, res => {
expect(res).toContain(
'<div server-rendered="true" style="display:none;"><span>inner</span></div>'
)
done()
})
})

it('v-show directive merging on components', done => {
renderVmWithOptions({
template: '<foo v-show="false"></foo>',
components: {
foo: {
render: h => h('bar', {
directives: [{
name: 'show',
value: true
}]
}),
components: {
bar: {
render: h => h('div', 'inner')
}
}
}
}
}, res => {
expect(res).toContain(
'<div server-rendered="true" style="display:none;">inner</div>'
)
done()
})
})

it('text interpolation', done => {
renderVmWithOptions({
template: '<div>{{ foo }} side {{ bar }}</div>',
Expand Down