@dashadmin/dash-admin 1.3.49 → 1.3.51

package/dist/default-theme/DashThemeContext.js

@@ -25,9 +25,9 @@ const useDashThemeContext = () => {
   return context;
 };
 const DashThemeProvider = ({ extendedOptions, children }) => {
-  const [currentMode, setCurrentMode] = useState(
-    () => document.documentElement.getAttribute("data-theme") || "dark"
-  );
+  const [currentMode, setCurrentMode] = useState(() => {
+    return document.documentElement.getAttribute("data-theme") || "dark";
+  });
   const [themeOptions, setThemeOptions] = useState(() => {
     const initialTenantSettings = AuthPersistenceService.getTenantSettings();
     return appTheme(extendedOptions, {
@@ -59,7 +59,6 @@ const DashThemeProvider = ({ extendedOptions, children }) => {
   const recreateTheme = (tenantSettings, mode) => {
     const settings = tenantSettings || getTenantSettings();
     const themeMode = mode || document.documentElement.getAttribute("data-theme") || "dark";
-    console.log("Recreating MUI theme with tenant settings:", settings, "mode:", themeMode);
     const newThemeOptions = appTheme(
       extendedOptions,
       {
@@ -84,10 +83,8 @@ const DashThemeProvider = ({ extendedOptions, children }) => {
         if (mutation.type === "attributes" && mutation.attributeName === "data-theme") {
           const newMode = document.documentElement.getAttribute("data-theme") || "dark";
           if (newMode !== currentMode) {
-            console.log("Theme mode changed from", currentMode, "to", newMode);
             setCurrentMode(newMode);
             const settings = getTenantSettings();
-            console.log("Updating theme with new mode:", newMode, "and settings:", settings);
             updateDomCssVariables(newMode, settings == null ? void 0 : settings.colors, settings == null ? void 0 : settings.values);
           }
         }
@@ -100,14 +97,12 @@ const DashThemeProvider = ({ extendedOptions, children }) => {
     return () => observer.disconnect();
   }, [currentMode]);
   useEffect(() => {
-    console.log("Current mode updated to:", currentMode);
     const tenantSettings = getTenantSettings();
     recreateTheme(tenantSettings, currentMode);
   }, [currentMode]);
   useEffect(() => {
     const tenantSettings = getTenantSettings();
     if (tenantSettings) {
-      console.log("Recreating MUI theme on mount");
       recreateTheme(tenantSettings, currentMode);
     }
   }, []);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dashadmin/dash-admin",
-	"version": "1.3.49",
+	"version": "1.3.51",
 	"main": "dist/index.js",
 	"type": "module",
 	"scripts": {

package/src/DASHAdmin.tsx

@@ -397,6 +397,7 @@ const DASHAdminApp: React.FC<IDASHAdmin<unknown, unknown, unknown, unknown>> = R
     // are present it triggers createThemeWithVars which can produce a theme with undefined
     // breakpoints.internal_mediaKeys, crashing MUI v9's responsive sx prop handling.
     const { colorSchemes: _cs, cssVariables: _cv, defaultColorScheme: _dcs, ...safeAdminThemeOptions } = themeOptions as any;
+
     // Memoize AdminContext props
     const adminContextProps = {
         dataProvider: customDataProvider || dataProvider,

package/src/default-theme/DASHAppProviders.tsx

@@ -74,7 +74,7 @@ const DomainAppProviders = <U, A, R>({
     queryPersister,
     CustomEchoProvider
 }: IDomainAppProviders<U, A, R>): React.JSX.Element => {
-   
+
     const content = (
        <I18nBridgeProvider>
        <DashThemeProvider extendedOptions={extendedThemeOptions}>

package/src/default-theme/DashThemeContext.tsx

@@ -51,9 +51,9 @@ interface DashThemeProviderProps {
 
 export const DashThemeProvider: React.FC<DashThemeProviderProps> = ({ extendedOptions, children }) => {
     // Track current theme mode from data-theme attribute
-    const [currentMode, setCurrentMode] = useState<string>(() =>
-        document.documentElement.getAttribute('data-theme') || 'dark'
-    );
+    const [currentMode, setCurrentMode] = useState<string>(() => {
+        return document.documentElement.getAttribute('data-theme') || 'dark';
+    });
 
     const [themeOptions, setThemeOptions] = useState<ReturnType<typeof appTheme>>(() => {
         // Read persisted tenant settings on initialization to include tenant colors
@@ -97,8 +97,6 @@ export const DashThemeProvider: React.FC<DashThemeProviderProps> = ({ extendedOp
         //const themeMode = mode || currentMode;
         const themeMode = mode || document.documentElement.getAttribute('data-theme') || 'dark';
 
-        console.log('Recreating MUI theme with tenant settings:', settings, 'mode:', themeMode);
-
         const newThemeOptions = appTheme(
             extendedOptions,
             {
@@ -112,14 +110,14 @@ export const DashThemeProvider: React.FC<DashThemeProviderProps> = ({ extendedOp
 
         setThemeOptions(newThemeOptions);
         setTheme(newTheme);
-        
+
 
         setAntTheme(getAntTheme({
                 tenantSettings: settings,
                 colors: settings?.colors,
                 currentMode: themeMode,
             }));
-        
+
             updateDomCssVariables(themeMode, settings?.colors, settings?.values);
         /*if (settings?.colors || settings?.values) {
             updateDomCssVariables(themeMode, settings?.colors, settings?.values);
@@ -133,12 +131,8 @@ export const DashThemeProvider: React.FC<DashThemeProviderProps> = ({ extendedOp
                 if (mutation.type === 'attributes' && mutation.attributeName === 'data-theme') {
                     const newMode = document.documentElement.getAttribute('data-theme') || 'dark';
                     if (newMode !== currentMode) {
-                        console.log('Theme mode changed from', currentMode, 'to', newMode);
                         setCurrentMode(newMode);
                         const settings = getTenantSettings();
-
-                        console.log('Updating theme with new mode:', newMode, 'and settings:', settings);
-
                         updateDomCssVariables(newMode, settings?.colors, settings?.values);
                     }
                 }
@@ -157,7 +151,6 @@ export const DashThemeProvider: React.FC<DashThemeProviderProps> = ({ extendedOp
 
     // React to mode changes
     useEffect(() => {
-        console.log('Current mode updated to:', currentMode);
         const tenantSettings = getTenantSettings();
         recreateTheme(tenantSettings, currentMode);
     }, [currentMode]);
@@ -165,9 +158,7 @@ export const DashThemeProvider: React.FC<DashThemeProviderProps> = ({ extendedOp
     // Initial setup
     useEffect(() => {
         const tenantSettings = getTenantSettings();
-
         if (tenantSettings) {
-            console.log("Recreating MUI theme on mount");
             recreateTheme(tenantSettings, currentMode);
         }
     }, []);