Merge branch 'fix/formResetError' into 'develop'
fix: 🐛 ✨ old values are now kept in form See merge request ldc-web/projets/ldc!101
This commit is contained in:
commit
3d5d93a415
1 changed files with 60 additions and 57 deletions
|
|
@ -30,64 +30,7 @@ export default function AuthenticatedLayout({
|
|||
? localStorage.getItem("vite-ui-collapsed")
|
||||
: null;
|
||||
|
||||
function LayoutContent({
|
||||
title,
|
||||
beforeNode,
|
||||
afterNode,
|
||||
children,
|
||||
}: Omit<AuthenticatedLayoutProps, "children"> & { children: ReactNode }) {
|
||||
const { open } = useSidebar();
|
||||
const [isSm, setIsSm] = useState(false);
|
||||
const sidebarVar = !isSm
|
||||
? open
|
||||
? "var(--sidebar-width)"
|
||||
: "var(--sidebar-width-icon)"
|
||||
: "0px";
|
||||
|
||||
useEffect(() => {
|
||||
const mediaQuery = window.matchMedia("(max-width: 767px)");
|
||||
setIsSm(mediaQuery.matches);
|
||||
|
||||
const handler = (e: MediaQueryListEvent) => setIsSm(e.matches);
|
||||
mediaQuery.addEventListener("change", handler);
|
||||
return () => mediaQuery.removeEventListener("change", handler);
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<>
|
||||
<AppSidebar />
|
||||
<motion.main
|
||||
initial={{ opacity: 0 }}
|
||||
animate={{ opacity: 1 }}
|
||||
exit={{ opacity: 0 }}
|
||||
transition={{ duration: 0.3 }}
|
||||
style={{ maxWidth: `calc(100% - ${sidebarVar})` }}
|
||||
className="relative flex flex-col justify-between transition-[max-width] duration-200 ease-linear w-full px-8 pb-4"
|
||||
>
|
||||
<div className="container flex flex-col justify-between mx-auto">
|
||||
<AppHeader />
|
||||
<div className="flex justify-between items-center py-4">
|
||||
<Head title={title} />
|
||||
<div className="flex justify-start items-center">
|
||||
{beforeNode}
|
||||
<h1
|
||||
className={`scroll-m-20 text-4xl font-extrabold tracking-tight lg:text-5xl${
|
||||
beforeNode ? " ms-2" : ""
|
||||
}`}
|
||||
>
|
||||
{title}
|
||||
</h1>
|
||||
</div>
|
||||
{afterNode}
|
||||
</div>
|
||||
{children}
|
||||
</div>
|
||||
<Toaster />
|
||||
<AppFooter />
|
||||
</motion.main>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<ThemeProvider>
|
||||
|
|
@ -105,3 +48,63 @@ export default function AuthenticatedLayout({
|
|||
</ThemeProvider>
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
function LayoutContent({
|
||||
title,
|
||||
beforeNode,
|
||||
afterNode,
|
||||
children,
|
||||
}: Omit<AuthenticatedLayoutProps, "children"> & { children: ReactNode }) {
|
||||
const { open } = useSidebar();
|
||||
const [isSm, setIsSm] = useState(false);
|
||||
const sidebarVar = !isSm
|
||||
? open
|
||||
? "var(--sidebar-width)"
|
||||
: "var(--sidebar-width-icon)"
|
||||
: "0px";
|
||||
|
||||
useEffect(() => {
|
||||
const mediaQuery = window.matchMedia("(max-width: 767px)");
|
||||
setIsSm(mediaQuery.matches);
|
||||
|
||||
const handler = (e: MediaQueryListEvent) => setIsSm(e.matches);
|
||||
mediaQuery.addEventListener("change", handler);
|
||||
return () => mediaQuery.removeEventListener("change", handler);
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<>
|
||||
<AppSidebar />
|
||||
<motion.main
|
||||
initial={{ opacity: 0 }}
|
||||
animate={{ opacity: 1 }}
|
||||
exit={{ opacity: 0 }}
|
||||
transition={{ duration: 0.3 }}
|
||||
style={{ maxWidth: `calc(100% - ${sidebarVar})` }}
|
||||
className="relative flex flex-col justify-between transition-[max-width] duration-200 ease-linear w-full px-8 pb-4"
|
||||
>
|
||||
<div className="container flex flex-col justify-between mx-auto">
|
||||
<AppHeader />
|
||||
<div className="flex justify-between items-center py-4">
|
||||
<Head title={title} />
|
||||
<div className="flex justify-start items-center">
|
||||
{beforeNode}
|
||||
<h1
|
||||
className={`scroll-m-20 text-4xl font-extrabold tracking-tight lg:text-5xl${
|
||||
beforeNode ? " ms-2" : ""
|
||||
}`}
|
||||
>
|
||||
{title}
|
||||
</h1>
|
||||
</div>
|
||||
{afterNode}
|
||||
</div>
|
||||
{children}
|
||||
</div>
|
||||
<Toaster />
|
||||
<AppFooter />
|
||||
</motion.main>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue