refactor(theme): centralize Windows checks with isWindowsTheme()

src/App.tsx

@@ -21,6 +21,7 @@ import { DesktopErrorBoundary } from "@/components/errors/ErrorBoundaries";
 import { useAutoCloudSync } from "@/hooks/useAutoCloudSync";
 import { AirDropListener } from "@/components/AirDropListener";
 import { useFilesStore } from "@/stores/useFilesStore";
+import { isWindowsTheme } from "@/themes";
 
 // Convert registry to array
 const apps: AnyApp[] = Object.values(appRegistry);
@@ -44,9 +45,9 @@ export function App() {
 
   // Determine toast position and offset based on theme and device
   const toastConfig = useMemo(() => {
-    const isWindowsTheme = currentTheme === "xp" || currentTheme === "win98";
+    const windowsTheme = isWindowsTheme(currentTheme);
     const dockHeight = currentTheme === "macosx" ? 56 : 0;
-    const taskbarHeight = isWindowsTheme ? 30 : 0;
+    const taskbarHeight = windowsTheme ? 30 : 0;
 
     // Mobile: always show at bottom-center with dock/taskbar and safe area clearance
     if (isMobile) {
@@ -57,7 +58,7 @@ export function App() {
       };
     }
 
-    if (isWindowsTheme) {
+    if (windowsTheme) {
       // Windows themes: bottom-right with taskbar clearance (30px + padding)
       return {
         position: "bottom-right" as const,

src/apps/admin/components/AdminMenuBar.tsx

@@ -9,6 +9,7 @@ import {
 } from "@/components/ui/menubar";
 import { useThemeStore } from "@/stores/useThemeStore";
 import { useTranslation } from "react-i18next";
+import { isWindowsTheme } from "@/themes";
 
 type AdminSection = "dashboard" | "users" | "rooms" | "songs" | "server";
 
@@ -35,7 +36,7 @@ export function AdminMenuBar({
 }: AdminMenuBarProps) {
   const { t } = useTranslation();
   const currentTheme = useThemeStore((state) => state.current);
-  const isXpTheme = currentTheme === "xp" || currentTheme === "win98";
+  const isXpTheme = isWindowsTheme(currentTheme);
   const isMacOsxTheme = currentTheme === "macosx";
 
   return (

src/apps/admin/hooks/useAdminLogic.ts

@@ -32,6 +32,7 @@ import {
   type AdminSection,
 } from "../utils/navigationState";
 import { helpItems } from "..";
+import { isWindowsTheme } from "@/themes";
 
 /**
  * Format Kugou image URL with size and HTTPS
@@ -173,7 +174,7 @@ export function useAdminLogic({ isWindowOpen }: UseAdminLogicProps) {
   const { username, isAuthenticated } = useAuth();
   const isOffline = useOffline();
   const currentTheme = useThemeStore((state) => state.current);
-  const isXpTheme = currentTheme === "xp" || currentTheme === "win98";
+  const isXpTheme = isWindowsTheme(currentTheme);
 
   const [isHelpDialogOpen, setIsHelpDialogOpen] = useState(false);
   const [isAboutDialogOpen, setIsAboutDialogOpen] = useState(false);

src/apps/applet-viewer/components/AppStore.tsx

@@ -10,6 +10,7 @@ import { AppStoreFeed, type AppStoreFeedRef } from "./AppStoreFeed";
 import { useTranslation } from "react-i18next";
 import { getApiUrl } from "@/utils/platform";
 import { abortableFetch } from "@/utils/abortableFetch";
+import { isWindowsTheme } from "@/themes";
 
 interface AppStoreProps {
   theme?: string;
@@ -34,7 +35,7 @@ export function AppStore({ theme, sharedAppletId, focusWindow }: AppStoreProps)
   const isMacTheme = theme === "macosx";
   const isSystem7Theme = theme === "system7";
   const currentTheme = useThemeStore((state) => state.current);
-  const isXpTheme = currentTheme === "xp" || currentTheme === "win98";
+  const isXpTheme = isWindowsTheme(currentTheme);
 
   const actions = useAppletActions();
   const lastUpdateToastKeyRef = useRef<string | null>(null);

src/apps/applet-viewer/components/AppStoreFeed.tsx

@@ -12,6 +12,7 @@ import { useTranslation } from "react-i18next";
 import { getApiUrl } from "@/utils/platform";
 import { useChatsStoreShallow } from "@/stores/helpers";
 import { abortableFetch } from "@/utils/abortableFetch";
+import { isWindowsTheme } from "@/themes";
 
 interface AppStoreFeedProps {
   theme?: string;
@@ -54,7 +55,7 @@ export const AppStoreFeed = forwardRef<AppStoreFeedRef, AppStoreFeedProps>(
   const PREVIEW_Y_SPACING = -28;
   const isMacTheme = theme === "macosx" || currentTheme === "macosx";
   const isSystem7Theme = theme === "system7" || currentTheme === "system7";
-  const isXpTheme = currentTheme === "xp" || currentTheme === "win98";
+  const isXpTheme = isWindowsTheme(currentTheme);
 
   const actions = useAppletActions();
 

src/apps/applet-viewer/components/AppletViewerMenuBar.tsx

@@ -20,6 +20,7 @@ import { useChatsStore } from "@/stores/useChatsStore";
 import { ShareItemDialog } from "@/components/dialogs/ShareItemDialog";
 import { appRegistry } from "@/config/appRegistry";
 import { useTranslation } from "react-i18next";
+import { isWindowsTheme } from "@/themes";
 
 interface AppletViewerMenuBarProps {
   onClose: () => void;
@@ -61,7 +62,7 @@ export function AppletViewerMenuBar({
   const appId = "applet-viewer";
   const appName = appRegistry[appId as keyof typeof appRegistry]?.name || appId;
   const currentTheme = useThemeStore((s) => s.current);
-  const isXpTheme = currentTheme === "xp" || currentTheme === "win98";
+  const isXpTheme = isWindowsTheme(currentTheme);
   const isMacOsxTheme = currentTheme === "macosx";
   const launchApp = useLaunchApp();
   const fileInputRef = React.useRef<HTMLInputElement>(null);

src/apps/applet-viewer/hooks/useAppletViewerLogic.ts

@@ -28,6 +28,7 @@ import { track } from "@vercel/analytics";
 import { APPLET_ANALYTICS } from "@/utils/analytics";
 import { extractMetadataFromHtml } from "@/utils/appletMetadata";
 import { exportAppletAsHtml } from "@/utils/appletImportExport";
+import { isWindowsTheme } from "@/themes";
 import {
   emitFileSaved,
   onAppletUpdated,
@@ -54,7 +55,7 @@ export function useAppletViewerLogic({
   const iframeRef = useRef<HTMLIFrameElement>(null);
   const fileInputRef = useRef<HTMLInputElement>(null);
   const currentTheme = useThemeStore((state) => state.current);
-  const isXpTheme = currentTheme === "xp" || currentTheme === "win98";
+  const isXpTheme = isWindowsTheme(currentTheme);
   const isMacTheme = currentTheme === "macosx";
   const username = useChatsStore((state) => state.username);
   const isAuthenticated = useChatsStore((state) => state.isAuthenticated);

src/apps/base/AppManager.tsx

@@ -27,6 +27,7 @@ import {
   toggleSpotlightSearch,
 } from "@/utils/appEventBus";
 import { useGlobalUndoRedo } from "@/hooks/useGlobalUndoRedo";
+import { isWindowsTheme } from "@/themes";
 
 interface AppManagerProps {
   apps: AnyApp[];
@@ -66,7 +67,7 @@ export function AppManager({ apps }: AppManagerProps) {
 
   // Get current theme to determine if we should show the desktop menubar
   const currentTheme = useThemeStore((state) => state.current);
-  const isXpTheme = currentTheme === "xp" || currentTheme === "win98";
+  const isXpTheme = isWindowsTheme(currentTheme);
 
   const [crashedInstanceIds, setCrashedInstanceIds] = useState<Set<string>>(
     () => new Set()

src/apps/base/types.ts

@@ -153,8 +153,9 @@ export type AnyInitialData =
 // For XP/98 themes, pass the menu bar as a prop to WindowFrame
 // For other themes, render the menu bar normally outside WindowFrame
 // Example:
+// import { isWindowsTheme } from "@/themes";
 // const currentTheme = useThemeStore((state) => state.current);
-// const isXpTheme = currentTheme === "xp" || currentTheme === "win98";
+// const isXpTheme = isWindowsTheme(currentTheme);
 // const menuBar = <AppMenuBar ... />;
 // return (
 //   <>

src/apps/calendar/components/EventDialog.tsx

@@ -17,6 +17,7 @@ import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@
 import { useThemeStore } from "@/stores/useThemeStore";
 import { cn } from "@/lib/utils";
 import type { CalendarEvent, EventColor, CalendarGroup } from "@/stores/useCalendarStore";
+import { isWindowsTheme } from "@/themes";
 
 interface EventDialogProps {
   isOpen: boolean;
@@ -57,7 +58,7 @@ export function EventDialog({
 }: EventDialogProps) {
   const { t } = useTranslation();
   const currentTheme = useThemeStore((state) => state.current);
-  const isXpTheme = currentTheme === "xp" || currentTheme === "win98";
+  const isXpTheme = isWindowsTheme(currentTheme);
   const isMacTheme = currentTheme === "macosx";
 
   const [title, setTitle] = useState("");

src/apps/candybar/components/CandyBarMenuBar.tsx

@@ -8,6 +8,7 @@ import {
 } from "@/components/ui/menubar";
 import { useThemeStore } from "@/stores/useThemeStore";
 import { useTranslation } from "react-i18next";
+import { isWindowsTheme } from "@/themes";
 
 interface CandyBarMenuBarProps {
   onClose: () => void;
@@ -30,7 +31,7 @@ export function CandyBarMenuBar({
 }: CandyBarMenuBarProps) {
   const { t } = useTranslation();
   const currentTheme = useThemeStore((state) => state.current);
-  const isXpTheme = currentTheme === "xp" || currentTheme === "win98";
+  const isXpTheme = isWindowsTheme(currentTheme);
   const isMacOsxTheme = currentTheme === "macosx";
 
   return (

src/apps/candybar/hooks/useCandyBarLogic.ts

@@ -4,6 +4,7 @@ import { toast } from "sonner";
 import { useTranslatedHelpItems } from "@/hooks/useTranslatedHelpItems";
 import { useThemeStore } from "@/stores/useThemeStore";
 import { helpItems } from "..";
+import { isWindowsTheme } from "@/themes";
 
 export interface IconPackIcon {
   name: string;
@@ -49,7 +50,7 @@ export function useCandyBarLogic({
   const { t } = useTranslation();
   const translatedHelpItems = useTranslatedHelpItems("candybar", helpItems);
   const currentTheme = useThemeStore((state) => state.current);
-  const isXpTheme = currentTheme === "xp" || currentTheme === "win98";
+  const isXpTheme = isWindowsTheme(currentTheme);
   const isMacOSXTheme = currentTheme === "macosx";
 
   const [isHelpDialogOpen, setIsHelpDialogOpen] = useState(false);

src/apps/chats/components/ChatsAppComponent.tsx

@@ -36,6 +36,7 @@ import { useChatsFrameLayout } from "../hooks/useChatsFrameLayout";
 import { useProactiveGreeting } from "../hooks/useProactiveGreeting";
 import { useTelegramLink } from "@/hooks/useTelegramLink";
 import { useGlobalPresence } from "@/hooks/useGlobalPresence";
+import { isWindowsTheme } from "@/themes";
 
 export function ChatsAppComponent({
   isWindowOpen,
@@ -418,7 +419,7 @@ export function ChatsAppComponent({
   }, [setIsNewRoomDialogOpen]);
 
   const currentTheme = useThemeStore((state) => state.current);
-  const isXpTheme = currentTheme === "xp" || currentTheme === "win98";
+  const isXpTheme = isWindowsTheme(currentTheme);
   const isWindowsLegacyTheme = isXpTheme;
   const isMacTheme = currentTheme === "macosx";
   const isOffline = useOffline();

src/apps/chats/components/CreateRoomDialog.tsx

@@ -20,6 +20,7 @@ import { useThemeStore } from "@/stores/useThemeStore";
 import { cn } from "@/lib/utils";
 import { useTranslation } from "react-i18next";
 import { abortableFetch } from "@/utils/abortableFetch";
+import { isWindowsTheme } from "@/themes";
 import {
   ThemedTabsList,
   ThemedTabsTrigger,
@@ -60,7 +61,7 @@ export function CreateRoomDialog({
 
   // Theme detection
   const currentTheme = useThemeStore((state) => state.current);
-  const isXpTheme = currentTheme === "xp" || currentTheme === "win98";
+  const isXpTheme = isWindowsTheme(currentTheme);
 
   // Reset form when dialog opens
   useEffect(() => {

src/apps/contacts/components/UserPicturePicker.tsx

@@ -13,6 +13,7 @@ import { cn } from "@/lib/utils";
 import { ALL_USER_PICTURES } from "@/utils/userPictures";
 import { resizeImageToBase64 } from "@/utils/imageResize";
 import { useTranslation } from "react-i18next";
+import { isWindowsTheme } from "@/themes";
 
 interface UserPicturePickerProps {
   isOpen: boolean;
@@ -29,7 +30,7 @@ export function UserPicturePicker({
 }: UserPicturePickerProps) {
   const { t } = useTranslation();
   const currentTheme = useThemeStore((state) => state.current);
-  const isXpTheme = currentTheme === "xp" || currentTheme === "win98";
+  const isXpTheme = isWindowsTheme(currentTheme);
   const isMacTheme = currentTheme === "macosx";
 
   const fontClassName = isXpTheme

src/apps/control-panels/components/ControlPanelsMenuBar.tsx

@@ -12,6 +12,7 @@ import { useThemeStore } from "@/stores/useThemeStore";
 import { ShareItemDialog } from "@/components/dialogs/ShareItemDialog";
 import { appRegistry } from "@/config/appRegistry";
 import { useTranslation } from "react-i18next";
+import { isWindowsTheme } from "@/themes";
 
 interface ControlPanelsMenuBarProps {
   onClose: () => void;
@@ -29,7 +30,7 @@ export function ControlPanelsMenuBar({
   const appId = "control-panels";
   const appName = appRegistry[appId as keyof typeof appRegistry]?.name || appId;
   const currentTheme = useThemeStore((state) => state.current);
-  const isXpTheme = currentTheme === "xp" || currentTheme === "win98";
+  const isXpTheme = isWindowsTheme(currentTheme);
   const isMacOsxTheme = currentTheme === "macosx";
 
   return (

src/apps/control-panels/hooks/useControlPanelsLogic.ts

@@ -47,6 +47,7 @@ import {
   isLogicalCloudSyncDomainEnabled,
   type LogicalCloudSyncDomain,
 } from "@/utils/syncLogicalDomains";
+import { isWindowsTheme } from "@/themes";
 import {
   readStoreItems,
   restoreStoreItems,
@@ -1492,7 +1493,7 @@ export function useControlPanelsLogic({
     performFormat();
   };
 
-  const isXpTheme = currentTheme === "xp" || currentTheme === "win98";
+  const isXpTheme = isWindowsTheme(currentTheme);
   const isMacOSXTheme = currentTheme === "macosx";
   const isSystem7Theme = currentTheme === "system7";
   const isClassicMacTheme = isMacOSXTheme || isSystem7Theme;

src/apps/dashboard/components/DashboardMenuBar.tsx

@@ -11,6 +11,7 @@ import {
 } from "@/components/ui/menubar";
 import { useThemeStore } from "@/stores/useThemeStore";
 import { useTranslation } from "react-i18next";
+import { isWindowsTheme } from "@/themes";
 
 interface DashboardMenuBarProps {
   onClose: () => void;
@@ -43,7 +44,7 @@ export function DashboardMenuBar({
 }: DashboardMenuBarProps) {
   const { t } = useTranslation();
   const currentTheme = useThemeStore((state) => state.current);
-  const isXpTheme = currentTheme === "xp" || currentTheme === "win98";
+  const isXpTheme = isWindowsTheme(currentTheme);
   const isMacOsxTheme = currentTheme === "macosx";
 
   return (

src/apps/finder/components/FileList.tsx

@@ -17,6 +17,7 @@ import { getFinderDisplayName } from "@/utils/finderDisplay";
 import { useThemeStore } from "@/stores/useThemeStore";
 import type { LaunchOriginRect } from "@/stores/useAppStore";
 import { useTranslation } from "react-i18next";
+import { isWindowsTheme } from "@/themes";
 import {
   createSelectionRect,
   getIntersectingSelectionIds,
@@ -383,7 +384,7 @@ export function FileList({
   } | null>(null);
   const currentTheme = useThemeStore((state) => state.current);
   const isMacOSXTheme = currentTheme === "macosx";
-  const isXpTheme = currentTheme === "xp" || currentTheme === "win98";
+  const isXpTheme = isWindowsTheme(currentTheme);
 
   // Add refs for rename timing
   const clickTimeoutRef = useRef<NodeJS.Timeout | null>(null);

src/apps/finder/hooks/useFileSystem.ts

@@ -30,6 +30,7 @@ import {
   type CloudSyncDeletionBucket,
 } from "@/stores/useCloudSyncStore";
 import { useThemeStore } from "@/stores/useThemeStore";
+import { isWindowsTheme } from "@/themes";
 
 // Interface for content stored in IndexedDB
 export interface DocumentContent {
@@ -872,7 +873,7 @@ export function useFileSystem(
                   name: "Macintosh HD",
                   isDirectory: true,
                   icon:
-                    currentTheme === "xp" || currentTheme === "win98"
+                    isWindowsTheme(currentTheme)
                       ? "/icons/default/pc.png"
                       : "/icons/default/disk.png",
                   type: "directory",

src/apps/finder/hooks/useFinderLogic.ts

@@ -34,6 +34,7 @@ import {
 } from "@/utils/appEventBus";
 import { useAirDropStore } from "@/stores/useAirDropStore";
 import { useChatsStore } from "@/stores/useChatsStore";
+import { isWindowsTheme } from "@/themes";
 
 type FinderUndoAction =
   | { type: "moveToTrash"; fileName: string; originalPath: string }
@@ -1289,7 +1290,7 @@ export function useFinderLogic({
     },
   ];
 
-  const isXpTheme = currentTheme === "xp" || currentTheme === "win98";
+  const isXpTheme = isWindowsTheme(currentTheme);
   const isMacOSXTheme = currentTheme === "macosx";
 
   // Sidebar state

src/apps/infinite-mac/components/InfiniteMacMenuBar.tsx

@@ -13,6 +13,7 @@ import {
 import { useThemeStore } from "@/stores/useThemeStore";
 import { useTranslation } from "react-i18next";
 import type { ScaleOption } from "../hooks/useInfiniteMacLogic";
+import { isWindowsTheme } from "@/themes";
 
 interface InfiniteMacMenuBarProps {
   onClose: () => void;
@@ -43,7 +44,7 @@ export function InfiniteMacMenuBar({
 }: InfiniteMacMenuBarProps) {
   const { t } = useTranslation();
   const currentTheme = useThemeStore((state) => state.current);
-  const isXpTheme = currentTheme === "xp" || currentTheme === "win98";
+  const isXpTheme = isWindowsTheme(currentTheme);
   const isMacOsxTheme = currentTheme === "macosx";
 
   return (

src/apps/infinite-mac/hooks/useInfiniteMacLogic.ts

@@ -11,6 +11,7 @@ import {
 } from "@/stores/useInfiniteMacStore";
 import { helpItems } from "../metadata";
 import { useShallow } from "zustand/react/shallow";
+import { isWindowsTheme } from "@/themes";
 
 // Re-export types and presets for consumers
 export type { ScaleOption, MacPreset, ScreenData } from "@/stores/useInfiniteMacStore";
@@ -106,7 +107,7 @@ export function useInfiniteMacLogic({
 
   const { t } = useTranslation();
   const currentTheme = useThemeStore((state) => state.current);
-  const isXpTheme = currentTheme === "xp" || currentTheme === "win98";
+  const isXpTheme = isWindowsTheme(currentTheme);
   const translatedHelpItems = useTranslatedHelpItems("infinite-mac", helpItems);
   const embedUrl = selectedPreset ? buildWrapperUrl(selectedPreset, currentScale) : null;