@compill/admin 1.0.64 → 1.0.66

package/index.cjs.js

@@ -2895,7 +2895,7 @@ function MenuItem(_a) {
     props = __rest$1(_a, ["icon", "path", "depth", "darkMode", "subMenu", "children"]);
   const location = reactRouterDom.useLocation();
   const selected = path == "/" ? location.pathname == "/" : location.pathname.startsWith(path.startsWith("/") ? path : `/${path}`);
-  // const match = useMatch("/" + 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';
@@ -2885,7 +2885,7 @@ function MenuItem(_a) {
     props = __rest$1(_a, ["icon", "path", "depth", "darkMode", "subMenu", "children"]);
   const location = useLocation();
   const selected = path == "/" ? location.pathname == "/" : location.pathname.startsWith(path.startsWith("/") ? path : `/${path}`);
-  // const match = useMatch("/" + 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.64",
+    "version": "1.0.66",
     "module": "./index.esm.js",
     "main": "./index.cjs.js"
 }

package/src/index.d.ts

@@ -20,7 +20,7 @@ export * from "./lib/json/types/TabbedView";
 export * from "./lib/json/types/TableView";
 export * from "./lib/layout/AdminLayout";
 export * from "./lib/layout/ButtonBar";
-export { MenuConfig } from "./lib/layout/Menu";
+export * from "./lib/layout/Menu";
 export * from "./lib/modal/AttachDialog";
 export * from "./lib/modal/FormActionDialog";
 export * from "./lib/page/PageContainer";

package/src/lib/layout/Menu.d.ts

@@ -1,19 +1,19 @@
 /// <reference types="react" />
 import { ParentComponent, SoperioComponent } from "@soperio/react";
-interface MenuProps extends SoperioComponent, ParentComponent {
+export interface MenuProps extends SoperioComponent, ParentComponent {
     darkMode?: boolean;
     config: MenuConfig;
 }
 export type MenuConfig = MenuItems;
 type MenuItems = (MenuItem | MenuDivider)[];
-type MenuItem = {
+export type MenuItem = {
     type: "item";
     path: string;
     icon?: string;
     label: string;
     children?: MenuItem[];
 };
-type MenuDivider = {
+export type MenuDivider = {
     type: "divider";
     label?: string;
 };
@@ -22,12 +22,4 @@ type MenuDivider = {
  *
  */
 export default function Menu({ darkMode, config, ...props }: MenuProps): JSX.Element;
-interface MenuItemProps extends SoperioComponent, ParentComponent {
-    path: string;
-    depth?: number;
-    icon?: string;
-    darkMode?: boolean;
-    subMenu?: MenuItem[];
-}
-declare function MenuItem({ icon, path, depth, darkMode, subMenu, children, ...props }: MenuItemProps): JSX.Element;
 export {};