Skip to content

Commit c89e054

Browse files
author
vakrilov
committed
wip
1 parent fe14433 commit c89e054

26 files changed

+574
-108
lines changed

‎nativescript-angular/animations/animations.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import {
2323
ɵBrowserAnimationBuilder as BrowserAnimationBuilder,
2424
} from "@angular/platform-browser/animations";
2525

26-
import { NativeScriptModule } from "../nativescript.module";
27-
import { NativeScriptRendererFactory } from "../renderer";
26+
import { NativeScriptModule } from "nativescript-angular/nativescript.module";
27+
import { NativeScriptRendererFactory } from "nativescript-angular/renderer";
2828
import { NativeScriptAnimationDriver } from "./animation-driver";
2929
import { throwIfAlreadyLoaded } from "nativescript-angular/core";
3030

‎nativescript-angular/animations/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
{
2-
"main": "index",
3-
"ngPackage": {
4-
"lib": {
5-
"entryFile": "index.ts"
6-
}
7-
}
8-
}
1+
// {
2+
// "main": "index",
3+
// "ngPackage": {
4+
// "lib": {
5+
// "entryFile": "index.ts"
6+
// }
7+
// }
8+
// }

‎nativescript-angular/modal-dialog/dialogs.ts renamed to ‎nativescript-angular/common/dialogs.ts

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,16 @@ import {
99
ViewContainerRef,
1010
} from "@angular/core";
1111

12-
import { NSLocationStrategy } from "nativescript-angular/router";
12+
import { topmost, Frame } from "tns-core-modules/ui/frame";
1313
import { View, ViewBase } from "tns-core-modules/ui/core/view";
1414
import { ProxyViewContainer } from "tns-core-modules/ui/proxy-view-container/proxy-view-container";
1515

16-
import { DetachedLoader } from "nativescript-angular/common";
17-
import { PageFactory, PAGE_FACTORY, AppHostView } from "nativescript-angular/core";
18-
import { once } from "nativescript-angular/core";
19-
import { topmost, Frame } from "tns-core-modules/ui/frame";
16+
17+
// import { NSLocationStrategy } from "nativescript-angular/router";
18+
19+
import { PageFactory, PAGE_FACTORY, AppHostView, once } from "nativescript-angular/core";
20+
21+
import { DetachedLoader } from "./directives";
2022

