MOBILE-2309 core: Don't initialize core-tab content until it's selected
parent
8a3f7053e5
commit
cb561cc4a3
|
@ -26,6 +26,14 @@ import { TranslateService } from '@ngx-translate/core';
|
||||||
* <core-loading [message]="loadingMessage" [hideUntil]="dataLoaded">
|
* <core-loading [message]="loadingMessage" [hideUntil]="dataLoaded">
|
||||||
* <!-- CONTENT TO HIDE UNTIL LOADED -->
|
* <!-- CONTENT TO HIDE UNTIL LOADED -->
|
||||||
* </core-loading>
|
* </core-loading>
|
||||||
|
*
|
||||||
|
* IMPORTANT: Due to how ng-content works in Angular, the content of core-loading will be executed as soon as your view
|
||||||
|
* is loaded, even if the content hidden. So if you have the following code:
|
||||||
|
* <core-loading [hideUntil]="dataLoaded"><my-component></my-component></core-loading>
|
||||||
|
*
|
||||||
|
* The component "my-component" will be initialized immediately, even if dataLoaded is false, but it will be hidden. If you want
|
||||||
|
* your component to be initialized only if dataLoaded is true, then you should use ngIf:
|
||||||
|
* <core-loading [hideUntil]="dataLoaded"><my-component *ngIf="dataLoaded"></my-component></core-loading>
|
||||||
*/
|
*/
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'core-loading',
|
selector: 'core-loading',
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
// See the License for the specific language governing permissions and
|
// See the License for the specific language governing permissions and
|
||||||
// limitations under the License.
|
// limitations under the License.
|
||||||
|
|
||||||
import { Component, Input, Output, OnInit, OnDestroy, ElementRef, EventEmitter } from '@angular/core';
|
import { Component, Input, Output, OnInit, OnDestroy, ElementRef, EventEmitter, ContentChild, TemplateRef } from '@angular/core';
|
||||||
import { CoreTabsComponent } from './tabs';
|
import { CoreTabsComponent } from './tabs';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -20,17 +20,23 @@ import { CoreTabsComponent } from './tabs';
|
||||||
*
|
*
|
||||||
* You must provide either a title or an icon for the tab.
|
* You must provide either a title or an icon for the tab.
|
||||||
*
|
*
|
||||||
|
* The tab content MUST be surrounded by ng-template. This component uses ngTemplateOutlet instead of ng-content because the
|
||||||
|
* latter executes all the code immediately. This means that all the tabs would be initialized as soon as your view is
|
||||||
|
* loaded, leading to performance issues.
|
||||||
|
*
|
||||||
* Example usage:
|
* Example usage:
|
||||||
*
|
*
|
||||||
* <core-tabs selectedIndex="1">
|
* <core-tabs selectedIndex="1">
|
||||||
* <core-tab [title]="'core.courses.timeline' | translate" (ionSelect)="switchTab('timeline')">
|
* <core-tab [title]="'core.courses.timeline' | translate" (ionSelect)="switchTab('timeline')">
|
||||||
|
* <ng-template> <!-- This ng-template is required. -->
|
||||||
* <!-- Tab contents. -->
|
* <!-- Tab contents. -->
|
||||||
|
* </ng-template>
|
||||||
* </core-tab>
|
* </core-tab>
|
||||||
* </core-tabs>
|
* </core-tabs>
|
||||||
*/
|
*/
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'core-tab',
|
selector: 'core-tab',
|
||||||
template: '<ng-content></ng-content>'
|
template: '<ng-container *ngIf="loaded" [ngTemplateOutlet]="template"></ng-container>'
|
||||||
})
|
})
|
||||||
export class CoreTabComponent implements OnInit, OnDestroy {
|
export class CoreTabComponent implements OnInit, OnDestroy {
|
||||||
@Input() title?: string; // The tab title.
|
@Input() title?: string; // The tab title.
|
||||||
|
@ -42,7 +48,10 @@ export class CoreTabComponent implements OnInit, OnDestroy {
|
||||||
@Input() id?: string; // An ID to identify the tab.
|
@Input() id?: string; // An ID to identify the tab.
|
||||||
@Output() ionSelect: EventEmitter<CoreTabComponent> = new EventEmitter<CoreTabComponent>();
|
@Output() ionSelect: EventEmitter<CoreTabComponent> = new EventEmitter<CoreTabComponent>();
|
||||||
|
|
||||||
|
@ContentChild(TemplateRef) template: TemplateRef<any> // Template defined by the content.
|
||||||
|
|
||||||
element: HTMLElement; // The core-tab element.
|
element: HTMLElement; // The core-tab element.
|
||||||
|
loaded = false;
|
||||||
|
|
||||||
constructor(private tabs: CoreTabsComponent, element: ElementRef) {
|
constructor(private tabs: CoreTabsComponent, element: ElementRef) {
|
||||||
this.element = element.nativeElement;
|
this.element = element.nativeElement;
|
||||||
|
@ -61,4 +70,20 @@ export class CoreTabComponent implements OnInit, OnDestroy {
|
||||||
ngOnDestroy() {
|
ngOnDestroy() {
|
||||||
this.tabs.removeTab(this);
|
this.tabs.removeTab(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Select tab.
|
||||||
|
*/
|
||||||
|
selectTab() {
|
||||||
|
this.element.classList.add('selected');
|
||||||
|
this.loaded = true;
|
||||||
|
this.ionSelect.emit(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Unselect tab.
|
||||||
|
*/
|
||||||
|
unselectTab() {
|
||||||
|
this.element.classList.remove('selected');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,9 @@ import { CoreTabComponent } from './tab';
|
||||||
*
|
*
|
||||||
* <core-tabs selectedIndex="1">
|
* <core-tabs selectedIndex="1">
|
||||||
* <core-tab [title]="'core.courses.timeline' | translate" (ionSelect)="switchTab('timeline')">
|
* <core-tab [title]="'core.courses.timeline' | translate" (ionSelect)="switchTab('timeline')">
|
||||||
|
* <ng-template> <!-- This ng-template is required, @see CoreTabComponent. -->
|
||||||
* <!-- Tab contents. -->
|
* <!-- Tab contents. -->
|
||||||
|
* </ng-template>
|
||||||
* </core-tab>
|
* </core-tab>
|
||||||
* </core-tabs>
|
* </core-tabs>
|
||||||
*
|
*
|
||||||
|
@ -171,7 +173,7 @@ export class CoreTabsComponent implements OnInit, AfterViewInit, OnChanges {
|
||||||
index = 0;
|
index = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
const currenTab = this.getSelected(),
|
const currentTab = this.getSelected(),
|
||||||
newTab = this.tabs[index];
|
newTab = this.tabs[index];
|
||||||
|
|
||||||
if (!newTab.enabled || !newTab.show) {
|
if (!newTab.enabled || !newTab.show) {
|
||||||
|
@ -179,14 +181,13 @@ export class CoreTabsComponent implements OnInit, AfterViewInit, OnChanges {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (currenTab) {
|
if (currentTab) {
|
||||||
// Unselect previous selected tab.
|
// Unselect previous selected tab.
|
||||||
currenTab.element.classList.remove('selected');
|
currentTab.unselectTab();
|
||||||
}
|
}
|
||||||
|
|
||||||
this.selected = index;
|
this.selected = index;
|
||||||
newTab.element.classList.add('selected');
|
newTab.selectTab();
|
||||||
newTab.ionSelect.emit(newTab);
|
|
||||||
this.ionChange.emit(newTab);
|
this.ionChange.emit(newTab);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,11 +16,14 @@
|
||||||
<core-tabs [selectedIndex]="firstSelectedTab" [hideUntil]="tabsReady">
|
<core-tabs [selectedIndex]="firstSelectedTab" [hideUntil]="tabsReady">
|
||||||
<!-- Site home tab. -->
|
<!-- Site home tab. -->
|
||||||
<core-tab [show]="siteHomeEnabled" [title]="'core.sitehome.sitehome' | translate" (ionSelect)="tabChanged('sitehome')">
|
<core-tab [show]="siteHomeEnabled" [title]="'core.sitehome.sitehome' | translate" (ionSelect)="tabChanged('sitehome')">
|
||||||
|
<ng-template>
|
||||||
<core-sitehome-index></core-sitehome-index>
|
<core-sitehome-index></core-sitehome-index>
|
||||||
|
</ng-template>
|
||||||
</core-tab>
|
</core-tab>
|
||||||
|
|
||||||
<!-- Timeline tab. -->
|
<!-- Timeline tab. -->
|
||||||
<core-tab [title]="'core.courses.timeline' | translate" (ionSelect)="tabChanged('timeline')">
|
<core-tab [title]="'core.courses.timeline' | translate" (ionSelect)="tabChanged('timeline')">
|
||||||
|
<ng-template>
|
||||||
<ion-content>
|
<ion-content>
|
||||||
<ion-refresher [enabled]="timeline.loaded || timelineCourses.loaded || courses.loaded" (ionRefresh)="refreshMyOverview($event)">
|
<ion-refresher [enabled]="timeline.loaded || timelineCourses.loaded || courses.loaded" (ionRefresh)="refreshMyOverview($event)">
|
||||||
<ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
|
<ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
|
||||||
|
@ -48,10 +51,12 @@
|
||||||
<core-empty-box *ngIf="timelineCourses.courses.length == 0" image="assets/img/icons/courses.svg" [message]="'core.courses.nocoursesoverview' | translate"></core-empty-box>
|
<core-empty-box *ngIf="timelineCourses.courses.length == 0" image="assets/img/icons/courses.svg" [message]="'core.courses.nocoursesoverview' | translate"></core-empty-box>
|
||||||
</core-loading>
|
</core-loading>
|
||||||
</ion-content>
|
</ion-content>
|
||||||
|
</ng-template>
|
||||||
</core-tab>
|
</core-tab>
|
||||||
|
|
||||||
<!-- Courses tab. -->
|
<!-- Courses tab. -->
|
||||||
<core-tab [title]="'core.courses.courses' | translate" (ionSelect)="tabChanged('courses')">
|
<core-tab [title]="'core.courses.courses' | translate" (ionSelect)="tabChanged('courses')">
|
||||||
|
<ng-template>
|
||||||
<ion-content>
|
<ion-content>
|
||||||
<ion-refresher [enabled]="timeline.loaded || timelineCourses.loaded || courses.loaded" (ionRefresh)="refreshMyOverview($event)">
|
<ion-refresher [enabled]="timeline.loaded || timelineCourses.loaded || courses.loaded" (ionRefresh)="refreshMyOverview($event)">
|
||||||
<ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
|
<ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
|
||||||
|
@ -97,7 +102,7 @@
|
||||||
</div>
|
</div>
|
||||||
</core-loading>
|
</core-loading>
|
||||||
</ion-content>
|
</ion-content>
|
||||||
|
</ng-template>
|
||||||
</core-tab>
|
</core-tab>
|
||||||
</core-tabs>
|
</core-tabs>
|
||||||
|
|
||||||
</ion-content>
|
</ion-content>
|
||||||
|
|
Loading…
Reference in New Issue