Skip to content

Commit

Permalink
fix(compiler-ssr): fix attr fallthrough for transition/keep-alive as …
Browse files Browse the repository at this point in the history
…template root

fix #3981
  • Loading branch information
yyx990803 committed Jun 22, 2021
1 parent 9b607fe commit 9f6f8b3
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 5 deletions.
7 changes: 4 additions & 3 deletions packages/compiler-ssr/__tests__/ssrComponent.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,10 @@ describe('ssr: components', () => {
test('built-in fallthroughs', () => {
expect(compile(`<transition><div/></transition>`).code)
.toMatchInlineSnapshot(`
"
"const { ssrRenderAttrs: _ssrRenderAttrs } = require(\\"@vue/server-renderer\\")
return function ssrRender(_ctx, _push, _parent, _attrs) {
_push(\`<div></div>\`)
_push(\`<div\${_ssrRenderAttrs(_attrs)}></div>\`)
}"
`)

Expand All @@ -283,7 +284,7 @@ describe('ssr: components', () => {
return function ssrRender(_ctx, _push, _parent, _attrs) {
const _component_foo = _resolveComponent(\\"foo\\")
_push(_ssrRenderComponent(_component_foo, null, null, _parent))
_push(_ssrRenderComponent(_component_foo, _attrs, null, _parent))
}"
`)
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import {
RootNode,
TemplateChildNode,
ParentNode,
findDir
findDir,
isBuiltInType
} from '@vue/compiler-dom'

const hasSingleChild = (node: ParentNode): boolean =>
Expand All @@ -21,6 +22,18 @@ export const ssrInjectFallthroughAttrs: NodeTransform = (node, context) => {
context.identifiers._attrs = 1
}

if (
node.type === NodeTypes.ELEMENT &&
node.tagType === ElementTypes.COMPONENT &&
(isBuiltInType(node.tag, 'Transition') ||
isBuiltInType(node.tag, 'KeepAlive'))
) {
if (hasSingleChild(node)) {
injectFallthroughAttrs(node.children[0])
}
return
}

const parent = context.parent
if (!parent || parent.type !== NodeTypes.ROOT) {
return
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,8 @@ export function ssrProcessComponent(
} else if (component === TRANSITION_GROUP) {
return ssrProcessTransitionGroup(node, context)
} else {
// real fall-through (e.g. KeepAlive): just render its children.
// real fall-through: Transition / KeepAlive
// just render its children.
processChildren(node.children, context)
}
} else {
Expand Down

0 comments on commit 9f6f8b3

Please sign in to comment.