fix: comboboxEmpty render and nav menu

unovue · Aug 13, 2024 · 82505dc · 82505dc
1 parent 1676719
commit 82505dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/core/src/Combobox/ComboboxEmpty.vue b/packages/core/src/Combobox/ComboboxEmpty.vue
@@ -12,7 +12,7 @@ import { Primitive } from '@/Primitive'
 const props = defineProps<ComboboxEmptyProps>()
 const rootContext = injectComboboxRootContext()
 
-const isRender = computed(() => rootContext.ignoreFilter.value ? true : rootContext.filterState.filtered.count === 0)
+const isRender = computed(() => rootContext.ignoreFilter.value ? rootContext.allItems.value.size === 0 : rootContext.filterState.filtered.count === 0)
 </script>
 
 <template>

diff --git a/packages/core/src/NavigationMenu/NavigationMenuViewport.vue b/packages/core/src/NavigationMenu/NavigationMenuViewport.vue
@@ -146,7 +146,7 @@ useResizeObserver(content, () => {
   }
 })
 
-useResizeObserver([globalThis.document.body, rootNavigationMenu], () => {
+useResizeObserver([globalThis.document?.body, rootNavigationMenu], () => {
   updatePosition()
 })
 </script>