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

Mark node with static props as static #4662

Merged
merged 2 commits into from
Jan 10, 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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions flow/compiler.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ declare type ASTElement = {
plain?: boolean;
pre?: true;
ns?: string;
staticProps?: Array<string>;

component?: string;
inlineTemplate?: true;
Expand Down
5 changes: 4 additions & 1 deletion src/compiler/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ export function pluckModuleFunction<F: Function> (
: []
}

export function addProp (el: ASTElement, name: string, value: string) {
export function addProp (el: ASTElement, name: string, value: string, fromStaticAttr?: boolean) {
if (fromStaticAttr) {
(el.staticProps || (el.staticProps = [])).push(name)
}
(el.props || (el.props = [])).push({ name, value })
}

Expand Down
10 changes: 7 additions & 3 deletions src/compiler/optimizer.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* @flow */

import { makeMap, isBuiltInTag, cached, no } from 'shared/util'
import { makeMap, isBuiltInTag, cached, no, remove } from 'shared/util'

let isStaticKey
let isPlatformReservedTag
Expand Down Expand Up @@ -30,7 +30,7 @@ export function optimize (root: ?ASTElement, options: CompilerOptions) {

function genStaticKeys (keys: string): Function {
return makeMap(
'type,tag,attrsList,attrsMap,plain,parent,children,attrs' +
'type,tag,attrsList,attrsMap,plain,parent,children,attrs,staticProps' +
(keys ? ',' + keys : '')
)
}
Expand Down Expand Up @@ -99,13 +99,17 @@ function isStatic (node: ASTNode): boolean {
if (node.type === 3) { // text
return true
}
const nodeAttrs = Object.keys(node)
if (node.staticProps && node.props && node.staticProps.length === node.props.length) {
remove(nodeAttrs, 'props')
}
return !!(node.pre || (
!node.hasBindings && // no dynamic bindings
!node.if && !node.for && // not v-if or v-for or v-else
!isBuiltInTag(node.tag) && // not a built-in
isPlatformReservedTag(node.tag) && // not a component
!isDirectChildOfTemplateFor(node) &&
Object.keys(node).every(isStaticKey)
nodeAttrs.every(isStaticKey)
))
}

Expand Down
4 changes: 2 additions & 2 deletions src/compiler/parser/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -481,9 +481,9 @@ function processAttrs (el) {
// so that patches between dynamic/static are consistent
if (platformMustUseProp(el.tag, name)) {
if (name === 'value') {
addProp(el, name, JSON.stringify(value))
addProp(el, name, JSON.stringify(value), true)
} else {
addProp(el, name, 'true')
addProp(el, name, 'true', true)
}
}
}
Expand Down
6 changes: 6 additions & 0 deletions test/unit/modules/compiler/optimizer.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,12 @@ describe('optimizer', () => {
expect(ast.children[0].static).toBe(false)
})

it('mark static with static dom property', () => {
const ast = parse('<input type="text" value="1">', baseOptions)
optimize(ast, baseOptions)
expect(ast.static).toBe(true)
})

it('not root ast', () => {
const ast = null
optimize(ast, baseOptions)
Expand Down