Skip to content

Commit

Permalink
send correct props when calculating gallery position (#1290)
Browse files Browse the repository at this point in the history
  • Loading branch information
Galpittel authored Sep 19, 2024
1 parent 25e50b6 commit 090c39a
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions packages/gallery/src/components/gallery/proGallery/slideshowView.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,34 +67,34 @@ class SlideshowView extends React.Component {
return this.state.activeIndex === 0;
}

isScrollStart() {
const slideAnimation = this.props.options.behaviourParams_gallery_horizontal_slideAnimation;
isScrollStart(props = this.props) {
const slideAnimation = props.options.behaviourParams_gallery_horizontal_slideAnimation;
if (
slideAnimation !== GALLERY_CONSTS[optionsMap.behaviourParams.gallery.horizontal.slideAnimation].SCROLL ||
!this.scrollElement
) {
return false;
}
return this.scrollPosition() <= 1;
return this.scrollPosition(props) <= 1;
}

isScrollEnd(props = this.props) {
const slideAnimation = this.props.options.behaviourParams_gallery_horizontal_slideAnimation;
const slideAnimation = props.options.behaviourParams_gallery_horizontal_slideAnimation;
if (
this.props.options.behaviourParams_gallery_horizontal_loop ||
props.options.behaviourParams_gallery_horizontal_loop ||
slideAnimation === GALLERY_CONSTS[optionsMap.behaviourParams.gallery.horizontal.slideAnimation].FADE ||
slideAnimation === GALLERY_CONSTS[optionsMap.behaviourParams.gallery.horizontal.slideAnimation].DECK
) {
return false;
}
return (
this.isAllItemsLoaded() &&
this.scrollPositionAtTheAndOfTheGallery() >= Math.floor(this.getScrollElementWidth(props))
this.isAllItemsLoaded(props) &&
this.scrollPositionAtTheAndOfTheGallery(props) >= Math.floor(this.getScrollElementWidth(props))
);
}

isAllItemsLoaded() {
const { totalItemsCount, getVisibleItems, galleryStructure, container, isPrerenderMode } = this.props;
isAllItemsLoaded(props = this.props) {
const { totalItemsCount, getVisibleItems, galleryStructure, container, isPrerenderMode } = props;
const visibleItemsCount = getVisibleItems(galleryStructure.galleryItems, container, isPrerenderMode).length;
return visibleItemsCount >= totalItemsCount;
}
Expand Down Expand Up @@ -1006,21 +1006,21 @@ class SlideshowView extends React.Component {
};
}

getScrollPosition() {
return this.scrollElement ? this.scrollPosition() : 0;
getScrollPosition(props = this.props) {
return this.scrollElement ? this.scrollPosition(props) : 0;
}

scrollPositionAtTheMiddleOfTheGallery() {
return this.getScrollPosition() + this.props.container.galleryWidth / 2;
}

scrollPositionAtTheAndOfTheGallery() {
return this.getScrollPosition() + this.props.container.galleryWidth;
scrollPositionAtTheAndOfTheGallery(props = this.props) {
return this.getScrollPosition(props) + props.container.galleryWidth;
}

scrollPosition() {
scrollPosition(props = this.props) {
return (
(this.props.options.behaviourParams_gallery_layoutDirection ===
(props.options.behaviourParams_gallery_layoutDirection ===
GALLERY_CONSTS[optionsMap.behaviourParams.gallery.layoutDirection].RIGHT_TO_LEFT
? -1
: 1) * this.scrollElement.scrollLeft
Expand Down Expand Up @@ -1114,7 +1114,7 @@ class SlideshowView extends React.Component {
GALLERY_CONSTS[optionsMap.behaviourParams.gallery.layoutDirection].RIGHT_TO_LEFT;
const { hideLeftArrow, hideRightArrow } = this.state;

const isScrollStart = this.isScrollStart();
const isScrollStart = this.isScrollStart(props);
const isFirstItem = this.isFirstItem();
const isScrollEnd = this.isScrollEnd(props);
const isLastItem = this.isLastItem(props);
Expand Down

0 comments on commit 090c39a

Please sign in to comment.