nit - fix TS type

global.d.ts

@@ -1,15 +1,3 @@
 declare const __COMFYUI_FRONTEND_VERSION__: string
 declare const __SENTRY_ENABLED__: boolean
 declare const __SENTRY_DSN__: string
-
-interface Navigator {
-  /**
-   * Used by the electron API.  This is a WICG non-standard API, but is guaranteed to exist in Electron.
-   * It is `undefined` in Firefox and older browsers.
-   * @see https://developer.mozilla.org/en-US/docs/Web/API/Navigator/windowControlsOverlay
-   */
-  windowControlsOverlay?: {
-    /** When `true`, the window is using custom window style. */
-    visible: boolean
-  }
-}

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@comfyorg/comfyui-frontend",
-  "version": "1.8.4",
+  "version": "1.8.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@comfyorg/comfyui-frontend",
-      "version": "1.8.4",
+      "version": "1.8.2",
       "license": "GPL-3.0-only",
       "dependencies": {
         "@atlaskit/pragmatic-drag-and-drop": "^1.3.1",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@comfyorg/comfyui-frontend",
   "private": true,
-  "version": "1.8.4",
+  "version": "1.8.2",
   "type": "module",
   "repository": "https://github.com/Comfy-Org/ComfyUI_frontend",
   "homepage": "https://comfy.org",

src/components/maintenance/TaskListStatusIcon.vue

@@ -11,6 +11,7 @@ import ProgressSpinner from 'primevue/progressspinner'
 import { MaybeRef, computed } from 'vue'
 
 import { t } from '@/i18n'
+import { MaintenanceTaskState } from '@/stores/maintenanceTaskStore'
 
 // Properties
 const tooltip = computed(() => {
@@ -38,7 +39,7 @@ const cssClasses = computed(() => {
 
 // Model
 const props = defineProps<{
-  state: 'warning' | 'error' | 'resolved' | 'OK' | 'skipped' | undefined
+  state?: MaintenanceTaskState
   loading?: MaybeRef<boolean>
 }>()
 </script>

src/components/searchbox/NodeSearchBox.vue

@@ -60,9 +60,8 @@
       <!-- FilterAndValue -->
       <template v-slot:chip="{ value }">
         <SearchFilterChip
-          v-if="Array.isArray(value) && value.length === 2"
           :key="`${value[0].id}-${value[1]}`"
-          @remove="onRemoveFilter($event, value as FilterAndValue)"
+          @remove="onRemoveFilter($event, value)"
           :text="value[1]"
           :badge="value[0].invokeSequence.toUpperCase()"
           :badge-class="value[0].invokeSequence + '-badge'"

src/components/topbar/TopMenubar.vue

@@ -33,7 +33,7 @@
 
   <!-- Virtual top menu for native window (drag handle) -->
   <div
-    v-show="isNativeWindow() && !showTopMenu"
+    v-show="isNativeWindow && !showTopMenu"
     class="fixed top-0 left-0 app-drag w-full h-[var(--comfy-topbar-height)]"
   />
 </template>
@@ -50,12 +50,7 @@ import WorkflowTabs from '@/components/topbar/WorkflowTabs.vue'
 import { app } from '@/scripts/app'
 import { useSettingStore } from '@/stores/settingStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
-import {
-  electronAPI,
-  isElectron,
-  isNativeWindow,
-  showNativeMenu
-} from '@/utils/envUtil'
+import { electronAPI, isElectron, showNativeMenu } from '@/utils/envUtil'
 
 const workspaceState = useWorkspaceStore()
 const settingStore = useSettingStore()
@@ -69,6 +64,10 @@ const teleportTarget = computed(() =>
     ? '.comfyui-body-top'
     : '.comfyui-body-bottom'
 )
+const isNativeWindow = computed(
+  () =>
+    isElectron() && settingStore.get('Comfy-Desktop.WindowStyle') === 'custom'
+)
 const showTopMenu = computed(
   () => betaMenuEnabled.value && !workspaceState.focusMode
 )

src/stores/maintenanceTaskStore.ts

@@ -7,7 +7,7 @@ import type { MaintenanceTask } from '@/types/desktop/maintenanceTypes'
 import { electronAPI } from '@/utils/envUtil'
 
 /** State of a maintenance task, managed by the maintenance task store. */
-type MaintenanceTaskState = 'warning' | 'error' | 'OK' | 'skipped'
+export type MaintenanceTaskState = 'warning' | 'error' | 'OK' | 'skipped'
 
 // Type not exported by API
 type ValidationState = InstallValidation['basePath']

src/utils/envUtil.ts

@@ -14,7 +14,3 @@ export function electronAPI() {
 export function showNativeMenu(event: MouseEvent) {
   electronAPI()?.showContextMenu(event as ElectronContextMenuOptions)
 }
-
-export function isNativeWindow() {
-  return isElectron() && !!window.navigator.windowControlsOverlay?.visible
-}

src/views/GraphView.vue

@@ -4,7 +4,7 @@
   <TopMenubar />
   <GraphCanvas @ready="onGraphReady" />
   <GlobalToast />
-  <UnloadWindowConfirmDialog v-if="!isElectron()" />
+  <UnloadWindowConfirmDialog />
   <BrowserTabTitle />
   <MenuHamburger />
 </template>

src/views/templates/BaseViewTemplate.vue

@@ -9,7 +9,7 @@
   >
     <!-- Virtual top menu for native window (drag handle) -->
     <div
-      v-show="isNativeWindow()"
+      v-show="isNativeWindow"
       ref="topMenuRef"
       class="app-drag w-full h-[var(--comfy-topbar-height)]"
     />
@@ -24,7 +24,7 @@
 <script setup lang="ts">
 import { nextTick, onMounted, ref } from 'vue'
 
-import { electronAPI, isElectron, isNativeWindow } from '@/utils/envUtil'
+import { electronAPI, isElectron } from '@/utils/envUtil'
 
 const props = withDefaults(
   defineProps<{
@@ -46,8 +46,12 @@ const lightTheme = {
 }
 
 const topMenuRef = ref<HTMLDivElement | null>(null)
+const isNativeWindow = ref(false)
 onMounted(async () => {
   if (isElectron()) {
+    const windowStyle = await electronAPI().Config.getWindowStyle()
+    isNativeWindow.value = windowStyle === 'custom'
+
     await nextTick()
 
     electronAPI().changeTheme({