fix(ui): двойной Sidebar на реестре задач и карточке задачи — TaskView/TaskDetail рендерили свой Sidebar поверх AppShell
This commit is contained in:
@@ -2,7 +2,6 @@ import { useState, useEffect, useRef, useMemo, useCallback } from 'react';
|
|||||||
import { useParams, useLocation } from 'wouter';
|
import { useParams, useLocation } from 'wouter';
|
||||||
import { useQuery, useMutation } from '@tanstack/react-query';
|
import { useQuery, useMutation } from '@tanstack/react-query';
|
||||||
import Layout from '@/components/Layout';
|
import Layout from '@/components/Layout';
|
||||||
import { Sidebar } from '@/components/Sidebar';
|
|
||||||
import { Button } from '@/components/ui/button';
|
import { Button } from '@/components/ui/button';
|
||||||
import { ArrowLeft } from 'lucide-react';
|
import { ArrowLeft } from 'lucide-react';
|
||||||
import { Link } from 'wouter';
|
import { Link } from 'wouter';
|
||||||
@@ -696,7 +695,8 @@ const TaskDetail = () => {
|
|||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Sidebar>
|
// Хром (Sidebar) предоставляет AppShell — здесь только контент страницы
|
||||||
|
<>
|
||||||
<div className="flex flex-col h-full overflow-hidden">
|
<div className="flex flex-col h-full overflow-hidden">
|
||||||
{/* Offline cache banner */}
|
{/* Offline cache banner */}
|
||||||
{isUsingOfflineCache && cacheTimestamp && (
|
{isUsingOfflineCache && cacheTimestamp && (
|
||||||
@@ -801,7 +801,7 @@ const TaskDetail = () => {
|
|||||||
/>
|
/>
|
||||||
|
|
||||||
{/* (debug overlay removed) */}
|
{/* (debug overlay removed) */}
|
||||||
</Sidebar>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import { apiRequest, queryClient } from '@/lib/queryClient';
|
|||||||
import { useToast } from '@/hooks/use-toast';
|
import { useToast } from '@/hooks/use-toast';
|
||||||
import { useEvents } from '@/hooks/useEvents';
|
import { useEvents } from '@/hooks/useEvents';
|
||||||
import Layout from '@/components/Layout';
|
import Layout from '@/components/Layout';
|
||||||
import { Sidebar } from '@/components/Sidebar';
|
|
||||||
import { Button } from '@/components/ui/button';
|
import { Button } from '@/components/ui/button';
|
||||||
import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
|
import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
|
||||||
import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog';
|
import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog';
|
||||||
@@ -402,7 +401,8 @@ const TaskView = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Sidebar>
|
// Хром (Sidebar) предоставляет AppShell — здесь только контент страницы
|
||||||
|
<>
|
||||||
<div className="flex flex-col h-full overflow-hidden">
|
<div className="flex flex-col h-full overflow-hidden">
|
||||||
{/* Компактная шапка */}
|
{/* Компактная шапка */}
|
||||||
<div className="border-b bg-background px-3 py-2">
|
<div className="border-b bg-background px-3 py-2">
|
||||||
@@ -589,7 +589,7 @@ const TaskView = () => {
|
|||||||
</div>
|
</div>
|
||||||
</DialogContent>
|
</DialogContent>
|
||||||
</Dialog>
|
</Dialog>
|
||||||
</Sidebar>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user