muffin-admin 13.5.0 → 13.6.0

package/dist/MuffinAdmin.js

@@ -22,18 +22,22 @@ import { buildProvider, muffinTranslations } from "./i18n";
 import { muffinDarkTheme, muffinLightTheme } from "./themes";
 import { buildAdmin, deepMerge, findBuilder, findIcon, setupAdmin } from "./utils";
 export function MuffinAdmin(_a) {
+    var _b;
     var { lightTheme = muffinLightTheme, darkTheme = muffinDarkTheme } = _a, props = __rest(_a, ["lightTheme", "darkTheme"]);
     const opts = useMuffinAdminOpts();
     const { resources = [], auth, adminProps, apiUrl, locales: backendLocales } = opts;
     document.title = (adminProps === null || adminProps === void 0 ? void 0 : adminProps.title) || "Muffin Admin";
+    // The configured theme is merged into both palettes, otherwise it is lost as soon as
+    // react-admin switches to the dark mode
+    const themeOverride = (_b = props.theme) !== null && _b !== void 0 ? _b : adminProps === null || adminProps === void 0 ? void 0 : adminProps.theme;
     const muffinI18nProvider = buildProvider(backendLocales
         ? Object.fromEntries(Object.entries(muffinTranslations).map(([locale, messages]) => [
             locale,
             deepMerge({}, messages, backendLocales[locale], buildAdmin(["locale", locale]) || {}),
         ]))
         : muffinTranslations);
-    const { basename, authProvider = findBuilder(["auth-provider"])(auth), dataProvider = findBuilder(["data-provider"])(apiUrl), catchAll, dashboard = findBuilder(["dashboard"]), disableTelemetry, error, i18nProvider = muffinI18nProvider, layout = findBuilder(["layout"]), loading, loginPage = findBuilder(["loginpage"]), authCallbackPage, notification, queryClient, requireAuth = auth.required, store = localStorageStore(), ready, theme, defaultTheme, title = "React Admin", } = props;
-    return (_jsx(AdminContext, { authProvider: authProvider, basename: basename, dataProvider: dataProvider, i18nProvider: i18nProvider, store: store, queryClient: queryClient, theme: theme !== null && theme !== void 0 ? theme : adminProps === null || adminProps === void 0 ? void 0 : adminProps.theme, lightTheme: lightTheme, darkTheme: darkTheme, defaultTheme: defaultTheme, children: _jsx(ConfirmationProvider, { children: _jsx(AdminUI, { layout: layout, dashboard: dashboard, disableTelemetry: disableTelemetry, catchAll: catchAll, error: error, title: title, loading: loading, loginPage: loginPage, authCallbackPage: authCallbackPage, notification: notification, requireAuth: requireAuth, ready: ready, children: resources === null || resources === void 0 ? void 0 : resources.map(({ name }) => buildAdmin(["resource", name], { name })) }) }) }));
+    const { basename, authProvider = findBuilder(["auth-provider"])(auth), dataProvider = findBuilder(["data-provider"])(apiUrl), catchAll, dashboard = findBuilder(["dashboard"]), disableTelemetry, error, i18nProvider = muffinI18nProvider, layout = findBuilder(["layout"]), loading, loginPage = findBuilder(["loginpage"]), authCallbackPage, notification, queryClient, requireAuth = auth.required, store = localStorageStore(), ready, defaultTheme, title = "React Admin", } = props;
+    return (_jsx(AdminContext, { authProvider: authProvider, basename: basename, dataProvider: dataProvider, i18nProvider: i18nProvider, store: store, queryClient: queryClient, lightTheme: themeOverride ? deepMerge({}, lightTheme, themeOverride) : lightTheme, darkTheme: themeOverride ? deepMerge({}, darkTheme, themeOverride) : darkTheme, defaultTheme: defaultTheme, children: _jsx(ConfirmationProvider, { children: _jsx(AdminUI, { layout: layout, dashboard: dashboard, disableTelemetry: disableTelemetry, catchAll: catchAll, error: error, title: title, loading: loading, loginPage: loginPage, authCallbackPage: authCallbackPage, notification: notification, requireAuth: requireAuth, ready: ready, children: resources === null || resources === void 0 ? void 0 : resources.map(({ name }) => buildAdmin(["resource", name], { name })) }) }) }));
 }
 setupAdmin(["admin"], MuffinAdmin);
 export function MuffinAdminLayout(props) {

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "13.5.0";
+export declare const VERSION = "13.6.0";

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = "13.5.0";
+export const VERSION = "13.6.0";

package/package.json

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

package/src/MuffinAdmin.tsx

@@ -31,6 +31,9 @@ export function MuffinAdmin({
   const { resources = [], auth, adminProps, apiUrl, locales: backendLocales } = opts
 
   document.title = adminProps?.title || "Muffin Admin"
+  // The configured theme is merged into both palettes, otherwise it is lost as soon as
+  // react-admin switches to the dark mode
+  const themeOverride = props.theme ?? adminProps?.theme
   const muffinI18nProvider = buildProvider(
     backendLocales
       ? Object.fromEntries(
@@ -60,7 +63,6 @@ export function MuffinAdmin({
     requireAuth = auth.required,
     store = localStorageStore(),
     ready,
-    theme,
     defaultTheme,
     title = "React Admin",
   } = props
@@ -73,9 +75,8 @@ export function MuffinAdmin({
       i18nProvider={i18nProvider}
       store={store}
       queryClient={queryClient}
-      theme={theme ?? adminProps?.theme}
-      lightTheme={lightTheme}
-      darkTheme={darkTheme}
+      lightTheme={themeOverride ? deepMerge({}, lightTheme, themeOverride) : lightTheme}
+      darkTheme={themeOverride ? deepMerge({}, darkTheme, themeOverride) : darkTheme}
       defaultTheme={defaultTheme}
     >
       <ConfirmationProvider>

package/src/version.ts

@@ -1 +1 @@
-export const VERSION = "13.5.0"
+export const VERSION = "13.6.0"