Skip to content
Merged
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
1 change: 0 additions & 1 deletion packages/angular/common/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
export { LoadingController } from './providers/loading-controller';
export { MenuController } from './providers/menu-controller';
export { DomController } from './providers/dom-controller';
export { NavController } from './providers/nav-controller';
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ export * from './directives/validators';

// PROVIDERS
export {
LoadingController,
DomController,
NavController,
Config,
Expand All @@ -37,6 +36,7 @@ export { AlertController } from './providers/alert-controller';
export { AnimationController } from './providers/animation-controller';
export { ActionSheetController } from './providers/action-sheet-controller';
export { GestureController } from './providers/gesture-controller';
export { LoadingController } from './providers/loading-controller';
export { MenuController } from './providers/menu-controller';
export { ModalController } from './providers/modal-controller';
export { PickerController } from './providers/picker-controller';
Expand Down
13 changes: 13 additions & 0 deletions packages/angular/src/providers/loading-controller.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { Injectable } from '@angular/core';
import { OverlayBaseController } from '@ionic/angular/common';
import type { LoadingOptions } from '@ionic/core';
import { loadingController } from '@ionic/core';

@Injectable({
providedIn: 'root',
})
export class LoadingController extends OverlayBaseController<LoadingOptions, HTMLIonLoadingElement> {
constructor() {
super(loadingController);
}
}
2 changes: 1 addition & 1 deletion packages/angular/standalone/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ export { ActionSheetController } from './providers/action-sheet-controller';
export { AlertController } from './providers/alert-controller';
export { AnimationController } from './providers/animation-controller';
export { GestureController } from './providers/gesture-controller';
export { LoadingController } from './providers/loading-controller';
export { MenuController } from './providers/menu-controller';
export { ModalController } from './providers/modal-controller';
export { PickerController } from './providers/picker-controller';
export { PopoverController } from './providers/popover-controller';
export { ToastController } from './providers/toast-controller';
export {
LoadingController,
DomController,
NavController,
Config,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
import { Injectable } from '@angular/core';
import { OverlayBaseController } from '@ionic/angular/common';
import type { LoadingOptions } from '@ionic/core/components';
import { loadingController } from '@ionic/core/components';

import { OverlayBaseController } from '../utils/overlay';
import { defineCustomElement } from '@ionic/core/components/ion-loading.js';

@Injectable({
providedIn: 'root',
})
export class LoadingController extends OverlayBaseController<LoadingOptions, HTMLIonLoadingElement> {
constructor() {
super(loadingController);

// TODO: FW-5415 may remove the need for this
defineCustomElement();
}
}
6 changes: 6 additions & 0 deletions packages/angular/test/base/e2e/src/lazy/providers.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ describe('Providers', () => {
cy.get('ion-alert').should('be.visible');
});

it('should open a loading-indicator', () => {
cy.get('button#open-loading').click();

cy.get('ion-loading').should('be.visible');
});

it('should open a picker', () => {
cy.get('button#open-picker').click();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ describe('Overlay Controllers', () => {
cy.get('ion-alert').should('be.visible');
});

it('should present a loading indicator', () => {
cy.get('button#open-loading').click();

cy.get('ion-loading').should('be.visible');
});

it('should present a modal', () => {
cy.get('button#open-modal').click();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,6 @@
<button id="set-menu-count" (click)="setMenuCount()">Set Menu Count</button>
<button id="open-alert" (click)="openAlert()">Open Alert</button>
<button id="open-action-sheet" (click)="openActionSheet()">Open Action Sheet</button>
<button id="open-loading" (click)="openLoading()">Open Loading Indicator</button>
<button id="open-picker" (click)="openPicker()">Open Picker</button>
</ion-content>
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export class ProvidersComponent {
constructor(
private actionSheetCtrl: ActionSheetController,
private alertCtrl: AlertController,
loadingCtrl: LoadingController,
private loadingCtrl: LoadingController,
private menuCtrl: MenuController,
private pickerCtrl: PickerController,
modalCtrl: ModalController,
Expand Down Expand Up @@ -129,6 +129,15 @@ export class ProvidersComponent {
await alert.present();
}

async openLoading() {
const loading = await this.loadingCtrl.create({
message: 'Loading...',
duration: 2000,
});

await loading.present();
}

async openPicker() {
const picker = await this.pickerCtrl.create({
columns: [],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<div>
<button id="open-alert" (click)="openAlert()">Open Alert</button>
<button id="open-loading" (click)="openLoading()">Open Loading Indicator</button>
<button id="open-modal" (click)="openModal()">Open Modal</button>
<button id="open-picker" (click)="openPicker()">Open Picker</button>
<button id="open-popover" (click)="openPopover($event)">Open Popover</button>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
import { Component } from '@angular/core';
import { AlertController, ModalController, PickerController, PopoverController } from '@ionic/angular/standalone';
import {
AlertController,
LoadingController,
ModalController,
PickerController,
PopoverController,
} from '@ionic/angular/standalone';

@Component({
selector: 'app-overlay-controllers',
Expand All @@ -9,6 +15,7 @@ import { AlertController, ModalController, PickerController, PopoverController }
export class OverlayControllersComponent {
constructor(
private alertCtrl: AlertController,
private loadingCtrl: LoadingController,
private modalCtrl: ModalController,
private pickerCtrl: PickerController,
private popoverCtrl: PopoverController
Expand All @@ -28,6 +35,15 @@ export class OverlayControllersComponent {
await alert.present();
}

async openLoading() {
const loading = await this.loadingCtrl.create({
message: 'Loading...',
duration: 2000,
});

await loading.present();
}

async openModal() {
const modal = await this.modalCtrl.create({
component: DialogComponent,
Expand Down