javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-16 01:52:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(vue): correctly update property values (#22218)

Browse Source 
resolves #22079
This commit is contained in:
Liam DeBeasi
2020-09-30 10:19:26 -04:00
committed by GitHub
parent 2c6259c1f6
commit 25271897e2
3 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
packages/vue/src/vue-component-lib/utils.ts
View File

@ -60,32 +60,19 @@ export const defineContainer = <Props>(name: string, componentProps: string[] =
}
};
let finalProps: any = { ...props };
let handleClick: (ev: Event) => void;
if (routerLinkComponent) {
const navManager: NavManager = inject(NAV_MANAGER);
const handleClick = (ev: Event) => {
const routerProps = Object.keys(finalProps).filter(p => p.startsWith(ROUTER_PROP_REFIX));
handleClick = (ev: Event) => {
const routerProps = Object.keys(props).filter(p => p.startsWith(ROUTER_PROP_REFIX));
if (routerProps.length === 0) return;
let navigationPayload: any = { event: ev };
routerProps.forEach(prop => {
navigationPayload[prop] = finalProps[prop];
navigationPayload[prop] = (props as any)[prop];
});
navManager.navigate(navigationPayload);
}
if (finalProps.onClick) {
const oldClick = finalProps.onClick;
finalProps.onClick = (ev: Event) => {
oldClick(ev);
if (!ev.defaultPrevented) {
handleClick(ev);
}
}
} else {
finalProps.onClick = handleClick;
}
}
return () => {
@ -94,16 +81,21 @@ export const defineContainer = <Props>(name: string, componentProps: string[] =
});
let propsToAdd = {
...finalProps,
...props,
ref: containerRef,
class: getElementClasses(containerRef, classes)
class: getElementClasses(containerRef, classes),
onClick: (routerLinkComponent) ? handleClick : (props as any).onClick,
onVnodeBeforeMount: (modelUpdateEvent) ? onVnodeBeforeMount : undefined
};
if (modelUpdateEvent) {
propsToAdd = {
...propsToAdd,
onVnodeBeforeMount
}
if ((props as any).onClick) {
const oldClick = (props as any).onClick;
propsToAdd.onClick = (ev: Event) => {
oldClick(ev);
if (!ev.defaultPrevented) {
handleClick(ev);
}
};
}
if (modelProp) {