Merge commit 'c2711a7ad4513c8d4708934fa0abe3003b57baf7'
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
import React, { useEffect } from 'react';
|
||||
import { usePathname, useRouter } from "next/navigation";
|
||||
import { useQueryClient } from "@tanstack/react-query";
|
||||
import { BaseLayout } from "@common/components";
|
||||
import { NoFooterLayout } from "@common/components";
|
||||
import type { MenuItem } from "@/entities/menu";
|
||||
import { useMenuStore } from "@/shared/lib";
|
||||
import useStore from '../store/useStore';
|
||||
@@ -33,12 +33,12 @@ export default function MapLayout({
|
||||
};
|
||||
|
||||
return (
|
||||
<BaseLayout
|
||||
<NoFooterLayout
|
||||
queryClient={queryClient}
|
||||
currentPath={pathname ?? ""}
|
||||
handleMenuClick={handleMenuClick}
|
||||
>
|
||||
{children}
|
||||
</BaseLayout>
|
||||
</NoFooterLayout>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -122,8 +122,7 @@ function Gis({
|
||||
targetLayerTypes = [],
|
||||
orderedLayers = [],
|
||||
checkInterval = 3000,
|
||||
height: height = "h-[calc(100vh-10rem)]",
|
||||
onOpenPopup = () => {},
|
||||
height: height = "h-[calc(100vh-5rem)]",
|
||||
}) {
|
||||
const mapRef = useRef();
|
||||
const [mapObject, setMapObject] = useState({});
|
||||
|
||||
Reference in New Issue
Block a user