Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev

packages/@core/preferences/src/preferences.ts

@@ -2,16 +2,14 @@ import type { DeepPartial } from '@vben-core/typings';
 
 import type { InitialOptions, Preferences } from './types';
 
-import { markRaw, reactive, readonly, watch } from 'vue';
-
 import { StorageManager } from '@vben-core/shared/cache';
 import { isMacOs, merge } from '@vben-core/shared/utils';
-
 import {
   breakpointsTailwind,
   useBreakpoints,
   useDebounceFn,
 } from '@vueuse/core';
+import { markRaw, reactive, readonly, watch } from 'vue';
 
 import { defaultPreferences } from './config';
 import { updateCSSVariables } from './update-css-variables';

packages/@core/preferences/src/use-preferences.ts

@@ -1,6 +1,5 @@
-import { computed } from 'vue';
-
 import { diff } from '@vben-core/shared/utils';
+import { computed } from 'vue';
 
 import { preferencesManager } from './preferences';
 import { isDarkTheme } from './update-css-variables';
@@ -111,7 +110,8 @@ function usePreferences() {
       isMixedNav.value ||
       isSideMixedNav.value ||
       isSideNav.value ||
-      isHeaderMixedNav.value
+      isHeaderMixedNav.value ||
+      isHeaderSidebarNav.value
     );
   });