diff --git a/src/__tests__/App.spec.ts b/src/__tests__/App.spec.ts index ce11075..92ffe31 100644 --- a/src/__tests__/App.spec.ts +++ b/src/__tests__/App.spec.ts @@ -126,7 +126,7 @@ describe('App', () => { expect(wrapper.text()).toContain('KwiTsukasa的小站'); }); - it('renders Argon header without hidden navigation containers', async () => { + it('renders Argon header without the old collapse container', async () => { await router.push('/'); await router.isReady(); @@ -137,8 +137,7 @@ describe('App', () => { }); expect(wrapper.find('.kt-blog__header-collapse').exists()).toBe(false); - expect(wrapper.find('.kt-blog__header-navbar .kt-blog__header-nav').exists()).toBe(false); - expect(wrapper.find('.kt-blog__header-navbar .navbar-nav').exists()).toBe(false); + expect(wrapper.find('.kt-blog__header-nav').exists()).toBe(true); }); it('loads local blog theme config by default', async () => { diff --git a/src/components/blog/BlogHeader.tsx b/src/components/blog/BlogHeader.tsx index 0518117..27f1dc8 100644 --- a/src/components/blog/BlogHeader.tsx +++ b/src/components/blog/BlogHeader.tsx @@ -88,38 +88,63 @@ export default defineComponent({ -
{ - navSearchOpen.value = true; - nextTick(() => focusInput(navSearchInputRef.value)); - }} - > -
-
- - - +
    + {siteConfig.value.headerMenu.map((item) => ( +
  • + {item.external ? ( + + {item.label} + + ) : ( + + {item.label} + + )} +
  • + ))} +
+ +
    +
  • +
    { + navSearchOpen.value = true; + nextTick(() => focusInput(navSearchInputRef.value)); + }} + > +
    +
    + + + +
    + event.stopPropagation()} + onBlur={() => { + navSearchOpen.value = false; + }} + onKeydown={(event: KeyboardEvent) => { + if (event.key === 'Enter') { + event.preventDefault(); + submitSearch(); + } + }} + /> +
    - event.stopPropagation()} - onBlur={() => { - navSearchOpen.value = false; - }} - onKeydown={(event: KeyboardEvent) => { - if (event.key === 'Enter') { - event.preventDefault(); - submitSearch(); - } - }} - /> -
-
+ +