Merge branch 'master' of github.com:nativescript-community/ui-material-components

Author: farfromrefug

demo-ng/package.json

@@ -3,16 +3,16 @@
     "main": "src/main.ts",
     "dependencies": {
         "@mdi/font": "4.9.95",
-        "@angular/animations": "~11.2.7",
-        "@angular/common": "~11.2.7",
-        "@angular/compiler": "~11.2.7",
-        "@angular/core": "~11.2.7",
-        "@angular/forms": "~11.2.7",
-        "@angular/platform-browser": "~11.2.7",
-        "@angular/platform-browser-dynamic": "~11.2.7",
-        "@angular/router": "~11.2.7",
+        "@angular/animations": "~12.1.0",
+        "@angular/common": "~12.1.0",
+        "@angular/compiler": "~12.1.0",
+        "@angular/core": "~12.1.0",
+        "@angular/forms": "~12.1.0",
+        "@angular/platform-browser": "~12.1.0",
+        "@angular/platform-browser-dynamic": "~12.1.0",
+        "@angular/router": "~12.1.0",
         "@nativescript/core": "8.0.0",
-        "@nativescript/angular": "~11.8.0",
+        "@nativescript/angular": "~12.0.0",
         "@nativescript-community/ui-material-activityindicator": "file:../packages/activityindicator",
         "@nativescript-community/ui-material-bottomsheet": "file:../packages/bottomsheet",
         "@nativescript-community/ui-material-bottomnavigationbar": "file:../packages/bottomnavigationbar",
@@ -33,14 +33,14 @@
         "zone.js": "~0.11.4"
     },
     "devDependencies": {
-        "@angular/cli": "~11.2.7",
-        "@angular/compiler-cli": "~11.2.7",
+        "@angular/cli": "~12.1.0",
+        "@angular/compiler-cli": "~12.1.0",
         "@nativescript/android": "8.0.0",
         "@nativescript/ios": "8.0.0",
         "@nativescript/types": "~8.0.0",
         "@nativescript/webpack": "beta",
-        "@ngtools/webpack": "~11.2.6",
-        "typescript": "~4.0.0"
+        "@ngtools/webpack": "~12.1.0",
+        "typescript": "~4.2.0"
     },
     "gitHead": "8ab7726d1ee9991706069c1359c552e67ee0d1a4",
     "readme": "NativeScript Application"

demo-ng/src/main.ts

@@ -1,18 +1,12 @@
 // this import should be first in order to load some required settings (like globals and reflect-metadata)
-import { platformNativeScriptDynamic } from "@nativescript/angular";
+import { platformNativeScript, runNativeScriptAngularApp } from '@nativescript/angular';
 import { themer } from '@nativescript-community/ui-material-core';
 import { AppModule } from './app/app.module';
 
 if (global.isIOS) {
     themer.setPrimaryColor('#bff937');
-   
 }
 
-// A traditional NativeScript application starts by initializing global objects,
-// setting up global CSS rules, creating, and navigating to the main page.
-// Angular applications need to take care of their own initialization:
-// modules, components, directives, routes, DI providers.
-// A NativeScript Angular app needs to make both paradigms work together,
-// so we provide a wrapper platform object, platformNativeScriptDynamic,
-// that sets up a NativeScript application and can bootstrap the Angular framework.
-platformNativeScriptDynamic().bootstrapModule(AppModule);
+runNativeScriptAngularApp({
+    appModuleBootstrap: () => platformNativeScript().bootstrapModule(AppModule)
+});

demo-ng/src/polyfills.ts

@@ -0,0 +1,20 @@
+/**
+ * NativeScript Polyfills
+ */
+
+// Install @nativescript/core polyfills (XHR, setTimeout, requestAnimationFrame)
+import '@nativescript/core/globals';
+// Install @nativescript/angular specific polyfills
+import '@nativescript/angular/polyfills';
+
+/**
+ * Zone.js and patches
+ */
+// Add pre-zone.js patches needed for the NativeScript platform
+import '@nativescript/zone-js/dist/pre-zone-polyfills';
+
+// Zone JS is required by default for Angular itself
+import 'zone.js';
+
+// Add NativeScript specific Zone JS patches
+import '@nativescript/zone-js';

demo-ng/tsconfig.json

@@ -16,7 +16,7 @@
       }
     },
     "include": ["src/tests/**/*.ts", "src/**/*.ios.ts", "src/**/*.android.ts"],
-    "files": ["./src/main.ts", "./references.d.ts"],
+    "files": ["./src/main.ts", "./references.d.ts", "./src/polyfills.ts"],
     "exclude": ["node_modules", "platforms", "e2e"]
   }
 

src/bottomsheet/angular/bottomsheet.service.ts

@@ -118,7 +118,7 @@ export class BottomSheetService {
         const detachedLoaderFactory = factoryResolver.resolveComponentFactory(DetachedLoader);
         const childInjector = this.createChildInjector(bottomSheetParams, viewContainerRef);
 
-        return viewContainerRef.createComponent(detachedLoaderFactory, 0, childInjector, null);
+        return viewContainerRef.createComponent(detachedLoaderFactory, 0, childInjector);
     }
 
     private async loadComponent(type: Type<any>, sheetRef: SheetRef): Promise<View> {