@ionic/angular 7.6.2-dev.11706202387.1dfcd9b8 → 7.6.2-dev.11706205501.196a5433

package/fesm2020/ionic-angular-common.mjs

@@ -677,8 +677,8 @@ class AngularDelegate {
         this.zone = inject(NgZone);
         this.applicationRef = inject(ApplicationRef);
     }
-    create(environmentInjector, elementReferenceKey) {
-        return new AngularFrameworkDelegate(environmentInjector, this.applicationRef, this.zone, elementReferenceKey);
+    create(environmentInjector, injector, elementReferenceKey) {
+        return new AngularFrameworkDelegate(environmentInjector, injector, this.applicationRef, this.zone, elementReferenceKey);
     }
 }
 /** @nocollapse */ AngularDelegate.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: AngularDelegate, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
@@ -687,8 +687,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImpo
             type: Injectable
         }] });
 class AngularFrameworkDelegate {
-    constructor(environmentInjector, applicationRef, zone, elementReferenceKey) {
+    constructor(environmentInjector, injector, applicationRef, zone, elementReferenceKey) {
         this.environmentInjector = environmentInjector;
+        this.injector = injector;
         this.applicationRef = applicationRef;
         this.zone = zone;
         this.elementReferenceKey = elementReferenceKey;
@@ -712,7 +713,7 @@ class AngularFrameworkDelegate {
                 if (this.elementReferenceKey !== undefined) {
                     componentProps[this.elementReferenceKey] = container;
                 }
-                const el = attachView(this.zone, this.environmentInjector, this.applicationRef, this.elRefMap, this.elEventsMap, container, component, componentProps, cssClasses, this.elementReferenceKey);
+                const el = attachView(this.zone, this.environmentInjector, this.injector, this.applicationRef, this.elRefMap, this.elEventsMap, container, component, componentProps, cssClasses, this.elementReferenceKey);
                 resolve(el);
             });
         });
@@ -735,9 +736,10 @@ class AngularFrameworkDelegate {
         });
     }
 }
-const attachView = (zone, environmentInjector, applicationRef, elRefMap, elEventsMap, container, component, params, cssClasses, elementReferenceKey) => {
+const attachView = (zone, environmentInjector, injector, applicationRef, elRefMap, elEventsMap, container, component, params, cssClasses, elementReferenceKey) => {
     const componentRef = createComponent(component, {
         environmentInjector,
+        elementInjector: injector,
     });
     const instance = componentRef.instance;
     const hostElement = componentRef.location.nativeElement;
@@ -752,26 +754,36 @@ const attachView = (zone, environmentInjector, applicationRef, elRefMap, elEvent
         if (elementReferenceKey && instance[elementReferenceKey] !== undefined) {
             console.error(`[Ionic Error]: ${elementReferenceKey} is a reserved property when using ${container.tagName.toLowerCase()}. Rename or remove the "${elementReferenceKey}" property from ${component.name}.`);
         }
-        const { modal, popover, ...otherParams } = params;
-        /**
-         * Any key/value pairs set in componentProps
-         * must be set as inputs on the component instance.
-         */
-        for (const key in otherParams) {
-            componentRef.setInput(key, otherParams[key]);
-        }
         /**
-         * Using setInput will cause an error when
-         * setting modal/popover on a component that
-         * does not define them as an input. For backwards
-         * compatibility purposes we fall back to using
-         * Object.assign for these properties.
+         * Angular 14.1 added support for setInput
+         * so we need to fall back to Object.assign
+         * for Angular 14.0.
          */
-        if (modal !== undefined) {
-            Object.assign(instance, { modal });
+        if (componentRef.setInput !== undefined) {
+            const { modal, popover, ...otherParams } = params;
+            /**
+             * Any key/value pairs set in componentProps
+             * must be set as inputs on the component instance.
+             */
+            for (const key in otherParams) {
+                componentRef.setInput(key, otherParams[key]);
+            }
+            /**
+             * Using setInput will cause an error when
+             * setting modal/popover on a component that
+             * does not define them as an input. For backwards
+             * compatibility purposes we fall back to using
+             * Object.assign for these properties.
+             */
+            if (modal !== undefined) {
+                Object.assign(instance, { modal });
+            }
+            if (popover !== undefined) {
+                Object.assign(instance, { popover });
+            }
         }
-        if (popover !== undefined) {
-            Object.assign(instance, { popover });
+        else {
+            Object.assign(instance, params);
         }
     }
     if (cssClasses) {
@@ -1979,15 +1991,15 @@ const NAV_METHODS = [
     'getPrevious',
 ];
 let IonNav = class IonNav {
-    constructor(ref, environmentInjector, angularDelegate, z, c) {
+    constructor(ref, environmentInjector, injector, angularDelegate, z, c) {
         this.z = z;
         c.detach();
         this.el = ref.nativeElement;
-        ref.nativeElement.delegate = angularDelegate.create(environmentInjector);
+        ref.nativeElement.delegate = angularDelegate.create(environmentInjector, injector);
         proxyOutputs(this, this.el, ['ionNavDidChange', 'ionNavWillChange']);
     }
 };
-/** @nocollapse */ IonNav.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: IonNav, deps: [{ token: i0.ElementRef }, { token: i0.EnvironmentInjector }, { token: AngularDelegate }, { token: i0.NgZone }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Directive });
+/** @nocollapse */ IonNav.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: IonNav, deps: [{ token: i0.ElementRef }, { token: i0.EnvironmentInjector }, { token: i0.Injector }, { token: AngularDelegate }, { token: i0.NgZone }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Directive });
 /** @nocollapse */ IonNav.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.12", type: IonNav, inputs: { animated: "animated", animation: "animation", root: "root", rootParams: "rootParams", swipeGesture: "swipeGesture" }, ngImport: i0 });
 IonNav = __decorate([
     ProxyCmp({
@@ -2001,7 +2013,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImpo
                     // eslint-disable-next-line @angular-eslint/no-inputs-metadata-property
                     inputs: NAV_INPUTS,
                 }]
-        }], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: i0.EnvironmentInjector }, { type: AngularDelegate }, { type: i0.NgZone }, { type: i0.ChangeDetectorRef }]; } });
+        }], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: i0.EnvironmentInjector }, { type: i0.Injector }, { type: AngularDelegate }, { type: i0.NgZone }, { type: i0.ChangeDetectorRef }]; } });
 
 // eslint-disable-next-line @angular-eslint/directive-class-suffix
 class IonTabs {