Fix scroll issue in project priorities list (v2.8.1)
All checks were successful
Build and Push Docker Image / build-and-push (push) Successful in 23s
All checks were successful
Build and Push Docker Image / build-and-push (push) Successful in 23s
This commit is contained in:
@@ -397,7 +397,7 @@ function AppContent() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-col min-h-screen min-h-dvh">
|
<div className="flex flex-col min-h-screen min-h-dvh">
|
||||||
<div className={`flex-1 ${isFullscreenTab ? 'pb-0' : 'pb-20'}`}>
|
<div className={`flex-1 ${isFullscreenTab ? 'pb-0' : 'pb-20'} overflow-y-auto min-h-0`}>
|
||||||
<div className={`max-w-7xl mx-auto ${isFullscreenTab ? 'p-0' : 'p-4 md:p-6'}`}>
|
<div className={`max-w-7xl mx-auto ${isFullscreenTab ? 'p-0' : 'p-4 md:p-6'}`}>
|
||||||
{loadedTabs.current && (
|
{loadedTabs.current && (
|
||||||
<div className={activeTab === 'current' ? 'block' : 'hidden'}>
|
<div className={activeTab === 'current' ? 'block' : 'hidden'}>
|
||||||
@@ -414,7 +414,7 @@ function AppContent() {
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{loadedTabs.priorities && (
|
{loadedTabs.priorities && (
|
||||||
<div className={activeTab === 'priorities' ? 'block' : 'hidden'}>
|
<div className={activeTab === 'priorities' ? 'block h-full' : 'hidden'}>
|
||||||
<ProjectPriorityManager
|
<ProjectPriorityManager
|
||||||
allProjectsData={fullStatisticsData}
|
allProjectsData={fullStatisticsData}
|
||||||
currentWeekData={currentWeekData}
|
currentWeekData={currentWeekData}
|
||||||
|
|||||||
@@ -864,9 +864,9 @@ function ProjectPriorityManager({ allProjectsData, currentWeekData, shouldLoad,
|
|||||||
const activeProject = allItems.find(item => item.name === activeId)
|
const activeProject = allItems.find(item => item.name === activeId)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="max-w-4xl mx-auto">
|
<div className="max-w-4xl mx-auto h-full flex flex-col">
|
||||||
{onNavigate && (
|
{onNavigate && (
|
||||||
<div className="flex justify-end mb-4">
|
<div className="flex justify-end mb-4 flex-shrink-0">
|
||||||
<button
|
<button
|
||||||
onClick={() => onNavigate('current')}
|
onClick={() => onNavigate('current')}
|
||||||
className="flex items-center justify-center w-10 h-10 rounded-full bg-white hover:bg-gray-100 text-gray-600 hover:text-gray-800 border border-gray-200 hover:border-gray-300 transition-all duration-200 shadow-sm hover:shadow-md"
|
className="flex items-center justify-center w-10 h-10 rounded-full bg-white hover:bg-gray-100 text-gray-600 hover:text-gray-800 border border-gray-200 hover:border-gray-300 transition-all duration-200 shadow-sm hover:shadow-md"
|
||||||
@@ -880,7 +880,7 @@ function ProjectPriorityManager({ allProjectsData, currentWeekData, shouldLoad,
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{projectsError && (!maxPriority.length && !mediumPriority.length && !lowPriority.length) && (
|
{projectsError && (!maxPriority.length && !mediumPriority.length && !lowPriority.length) && (
|
||||||
<div className="mb-4 rounded-lg border border-red-200 bg-red-50 p-4 text-sm text-red-700 shadow-sm">
|
<div className="mb-4 rounded-lg border border-red-200 bg-red-50 p-4 text-sm text-red-700 shadow-sm flex-shrink-0">
|
||||||
<div className="font-semibold">Не удалось загрузить проекты</div>
|
<div className="font-semibold">Не удалось загрузить проекты</div>
|
||||||
<div className="mt-2 flex flex-wrap items-center justify-between gap-3">
|
<div className="mt-2 flex flex-wrap items-center justify-between gap-3">
|
||||||
<span className="text-red-600">{projectsError}</span>
|
<span className="text-red-600">{projectsError}</span>
|
||||||
@@ -895,7 +895,7 @@ function ProjectPriorityManager({ allProjectsData, currentWeekData, shouldLoad,
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{projectsLoading && (!maxPriority.length && !mediumPriority.length && !lowPriority.length) ? (
|
{projectsLoading && (!maxPriority.length && !mediumPriority.length && !lowPriority.length) ? (
|
||||||
<div className="rounded-lg border border-gray-200 bg-white p-4 text-center text-gray-600 shadow-sm">
|
<div className="rounded-lg border border-gray-200 bg-white p-4 text-center text-gray-600 shadow-sm flex-shrink-0">
|
||||||
Загружаем проекты...
|
Загружаем проекты...
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
@@ -906,7 +906,7 @@ function ProjectPriorityManager({ allProjectsData, currentWeekData, shouldLoad,
|
|||||||
onDragEnd={handleDragEnd}
|
onDragEnd={handleDragEnd}
|
||||||
onDragCancel={handleDragCancel}
|
onDragCancel={handleDragCancel}
|
||||||
>
|
>
|
||||||
<div className="space-y-6">
|
<div className="space-y-6 overflow-y-auto flex-1 min-h-0">
|
||||||
<SortableContext items={maxPriority.map(p => p.name)} strategy={verticalListSortingStrategy}>
|
<SortableContext items={maxPriority.map(p => p.name)} strategy={verticalListSortingStrategy}>
|
||||||
<PrioritySlot
|
<PrioritySlot
|
||||||
title="Максимальный приоритет (1 проект)"
|
title="Максимальный приоритет (1 проект)"
|
||||||
|
|||||||
Reference in New Issue
Block a user