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.

Sign up for GitHub

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

Jump to bottom

fix(core): Change opacityString and scaleString to originalProgress #5095

Merged
merged 2 commits into from Oct 18, 2021
Merged

fix(core): Change opacityString and scaleString to originalProgress #5095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8d9d26
feat(core): add originalProgress
nabigraphics Oct 16, 2021
9408b5b
fix(core): use originalProgress to opacity and scale
nabigraphics Oct 16, 2021
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
9 changes: 8 additions & 1 deletion src/core/update/updateSlidesProgress.js
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ export default function updateSlidesProgress(translate = (this && this.translate
const swiper = this;
const params = swiper.params;

const { slides, rtlTranslate: rtl } = swiper;
const { slides, rtlTranslate: rtl, snapGrid } = swiper;

if (slides.length === 0) return;
if (typeof slides[0].swiperSlideOffset === 'undefined') swiper.updateSlidesOffset();
Expand All @@ -28,6 +28,12 @@ export default function updateSlidesProgress(translate = (this && this.translate
const slideProgress =
(offsetCenter + (params.centeredSlides ? swiper.minTranslate() : 0) - slideOffset) /
(slide.swiperSlideSize + params.spaceBetween);
const originalSlideProgress =
(offsetCenter -
snapGrid[0] +
(params.centeredSlides ? swiper.minTranslate() : 0) -
slideOffset) /
(slide.swiperSlideSize + params.spaceBetween);
const slideBefore = -(offsetCenter - slideOffset);
const slideAfter = slideBefore + swiper.slidesSizesGrid[i];
const isVisible =
Expand All @@ -40,6 +46,7 @@ export default function updateSlidesProgress(translate = (this && this.translate
slides.eq(i).addClass(params.slideVisibleClass);
}
slide.progress = rtl ? -slideProgress : slideProgress;
slide.originalProgress = rtl ? -originalSlideProgress : originalSlideProgress;
}
swiper.visibleSlides = $(swiper.visibleSlides);
}
17 changes: 11 additions & 6 deletions src/modules/effect-creative/effect-creative.js
View file
Open in desktop
Expand Up @@ -42,6 +42,11 @@ export default function EffectCreative({ swiper, extendParams, on }) {
Math.max($slideEl[0].progress, -params.limitProgress),
params.limitProgress,
);
const originalProgress = Math.min(
Math.max($slideEl[0].originalProgress, -params.limitProgress),
params.limitProgress,
);

const offset = $slideEl[0].swiperSlideOffset;
const t = [swiper.params.cssMode ? -offset - swiper.translate : -offset, 0, 0];
const r = [0, 0, 0];
Expand Down Expand Up @@ -79,13 +84,13 @@ export default function EffectCreative({ swiper, extendParams, on }) {
const translateString = t.join(', ');
const rotateString = `rotateX(${r[0]}deg) rotateY(${r[1]}deg) rotateZ(${r[2]}deg)`;
const scaleString =
progress < 0
? `scale(${1 + (1 - data.scale) * progress * multiplier})`
: `scale(${1 - (1 - data.scale) * progress * multiplier})`;
originalProgress < 0
? `scale(${1 + (1 - data.scale) * originalProgress * multiplier})`
: `scale(${1 - (1 - data.scale) * originalProgress * multiplier})`;
const opacityString =
progress < 0
? 1 + (1 - data.opacity) * progress * multiplier
: 1 - (1 - data.opacity) * progress * multiplier;
originalProgress < 0
? 1 + (1 - data.opacity) * originalProgress * multiplier
: 1 - (1 - data.opacity) * originalProgress * multiplier;
const transform = `translate3d(${translateString}) ${rotateString} ${scaleString}`;

// Set shadows
Expand Down