diff --git a/VERSION b/VERSION index daf4ba0..7a33340 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.19.2 +6.19.3 diff --git a/play-life-web/package.json b/play-life-web/package.json index 0f5e8e6..7a642e7 100644 --- a/play-life-web/package.json +++ b/play-life-web/package.json @@ -1,6 +1,6 @@ { "name": "play-life-web", - "version": "6.19.2", + "version": "6.19.3", "type": "module", "scripts": { "dev": "vite", diff --git a/play-life-web/src/components/FullStatistics.jsx b/play-life-web/src/components/FullStatistics.jsx index a753740..1592412 100644 --- a/play-life-web/src/components/FullStatistics.jsx +++ b/play-life-web/src/components/FullStatistics.jsx @@ -204,6 +204,7 @@ function FullStatistics({ selectedProject, onClearSelection, data, loading, erro fetchCurrentWeekData && fetchCurrentWeekData(true) onRetry && onRetry(true) }} + onNavigate={onNavigate} /> )} diff --git a/play-life-web/src/components/TodayEntriesList.jsx b/play-life-web/src/components/TodayEntriesList.jsx index 4223594..671d8c2 100644 --- a/play-life-web/src/components/TodayEntriesList.jsx +++ b/play-life-web/src/components/TodayEntriesList.jsx @@ -348,7 +348,7 @@ function EditEntryModal({ entry, onClose, onSuccess, authFetch }) { : modalContent } -function TodayEntriesList({ data, loading, error, onRetry, onDelete }) { +function TodayEntriesList({ data, loading, error, onRetry, onDelete, onNavigate }) { const { authFetch } = useAuth() const [deletingIds, setDeletingIds] = useState(new Set()) const [selectedTaskId, setSelectedTaskId] = useState(null) @@ -390,10 +390,11 @@ function TodayEntriesList({ data, loading, error, onRetry, onDelete }) { setSelectedTaskId(taskId) } - const handleCloseTaskDetail = () => { - if (historyPushedRef.current) { + const handleCloseTaskDetail = (skipHistoryBack = false) => { + if (!skipHistoryBack && historyPushedRef.current) { window.history.back() } else { + historyPushedRef.current = false setSelectedTaskId(null) } } @@ -606,6 +607,7 @@ function TodayEntriesList({ data, loading, error, onRetry, onDelete }) { taskId={selectedTaskId} onClose={handleCloseTaskDetail} onRefresh={handleTaskSaved} + onNavigate={onNavigate} /> )} {editingEntry && (