From a5ff0453fb95be1a94265cbda38e8e2912dbca8f Mon Sep 17 00:00:00 2001
From: Austin Mroz <austin@comfy.org>
Date: Mon, 29 Dec 2025 23:01:41 -0800
Subject: [PATCH 1/2] Fix error on close of combo dropdown

---
 src/components/primevueOverride/SelectPlus.vue | 18 ++++++++++++++++++
 .../widgets/components/WidgetSelectDefault.vue |  6 +++---
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 src/components/primevueOverride/SelectPlus.vue

diff --git a/src/components/primevueOverride/SelectPlus.vue b/src/components/primevueOverride/SelectPlus.vue
new file mode 100644
index 0000000000..f699a5d3ef
--- /dev/null
+++ b/src/components/primevueOverride/SelectPlus.vue
@@ -0,0 +1,18 @@
+<script>
+import Select from 'primevue/select'
+
+export default {
+  name: 'SelectPlus',
+  extends: Select,
+  methods: {
+    onOverlayLeave() {
+      this.unbindOutsideClickListener()
+      this.unbindScrollListener()
+      this.unbindResizeListener()
+
+      this.$emit('hide')
+      this.overlay = null
+    }
+  }
+}
+</script>
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDefault.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDefault.vue
index e996c944e8..93428aab55 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDefault.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDefault.vue
@@ -1,10 +1,10 @@
 <template>
   <WidgetLayoutField :widget>
-    <Select
+    <SelectPlus
       v-model="modelValue"
       :invalid
       :filter="selectOptions.length > 4"
-      :auto-filter-focus="selectOptions.length > 4"
+      auto-filter-focus
       :options="selectOptions"
       v-bind="combinedProps"
       :class="cn(WidgetInputBaseClass, 'w-full text-xs')"
@@ -25,9 +25,9 @@
 </template>
 
 <script setup lang="ts">
-import Select from 'primevue/select'
 import { computed } from 'vue'
 
+import SelectPlus from '@/components/primevueOverride/SelectPlus.vue'
 import { useTransformCompatOverlayProps } from '@/composables/useTransformCompatOverlayProps'
 import type { SimplifiedWidget } from '@/types/simplifiedWidget'
 import { cn } from '@/utils/tailwindUtil'

From 907b3d7a9a625a5a41950eb5352dced6f769f484 Mon Sep 17 00:00:00 2001
From: Austin Mroz <austin@comfy.org>
Date: Tue, 30 Dec 2025 09:53:58 -0800
Subject: [PATCH 2/2] Fix tests

---
 .../widgets/components/WidgetSelect.test.ts   | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/tests-ui/renderer/extensions/vueNodes/widgets/components/WidgetSelect.test.ts b/tests-ui/renderer/extensions/vueNodes/widgets/components/WidgetSelect.test.ts
index 4d52d47e26..9505840db8 100644
--- a/tests-ui/renderer/extensions/vueNodes/widgets/components/WidgetSelect.test.ts
+++ b/tests-ui/renderer/extensions/vueNodes/widgets/components/WidgetSelect.test.ts
@@ -1,13 +1,12 @@
 import { createTestingPinia } from '@pinia/testing'
 import { mount } from '@vue/test-utils'
 import PrimeVue from 'primevue/config'
-import Select from 'primevue/select'
 import type { SelectProps } from 'primevue/select'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
+import SelectPlus from '@/components/primevueOverride/SelectPlus.vue'
 import type { ComboInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
 import type { SimplifiedWidget } from '@/types/simplifiedWidget'
-
 import WidgetSelect from '@/renderer/extensions/vueNodes/widgets/components/WidgetSelect.vue'
 import WidgetSelectDefault from '@/renderer/extensions/vueNodes/widgets/components/WidgetSelectDefault.vue'
 import WidgetSelectDropdown from '@/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.vue'
@@ -76,7 +75,7 @@ describe('WidgetSelect Value Binding', () => {
       },
       global: {
         plugins: [PrimeVue, createTestingPinia()],
-        components: { Select }
+        components: { SelectPlus }
       }
     })
   }
@@ -85,7 +84,7 @@ describe('WidgetSelect Value Binding', () => {
     wrapper: ReturnType<typeof mount>,
     value: string
   ) => {
-    const select = wrapper.findComponent({ name: 'Select' })
+    const select = wrapper.findComponent({ name: 'SelectPlus' })
     await select.setValue(value)
     return wrapper.emitted('update:modelValue')
   }
@@ -150,7 +149,7 @@ describe('WidgetSelect Value Binding', () => {
       const widget = createMockWidget('', { values: [] })
       const wrapper = mountComponent(widget, '')
 
-      const select = wrapper.findComponent({ name: 'Select' })
+      const select = wrapper.findComponent({ name: 'SelectPlus' })
       expect(select.props('options')).toEqual([])
     })
 
@@ -160,7 +159,7 @@ describe('WidgetSelect Value Binding', () => {
       })
       const wrapper = mountComponent(widget, 'only_option')
 
-      const select = wrapper.findComponent({ name: 'Select' })
+      const select = wrapper.findComponent({ name: 'SelectPlus' })
       const options = select.props('options')
       expect(options).toHaveLength(1)
       expect(options[0]).toEqual('only_option')
@@ -228,7 +227,7 @@ describe('WidgetSelect Value Binding', () => {
         },
         global: {
           plugins: [PrimeVue, createTestingPinia()],
-          components: { Select }
+          components: { SelectPlus }
         }
       })
 
@@ -247,7 +246,7 @@ describe('WidgetSelect Value Binding', () => {
         },
         global: {
           plugins: [PrimeVue, createTestingPinia()],
-          components: { Select }
+          components: { SelectPlus }
         }
       })
 
@@ -271,7 +270,7 @@ describe('WidgetSelect Value Binding', () => {
         },
         global: {
           plugins: [PrimeVue, createTestingPinia()],
-          components: { Select }
+          components: { SelectPlus }
         }
       })
 
@@ -290,7 +289,7 @@ describe('WidgetSelect Value Binding', () => {
         },
         global: {
           plugins: [PrimeVue, createTestingPinia()],
-          components: { Select }
+          components: { SelectPlus }
         }
       })