javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-07 23:16:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature-8.0' into sp/sync-next-with-v8

Browse Source
This commit is contained in:
Sean Perkins
2024-03-20 21:05:35 -04:00
parent 284eb8ecaf 9efeb0ad31
commit 245a5c6f23
292 changed files with 8753 additions and 65287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/angular/standalone/src/navigation/router-outlet.ts
View File

@ -46,9 +46,8 @@ export class IonRouterOutlet extends IonRouterOutletBase {
router: Router,
zone: NgZone,
activatedRoute: ActivatedRoute,
outletContent: ViewContainerRef,
@SkipSelf() @Optional() readonly parentOutlet?: IonRouterOutlet
) {
super(name, tabs, commonLocation, elementRef, router, zone, activatedRoute, outletContent, parentOutlet);
super(name, tabs, commonLocation, elementRef, router, zone, activatedRoute, parentOutlet);
}
}

15
packages/angular/standalone/src/providers/ionic-angular.ts
View File

@ -1,6 +1,6 @@
import { DOCUMENT } from '@angular/common';
import { APP_INITIALIZER } from '@angular/core';
import type { Provider } from '@angular/core';
import { APP_INITIALIZER, makeEnvironmentProviders } from '@angular/core';
import type { EnvironmentProviders } from '@angular/core';
import { AngularDelegate, ConfigToken, provideComponentInputBinding } from '@ionic/angular/common';
import { initialize } from '@ionic/core/components';
import type { IonicConfig } from '@ionic/core/components';
@ -8,13 +8,8 @@ import type { IonicConfig } from '@ionic/core/components';
import { ModalController } from './modal-controller';
import { PopoverController } from './popover-controller';
export const provideIonicAngular = (config?: IonicConfig): Provider[] => {
/**
* TODO FW-4967
* Use makeEnvironmentProviders once Angular 14 support is dropped.
* This prevents provideIonicAngular from being accidentally referenced in an @Component.
*/
return [
export const provideIonicAngular = (config?: IonicConfig): EnvironmentProviders => {
return makeEnvironmentProviders([
{
provide: ConfigToken,
useValue: config,
@ -29,7 +24,7 @@ export const provideIonicAngular = (config?: IonicConfig): Provider[] => {
AngularDelegate,
ModalController,
PopoverController,
];
]);
};
const initializeIonicAngular = (config: IonicConfig, doc: Document) => {