2123
export interface ModalDialogOptions {
2224
context?: any;
@@ -49,8 +51,8 @@ interface ShowDialogOptions {
4951

5052
@Injectable()
5153
export class ModalDialogService {
52-
constructor(private location: NSLocationStrategy) {
53-
}
54+
// constructor(private location: NSLocationStrategy) {
55+
// }
5456

5557
public showModal(type: Type<any>,
5658
{ viewContainerRef, moduleRef, context, fullscreen, animated, stretched }: ModalDialogOptions
@@ -86,7 +88,7 @@ export class ModalDialogService {
8688
frame = (parentView.page && parentView.page.frame) || topmost();
8789
}
8890

89-
this.location._beginModalNavigation(frame);
91+
// this.location._beginModalNavigation(frame);
9092

9193
return new Promise((resolve, reject) => {
9294
setTimeout(() => {
@@ -129,7 +131,7 @@ export class ModalDialogService {
129131
doneCallback.apply(undefined, args);
130132
if (componentView) {
131133
componentView.closeModal();
132-
this.location._closeModalNavigation();
134+
// this.location._closeModalNavigation();
133135
detachedLoaderRef.instance.detectChanges();
134136
detachedLoaderRef.destroy();
135137
}
@@ -162,15 +164,3 @@ export class ModalDialogService {
162164
});
163165
}
164166
}
165-
166-
@Directive({
167-
selector: "[modal-dialog-host]" // tslint:disable-line:directive-selector
168-
})
169-
export class ModalDialogHost { // tslint:disable-line:directive-class-suffix
170-
constructor() {
171-
throw new Error("ModalDialogHost is deprecated. " +
172-
"Call ModalDialogService.showModal() " +
173-
"by passing ViewContainerRef in the options instead."
174-
);
175-
}
176-
}

‎nativescript-angular/common/detached-loader.ts renamed to ‎nativescript-angular/common/directives/detached-loader.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ function log(message: string) {
99
write(message, CATEGORY);
1010
}
1111

12-
1312
/**
1413
* Wrapper component used for loading components when navigating
1514
* It uses DetachedContainer as selector so that it is containerRef is not attached to

‎nativescript-angular/common/directives/index.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ import {
77
ActionItemDirective,
88
NavigationButtonDirective
99
} from "./action-bar";
10-
import { AndroidFilterComponent, IosFilterComponent } from "./platform-filters";
10+
import { AndroidFilterComponent } from "./platform-filter-android";
11+
import { IosFilterComponent } from "./platform-filter-ios";
12+
import { DetachedLoader } from "./detached-loader";
1113

1214
export { ListViewComponent } from "./list-view-comp";
1315
export { SetupItemViewArgs, TemplateKeyDirective } from "./templated-items-comp";
@@ -19,7 +21,11 @@ export {
1921
ActionItemDirective,
2022
NavigationButtonDirective
2123
} from "./action-bar";
22-
export { AndroidFilterComponent, IosFilterComponent } from "./platform-filters";
24+
25+
export { AndroidFilterComponent } from "./platform-filter-android";
26+
export { IosFilterComponent } from "./platform-filter-ios";
27+
export { DetachedLoader } from "./detached-loader";
28+
export { TemplatedItemsComponent } from "./templated-items-comp";
2329

2430
export const NS_DIRECTIVES = [
2531
ListViewComponent,
@@ -32,4 +38,5 @@ export const NS_DIRECTIVES = [
3238
NavigationButtonDirective,
3339
AndroidFilterComponent,
3440
IosFilterComponent,
41+
DetachedLoader,
3542
];

‎nativescript-angular/common/directives/platform-filters.ts

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎nativescript-angular/common/index.ts

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
11
export { NativeScriptCommonModule } from "./nativescript-common.module";
2-
export { DetachedLoader } from "./detached-loader";
32

3+
export {
4+
ListViewComponent,
5+
TemplateKeyDirective,
6+
TabViewDirective,
7+
TabViewItemDirective,
8+
ActionBarComponent,
9+
ActionBarScope,
10+
ActionItemDirective,
11+
NavigationButtonDirective,
12+
AndroidFilterComponent,
13+
IosFilterComponent,
14+
DetachedLoader,
15+
TemplatedItemsComponent,
16+
} from "./directives";
17+
18+
export {
19+
ModalDialogOptions,
20+
ModalDialogParams,
21+
ModalDialogService
22+
} from "./dialogs";

‎nativescript-angular/common/nativescript-common.module.ts

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,26 @@
1+
import { NO_ERRORS_SCHEMA, NgModule, } from "@angular/core";
12
import { CommonModule } from "@angular/common";
2-
import {
3-
NO_ERRORS_SCHEMA,
4-
NgModule,
5-
} from "@angular/core";
63

7-
// import {
8-
// ModalDialogHost,
9-
// ModalDialogService,
10-
// } from "nativescript-angular/directives/dialogs";
4+
import {
5+
ModalDialogService,
6+
} from "./dialogs";
117

128
import {
139
defaultDeviceProvider,
1410
defaultFrameProvider,
1511
defaultPageProvider,
1612
} from "nativescript-angular/core";
1713

18-
// import { NS_DIRECTIVES } from "../directives";
19-
14+
// import { NS_DIRECTIVES } from "./directives";
15+
import {
16+
NS_DIRECTIVES
17+
} from "./directives";
2018
@NgModule({
2119
declarations: [
22-
// ModalDialogHost,
23-
// ...NS_DIRECTIVES,
20+
...NS_DIRECTIVES
2421
],
2522
providers: [
26-
// ModalDialogService,
23+
ModalDialogService,
2724
defaultDeviceProvider,
2825
defaultFrameProvider,
2926
defaultPageProvider,
@@ -33,8 +30,7 @@ import {
3330
],
3431
exports: [
3532
CommonModule,
36-
// ModalDialogHost,
37-
// ...NS_DIRECTIVES,
33+
...NS_DIRECTIVES,
3834
],
3935
schemas: [NO_ERRORS_SCHEMA]
4036
})

‎nativescript-angular/common/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"main": "index",
3+
"ngPackage": {
4+
"lib": {
5+
"entryFile": "index.ts"
6+
}
7+
}
8+
}

‎nativescript-angular/file-system/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { NSFileSystem } from "./ns-file-system"

‎nativescript-angular/file-system/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"main": "index",
3+
"ngPackage": {
4+
"lib": {
5+
"entryFile": "index.ts"
6+
}
7+
}
8+
}

‎nativescript-angular/index.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@ import "./init-globals";
33
export * from "./platform-common";
44
export * from "./platform";
55
export * from "./platform-static";
6-
export * from "./router";
7-
export * from "./forms";
8-
export * from "./http";
6+
// export * from "./router";
7+
// export * from "./forms";
8+
// export * from "./http";
99
// export * from "./directives";
1010
// export * from "./common/detached-loader";
1111
// export * from "nativescript-angular/trace";
1212
// export * from "nativescript-angular/core";
1313
export * from "./file-system/ns-file-system";
14-
export * from "./modal-dialog";
15-
export * from "./renderer";
14+
// export * from "./modal-dialog";
15+
// export * from "./renderer";
1616
export * from "./view-util";
1717
export * from "./resource-loader";
18-
export * from "./nativescript.module";
18+
// export * from "./nativescript.module";
1919

20-
export {
21-
ViewClass,
22-
ViewClassMeta,
23-
ViewResolver,
24-
getViewClass,
25-
getViewMeta,
26-
isKnownView,
27-
registerElement,
28-
} from "./element-registry/element-registry";
20+
// export {
21+
// ViewClass,
22+
// ViewClassMeta,
23+
// ViewResolver,
24+
// getViewClass,
25+
// getViewMeta,
26+
// isKnownView,
27+
// registerElement,
28+
// } from "./element-registry/element-registry";
2929

30-
export * from "./forms/value-accessors/base-value-accessor";
30+
// export * from "./forms/value-accessors/base-value-accessor";

‎nativescript-angular/modal-dialog/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
export {
2-
ModalDialogHost,
32
ModalDialogOptions,
43
ModalDialogParams,
54
ModalDialogService
6-
} from "./dialogs"
5+
} from "nativescript-angular/common"

‎nativescript-angular/modal-dialog/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
{
2-
"main": "index",
3-
"ngPackage": {
4-
"lib": {
5-
"entryFile": "index.ts"
6-
}
7-
}
8-
}
1+
// {
2+
// "main": "index",
3+
// "ngPackage": {
4+
// "lib": {
5+
// "entryFile": "index.ts"
6+
// }
7+
// }
8+
// }

‎nativescript-angular/nativescript.module/index.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
// TODO: export nativescript.module for backwards compatibility
2-
const a = 0;
3-
export default a;
1+
export * from "./nativescript.module";

‎nativescript-angular/nativescript.module.ts renamed to ‎nativescript-angular/nativescript.module/nativescript.module.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,16 @@ import {
1515
ɵNullViewportScroller as NullViewportScroller,
1616
} from "@angular/common";
1717

18-
import { NativeScriptCommonModule, DetachedLoader, } from "nativescript-angular/common";
18+
import { NativeScriptCommonModule } from "nativescript-angular/common";
1919
import { throwIfAlreadyLoaded } from "nativescript-angular/core";
20-
import { NativeScriptRendererFactory } from "./renderer";
20+
import { NativeScriptRendererFactory } from "nativescript-angular/renderer";
2121
import { FrameService } from "nativescript-angular/core";
2222

2323
export function errorHandlerFactory() {
2424
return new ErrorHandler();
2525
}
2626

2727
@NgModule({
28-
declarations: [
29-
DetachedLoader,
30-
],
3128
providers: [
3229
FrameService,
3330
NativeScriptRendererFactory,
@@ -38,7 +35,6 @@ export function errorHandlerFactory() {
3835
{ provide: ViewportScroller, useClass: NullViewportScroller },
3936
],
4037
entryComponents: [
41-
DetachedLoader,
4238
],
4339
imports: [
4440
ApplicationModule,
@@ -47,7 +43,6 @@ export function errorHandlerFactory() {
4743
exports: [
4844
ApplicationModule,
4945
NativeScriptCommonModule,
50-
DetachedLoader,
5146
],
5247
schemas: [NO_ERRORS_SCHEMA]
5348
})

‎nativescript-angular/nativescript.module/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
{
2-
"main": "index",
3-
"ngPackage": {
4-
"lib": {
5-
"entryFile": "index.ts"
6-
}
7-
}
8-
}
1+
// {
2+
// "main": "index",
3+
// "ngPackage": {
4+
// "lib": {
5+
// "entryFile": "index.ts"
6+
// }
7+
// }
8+
// }

‎nativescript-angular/renderer/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from "./renderer";

‎nativescript-angular/renderer/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"main": "index",
3+
"ngPackage": {
4+
"lib": {
5+
"entryFile": "index.ts"
6+
}
7+
}
8+
}

‎nativescript-angular/renderer.ts renamed to ‎nativescript-angular/renderer/renderer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import { addCss } from "tns-core-modules/application";
1010
import { profile } from "tns-core-modules/profiling";
1111

1212
import { APP_ROOT_VIEW, DEVICE, getRootPage } from "nativescript-angular/core";
13-
import { ViewUtil } from "./view-util";
14-
import { NgView, InvisibleNode } from "./element-registry/element-registry";
13+
import { ViewUtil } from "nativescript-angular/view-util";
14+
import { NgView, InvisibleNode } from "nativescript-angular/element-registry";
1515
import { rendererLog as traceLog, isLogEnabled } from "nativescript-angular/trace";
1616

1717
// CONTENT_ATTR not exported from NativeScript_renderer - we need it for styles application.

0 commit comments

Comments
 (0)