muffin-admin 9.5.0 → 9.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muffin-admin",
-  "version": "9.5.0",
+  "version": "9.5.2",
   "description": "NPM package for https://github.com/klen/muffin-admin",
   "files": [
     "src",

package/src/MuffinMenu.tsx

@@ -6,7 +6,7 @@ import ListItemIcon from "@mui/material/ListItemIcon"
 import ListItemText from "@mui/material/ListItemText"
 import { matchPath, useLocation } from "react-router-dom"
 
-import { Menu, MenuProps, useBasename, useTranslate } from "react-admin"
+import { Menu, MenuProps, useBasename, useTheme, useTranslate } from "react-admin"
 
 import find from "lodash/find"
 import groupBy from "lodash/groupBy"
@@ -47,19 +47,29 @@ function MenuGroup({ name, resources }: { name: string; resources: AdminResource
   const basename = useBasename()
   const { pathname } = useLocation()
   const match = resources.some(
-    (resource) =>
-      !!matchPath(
-        {
-          path: `${basename}/${resource.name}/*`,
-        },
-        pathname
-      )
+    (resource) => !!matchPath({ path: `${basename}/${resource.name}/*` }, pathname)
   )
   const [groupOpen, setGroupOpen] = useState(match)
+  const theme = useTheme()[0]
+  const colors =
+    theme == "dark"
+      ? {
+          text: "rgba(255, 255, 255, 0.87)",
+          textSecondary: "rgba(255, 255, 255, 0.6)",
+        }
+      : {
+          text: "rgba(0, 0, 0, 0.87)",
+          textSecondary: "rgba(0, 0, 0, 0.6)",
+        }
 
   return (
     <div>
-      <ListItemButton onClick={() => setGroupOpen(!groupOpen)}>
+      <ListItemButton
+        onClick={() => setGroupOpen(!groupOpen)}
+        sx={{
+          color: match ? colors.text : colors.textSecondary,
+        }}
+      >
         {Icon && (
           <ListItemIcon sx={{ minWidth: 40 }}>
             <Icon />

package/src/index.tsx

@@ -37,4 +37,4 @@ export async function initAdmin(prefix = "", containerId: string = "root") {
   )
 }
 
-export const VERSION = "9.5.0"
+export const VERSION = "9.5.2"

package/src/themes.ts

@@ -8,8 +8,8 @@ export const muffinLightTheme: typeof defaultLightTheme = {
       styleOverrides: {
         root: {
           "&.RaMenuItemLink-active": {
-            backgroundColor: "#f0f0f0",
             borderRadius: "4px",
+            backgroundColor: "#f0f0f0",
           },
         },
       },
@@ -25,8 +25,8 @@ export const muffinDarkTheme: typeof defaultDarkTheme = {
       styleOverrides: {
         root: {
           "&.RaMenuItemLink-active": {
-            backgroundColor: "#424242",
             borderRadius: "4px",
+            backgroundColor: "#424242",
           },
         },
       },