From 8fec89a699bbbbf74b0fc0901ea41bef2e3eed00 Mon Sep 17 00:00:00 2001 From: Ilia Mashkov Date: Fri, 21 Nov 2025 12:52:51 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=B0=D0=BD=D0=B8=D0=BC=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D1=8F=20=D1=81=D0=BC=D0=B5=D0=BD=D1=8B=20=D0=B3=D0=BE?= =?UTF-8?q?=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/TimeFrameSlider/TimeFrameSlider.tsx | 60 ++++++++++++------- 1 file changed, 39 insertions(+), 21 deletions(-) diff --git a/src/widgets/TimeFrameSlider/ui/TimeFrameSlider/TimeFrameSlider.tsx b/src/widgets/TimeFrameSlider/ui/TimeFrameSlider/TimeFrameSlider.tsx index 9ff0d38..2cc1e4e 100644 --- a/src/widgets/TimeFrameSlider/ui/TimeFrameSlider/TimeFrameSlider.tsx +++ b/src/widgets/TimeFrameSlider/ui/TimeFrameSlider/TimeFrameSlider.tsx @@ -10,7 +10,7 @@ import { HISTORICAL_PERIODS } from '@/entities/TimePeriod' import ChevronSvg from '@/shared/assets/chevron--left.svg' import { Button } from '@/shared/ui/Button' -import { ACTIVE_POSITION_ANGLE } from './constants' +import { ACTIVE_POSITION_ANGLE, GSAP_ANIMATION_CONFIG } from './constants' import styles from './TimeFrameSlider.module.scss' import { CircleTimeline } from '../CircleTimeline/CircleTimeline' import { EventsCarousel } from '../EventsCarousel/EventsCarousel' @@ -35,16 +35,20 @@ export const TimeFrameSlider = memo(() => { const endYearRef = useRef(null) const containerRef = useRef(null) - // Мемоизированные константы - const totalPeriods = useMemo(() => HISTORICAL_PERIODS.length, []) - const anglePerPoint = useMemo(() => 360 / totalPeriods, [totalPeriods]) - // Текущий период const currentPeriod = useMemo( () => HISTORICAL_PERIODS[activePeriod], [activePeriod] ) + // Мемоизированные константы + const totalPeriods = useMemo(() => HISTORICAL_PERIODS.length, []) + const anglePerPoint = useMemo(() => 360 / totalPeriods, [totalPeriods]) + + // Рефы для предыдущих значений периода + const prevYearFromRef = useRef(currentPeriod.yearFrom) + const prevYearToRef = useRef(currentPeriod.yearTo) + /** * Расчет поворота при изменении активного периода * Использует кратчайший путь для анимации @@ -68,22 +72,33 @@ export const TimeFrameSlider = memo(() => { const ctx = gsap.context(() => { if (startYearRef.current) { - gsap.to(startYearRef.current, { - innerText: currentPeriod.yearFrom, - snap: { innerText: 1 }, - duration: 1, - ease: 'power2.inOut', - }) + gsap.fromTo( + startYearRef.current, + { + innerText: prevYearFromRef.current, + }, + { + innerText: currentPeriod.yearFrom, + ...GSAP_ANIMATION_CONFIG, + } + ) } if (endYearRef.current) { - gsap.to(endYearRef.current, { - innerText: currentPeriod.yearTo, - snap: { innerText: 1 }, - duration: 1, - ease: 'power2.inOut', - }) + gsap.fromTo( + endYearRef.current, + { + innerText: prevYearToRef.current, + }, + { + innerText: currentPeriod.yearTo, + ...GSAP_ANIMATION_CONFIG, + } + ) } + + prevYearFromRef.current = currentPeriod.yearFrom + prevYearToRef.current = currentPeriod.yearTo }, containerRef) return () => ctx.revert() @@ -112,6 +127,7 @@ export const TimeFrameSlider = memo(() => {
{currentPeriod.yearFrom} + {'\u00A0'} {currentPeriod.yearTo}
@@ -137,7 +153,7 @@ export const TimeFrameSlider = memo(() => { onClick={handlePrev} aria-label='Предыдущий период' > - +
- +
+ +
) })