From 1df00bbefd431aa874536f33465adccafc68f48c Mon Sep 17 00:00:00 2001 From: poignatov Date: Thu, 12 Mar 2026 15:53:22 +0300 Subject: [PATCH] =?UTF-8?q?6.13.1:=20=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BE?= =?UTF-8?q?=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=82?= =?UTF-8?q?=D0=B5=D0=BA=D1=83=D1=89=D0=B5=D0=B3=D0=BE=20=D0=B4=D0=BD=D1=8F?= =?UTF-8?q?=20=D0=B2=20=D1=81=D1=82=D0=B0=D1=82=D0=B8=D1=81=D1=82=D0=B8?= =?UTF-8?q?=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION | 2 +- play-life-web/package.json | 2 +- .../src/components/FullStatistics.jsx | 23 +++++++++++++------ 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/VERSION b/VERSION index 5917993..d7d9d3f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.13.0 +6.13.1 diff --git a/play-life-web/package.json b/play-life-web/package.json index fe438ab..359ce45 100644 --- a/play-life-web/package.json +++ b/play-life-web/package.json @@ -1,6 +1,6 @@ { "name": "play-life-web", - "version": "6.13.0", + "version": "6.13.1", "type": "module", "scripts": { "dev": "vite", diff --git a/play-life-web/src/components/FullStatistics.jsx b/play-life-web/src/components/FullStatistics.jsx index d944848..5816e3d 100644 --- a/play-life-web/src/components/FullStatistics.jsx +++ b/play-life-web/src/components/FullStatistics.jsx @@ -41,17 +41,26 @@ function FullStatistics({ selectedProject, onClearSelection, data, loading, erro const [selectedDate, setSelectedDate] = useState(null) const prevActiveTabRef = React.useRef(activeTab) const componentJustOpenedRef = React.useRef(false) - + + // Пересчитываем текущий день и даты недели при каждом открытии экрана + const [now, setNow] = useState(() => new Date()) + + useEffect(() => { + if (activeTab === 'full') { + setNow(new Date()) + } + }, [activeTab]) + // Получаем даты текущей недели - const weekDates = getCurrentWeekDates() - - // Определяем текущий день (используем useMemo для стабильности) + const weekDates = React.useMemo(() => getCurrentWeekDates(), [now]) // eslint-disable-line react-hooks/exhaustive-deps + + // Определяем текущий день const today = React.useMemo(() => { - const date = new Date() + const date = new Date(now) date.setHours(0, 0, 0, 0) return date - }, []) - + }, [now]) + // Получаем строковое представление сегодняшней даты const todayDateStr = React.useMemo(() => formatDate(today), [today])