Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/move navigation to header #235

Merged
merged 2 commits into from
Dec 8, 2023
Merged

Feat/move navigation to header #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cc33d6
fix: :bug: fix Header modals and navigation
nicolaskempf57 Dec 8, 2023
4be71ad
feat: :sparkles: move navigation to header
nicolaskempf57 Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,14 @@ const badgeStyle = ref(config.website.badge.style)
:badge-style="badgeStyle"
@search="doSearch"
@update:modelValue="updateQuery"
/>
>
<template #mainnav>
<Navigation />
</template>
</Header>

<div class="fr-header__body">
<div class="fr-container width-inherit">
<Navigation />
</div>
<div class="fr-container width-inherit"></div>
<div>
<RouterView />
</div>
Expand Down
93 changes: 52 additions & 41 deletions src/components/header/Header.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,25 +60,21 @@ onUnmounted(() => {
document.removeEventListener('keydown', onKeyDown)
})

const menuOpened = ref(false)
const searchModalOpened = ref(false)
const modalOpened = ref(false)
const headerModalOpened = ref(false)

const hideModal = () => {
modalOpened.value = false
menuOpened.value = false
headerModalOpened.value = false
searchModalOpened.value = false
document.getElementById('button-menu')?.focus()
}
const showMenu = () => {
modalOpened.value = true
menuOpened.value = true
headerModalOpened.value = true
searchModalOpened.value = false
document.getElementById('close-button')?.focus()
}
const showSearchModal = () => {
modalOpened.value = true
menuOpened.value = false
headerModalOpened.value = false
searchModalOpened.value = true
}
const onQuickLinkClick = hideModal
Expand Down Expand Up @@ -199,7 +195,7 @@ defineEmits<{
<div v-if="quickLinks?.length" class="fr-header__tools-links">
<nav role="navigation">
<DsfrHeaderMenuLinks
v-if="!menuOpened"
v-if="!headerModalOpened"
:links="quickLinks"
:nav-aria-label="quickLinksAriaLabel"
/>
Expand All @@ -218,12 +214,38 @@ defineEmits<{
</div>
</div>
<div
v-if="
showSearch || isWithSlotNav || (quickLinks && quickLinks.length)
"
v-if="showSearch"
id="header-search"
class="fr-header__search fr-modal"
:class="{ 'fr-modal--opened': searchModalOpened }"
aria-label="Menu modal"
role="dialog"
aria-modal="true"
>
<div class="fr-container">
<button
id="close-button"
class="fr-btn fr-btn--close"
aria-controls="header-navigation"
data-testid="close-modal-btn"
@click.prevent.stop="hideModal()"
>
Fermer
</button>
<DsfrSearchBar
v-if="searchModalOpened"
:model-value="modelValue"
:placeholder="placeholder"
@update:model-value="$emit('update:modelValue', $event)"
@search="$emit('search', $event)"
/>
</div>
</div>
<div
v-if="isWithSlotNav || (quickLinks && quickLinks.length)"
id="header-navigation"
class="fr-header__menu fr-modal"
:class="{ 'fr-modal--opened': modalOpened }"
:class="{ 'fr-modal--opened': headerModalOpened }"
aria-label="Menu modal"
role="dialog"
aria-modal="true"
Expand All @@ -239,41 +261,30 @@ defineEmits<{
Fermer
</button>
<div class="fr-header__menu-links">
<nav role="navigation">
<DsfrHeaderMenuLinks
v-if="menuOpened"
role="navigation"
:links="quickLinks"
:nav-aria-label="quickLinksAriaLabel"
@link-click="onQuickLinkClick"
/>
</nav>
<DsfrHeaderMenuLinks
v-if="headerModalOpened"
role="navigation"
:links="quickLinks"
:nav-aria-label="quickLinksAriaLabel"
@link-click="onQuickLinkClick"
/>
</div>
<template v-if="modalOpened">
<template v-if="headerModalOpened">
<slot name="mainnav" :hidemodal="hideModal" />
</template>
<div
v-if="searchModalOpened"
class="flex justify-center items-center"
>
<DsfrSearchBar
:model-value="modelValue"
:placeholder="placeholder"
@update:model-value="$emit('update:modelValue', $event)"
@search="$emit('search', $event)"
/>
</div>
</div>
</div>
<div
v-if="isWithSlotNav && !modalOpened"
class="fr-hidden fr-unhidden-lg"
>
<!-- @slot Slot nommé mainnav pour le menu de navigation principal -->
<slot name="mainnav" :hidemodal="hideModal" />
</div>
<slot />
</div>
</div>
<div
v-if="isWithSlotNav && !headerModalOpened && !searchModalOpened"
class="fr-hidden fr-unhidden-lg fr-header__menu"
>
<div class="fr-container">
<!-- @slot Slot nommé mainnav pour le menu de navigation principal -->
<slot name="mainnav" :hidemodal="hideModal" />
</div>
</div>
</header>
</template>