Skip to content

Commit 12e3ec0

Browse files
authored
Merge pull request #14390 from toranb/layoutCPFix
[BUGFIX beta] layout now supports computed property
2 parents 5a8f3cb + 761b67f commit 12e3ec0

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

packages/ember-glimmer/lib/syntax/curly-component.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ class CurlyComponentManager {
262262
}
263263

264264
templateFor(component, env) {
265-
let Template = component.layout;
265+
let Template = get(component, 'layout');
266266
let owner = component[OWNER];
267267
if (Template) {
268268
return env.getTemplate(Template, owner);

packages/ember-glimmer/tests/integration/components/curly-components-test.js

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,25 @@ moduleFor('Components test: curly components', class extends RenderingTest {
152152
this.assertText('so much layout wat hey');
153153
}
154154

155+
['@test layout supports computed property']() {
156+
let FooBarComponent = Component.extend({
157+
elementId: 'blahzorz',
158+
layout: computed(function () {
159+
return compile('so much layout wat {{lulz}}');
160+
}),
161+
init() {
162+
this._super(...arguments);
163+
this.lulz = 'heyo';
164+
}
165+
});
166+
167+
this.registerComponent('foo-bar', { ComponentClass: FooBarComponent });
168+
169+
this.render('{{foo-bar}}');
170+
171+
this.assertText('so much layout wat heyo');
172+
}
173+
155174
['@test passing undefined elementId results in a default elementId'](assert) {
156175
let FooBarComponent = Component.extend({
157176
tagName: 'h1'

0 commit comments

Comments
 (0)