Skip to content

Commit

Permalink
fix(runtime-core): cache props default values to avoid unnecessary wa…
Browse files Browse the repository at this point in the history
…tcher trigger (#3474)

fix #3471
  • Loading branch information
HcySunYang authored Mar 25, 2021
1 parent ebedccc commit 44166b4
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 5 deletions.
42 changes: 41 additions & 1 deletion packages/runtime-core/__tests__/componentProps.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import {
serializeInner,
createApp,
provide,
inject
inject,
watch
} from '@vue/runtime-test'
import { render as domRender, nextTick } from 'vue'

Expand Down Expand Up @@ -420,4 +421,43 @@ describe('component props', () => {

expect(serializeInner(root)).toMatch('<div>60000000100000111</div>')
})

// #3474
test('should cache the value returned from the default factory to avoid unnecessary watcher trigger', async () => {
let count = 0
const Comp = {
props: {
foo: {
type: Object,
default: () => ({ val: 1 })
},
bar: Number
},
setup(props: any) {
watch(
() => props.foo,
() => {
count++
}
)
return () => h('h1', [props.foo.val, props.bar])
}
}

const foo = ref()
const bar = ref(0)
const app = createApp({
render: () => h(Comp, { foo: foo.value, bar: bar.value })
})

const root = nodeOps.createElement('div')
app.mount(root)
expect(serializeInner(root)).toMatch(`<h1>10</h1>`)
expect(count).toBe(0)

bar.value++
await nextTick()
expect(serializeInner(root)).toMatch(`<h1>11</h1>`)
expect(count).toBe(0)
})
})
10 changes: 9 additions & 1 deletion packages/runtime-core/src/component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,12 @@ export interface ComponentInternalInstance {
* @internal
*/
emitted: Record<string, boolean> | null

/**
* used for caching the value returned from props default factory functions to
* avoid unnecessary watcher trigger
* @internal
*/
propsDefaults: Data
/**
* setup related
* @internal
Expand Down Expand Up @@ -440,6 +445,9 @@ export function createComponentInstance(
emit: null as any, // to be set immediately
emitted: null,

// props default value
propsDefaults: EMPTY_OBJ,

// state
ctx: EMPTY_OBJ,
data: EMPTY_OBJ,
Expand Down
14 changes: 11 additions & 3 deletions packages/runtime-core/src/componentProps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,9 @@ export function initProps(
const props: Data = {}
const attrs: Data = {}
def(attrs, InternalObjectKey, 1)

instance.propsDefaults = Object.create(null)

setFullProps(instance, rawProps, props, attrs)
// validation
if (__DEV__) {
Expand Down Expand Up @@ -326,9 +329,14 @@ function resolvePropValue(
if (hasDefault && value === undefined) {
const defaultValue = opt.default
if (opt.type !== Function && isFunction(defaultValue)) {
setCurrentInstance(instance)
value = defaultValue(props)
setCurrentInstance(null)
const { propsDefaults } = instance
if (key in propsDefaults) {
value = propsDefaults[key]
} else {
setCurrentInstance(instance)
value = propsDefaults[key] = defaultValue(props)
setCurrentInstance(null)
}
} else {
value = defaultValue
}
Expand Down

0 comments on commit 44166b4

Please sign in to comment.