@compill/admin 1.0.62 → 1.0.64

package/index.cjs.js

@@ -2893,8 +2893,10 @@ function MenuItem(_a) {
       children
     } = _a,
     props = __rest$1(_a, ["icon", "path", "depth", "darkMode", "subMenu", "children"]);
-  const match = reactRouterDom.useMatch("/" + path); // + "/*")
-  const selected = match != null;
+  const location = reactRouterDom.useLocation();
+  const selected = path == "/" ? location.pathname == "/" : location.pathname.startsWith(path.startsWith("/") ? path : `/${path}`);
+  // const match = useMatch("/" + path)// + "/*")
+  // const selected = match != null
   return jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [jsxRuntime.jsxs(reactRouterDom.Link, {
       to: path,
@@ -2970,7 +2972,8 @@ function Sidebar(_a) {
       borderOpacity: "5",
       children: [logo !== null && logo !== void 0 ? logo : jsxRuntime.jsx(Logo, {
         width: 40,
-        height: 40
+        height: 40,
+        darkMode: darkMode
       }), jsxRuntime.jsx("h1", {
         textSize: "md",
         children: title !== null && title !== void 0 ? title : env.Env.appName()

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, useMatch, Link as Link$1 } from 'react-router-dom';
+import { useNavigate, useParams, Outlet, useLocation, 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';
@@ -2883,8 +2883,10 @@ function MenuItem(_a) {
       children
     } = _a,
     props = __rest$1(_a, ["icon", "path", "depth", "darkMode", "subMenu", "children"]);
-  const match = useMatch("/" + path); // + "/*")
-  const selected = match != null;
+  const location = useLocation();
+  const selected = path == "/" ? location.pathname == "/" : location.pathname.startsWith(path.startsWith("/") ? path : `/${path}`);
+  // const match = useMatch("/" + path)// + "/*")
+  // const selected = match != null
   return jsxs(Fragment, {
     children: [jsxs(Link$1, {
       to: path,
@@ -2960,7 +2962,8 @@ function Sidebar(_a) {
       borderOpacity: "5",
       children: [logo !== null && logo !== void 0 ? logo : jsx(Logo, {
         width: 40,
-        height: 40
+        height: 40,
+        darkMode: darkMode
       }), jsx("h1", {
         textSize: "md",
         children: title !== null && title !== void 0 ? title : Env.appName()

package/package.json

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