Ensure nested custom elements fallback properly. #488
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This fixes an issue with Ember versions using [email protected] when attempting to use nested web components. This is obviously not correct for angle bracket components but since no consumers are currently using them with [email protected] we are hard coding support to just use the fallback case. The master version of glimmer-vm (v0.23.0-alpha.x) properly handles this without issue (for either true angle bracket invocation or web component fallback invocation). diff --git a/packages/@glimmer/runtime/lib/syntax/functions.ts b/packages/@glimmer/runtime/lib/syntax/functions.ts index 3c9b3f2..29a2bba 100644 --- a/packages/@glimmer/runtime/lib/syntax/functions.ts +++ b/packages/@glimmer/runtime/lib/syntax/functions.ts @@ -196,6 +196,29 @@ STATEMENTS.add(Ops.ScannedBlock, (sexp: BaselineSyntax.ScannedBlock, builder) => blocks.compile([Ops.NestedBlock, path, params, hash, templateBlock, inverseBlock], builder); }); +// this fixes an issue with Ember versions using [email protected] when attempting +// to use nested web components. This is obviously not correct for angle bracket components +// but since no consumers are currently using them with [email protected] we are hard coding +// support to just use the fallback case. +STATEMENTS.add(Ops.Component, (sexp: WireFormat.Statements.Component, builder) => { + let [, tag, component ] = sexp; + let { attrs, statements } = component; + + builder.openPrimitiveElement(tag); + + for (let i = 0; i < attrs.length; i++) { + STATEMENTS.compile(attrs[i], builder); + } + + builder.flushElement(); + + for (let i = 0; i < statements.length; i++) { + STATEMENTS.compile(statements[i], builder); + } + + builder.closeElement(); +}); + STATEMENTS.add(Ops.ScannedComponent, (sexp: BaselineSyntax.ScannedComponent, builder) => { let [, tag, attrs, rawArgs, rawBlock] = sexp; let block = rawBlock && rawBlock.scan(); diff --git a/packages/@glimmer/runtime/tests/rendering/content-test.ts b/packages/@glimmer/runtime/tests/rendering/content-test.ts index c06ad9e..d39aaad 100644 --- a/packages/@glimmer/runtime/tests/rendering/content-test.ts +++ b/packages/@glimmer/runtime/tests/rendering/content-test.ts @@ -29,6 +29,19 @@ class StaticContentTests extends RenderingTest { this.assertStableRerender(); } + @template(`<use-the-platform><seriously-please data-foo="1">Stuff <div>Here</div></seriously-please></use-the-platform>`) + ['renders nested custom elements']() { + this.render({}); + this.assertContent(`<use-the-platform><seriously-please data-foo="1">Stuff <div>Here</div></seriously-please></use-the-platform>`); + this.assertStableRerender(); + } + @template(`<use-the-platform><seriously-please data-foo="1"><wheres-the-platform>Here</wheres-the-platform></seriously-please></use-the-platform>`) + ['renders MOAR NESTED custom elements']() { + this.render({}); + this.assertContent(`<use-the-platform><seriously-please data-foo="1"><wheres-the-platform>Here</wheres-the-platform></seriously-please></use-the-platform>`); + this.assertStableRerender(); + } + @template(strip` <div class="world"> <h1>Hello World!</h1>
rwjblue
force-pushed
the
fix-custom-elements
branch
from
844dc07
to
015cf03
Compare
|
CI is failing due to some lerna stuff I guess? |
rwjblue
added a commit
to rwjblue/ember.js
that referenced
this pull request
May 17, 2017
A bug was introduced with the Glimmer update that was included in Ember 2.13 that caused an error to be thrown when using nested custom elements like: ```hbs <foo-bar> <baz-qux></baz-qux> </foo-bar> ``` The fix was done upstream in glimmerjs/glimmer-vm#488.
This was referenced May 17, 2017
|
Thank you! 💞 |
|
I'm sorry you had to fight the Lerna. |
rwjblue
added a commit
to emberjs/ember.js
that referenced
this pull request
May 17, 2017
A bug was introduced with the Glimmer update that was included in Ember 2.13 that caused an error to be thrown when using nested custom elements like: ```hbs <foo-bar> <baz-qux></baz-qux> </foo-bar> ``` The fix was done upstream in glimmerjs/glimmer-vm#488. (cherry picked from commit 15c2d25)
rwjblue
added a commit
to emberjs/ember.js
that referenced
this pull request
May 17, 2017
A bug was introduced with the Glimmer update that was included in Ember 2.13 that caused an error to be thrown when using nested custom elements like: ```hbs <foo-bar> <baz-qux></baz-qux> </foo-bar> ``` The fix was done upstream in glimmerjs/glimmer-vm#488. (cherry picked from commit 15c2d25)
Turbo87
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes an issue with Ember versions using [email protected] when attempting to use nested web components. This is obviously not correct for angle bracket components but since no consumers are currently using them with [email protected] we are hard coding support to just use the fallback case.
The master version of glimmer-vm (v0.23.0-alpha.x) properly handles this without issue (for either true angle bracket invocation or web component fallback invocation).
Thanks for @krisselden for pairing with me to teach me how to do this.