Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

馃悰 amp-base-carousel: Update offset and index together #30963

Merged
merged 2 commits into from
Nov 3, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion extensions/amp-base-carousel/0.1/carousel.js
Original file line number Diff line number Diff line change
Expand Up @@ -1180,10 +1180,11 @@ export class Carousel {
}

// We are updating during a programmatic scroll, so go to the correct
// index.
// index (and update offset accordingly).
if (this.requestedIndex_ !== null) {
this.currentIndex_ = this.requestedIndex_;
this.requestedIndex_ = null;
this.currentElementOffset_ = 0;
}

const totalLength = sum(this.getSlideLengths_());
Expand Down
26 changes: 26 additions & 0 deletions extensions/amp-base-carousel/0.1/test/test-carousel.js
Original file line number Diff line number Diff line change
Expand Up @@ -236,4 +236,30 @@ describes.realWin('carousel implementation', {}, (env) => {
expect(carousel.isAtStart()).to.be.false;
});
});

describe('resetScrollReferencePoint_', () => {
it('currentElementOffset_ & currentIndex_ should be set when it is a' +
' programmatic scroll', async () => {
setStyle(element, 'width', '299.2px');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this condition happen only when the element width is not floored?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, this is actually unnecessary. I'll simplify.


const carousel = await createCarousel({
slideCount: 12,
loop: false,
});

// Fake the scroll that ends short of the correct index.
// This is handled by scroll event listener.
carousel.touching_ = false;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for adding a comment here describing what the intent of these values are, nice touch!

carousel.requestedIndex_ = 1;
carousel.currentIndex_ = 0;
carousel.restingIndex_ = 0;
carousel.currentElementOffset_ = -0.99382;

carousel.resetScrollReferencePoint_();

expect(carousel.currentElementOffset_).to.equal(0);
expect(carousel.currentIndex_).to.equal(1);
expect(carousel.requestedIndex_).to.be.null;
});
});
});