Skip to content

Commit

Permalink
fix: Fix computing of RTL based Language for Card Carousel Arrows - M…
Browse files Browse the repository at this point in the history
…EED-7912 - Meeds-io/meeds#2652 (#4252)

Prior to his change, some changes were made to make the Card carousel
Arrows works on RTL based Locales which had made some regressions on LTR
based languages. This change will revert recent changes and rework the
RTL computing algorithms to consider RTL DOM offset computing.

Resolves Meeds-io/meeds#2652
  • Loading branch information
boubaker authored and rdenarie committed Dec 9, 2024
1 parent cfbdd31 commit 4a3648c
Showing 1 changed file with 28 additions and 17 deletions.
45 changes: 28 additions & 17 deletions webapp/src/main/webapp/vue-apps/common/components/CardCarousel.vue
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
<template>
<div class="carousel-top-parent overflow-hidden position-relative">
<v-fab-transition>
<v-expand-transition>
<v-btn
v-show="displayLeftArrow"
:aria-label="$t('cardCarousel.leftArrowButtonTitle')"
:left="!$vuetify.rtl"
:right="$vuetify.rtl"
color="while"
width="23px"
height="23px"
class="absolute-vertical-center"
fab
dark
absolute
left
x-small
@click="($vuetify.rtl) ? moveRight() : moveLeft()">
<v-icon size="25">fa-arrow-circle-left</v-icon>
@click="moveLeft">
<v-icon size="25">{{ leftArrowIcon }}</v-icon>
</v-btn>
</v-fab-transition>
</v-expand-transition>
<v-card
:class="!dense && 'px-0 pb-4 pt-2'"
class="carousel-middle-parent scrollbar-width-none transparent d-flex overflow-x-scroll"
Expand All @@ -27,23 +28,24 @@
<slot></slot>
</div>
</v-card>
<v-fab-transition>
<v-expand-transition>
<v-btn
v-show="displayRightArrow"
:aria-label="$t('cardCarousel.rightArrowButtonTitle')"
:left="$vuetify.rtl"
:right="!$vuetify.rtl"
color="while"
width="23px"
height="23px"
class="absolute-vertical-center"
fab
dark
absolute
right
x-small
@click="($vuetify.rtl) ? moveLeft() : moveRight()">
<v-icon size="25">fa-arrow-circle-right</v-icon>
@click="moveRight">
<v-icon size="25">{{ rightArrowIcon }}</v-icon>
</v-btn>
</v-fab-transition>
</v-expand-transition>
</div>
</template>

Expand All @@ -68,6 +70,14 @@ export default {
computing: false,
initialized: false,
}),
computed: {
leftArrowIcon() {
return this.$vuetify.rtl && 'fa-arrow-circle-right' || 'fa-arrow-circle-left';
},
rightArrowIcon() {
return this.$vuetify.rtl && 'fa-arrow-circle-left' || 'fa-arrow-circle-right';
},
},
mounted() {
this.scrollElement = this.$el && this.$el.children && this.$el.children.length > 1 && this.$el.children[1];
Expand Down Expand Up @@ -111,14 +121,9 @@ export default {
const contentWidth = this.scrollElement.firstChild.offsetWidth;
const children = this.scrollElement.firstChild.children;
const childrenCount = children.length;
const firstElementLocation = this.scrollElement.firstChild.children[0].getBoundingClientRect();
const lastElementLocation = this.scrollElement.lastChild.children[9].getBoundingClientRect();
const carouselLocation = this.scrollElement.parentElement.getBoundingClientRect();
const visibilityIconArrowNext = (this.$vuetify.rtl) ? lastElementLocation.right<carouselLocation.x : lastElementLocation.x>carouselLocation.right;
const visibilityIconArrowPrev = (this.$vuetify.rtl) ? firstElementLocation.x > carouselLocation.right :firstElementLocation.right < carouselLocation.x;
this.visibleChildrenPerPage = parseInt(parentWidth * childrenCount / contentWidth);
this.displayLeftArrow = (this.$vuetify.rtl) ? visibilityIconArrowNext : visibilityIconArrowPrev;
this.displayRightArrow = (this.$vuetify.rtl) ? visibilityIconArrowPrev : visibilityIconArrowNext;
this.displayLeftArrow = this.scrollElement && childrenCount && this.checkDisplayLeftArrow(children);
this.displayRightArrow = this.scrollElement && childrenCount && this.checkDisplayRightArrow(children);
if (!this.initialized && childrenCount) {
this.childScrollIndex = this.visibleChildrenPerPage >= children.length ? (children.length - 1) : this.visibleChildrenPerPage;
this.initialized = true;
Expand All @@ -127,6 +132,12 @@ export default {
}, 200);
}
},
checkDisplayLeftArrow(children) {
return Math.abs(this.scrollElement.scrollLeft) - Math.abs(this.$vuetify.rtl ? 0 : children[0].offsetLeft) > 10;
},
checkDisplayRightArrow() {
return parseInt(this.scrollElement.scrollWidth - this.scrollElement.offsetWidth - Math.abs(this.scrollElement.scrollLeft)) > 10;
},
},
};
</script>

0 comments on commit 4a3648c

Please sign in to comment.