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

refactor(engine-core): Remove patching hooks #2677

Merged
merged 14 commits into from
Feb 17, 2022
Merged

refactor(engine-core): Remove patching hooks #2677

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
055d382
refactor: first draft
pmdartus Feb 2, 2022
c45ae7b
refactor: simplify mount and unmount
pmdartus Feb 3, 2022
d7c57f5
refactor: fix patch types
pmdartus Feb 4, 2022
d740ccd
refactor: fix patching algo
pmdartus Feb 4, 2022
14d43ba
refactor: fix hydration
pmdartus Feb 5, 2022
37b6166
Merge remote-tracking branch 'origin/master' into pmdartus/move-away-…
nolanlawson Feb 15, 2022
0094a68
refactor: split into patch* and mount*
nolanlawson Feb 16, 2022
f95d694
fix: remove unused code block
nolanlawson Feb 16, 2022
73dbf78
fix: add dev-only test
nolanlawson Feb 16, 2022
d610f82
fix: fix json.stringify
nolanlawson Feb 16, 2022
53eb14e
test: add test for key attribute outside of iteration
nolanlawson Feb 16, 2022
df6c672
fix: fix key defined outside of iteration
nolanlawson Feb 16, 2022
b2d0129
test: add more tests and a fix
nolanlawson Feb 16, 2022
35fb87a
test: add more tests
nolanlawson Feb 16, 2022
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
18 changes: 4 additions & 14 deletions packages/@lwc/engine-core/src/framework/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import { EmptyArray } from './utils';
import { isComponentConstructor } from './def';
import { ShadowMode, SlotSet, VM, RenderMode } from './vm';
import { LightningElementConstructor } from './base-lightning-element';
import { markAsDynamicChildren } from './rendering';
import {
VNode,
VNodes,
Expand All @@ -41,13 +42,6 @@ import {
VElementData,
VNodeType,
} from './vnodes';
import {
CommentHook,
CustomElementHook,
ElementHook,
TextHook,
markAsDynamicChildren,
} from './rendering';

const SymbolIterator: typeof Symbol.iterator = Symbol.iterator;

Expand Down Expand Up @@ -104,7 +98,6 @@ function h(sel: string, data: VElementData, children: VNodes): VElement {
children,
elm,
key,
hook: ElementHook,
owner: vmBeingRendered,
};
}
Expand Down Expand Up @@ -208,7 +201,7 @@ function c(
}
}
const { key } = data;
let elm;
let elm, aChildren, vm;
const vnode: VCustomElement = {
type: VNodeType.CustomElement,
sel,
Expand All @@ -217,10 +210,11 @@ function c(
elm,
key,

hook: CustomElementHook,
ctor: Ctor,
owner: vmBeingRendered,
mode: 'open', // TODO [#1294]: this should be defined in Ctor
aChildren,
vm,
};
addVNodeToChildLWC(vnode);
return vnode;
Expand Down Expand Up @@ -346,8 +340,6 @@ function t(text: string): VText {
text,
elm,
key,

hook: TextHook,
owner: getVMBeingRendered()!,
};
}
Expand All @@ -361,8 +353,6 @@ function co(text: string): VComment {
text,
elm,
key,

hook: CommentHook,
owner: getVMBeingRendered()!,
};
}
Expand Down
5 changes: 3 additions & 2 deletions packages/@lwc/engine-core/src/framework/hydration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,6 @@ function hydrateCustomElement(vnode: VCustomElement, node: Node) {
}

const elm = node as Element;
vnode.elm = elm;

const { sel, mode, ctor, owner } = vnode;

const vm = createVM(elm, ctor, {
Expand All @@ -150,6 +148,9 @@ function hydrateCustomElement(vnode: VCustomElement, node: Node) {
tagName: sel,
});

vnode.elm = elm;
vnode.vm = vm;

allocateChildren(vnode, vm);
patchElementPropsAndAttrs(vnode);

Expand Down
Loading