CIT
/
Vmeda.Online
forked from EVOgeek/Vmeda.Online
2
0
Fork 0
Code Pull Requests Activity

MOBILE-3833 calendar: Fix calendar view reactivity

main
Noel De Martin 2022-03-28 16:44:25 +02:00
parent 831ae1789c
commit 279deeb082
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/addons/calendar/components/calendar/calendar.ts
View File

@ -23,6 +23,7 @@ import {
KeyValueDiffers, KeyValueDiffers,
KeyValueDiffer, KeyValueDiffer,
ViewChild, ViewChild,
HostBinding,
} from '@angular/core'; } from '@angular/core';
import { CoreEventObserver, CoreEvents } from '@singletons/events'; import { CoreEventObserver, CoreEvents } from '@singletons/events';
import { CoreSites } from '@services/sites'; import { CoreSites } from '@services/sites';
@ -64,6 +65,7 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
@Input() initialYear?: number; // Initial year to load. @Input() initialYear?: number; // Initial year to load.
@Input() initialMonth?: number; // Initial month to load. @Input() initialMonth?: number; // Initial month to load.
@Input() filter?: AddonCalendarFilter; // Filter to apply. @Input() filter?: AddonCalendarFilter; // Filter to apply.
@Input() hidden?: boolean; // Whether the component is hidden.
@Input() canNavigate?: string | boolean; // Whether to include arrows to change the month. Defaults to true. @Input() canNavigate?: string | boolean; // Whether to include arrows to change the month. Defaults to true.
@Input() displayNavButtons?: string | boolean; // Whether to display nav buttons created by this component. Defaults to true. @Input() displayNavButtons?: string | boolean; // Whether to display nav buttons created by this component. Defaults to true.
@Output() onEventClicked = new EventEmitter<number>(); @Output() onEventClicked = new EventEmitter<number>();
@ -74,14 +76,13 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
loaded = false; loaded = false;
protected currentSiteId: string; protected currentSiteId: string;
protected differ: KeyValueDiffer<unknown, unknown>; // To detect changes in the data input. protected hiddenDiffer?: boolean; // To detect changes in the hidden input.
protected filterDiffer: KeyValueDiffer<unknown, unknown>; // To detect changes in the filters input.
// Observers and listeners. // Observers and listeners.
protected undeleteEventObserver: CoreEventObserver; protected undeleteEventObserver: CoreEventObserver;
protected managerUnsubscribe?: () => void; protected managerUnsubscribe?: () => void;
constructor( constructor(differs: KeyValueDiffers) {
differs: KeyValueDiffers,
) {
this.currentSiteId = CoreSites.getCurrentSiteId(); this.currentSiteId = CoreSites.getCurrentSiteId();
// Listen for events "undeleted" (offline). // Listen for events "undeleted" (offline).
@ -104,7 +105,12 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
this.currentSiteId, this.currentSiteId,
); );
this.differ = differs.find([]).create(); this.hiddenDiffer = this.hidden;
this.filterDiffer = differs.find(this.filter ?? {}).create();
}
@HostBinding('attr.hidden') get hiddenAttribute(): string | null {
return this.hidden ? 'hidden' : null;
} }
/** /**
@ -137,7 +143,7 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
if (items?.length) { if (items?.length) {
// Check if there's any change in the filter object. // Check if there's any change in the filter object.
const changes = this.differ.diff(this.filter || {}); const changes = this.filterDiffer.diff(this.filter ?? {});
if (changes) { if (changes) {
items.forEach((month) => { items.forEach((month) => {
if (month.loaded && month.weeks) { if (month.loaded && month.weeks) {
@ -146,6 +152,14 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
}); });
} }
} }
if (this.hiddenDiffer !== this.hidden) {
this.hiddenDiffer = this.hidden;
if (!this.hidden) {
this.slides?.slides?.getSwiper().then(swipper => swipper.update());
}
}
} }
get timeFormat(): string { get timeFormat(): string {