ui/vant
1
0
Fork 0
mirror of https://github.com/youzan/vant.git synced 2025-10-20 02:31:21 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[bugfix] functional component should not inherit scropedSlots (#2752)

Browse Source
This commit is contained in:
neverland
2019-02-15 19:07:27 +08:00
committed by GitHub
parent 137fe83fc1
commit 170dcbf0d2
10 changed files with 50 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/utils/functional.ts
View File

@@ -21,8 +21,8 @@ const inheritKey = [
const mapInheritKey: ObjectIndex = { nativeOn: 'on' };
// inherit partial context, map nativeOn to on
export function inherit(context: Context): InheritContext {
return inheritKey.reduce(
export function inherit(context: Context, inheritListeners: boolean): InheritContext {
const result = inheritKey.reduce(
(obj, key) => {
if (context.data[key]) {
obj[mapInheritKey[key] || key] = context.data[key];
@@ -31,6 +31,13 @@ export function inherit(context: Context): InheritContext {
},
{} as InheritContext
);
if (inheritListeners) {
result.on = result.on || {};
Object.assign(result.on, context.data.on);
}
return result;
}
// emit event