xladmin 0.3.5 → 0.3.7

package/dist/components/layout/ShellContext.d.ts

@@ -5,6 +5,7 @@ type ShellContextValue = {
     pendingPath: string | null;
     pendingView: 'overview' | 'model' | 'generic' | null;
     startPendingNavigation: (path: string, view?: 'overview' | 'model' | 'generic') => void;
+    finishPendingNavigation: (path?: string) => void;
 };
 export declare function ShellContextProvider({ value, children, }: {
     value: ShellContextValue;

package/dist/index.js

@@ -1180,8 +1180,9 @@ function AdminMessageBubble({
         borderRadius: "11px",
         px: 1.5,
         py: 1.125,
-        border: `1px solid ${appearance.borderColor}`,
         backgroundColor: appearance.backgroundColor,
+        backdropFilter: "blur(14px)",
+        WebkitBackdropFilter: "blur(14px)",
         boxShadow: `0 14px 32px ${alpha("#000000", 0.22)}`,
         transform: item.leaving ? "translateX(24px) scale(0.98)" : "translateX(0) scale(1)",
         opacity: item.leaving ? 0 : 1,
@@ -1223,7 +1224,7 @@ function AdminMessageBubble({
               fontSize: 14,
               lineHeight: 1.35,
               fontWeight: 500,
-              color: "text.primary",
+              color: appearance.textColor,
               wordBreak: "break-word",
               flex: 1,
               display: "flex",
@@ -1241,27 +1242,27 @@ function getBubbleAppearance(theme, kind) {
   if (kind === "success") {
     return {
       icon: CheckCircleOutlineIcon,
-      borderColor: alpha(theme.palette.success.main, 0.62),
-      backgroundColor: alpha(theme.palette.success.main, 0.26),
-      iconColor: theme.palette.success.main,
-      iconBackgroundColor: alpha(theme.palette.success.main, 0.3)
+      backgroundColor: alpha(theme.palette.success.main, 0.6),
+      iconColor: theme.palette.common.white,
+      iconBackgroundColor: alpha(theme.palette.common.white, 0.14),
+      textColor: theme.palette.common.white
     };
   }
   if (kind === "error") {
     return {
       icon: ErrorOutlineIcon,
-      borderColor: alpha(theme.palette.error.main, 0.42),
-      backgroundColor: alpha(theme.palette.error.main, 0.14),
-      iconColor: theme.palette.error.main,
-      iconBackgroundColor: alpha(theme.palette.error.main, 0.18)
+      backgroundColor: alpha(theme.palette.error.main, 0.6),
+      iconColor: theme.palette.common.white,
+      iconBackgroundColor: alpha(theme.palette.common.white, 0.14),
+      textColor: theme.palette.common.white
     };
   }
   return {
     icon: InfoOutlinedIcon,
-    borderColor: alpha(theme.palette.info.main, 0.42),
-    backgroundColor: alpha(theme.palette.info.main, 0.14),
-    iconColor: theme.palette.info.main,
-    iconBackgroundColor: alpha(theme.palette.info.main, 0.18)
+    backgroundColor: alpha(theme.palette.info.main, 0.6),
+    iconColor: theme.palette.common.white,
+    iconBackgroundColor: alpha(theme.palette.common.white, 0.14),
+    textColor: theme.palette.common.white
   };
 }
 
@@ -1371,7 +1372,7 @@ function FormDialog({
 }
 
 // src/components/OverviewPage.tsx
-import { useEffect as useEffect7, useMemo as useMemo7, useState as useState7 } from "react";
+import { useEffect as useEffect7, useLayoutEffect, useMemo as useMemo7, useState as useState7 } from "react";
 import { Alert as Alert3, Box as Box6, Grid, Paper as Paper4, Skeleton as Skeleton2, Stack as Stack6 } from "@mui/material";
 
 // src/hooks/useAdminDocumentTitle.ts
@@ -1402,6 +1403,31 @@ function useAdminData() {
   return useContext4(AdminDataContext);
 }
 
+// src/components/layout/ShellContext.tsx
+import { createContext as createContext5, useContext as useContext5 } from "react";
+import { jsx as jsx7 } from "react/jsx-runtime";
+var defaultShellContextValue = {
+  isMobile: false,
+  openMobileSidebar: () => {
+  },
+  pendingPath: null,
+  pendingView: null,
+  startPendingNavigation: () => {
+  },
+  finishPendingNavigation: () => {
+  }
+};
+var ShellContext = createContext5(defaultShellContextValue);
+function ShellContextProvider({
+  value,
+  children
+}) {
+  return /* @__PURE__ */ jsx7(ShellContext.Provider, { value, children });
+}
+function useShellContext() {
+  return useContext5(ShellContext);
+}
+
 // src/components/ModelsBlocks.tsx
 import { memo as memo2, useMemo as useMemo6 } from "react";
 import { Box as Box4, Stack as Stack4, useMediaQuery, useTheme as useTheme2 } from "@mui/material";
@@ -1420,10 +1446,10 @@ import {
 
 // src/components/models-blocks/BlockTitle.tsx
 import { Stack as Stack2, Typography as Typography2 } from "@mui/material";
-import { jsx as jsx7, jsxs as jsxs4 } from "react/jsx-runtime";
+import { jsx as jsx8, jsxs as jsxs4 } from "react/jsx-runtime";
 function BlockTitle({ block, compact = false }) {
   return /* @__PURE__ */ jsxs4(Stack2, { spacing: 0.25, children: [
-    /* @__PURE__ */ jsx7(
+    /* @__PURE__ */ jsx8(
       Typography2,
       {
         variant: compact ? "subtitle1" : "h6",
@@ -1435,7 +1461,7 @@ function BlockTitle({ block, compact = false }) {
         children: block.title
       }
     ),
-    block.description && !compact ? /* @__PURE__ */ jsx7(Typography2, { color: "text.secondary", sx: { fontSize: compact ? 12 : 14, lineHeight: 1.3 }, children: block.description }) : null
+    block.description && !compact ? /* @__PURE__ */ jsx8(Typography2, { color: "text.secondary", sx: { fontSize: compact ? 12 : 14, lineHeight: 1.3 }, children: block.description }) : null
   ] });
 }
 
@@ -1494,10 +1520,10 @@ function getStorageKey(blockSlug) {
 }
 
 // src/components/NavLink.tsx
-import { jsx as jsx8 } from "react/jsx-runtime";
+import { jsx as jsx9 } from "react/jsx-runtime";
 function NavLink({ href, children, style, title, onClick, router }) {
   const resolvedRouter = useAdminRouter(router);
-  return /* @__PURE__ */ jsx8(
+  return /* @__PURE__ */ jsx9(
     "a",
     {
       href,
@@ -1513,7 +1539,7 @@ function NavLink({ href, children, style, title, onClick, router }) {
 }
 
 // src/components/models-blocks/DashboardModelsBlock.tsx
-import { jsx as jsx9, jsxs as jsxs5 } from "react/jsx-runtime";
+import { jsx as jsx10, jsxs as jsxs5 } from "react/jsx-runtime";
 function DashboardModelsBlock({ block, basePath }) {
   const [isExpanded, setIsExpanded] = useBlockExpandedState(block.slug, block.default_expanded);
   return /* @__PURE__ */ jsxs5(
@@ -1532,10 +1558,10 @@ function DashboardModelsBlock({ block, basePath }) {
         }
       },
       children: [
-        /* @__PURE__ */ jsx9(
+        /* @__PURE__ */ jsx10(
           AccordionSummary,
           {
-            expandIcon: block.collapsible ? /* @__PURE__ */ jsx9(ExpandMoreIcon, { fontSize: "small" }) : void 0,
+            expandIcon: block.collapsible ? /* @__PURE__ */ jsx10(ExpandMoreIcon, { fontSize: "small" }) : void 0,
             sx: {
               minHeight: "48px",
               pr: 1.75,
@@ -1557,15 +1583,15 @@ function DashboardModelsBlock({ block, basePath }) {
                 mb: 1.05
               }
             },
-            children: /* @__PURE__ */ jsx9(BlockTitle, { block })
+            children: /* @__PURE__ */ jsx10(BlockTitle, { block })
           }
         ),
-        /* @__PURE__ */ jsx9(AccordionDetails, { sx: { px: 1.35, pb: 1.35, pt: 0 }, children: /* @__PURE__ */ jsx9(Stack3, { spacing: 0.5, sx: { px: 0.4 }, children: block.models.map((model) => /* @__PURE__ */ jsx9(
+        /* @__PURE__ */ jsx10(AccordionDetails, { sx: { px: 1.35, pb: 1.35, pt: 0 }, children: /* @__PURE__ */ jsx10(Stack3, { spacing: 0.5, sx: { px: 0.4 }, children: block.models.map((model) => /* @__PURE__ */ jsx10(
           NavLink,
           {
             href: `${basePath}/${model.slug}`,
             style: { textDecoration: "none", display: "block" },
-            children: /* @__PURE__ */ jsx9(
+            children: /* @__PURE__ */ jsx10(
               ButtonBase,
               {
                 sx: {
@@ -1575,7 +1601,7 @@ function DashboardModelsBlock({ block, basePath }) {
                   borderRadius: "8px",
                   overflow: "hidden"
                 },
-                children: /* @__PURE__ */ jsx9(
+                children: /* @__PURE__ */ jsx10(
                   ListItemButton,
                   {
                     sx: {
@@ -1584,7 +1610,7 @@ function DashboardModelsBlock({ block, basePath }) {
                       px: 1.25,
                       py: 0.4
                     },
-                    children: /* @__PURE__ */ jsx9(ListItemText, { primary: model.title })
+                    children: /* @__PURE__ */ jsx10(ListItemText, { primary: model.title })
                   }
                 )
               }
@@ -1609,7 +1635,7 @@ import {
   ListItemText as ListItemText2,
   Paper as Paper2
 } from "@mui/material";
-import { jsx as jsx10, jsxs as jsxs6 } from "react/jsx-runtime";
+import { jsx as jsx11, jsxs as jsxs6 } from "react/jsx-runtime";
 function SidebarModelsBlock({ block, basePath, activeModelSlug, onModelNavigate }) {
   const [isExpanded, setIsExpanded] = useBlockExpandedState(block.slug, block.default_expanded);
   if (block.collapsible) {
@@ -1629,10 +1655,10 @@ function SidebarModelsBlock({ block, basePath, activeModelSlug, onModelNavigate
           }
         },
         children: [
-          /* @__PURE__ */ jsx10(
+          /* @__PURE__ */ jsx11(
             AccordionSummary2,
             {
-              expandIcon: /* @__PURE__ */ jsx10(ExpandMoreIcon2, { fontSize: "small" }),
+              expandIcon: /* @__PURE__ */ jsx11(ExpandMoreIcon2, { fontSize: "small" }),
               sx: {
                 minHeight: "42px",
                 pr: 1.25,
@@ -1648,10 +1674,10 @@ function SidebarModelsBlock({ block, basePath, activeModelSlug, onModelNavigate
                   my: 0
                 }
               },
-              children: /* @__PURE__ */ jsx10(BlockTitle, { block, compact: true })
+              children: /* @__PURE__ */ jsx11(BlockTitle, { block, compact: true })
             }
           ),
-          /* @__PURE__ */ jsx10(AccordionDetails2, { sx: { p: 0 }, children: /* @__PURE__ */ jsx10(
+          /* @__PURE__ */ jsx11(AccordionDetails2, { sx: { p: 0 }, children: /* @__PURE__ */ jsx11(
             SidebarModelsList,
             {
               models: block.models,
@@ -1673,8 +1699,8 @@ function SidebarModelsBlock({ block, basePath, activeModelSlug, onModelNavigate
         overflow: "hidden"
       },
       children: [
-        /* @__PURE__ */ jsx10(Box3, { sx: { px: 1.25, py: 1 }, children: /* @__PURE__ */ jsx10(BlockTitle, { block, compact: true }) }),
-        /* @__PURE__ */ jsx10(
+        /* @__PURE__ */ jsx11(Box3, { sx: { px: 1.25, py: 1 }, children: /* @__PURE__ */ jsx11(BlockTitle, { block, compact: true }) }),
+        /* @__PURE__ */ jsx11(
           SidebarModelsList,
           {
             models: block.models,
@@ -1688,16 +1714,16 @@ function SidebarModelsBlock({ block, basePath, activeModelSlug, onModelNavigate
   );
 }
 function SidebarModelsList({ models, basePath, activeModelSlug, onModelNavigate }) {
-  return /* @__PURE__ */ jsx10(List, { dense: true, disablePadding: true, sx: { display: "flex", flexDirection: "column", gap: 0.5, p: 1.35 }, children: models.map((model) => {
+  return /* @__PURE__ */ jsx11(List, { dense: true, disablePadding: true, sx: { display: "flex", flexDirection: "column", gap: 0.5, p: 1.35 }, children: models.map((model) => {
     const href = `${basePath}/${model.slug}`;
     const isActive = activeModelSlug === model.slug;
-    return /* @__PURE__ */ jsx10(
+    return /* @__PURE__ */ jsx11(
       NavLink,
       {
         href,
         style: { textDecoration: "none", display: "block" },
         onClick: () => onModelNavigate == null ? void 0 : onModelNavigate(href),
-        children: /* @__PURE__ */ jsx10(
+        children: /* @__PURE__ */ jsx11(
           ListItemButton2,
           {
             selected: isActive,
@@ -1716,7 +1742,7 @@ function SidebarModelsList({ models, basePath, activeModelSlug, onModelNavigate
                 backgroundColor: "rgba(255, 255, 255, 0.2)"
               }
             },
-            children: /* @__PURE__ */ jsx10(ListItemText2, { primary: model.title })
+            children: /* @__PURE__ */ jsx11(ListItemText2, { primary: model.title })
           }
         )
       },
@@ -1726,7 +1752,7 @@ function SidebarModelsList({ models, basePath, activeModelSlug, onModelNavigate
 }
 
 // src/components/ModelsBlocks.tsx
-import { jsx as jsx11 } from "react/jsx-runtime";
+import { jsx as jsx12 } from "react/jsx-runtime";
 var ModelsBlocks = memo2(function ModelsBlocks2({
   basePath,
   models,
@@ -1757,7 +1783,7 @@ var ModelsBlocks = memo2(function ModelsBlocks2({
     return distributeBlocksByHeight(normalizedBlocks, columnCount);
   }, [isMdUp, isXlUp, normalizedBlocks]);
   if (variant === "sidebar") {
-    return /* @__PURE__ */ jsx11(Stack4, { spacing: 1, children: normalizedBlocks.map((block) => /* @__PURE__ */ jsx11(
+    return /* @__PURE__ */ jsx12(Stack4, { spacing: 1, children: normalizedBlocks.map((block) => /* @__PURE__ */ jsx12(
       SidebarModelsBlock,
       {
         block,
@@ -1768,7 +1794,7 @@ var ModelsBlocks = memo2(function ModelsBlocks2({
       block.slug
     )) });
   }
-  return /* @__PURE__ */ jsx11(Box4, { sx: { display: "flex", gap: 2, alignItems: "flex-start" }, children: dashboardColumns.map((column, columnIndex) => /* @__PURE__ */ jsx11(Box4, { sx: { flex: 1, minWidth: 0 }, children: /* @__PURE__ */ jsx11(Stack4, { spacing: 2, children: column.map((block) => /* @__PURE__ */ jsx11(DashboardModelsBlock, { block, basePath }, block.slug)) }) }, columnIndex)) });
+  return /* @__PURE__ */ jsx12(Box4, { sx: { display: "flex", gap: 2, alignItems: "flex-start" }, children: dashboardColumns.map((column, columnIndex) => /* @__PURE__ */ jsx12(Box4, { sx: { flex: 1, minWidth: 0 }, children: /* @__PURE__ */ jsx12(Stack4, { spacing: 2, children: column.map((block) => /* @__PURE__ */ jsx12(DashboardModelsBlock, { block, basePath }, block.slug)) }) }, columnIndex)) });
 });
 function distributeBlocksByHeight(blocks, columnCount) {
   const columns = Array.from({ length: columnCount }, () => []);
@@ -1795,31 +1821,6 @@ import MenuIcon from "@mui/icons-material/Menu";
 import { Box as Box5 } from "@mui/material";
 import ExpandMoreIcon3 from "@mui/icons-material/ExpandMore";
 import { Alert as Alert2, Collapse, IconButton, Paper as Paper3, Skeleton, Stack as Stack5, Typography as Typography3 } from "@mui/material";
-
-// src/components/layout/ShellContext.tsx
-import { createContext as createContext5, useContext as useContext5 } from "react";
-import { jsx as jsx12 } from "react/jsx-runtime";
-var defaultShellContextValue = {
-  isMobile: false,
-  openMobileSidebar: () => {
-  },
-  pendingPath: null,
-  pendingView: null,
-  startPendingNavigation: () => {
-  }
-};
-var ShellContext = createContext5(defaultShellContextValue);
-function ShellContextProvider({
-  value,
-  children
-}) {
-  return /* @__PURE__ */ jsx12(ShellContext.Provider, { value, children });
-}
-function useShellContext() {
-  return useContext5(ShellContext);
-}
-
-// src/components/layout/MainHeader.tsx
 import { jsx as jsx13, jsxs as jsxs7 } from "react/jsx-runtime";
 var MAIN_HEADER_PADDING_X = 2.5;
 var MAIN_HEADER_PADDING_T = 1.35;
@@ -1979,6 +1980,7 @@ var inFlightModelsRequest = null;
 function OverviewPage({ client, basePath }) {
   const t = useAdminTranslation();
   useAdminDocumentTitle(t("admin_title"), t("overview_title"));
+  const { pendingPath, finishPendingNavigation } = useShellContext();
   const adminData = useAdminData();
   const shellModelsResponse = useMemo7(() => {
     if (adminData.models.length === 0 && adminData.blocks.length === 0) {
@@ -2032,6 +2034,18 @@ function OverviewPage({ client, basePath }) {
       isMounted = false;
     };
   }, [client, shellModelsResponse, t]);
+  useLayoutEffect(() => {
+    if (pendingPath === null) {
+      return;
+    }
+    if (isLoading) {
+      return;
+    }
+    if (!data && !error) {
+      return;
+    }
+    finishPendingNavigation();
+  }, [data, error, finishPendingNavigation, isLoading, pendingPath]);
   if (isLoading && !data) {
     return /* @__PURE__ */ jsx14(OverviewPageSkeleton, {});
   }
@@ -2094,6 +2108,7 @@ function OverviewPageSkeleton() {
 }
 
 // src/components/ModelPage.tsx
+import { useLayoutEffect as useLayoutEffect3 } from "react";
 import AddIcon from "@mui/icons-material/Add";
 import ChevronLeftIcon from "@mui/icons-material/ChevronLeft";
 import ChevronRightIcon from "@mui/icons-material/ChevronRight";
@@ -2713,7 +2728,7 @@ var SearchField = memo5(function SearchField2({
 });
 
 // src/components/model-page/useModelPageController.ts
-import { useCallback as useCallback5, useEffect as useEffect10, useMemo as useMemo9, useRef as useRef4, useState as useState10 } from "react";
+import { useCallback as useCallback5, useEffect as useEffect10, useLayoutEffect as useLayoutEffect2, useMemo as useMemo9, useRef as useRef4, useState as useState10 } from "react";
 
 // src/cache.ts
 var MAX_CACHE_ENTRIES = 100;
@@ -2899,7 +2914,7 @@ function useModelPageController({
   useEffect10(() => {
     setPageInput(String(currentPage));
   }, [currentPage]);
-  useEffect10(() => {
+  useLayoutEffect2(() => {
     var _a2, _b2, _c2, _d2;
     if (previousSlugRef.current === slug) {
       return;
@@ -2939,7 +2954,7 @@ function useModelPageController({
     setPendingDeleteScope(null);
     setPendingDeleteMode("single");
   }, [client, locationSearch, slug]);
-  useEffect10(() => {
+  useLayoutEffect2(() => {
     var _a2, _b2;
     const nextSearchParams = new URLSearchParams(locationSearch);
     const nextQuery = (_a2 = nextSearchParams.get("q")) != null ? _a2 : "";
@@ -3393,6 +3408,7 @@ function ModelPage({ client, basePath, slug, router, renderBeforePagination }) {
   const location = useAdminLocation(resolvedRouter);
   const theme = useTheme3();
   const isMobile = useMediaQuery2(theme.breakpoints.down("md"));
+  const { pendingPath, finishPendingNavigation } = useShellContext();
   const controller = useModelPageController({
     client,
     slug,
@@ -3401,6 +3417,21 @@ function ModelPage({ client, basePath, slug, router, renderBeforePagination }) {
     router: resolvedRouter,
     t
   });
+  useLayoutEffect3(() => {
+    if (pendingPath === null) {
+      return;
+    }
+    if (controller.isLoading) {
+      return;
+    }
+    if (!controller.meta && !controller.error) {
+      return;
+    }
+    if (controller.meta && controller.meta.slug !== slug) {
+      return;
+    }
+    finishPendingNavigation(location.pathname);
+  }, [controller.error, controller.isLoading, controller.meta, finishPendingNavigation, location.pathname, pendingPath, slug]);
   useAdminDocumentTitle(t("admin_title"), (_b = (_a = controller.meta) == null ? void 0 : _a.title) != null ? _b : slug);
   if (!controller.isLoading && controller.error && !controller.data) {
     return /* @__PURE__ */ jsx20(Alert5, { severity: "error", children: controller.error });
@@ -3825,6 +3856,7 @@ function resolveFieldSortable(field) {
 }
 
 // src/components/ObjectPage.tsx
+import { useLayoutEffect as useLayoutEffect5 } from "react";
 import ArrowBackIcon from "@mui/icons-material/ArrowBack";
 import MoreVertIcon2 from "@mui/icons-material/MoreVert";
 import { Alert as Alert6, Box as Box13, Button as Button5, IconButton as IconButton4, Menu as Menu2, MenuItem as MenuItem3, Paper as Paper9, Stack as Stack13, Typography as Typography7, useMediaQuery as useMediaQuery3 } from "@mui/material";
@@ -3942,7 +3974,7 @@ var ReadonlyObjectField = memo7(function ReadonlyObjectField2({
 });
 
 // src/components/object-page/useObjectPageController.ts
-import { useCallback as useCallback7, useEffect as useEffect11, useMemo as useMemo10, useState as useState11 } from "react";
+import { useCallback as useCallback7, useLayoutEffect as useLayoutEffect4, useMemo as useMemo10, useState as useState11 } from "react";
 
 // src/utils/isDeepEqual.ts
 function isDeepEqual(left, right) {
@@ -4006,7 +4038,7 @@ function useObjectPageController({
   const [isDeletePreviewLoading, setIsDeletePreviewLoading] = useState11(false);
   const [deletePreviewError, setDeletePreviewError] = useState11(null);
   const [actionsAnchorEl, setActionsAnchorEl] = useState11(null);
-  useEffect11(() => {
+  useLayoutEffect4(() => {
     var _a2;
     let isMounted = true;
     const bucket = getClientCacheBucket(client);
@@ -4223,6 +4255,7 @@ function ObjectPage({ client, slug, id, router }) {
   const pathname = location.pathname;
   const theme = useTheme4();
   const isPhone = useMediaQuery3(theme.breakpoints.down("sm"));
+  const { pendingPath, finishPendingNavigation } = useShellContext();
   const listPath = pathname.split("/").slice(0, -1).join("/");
   const controller = useObjectPageController({
     client,
@@ -4232,6 +4265,21 @@ function ObjectPage({ client, slug, id, router }) {
     router: resolvedRouter,
     t
   });
+  useLayoutEffect5(() => {
+    if (pendingPath === null) {
+      return;
+    }
+    if (controller.isLoading) {
+      return;
+    }
+    if (!controller.meta && !controller.error) {
+      return;
+    }
+    if (controller.meta && controller.meta.slug !== slug) {
+      return;
+    }
+    finishPendingNavigation(pathname);
+  }, [controller.error, controller.isLoading, controller.meta, finishPendingNavigation, pathname, pendingPath, slug]);
   useAdminDocumentTitle(t("admin_title"), (_b = (_a = controller.meta) == null ? void 0 : _a.title) != null ? _b : slug, controller.objectTitle);
   if (controller.isLoading && !controller.data) {
     return /* @__PURE__ */ jsx24(ObjectPageSkeleton, {});
@@ -4449,7 +4497,7 @@ function ObjectPage({ client, slug, id, router }) {
 }
 
 // src/components/Shell.tsx
-import { useEffect as useEffect12, useMemo as useMemo11, useState as useState12 } from "react";
+import { useEffect as useEffect11, useMemo as useMemo11, useState as useState12 } from "react";
 import { Box as Box16, CssBaseline, Drawer, GlobalStyles, Stack as Stack14, useMediaQuery as useMediaQuery4 } from "@mui/material";
 import { ThemeProvider } from "@mui/material/styles";
 
@@ -4584,13 +4632,9 @@ var defaultAdminTheme = createTheme({
 import { Box as Box14 } from "@mui/material";
 import { jsx as jsx25, jsxs as jsxs17 } from "react/jsx-runtime";
 function Main({ children }) {
-  const { pathname } = useAdminLocation();
+  useAdminLocation();
   const { pendingPath, pendingView } = useShellContext();
-  const normalizeAdminPath2 = (path) => {
-    const normalizedPath = path.endsWith("/") && path !== "/" ? path.slice(0, -1) : path;
-    return normalizedPath.replace(/^\/(ru|en)(?=\/|$)/, "") || "/";
-  };
-  const isPendingNavigation = pendingPath !== null && normalizeAdminPath2(pathname) !== normalizeAdminPath2(pendingPath);
+  const isPendingNavigation = pendingPath !== null;
   return /* @__PURE__ */ jsxs17(
     Box14,
     {
@@ -4707,23 +4751,14 @@ function Shell({ client, models, blocks, basePath, locale, children, theme, rout
   const [isMobileSidebarOpen, setIsMobileSidebarOpen] = useState12(false);
   const [pendingPath, setPendingPath] = useState12(null);
   const [pendingView, setPendingView] = useState12(null);
-  useEffect12(() => {
+  useEffect11(() => {
     if (isDesktopSidebar) {
       setIsMobileSidebarOpen(false);
     }
   }, [isDesktopSidebar]);
-  useEffect12(() => {
+  useEffect11(() => {
     setIsMobileSidebarOpen(false);
   }, [pathname]);
-  useEffect12(() => {
-    if (pendingPath === null) {
-      return;
-    }
-    if (normalizeAdminPath(pathname) === normalizeAdminPath(pendingPath)) {
-      setPendingPath(null);
-      setPendingView(null);
-    }
-  }, [pathname, pendingPath]);
   const shellContextValue = useMemo11(() => ({
     isMobile: !isDesktopSidebar,
     openMobileSidebar: () => setIsMobileSidebarOpen(true),
@@ -4735,6 +4770,16 @@ function Shell({ client, models, blocks, basePath, locale, children, theme, rout
       }
       setPendingPath(path);
       setPendingView(view);
+    },
+    finishPendingNavigation: (path) => {
+      if (pendingPath === null) {
+        return;
+      }
+      if (path && normalizeAdminPath(path) !== normalizeAdminPath(pendingPath)) {
+        return;
+      }
+      setPendingPath(null);
+      setPendingView(null);
     }
   }), [isDesktopSidebar, pathname, pendingPath, pendingView]);
   return /* @__PURE__ */ jsx27(AdminRouterProvider, { router: resolvedRouter, children: /* @__PURE__ */ jsx27(ThemeProvider, { theme: activeTheme, children: /* @__PURE__ */ jsx27(AdminLocaleProvider, { locale, children: /* @__PURE__ */ jsx27(AdminDataProvider, { value: { locale: locale === "en" ? "en" : "ru", models, blocks }, children: /* @__PURE__ */ jsx27(ShellContextProvider, { value: shellContextValue, children: /* @__PURE__ */ jsxs19(AdminMessageProvider, { children: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xladmin",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "description": "Framework-agnostic React + MUI admin frontend for xladmin.",
   "license": "MIT",
   "type": "module",