Skip to content

fix(renderer): correct createElement behaviour for EmulatedRenderer #718

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

Merged
merged 1 commit into from
Mar 24, 2017
Merged

fix(renderer): correct createElement behaviour for EmulatedRenderer #718

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
44 changes: 15 additions & 29 deletions nativescript-angular/renderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ import {
RendererStyleFlags2, ViewEncapsulation,
} from "@angular/core";

import { isBlank } from "./lang-facade";
import { View } from "ui/core/view";
import { addCss } from "application";
import { topmost } from "ui/frame";
import { escapeRegexSymbols } from "utils/utils";
import { Device } from "platform";

import { isBlank } from "./lang-facade";
import { ViewUtil } from "./view-util";
import { APP_ROOT_VIEW, DEVICE, getRootPage } from "./platform-providers";
import { NgView } from "./element-registry";
Expand All @@ -21,7 +20,6 @@ const COMPONENT_REGEX = /%COMP%/g;
export const COMPONENT_VARIABLE = "%COMP%";
export const HOST_ATTR = `_nghost-${COMPONENT_VARIABLE}`;
export const CONTENT_ATTR = `_ngcontent-${COMPONENT_VARIABLE}`;
const ATTR_REPLACER = new RegExp(escapeRegexSymbols(CONTENT_ATTR), "g");
const ATTR_SANITIZER = /-/g;

@Injectable()
Expand Down Expand Up @@ -152,6 +150,7 @@ export class NativeScriptRenderer extends Renderer2 {
// Seems to be called on component dispose only (router outlet)
// TODO: handle this when we resolve routing and navigation.
}

setAttribute(view: NgView, name: string, value: string) {
traceLog(`NativeScriptRenderer.setAttribute ${view} : ${name} = ${value}`);
return this.setProperty(view, name, value);
Expand Down Expand Up @@ -229,58 +228,45 @@ class EmulatedRenderer extends NativeScriptRenderer {
private hostAttr: string;

constructor(
private component: RendererType2,
component: RendererType2,
rootView: NgView,
zone: NgZone,
viewUtil: ViewUtil,
) {
super(rootView, zone, viewUtil);

this.addStyles();
this.contentAttr = shimContentAttribute(component.id);
this.hostAttr = shimHostAttribute(component.id);
const componentId = component.id.replace(ATTR_SANITIZER, "_");
this.contentAttr = replaceNgAttribute(CONTENT_ATTR, componentId);
this.hostAttr = replaceNgAttribute(HOST_ATTR, componentId);
this.addStyles(component.styles, componentId);
}

applyToHost(view: NgView) {
super.setAttribute(view, this.hostAttr, "");
}

appendChild(parent: any, newChild: NgView): void {
// Set an attribute to the view to scope component-specific css.
// The property name is pre-generated by Angular.
const cssAttribute = this.replaceNgAttribute(CONTENT_ATTR);
newChild[cssAttribute] = true;

super.appendChild(parent, newChild);
}

createElement(parent: any, name: string): NgView {
const view = super.createElement(parent, name);

// Set an attribute to the view to scope component-specific css.
// The property name is pre-generated by Angular.
super.setAttribute(view, this.contentAttr, "");

return view;
}

private addStyles() {
this.component.styles
.map(s => s.toString())
.map(s => this.replaceNgAttribute(s))
private addStyles(styles: (string | any[])[], componentId: string) {
styles.map(s => s.toString())
.map(s => replaceNgAttribute(s, componentId))
.forEach(addCss);
}

private replaceNgAttribute(input: string): string {
return input.replace(ATTR_REPLACER , `_ng_content_${this.componentId}`);
}

private get componentId(): string {
return this.component.id.replace(ATTR_SANITIZER , "_");
}
}

function shimContentAttribute(componentShortId: string): string {
return CONTENT_ATTR.replace(COMPONENT_REGEX, componentShortId);
}

function shimHostAttribute(componentShortId: string): string {
return HOST_ATTR.replace(COMPONENT_REGEX, componentShortId);
function replaceNgAttribute(input: string, componentId: string): string {
return input.replace(COMPONENT_REGEX, componentId);
}