Skip to content

Commit b417ce0

Browse files
committed
feat(orgchart): enable mobile scroll, global animation settings, and premium shared-element morph
1 parent 1e75ff0 commit b417ce0

4 files changed

Lines changed: 376 additions & 183 deletions

File tree

‎apps/codebility/app/home/_components/DynamicMainContent.tsx‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"use client";
22

33
import { ReactNode } from "react";
4+
import { usePathname } from "next/navigation";
45
import { useNavStore } from "@/hooks/use-sidebar";
56

67
interface DynamicMainContentProps {
@@ -9,13 +10,16 @@ interface DynamicMainContentProps {
910

1011
export default function DynamicMainContent({ children }: DynamicMainContentProps) {
1112
const { isToggleOpen } = useNavStore();
12-
13-
// Dynamic margin based on sidebar state - only apply on desktop (lg screens and up)
14-
const marginClass = isToggleOpen ? "lg:ml-64" : "lg:ml-20"; // 16rem = ml-64, 5rem = ml-20
15-
13+
const pathname = usePathname();
14+
15+
const isOrgChart = pathname === "/home/orgchart";
16+
17+
18+
const marginClass = isToggleOpen ? "lg:ml-64" : "lg:ml-20";
19+
1620
return (
17-
<main
18-
className={`background-lightsection_darksection flex-1 pt-[60px] overflow-y-auto overflow-x-hidden min-h-screen ${marginClass} transition-all duration-300 ease-in-out`}
21+
<main
22+
className={`background-lightsection_darksection flex-1 pt-[60px] ${isOrgChart ? "lg:overflow-hidden lg:h-[calc(100vh)] overflow-y-auto" : "overflow-y-auto"} overflow-x-hidden h-full ${marginClass} transition-all duration-300 ease-in-out`}
1923
>
2024
{children}
2125
</main>

‎apps/codebility/app/home/admin-controls/ticket-support/_components/TicketManagementView.tsx‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default function TicketManagementView({
3535
codevList,
3636
}: TicketManagementViewProps) {
3737
const router = useRouter();
38-
const { closeNav, toggleNav, isToggleOpen } = useNavStore();
38+
const { } = useNavStore();
3939
const [selectedTicket, setSelectedTicket] = useState<TicketSupport | null>(null);
4040
const [searchQuery, setSearchQuery] = useState("");
4141
const [sortField, setSortField] = useState<SortField>("created_at");
@@ -45,8 +45,6 @@ export default function TicketManagementView({
4545
const [filterAssignedTo, setFilterAssignedTo] = useState<string>("ALL");
4646
const [showArchived, setShowArchived] = useState(false);
4747

48-
const [wasSidebarOpen, setWasSidebarOpen] = useState(false);
49-
5048

5149
useEffect(() => {
5250
if (selectedTicket) {
@@ -130,17 +128,10 @@ export default function TicketManagementView({
130128

131129
const handleTicketSelect = (ticket: TicketSupport) => {
132130
setSelectedTicket(ticket);
133-
setWasSidebarOpen(isToggleOpen);
134-
if (isToggleOpen) {
135-
closeNav();
136-
}
137131
};
138132

139133
const handleCloseSidebar = () => {
140134
setSelectedTicket(null);
141-
if (wasSidebarOpen && !isToggleOpen) {
142-
toggleNav();
143-
}
144135
};
145136

146137
const handleTicketUpdated = () => {

0 commit comments

Comments
 (0)