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.

Sign up for GitHub

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

Jump to bottom

fix(compat): convertLegacyVModelProps should merge model option in mixins #5251

Merged
merged 3 commits into from Jan 21, 2022
Merged

fix(compat): convertLegacyVModelProps should merge model option in mixins #5251

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10be4b8
fix(compat): convertLegacyVModelProps should also care about model in…
moesoha Jan 13, 2022
00b7822
Update componentVModel.ts
yyx990803 Jan 21, 2022
2f3510a
Update componentVModel.ts
yyx990803 Jan 21, 2022
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
22 changes: 17 additions & 5 deletions packages/runtime-core/src/compat/componentVModel.ts
View file
Open in desktop
@@ -1,4 +1,4 @@
import { ShapeFlags } from '@vue/shared'
import { extend, ShapeFlags } from '@vue/shared'
import { ComponentInternalInstance, ComponentOptions } from '../component'
import { callWithErrorHandling, ErrorCodes } from '../errorHandling'
import { VNode } from '../vnode'
Expand All @@ -15,6 +15,7 @@ const warnedTypes = new WeakSet()

export function convertLegacyVModelProps(vnode: VNode) {
const { type, shapeFlag, props, dynamicProps } = vnode
const comp = type as ComponentOptions
if (shapeFlag & ShapeFlags.COMPONENT && props && 'modelValue' in props) {
if (
!isCompatEnabled(
Expand All @@ -28,17 +29,19 @@ export function convertLegacyVModelProps(vnode: VNode) {
return
}

if (__DEV__ && !warnedTypes.has(type as ComponentOptions)) {
if (__DEV__ && !warnedTypes.has(comp)) {
pushWarningContext(vnode)
warnDeprecation(DeprecationTypes.COMPONENT_V_MODEL, { type } as any, type)
warnDeprecation(DeprecationTypes.COMPONENT_V_MODEL, { type } as any, comp)
popWarningContext()
warnedTypes.add(type as ComponentOptions)
warnedTypes.add(comp)
}

// v3 compiled model code -> v2 compat props
// modelValue -> value
// onUpdate:modelValue -> onModelCompat:input
const { prop = 'value', event = 'input' } = (type as any).model || {}
const model = comp.model || {}
applyModelFromMixins(model, comp.mixins)
const { prop = 'value', event = 'input' } = model
if (prop !== 'modelValue') {
props[prop] = props.modelValue
delete props.modelValue
Expand All @@ -52,6 +55,15 @@ export function convertLegacyVModelProps(vnode: VNode) {
}
}

function applyModelFromMixins(model: any, mixins?: ComponentOptions[]) {
if (mixins) {
mixins.forEach(m => {
if (m.model) extend(model, m.model)
if (m.mixins) applyModelFromMixins(model, m.mixins)
})
}
}

export function compatModelEmit(
instance: ComponentInternalInstance,
event: string,
Expand Down