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

[WIP] [BUGFIX canary] Allow contextual components to be a glimmer component #12617

Closed
wants to merge 1 commit into from
Closed

[WIP] [BUGFIX canary] Allow contextual components to be a glimmer component #12617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion packages/ember-htmlbars/lib/glimmer-component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import AriaRoleSupport from 'ember-views/mixins/aria_role_support';
import ViewMixin from 'ember-views/mixins/view_support';
import EmberView from 'ember-views/views/view';

export default CoreView.extend(
const GlimmerComponent = CoreView.extend(
ViewChildViewsSupport,
ViewStateSupport,
TemplateRenderingSupport,
Expand All @@ -24,3 +24,9 @@ export default CoreView.extend(
this._viewRegistry = this._viewRegistry || EmberView.views;
}
});

GlimmerComponent.reopenClass({
isGlimmerComponentFactory: true
});

export default GlimmerComponent;
24 changes: 20 additions & 4 deletions packages/ember-htmlbars/lib/hooks/component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,14 @@ var IS_ANGLE_CACHE = new Cache(1000, function(key) {

export default function componentHook(renderNode, env, scope, _tagName, params, attrs, templates, visitor) {
var state = renderNode.getState();
let isClosureComponent = false;


let tagName = _tagName;
if (CONTAINS_DOT_CACHE.get(tagName)) {
let stream = env.hooks.get(env, scope, tagName);
let componentCell = stream.value();
let componentCell = getComponentCell(env, scope, tagName);
if (isComponentCell(componentCell)) {
isClosureComponent = true;
tagName = componentCell[COMPONENT_PATH];

/*
Expand Down Expand Up @@ -62,10 +64,12 @@ export default function componentHook(renderNode, env, scope, _tagName, params,
let isTopLevel = false;
let isDasherized = false;

let angles = IS_ANGLE_CACHE.get(tagName);
let angles = IS_ANGLE_CACHE.get(_tagName);

if (angles) {
tagName = angles[2];
if (!isClosureComponent) {
tagName = angles[2];
}
isAngleBracket = true;
isTopLevel = !!angles[1];
}
Expand Down Expand Up @@ -164,3 +168,15 @@ export default function componentHook(renderNode, env, scope, _tagName, params,
manager.render(env, visitor);
}
}

function getComponentCell(env, scope, _tagName) {
let tagName = _tagName;

// Clean tagName if it is a glimmer component
if (tagName.charAt(0) === '<') {
tagName = tagName.substring(1, tagName.length - 1);
}

let stream = env.hooks.get(env, scope, tagName);
return stream.value();
}
Loading