@compill/admin 1.0.63 → 1.0.65

package/index.cjs.js

@@ -2894,8 +2894,8 @@ function MenuItem(_a) {
     } = _a,
     props = __rest$1(_a, ["icon", "path", "depth", "darkMode", "subMenu", "children"]);
   const location = reactRouterDom.useLocation();
-  const selected = location.pathname.startsWith(path.startsWith("/") ? path : `/${path}`);
-  // const match = useMatch("/" + path)// + "/*")
+  const selected = path == "/" ? location.pathname == "/" : location.pathname.startsWith(path.startsWith("/") ? path : `/${path}`);
+  const match = reactRouterDom.useMatch("/" + path) != null;
   // const selected = match != null
   return jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [jsxRuntime.jsxs(reactRouterDom.Link, {
@@ -2926,7 +2926,7 @@ function MenuItem(_a) {
           path: icon,
           opacity: selected ? "100" : "60"
         }), children]
-      })), selected && jsxRuntime.jsx("div", {
+      })), match && jsxRuntime.jsx("div", {
         position: "absolute",
         bgColor: darkMode ? "white" : "black",
         bgOpacity: "90",

package/index.esm.js

@@ -4,7 +4,7 @@ import Link from 'next/link';
 import React, { useRef, useCallback, useContext as useContext$2, useLayoutEffect, useEffect, createContext } from 'react';
 import { INVALIDATE_API } from '@compill/admin-api';
 import { useApiMutation, useMutate, useInvalidateMutation, useApiQuery, useInvalidateQuery, useInvalidateParentMutation, useApiQueries } from '@compill/api';
-import { useNavigate, useParams, Outlet, useLocation, Link as Link$1 } from 'react-router-dom';
+import { useNavigate, useParams, Outlet, useLocation, useMatch, Link as Link$1 } from 'react-router-dom';
 import { toast } from 'react-toastify';
 import { SubmitButton, FormProvider, TextArea, FormRenderer, mergeInitialFormValues, FieldLabel } from '@compill/form';
 import { useFormikContext, Field, Formik, Form } from 'formik';
@@ -2884,8 +2884,8 @@ function MenuItem(_a) {
     } = _a,
     props = __rest$1(_a, ["icon", "path", "depth", "darkMode", "subMenu", "children"]);
   const location = useLocation();
-  const selected = location.pathname.startsWith(path.startsWith("/") ? path : `/${path}`);
-  // const match = useMatch("/" + path)// + "/*")
+  const selected = path == "/" ? location.pathname == "/" : location.pathname.startsWith(path.startsWith("/") ? path : `/${path}`);
+  const match = useMatch("/" + path) != null;
   // const selected = match != null
   return jsxs(Fragment, {
     children: [jsxs(Link$1, {
@@ -2916,7 +2916,7 @@ function MenuItem(_a) {
           path: icon,
           opacity: selected ? "100" : "60"
         }), children]
-      })), selected && jsx("div", {
+      })), match && jsx("div", {
         position: "absolute",
         bgColor: darkMode ? "white" : "black",
         bgOpacity: "90",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@compill/admin",
-    "version": "1.0.63",
+    "version": "1.0.65",
     "module": "./index.esm.js",
     "main": "./index.cjs.js"
 }