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(runtime-dom): v-model breaks minlength validation #1937

Merged
merged 7 commits into from
Aug 25, 2020
Merged
Show file tree
Hide file tree
Changes from 5 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
4 changes: 2 additions & 2 deletions packages/runtime-core/src/renderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -882,8 +882,8 @@ function baseCreateRenderer(
const prev = oldProps[key]
const next = newProps[key]
if (
next !== prev ||
(hostForcePatchProp && hostForcePatchProp(el, key))
(hostForcePatchProp && hostForcePatchProp(el, key)) ||
next !== prev
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you change this order? Typically a compare operation would be lighter than a method invoke. It's reasonable to have the comparison ahead.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes you are right. I think I should learn more about javascript optimization.
https://jsben.ch/dSVTE

) {
hostPatchProp(
el,
Expand Down
10 changes: 9 additions & 1 deletion packages/runtime-dom/src/directives/vModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,15 @@ export const vModelText: ModelDirective<
return
}
}
el.value = value == null ? '' : value
const newValue = value == null ? '' : value
if (
el.minLength > 0 &&
el.value.length === newValue.length &&
unbyte marked this conversation as resolved.
Show resolved Hide resolved
el.value === newValue
) {
return
}
el.value = newValue
}
}

Expand Down
5 changes: 4 additions & 1 deletion packages/runtime-dom/src/modules/props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ export function patchDOMProp(
// store value as _value as well since
// non-string values will be stringified.
el._value = value
el.value = value == null ? '' : value
const newValue = value == null ? '' : value
if (el.value.length !== newValue.length || el.value !== newValue) {
unbyte marked this conversation as resolved.
Show resolved Hide resolved
el.value = newValue
}
return
}
if (value === '' && typeof el[key] === 'boolean') {
Expand Down