fix: 🐛 n’affiche plus undefined dans le titre

- n’affiche plus `undefined` dans le titre si le titre du service est absent

Author: laruiss

demo-app/App.vue

@@ -280,6 +280,7 @@ const currentRoute = computed(() => route.name)
       v-model="search"
       :quick-links="quickLinks"
       show-search
+      service-title="VueDSFR demo App"
       placeholder="Rechercher placeholder"
     >
       <template #mainnav>

eslint.config.js

@@ -12,6 +12,10 @@ export default antfu({
       'test/prefer-lowercase-title': 'off',
       'sort-imports': 'off', // Should be 'error'
       'import/order': 'off', // Should be 'error'
+      // 'import/order': ['error', {
+      //   'newlines-between': 'always',
+      //   groups: ['builtin', 'external', 'internal', 'parent', 'sibling', 'index'],
+      // }], // Should be 'error'
       'antfu/top-level-function': 'off', // Should be 'error'
       'style/quote-props': ['error', 'as-needed'], // Should be ['error', 'consistent-as-needed']
       'vue/quote-props': ['error', 'as-needed'], // Should be ['error', 'consistent-as-needed']
@@ -21,6 +25,8 @@ export default antfu({
       'style/max-statements-per-line': 'off', // Should be 'error'
       'vue/no-irregular-whitespace': 'warn',
       'no-irregular-whitespace': 'warn',
+      'perfectionist/sort-imports': 'off', // import/order is better
+      'perfectionist/sort-exports': 'off', // Think about it
       'style/space-before-function-paren': ['error', 'always'],
       'style/brace-style': ['error', '1tbs', { allowSingleLine: true }],
       curly: ['error', 'all'],
@@ -70,9 +76,9 @@ export default antfu({
     },
   },
   {
-    files: ['src/components/index.ts'],
+    files: ['ci/**/*.mjs'],
     rules: {
-      'perfectionist/sort-exports': 'off',
+      'antfu/no-top-level-await': 'off',
     },
   },
 ])

src/components/DsfrHeader/DsfrHeader.vue

@@ -6,7 +6,6 @@ import DsfrLogo from '../DsfrLogo/DsfrLogo.vue'
 import DsfrSearchBar from '../DsfrSearchBar/DsfrSearchBar.vue'
 import DsfrHeaderMenuLinks from './DsfrHeaderMenuLinks.vue'
 import { registerNavigationLinkKey } from './injection-key'
-
 import type { DsfrHeaderProps } from './DsfrHeader.types'
 
 export type { DsfrHeaderProps }
@@ -36,7 +35,7 @@ const props = withDefaults(defineProps<DsfrHeaderProps>(), {
 const emit = defineEmits<{
   (e: 'update:modelValue', payload: string): void
   (e: 'search', payload: string): void
-  (e: 'language-select', payload: DsfrLanguageSelectorElement): void
+  (e: 'languageSelect', payload: DsfrLanguageSelectorElement): void
 }>()
 
 const languageSelector = toRef(props, 'languageSelector')
@@ -77,6 +76,8 @@ const showSearchModal = () => {
 }
 const onQuickLinkClick = hideModal
 
+const title = computed(() => [props.homeLabel, props.serviceTitle].filter(x => x).join(' - '))
+
 const slots = useSlots()
 const isWithSlotOperator = computed(() => Boolean(slots.operator?.().length) || !!props.operatorImgSrc)
 const isWithSlotNav = computed(() => Boolean(slots.mainnav))
@@ -98,7 +99,7 @@ provide(registerNavigationLinkKey, () => {
               <div class="fr-header__logo">
                 <RouterLink
                   :to="homeTo"
-                  :title="`${homeLabel} - ${serviceTitle}`"
+                  :title
                 >
                   <DsfrLogo
                     :logo-text="logoText"
@@ -154,7 +155,7 @@ provide(registerNavigationLinkKey, () => {
             >
               <RouterLink
                 :to="homeTo"
-                :title="`${homeLabel} - ${serviceTitle}`"
+                :title
                 v-bind="$attrs"
               >
                 <p class="fr-header__service-title">
@@ -196,7 +197,7 @@ provide(registerNavigationLinkKey, () => {
               <template v-if="languageSelector">
                 <DsfrLanguageSelector
                   v-bind="languageSelector"
-                  @select="emit('language-select', $event)"
+                  @select="emit('languageSelect', $event)"
                 />
               </template>
             </div>