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

Implement dynamic components #971

Merged
merged 11 commits into from
Dec 7, 2017
Merged

Implement dynamic components #971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4f99153
parse :Switch tags
Rich-Harris Dec 3, 2017
dba32df
client-side dynamic components mostly working (#640)
Rich-Harris Dec 3, 2017
57af153
SSR :Switch components
Rich-Harris Dec 3, 2017
e1777b6
dynamic component event handlers
Rich-Harris Dec 3, 2017
caa4d7d
rename tests
Rich-Harris Dec 3, 2017
dd9ecb8
dynamic component bindings
Rich-Harris Dec 3, 2017
f4e66c0
update props of existing dynamic component
Rich-Harris Dec 4, 2017
e6ef5af
slotted contents of dynamic components
Rich-Harris Dec 5, 2017
e238c65
rename :Switch -> :Component
Rich-Harris Dec 5, 2017
0d42ff8
fix tests, finish renaming stuff
Rich-Harris Dec 5, 2017
1636f17
Merge branch 'master' into gh-640
Rich-Harris Dec 5, 2017
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: 4 additions & 0 deletions src/generators/Generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,6 +763,10 @@ export default class Generator {
node.metadata = contextualise(node.expression, contextDependencies, indexes);
this.skip();
}

if (node.type === 'Element' && node.name === ':Component') {
node.metadata = contextualise(node.expression, contextDependencies, indexes);
}
},

leave(node: Node, parent: Node) {
Expand Down
9 changes: 7 additions & 2 deletions src/generators/dom/preprocess.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@ const preprocessors = {
) => {
cannotUseInnerHTML(node);
node.var = block.getUniqueName(`each`);
node.iterations = block.getUniqueName(`${node.var}_blocks`);

const { dependencies } = node.metadata;
block.addDependencies(dependencies);
Expand Down Expand Up @@ -436,13 +437,17 @@ const preprocessors = {
}

const isComponent =
generator.components.has(node.name) || node.name === ':Self';
generator.components.has(node.name) || node.name === ':Self' || node.name === ':Component';

if (isComponent) {
cannotUseInnerHTML(node);

node.var = block.getUniqueName(
(node.name === ':Self' ? generator.name : node.name).toLowerCase()
(
node.name === ':Self' ? generator.name :
node.name === ':Component' ? 'switch_instance' :
node.name
).toLowerCase()
);

node._state = getChildState(state, {
Expand Down
Loading