sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-05-23 06:07:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: refactor notifications position based on different promo banners (#13679)

Browse source
This commit is contained in:
negue 2021-12-15 02:14:38 +01:00 committed by GitHub
parent 9e0e805d35
commit c37dac5568
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
website/client/src/components/snackbars/notifications.vue
View file

@ -103,7 +103,7 @@ export default {
removalIntervalId: null,
notificationTopY: '0px',
preventMultipleWatchExecution: false,
gemsPromoBannerHeight: null,
eventPromoBannerHeight: null,
sleepingBannerHeight: null,
};
},
@ -113,6 +113,9 @@ export default {
userSleeping: 'user.data.preferences.sleep',
currentEvent: 'worldState.data.currentEvent',
}),
isEventActive () {
return Boolean(this.currentEvent?.event);
},
notificationsTopPosClass () {
const base = 'notifications-top-pos-';
let modifier = '';
@ -132,10 +135,8 @@ export default {
scrollPosToCheck += this.sleepingBannerHeight;
}
if (this.currentEvent
&& this.currentEvent.event
) {
scrollPosToCheck += this.gemsPromoBannerHeight ?? 0;
if (this.isEventActive) {
scrollPosToCheck += this.eventPromoBannerHeight ?? 0;
}
return scrollPosToCheck;
@ -169,7 +170,7 @@ export default {
this.preventMultipleWatchExecution = false;
},
currentEvent: function currentEventChanged () {
this.gemsPromoBannerHeight = getBannerHeight('gems-promo');
this.updateEventBannerHeight();
},
},
async mounted () {
@ -355,10 +356,31 @@ export default {
}, 16),
updateBannerHeightAndScrollY () {
this.gemsPromoBannerHeight = getBannerHeight('gems-promo');
this.updateEventBannerHeight();
this.sleepingBannerHeight = getBannerHeight('damage-paused');
this.updateScrollY();
},
updateEventBannerHeight () {
if (this.isEventActive) {
this.eventPromoBannerHeight = getBannerHeight(this.currentEventBannerName());
}
},
currentEventBannerName () {
// if there are any other types of promo bars
// this method needs to be updated
if (this.currentEvent?.promo) {
return 'gift-promo';
}
if (this.currentEvent?.gemsPromo) {
return 'gems-promo';
}
return '';
},
},
};
</script>