Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions apps/nativescript-demo-ng/src/app/modal/modal.component.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
<GridLayout [backgroundColor]="'#d63681'" rows="*,auto,auto">
<!-- <Image [src]="logo" stretch="aspectFit" width="200" marginTop="50" /> -->
<Image src="~/assets/ng-20.png" stretch="aspectFit" (loaded)="loadedImg($event)" class="w-full" />
<Image src="~/assets/ng-22.png" stretch="aspectFit" (loaded)="loadedImg($event)" class="w-full" />

<!-- @if (this.itemService.currentFlavor + 1 !== this.itemService.flavors.length) {
<Button row="1" (tap)="openNewModal()" text="Taste Another" fontSize="20" borderRadius="25"></Button>
} -->
<Button row="2" [nativeDialogClose]="'thanks for clicking modal ' + id" text="Close" class="text-lg mt-8 rounded-3xl"></Button>
<Button
row="2"
[nativeDialogClose]="'thanks for clicking modal ' + id"
text="Close"
class="text-lg mt-8 rounded-3xl"
></Button>
</GridLayout>
Binary file added apps/nativescript-demo-ng/src/assets/ng-22.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import {
Component,
ComponentFactory,
ComponentFactoryResolver,
ComponentRef,
EmbeddedViewRef,
inject,
Expand Down Expand Up @@ -82,10 +80,7 @@ describe('generateNativeScriptView', () => {
});

it('should reuse a DetachedLoaderRef', () => {
const containerRef = generateDetachedLoader(
fixture.componentRef.instance.injector.get(ComponentFactoryResolver),
fixture.componentRef.instance.injector,
);
const containerRef = generateDetachedLoader(fixture.componentRef.instance.injector);
cleanup.push(containerRef);
const ngViewRef = generateNativeScriptView(GeneratedComponent, {
injector: fixture.componentRef.instance.injector,
Expand Down
3 changes: 1 addition & 2 deletions apps/nativescript-demo-ng/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"target": "es2020",
"baseUrl": ".",
"outDir": "../../dist/out-tsc",
"paths": {
"~/*": ["src/*"],
"~/*": ["./src/*"],
"@nativescript/angular": ["../../packages/angular/src/index.ts"],
"@nativescript/angular/*": ["../../packages/angular/src/*"],
"@nativescript/angular/testing": ["../../packages/angular/testing/src/index.ts"],
Expand Down
3 changes: 1 addition & 2 deletions apps/nativescript-demo-ng/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"target": "es2020",
"baseUrl": ".",
"types": ["node", "jasmine"],
"outDir": "../../dist/out-tsc",
"paths": {
"~/*": ["src/*"],
"~/*": ["./src/*"],
"@nativescript/angular": ["../../packages/angular/src/index.ts"],
"@nativescript/angular/*": ["../../packages/angular/src/*"],
"@nativescript/angular/testing": ["../../packages/angular/testing/src/index.ts"],
Expand Down
5 changes: 4 additions & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,5 +118,8 @@
"typeSeparator": "."
}
},
"analytics": false
"analytics": false,
"tui": {
"enabled": false
}
}
Loading