From 080525f4f2b3da04925ca74cc8a45352a9dc98eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanislas=20Ormi=C3=A8res?= Date: Mon, 13 Jan 2025 19:18:49 +0100 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=F0=9F=90=9B=20r=C3=A9duit=20les=20m?= =?UTF-8?q?ismatch,=20notamment=20des=20id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - corrige le mismatch de DsfrSearchBar du DsfrHeader - utilise [useId() de vue 3.5](https://vuejs.org/api/composition-api-helpers.html#useid) dans getRandomId() --- src/components/DsfrAccordion/DsfrAccordion.md | 2 +- src/components/DsfrAccordion/DsfrAccordion.vue | 4 ++-- src/components/DsfrAlert/DsfrAlert.vue | 4 ++-- src/components/DsfrBreadcrumb/DsfrBreadcrumb.md | 2 +- src/components/DsfrBreadcrumb/DsfrBreadcrumb.vue | 4 ++-- src/components/DsfrCheckbox/DsfrCheckbox.vue | 4 ++-- src/components/DsfrCheckbox/DsfrCheckboxSet.vue | 4 ++-- src/components/DsfrDataTable/DsfrDataTable.vue | 4 ++-- src/components/DsfrFileUpload/DsfrFileUpload.md | 2 +- src/components/DsfrFileUpload/DsfrFileUpload.vue | 4 ++-- src/components/DsfrHeader/DsfrHeader.vue | 2 +- src/components/DsfrInput/DsfrInput.md | 2 +- src/components/DsfrInput/DsfrInput.vue | 4 ++-- src/components/DsfrInput/DsfrInputGroup.md | 2 +- src/components/DsfrInput/DsfrInputGroup.vue | 4 ++-- .../DsfrLanguageSelector/DsfrLanguageSelector.md | 2 +- .../DsfrLanguageSelector/DsfrLanguageSelector.vue | 4 ++-- src/components/DsfrModal/DsfrModal.md | 2 +- src/components/DsfrModal/DsfrModal.vue | 4 ++-- src/components/DsfrMultiselect/DsfrMultiselect.vue | 4 ++-- src/components/DsfrNavigation/DsfrNavigation.vue | 4 ++-- src/components/DsfrNavigation/DsfrNavigationItem.vue | 4 ++-- .../DsfrNavigation/DsfrNavigationMegaMenu.vue | 4 ++-- src/components/DsfrNavigation/DsfrNavigationMenu.vue | 4 ++-- .../DsfrNavigation/DsfrNavigationMenuItem.vue | 4 ++-- .../DsfrNavigation/DsfrNavigationMenuLink.vue | 4 ++-- src/components/DsfrRadioButton/DsfrRadioButton.vue | 4 ++-- src/components/DsfrRadioButton/DsfrRadioButtonSet.vue | 4 ++-- src/components/DsfrRange/DsfrRange.md | 2 +- src/components/DsfrRange/DsfrRange.vue | 4 ++-- src/components/DsfrSearchBar/DsfrSearchBar.md | 2 +- src/components/DsfrSearchBar/DsfrSearchBar.vue | 4 ++-- src/components/DsfrSegmented/DsfrSegmented.vue | 4 ++-- src/components/DsfrSegmented/DsfrSegmentedSet.vue | 6 +++--- src/components/DsfrSelect/DsfrSelect.md | 2 +- src/components/DsfrSelect/DsfrSelect.vue | 4 ++-- src/components/DsfrSideMenu/DsfrSideMenu.vue | 6 +++--- src/components/DsfrTable/DsfrTable.vue | 4 ++-- src/components/DsfrTabs/DsfrTabs.vue | 4 ++-- src/components/DsfrToggleSwitch/DsfrToggleSwitch.md | 2 +- src/components/DsfrToggleSwitch/DsfrToggleSwitch.vue | 4 ++-- src/components/DsfrTooltip/DsfrTooltip.md | 2 +- src/components/DsfrTooltip/DsfrTooltip.vue | 4 ++-- src/components/DsfrTranscription/DsfrTranscription.md | 2 +- .../DsfrTranscription/DsfrTranscription.vue | 4 ++-- src/utils/random-utils.ts | 11 +++++++++-- 46 files changed, 87 insertions(+), 80 deletions(-) diff --git a/src/components/DsfrAccordion/DsfrAccordion.md b/src/components/DsfrAccordion/DsfrAccordion.md index a9cedb05..0ecd9358 100644 --- a/src/components/DsfrAccordion/DsfrAccordion.md +++ b/src/components/DsfrAccordion/DsfrAccordion.md @@ -26,7 +26,7 @@ Autres props : | Nom | Type | Défaut | Obligatoire | | ----------------------- | ----------------------------------------- | ---------------- | -------------| -| `title` | *`string`* | `getRandomId('accordion')` | ✅ | +| `title` | *`string`* | `useRandomId('accordion')` | ✅ | | `titleTag` | [*`TitleTag`*](/docs/types.md#title-tag) | `'h3'` | | | `id` | *`string`* | *random string* | | diff --git a/src/components/DsfrAccordion/DsfrAccordion.vue b/src/components/DsfrAccordion/DsfrAccordion.vue index c4203d10..e99b323c 100644 --- a/src/components/DsfrAccordion/DsfrAccordion.vue +++ b/src/components/DsfrAccordion/DsfrAccordion.vue @@ -2,7 +2,7 @@ import { inject, onMounted, ref, toRef, watch } from 'vue' import { useCollapsable } from '../../composables' -import { getRandomId } from '../../utils/random-utils' +import { useRandomId } from '../../utils/random-utils' import { registerAccordionKey } from './injection-key' import type { DsfrAccordionProps } from './DsfrAccordion.types' @@ -12,7 +12,7 @@ export type { DsfrAccordionProps } const props = withDefaults( defineProps(), { - id: () => getRandomId('accordion'), + id: () => useRandomId('accordion'), title: 'Sans intitulé', titleTag: 'h3', }, diff --git a/src/components/DsfrAlert/DsfrAlert.vue b/src/components/DsfrAlert/DsfrAlert.vue index db486321..bc53a624 100644 --- a/src/components/DsfrAlert/DsfrAlert.vue +++ b/src/components/DsfrAlert/DsfrAlert.vue @@ -3,12 +3,12 @@ import { computed } from 'vue' import type { DsfrAlertProps } from './DsfrAlert.types.js' -import { getRandomId } from '@/utils/random-utils' +import { useRandomId } from '@/utils/random-utils' export type { DsfrAlertProps, DsfrAlertType } from './DsfrAlert.types.js' const props = withDefaults(defineProps(), { - id: () => getRandomId('basic', 'alert'), + id: () => useRandomId('basic', 'alert'), title: '', titleTag: 'h3', type: 'info', diff --git a/src/components/DsfrBreadcrumb/DsfrBreadcrumb.md b/src/components/DsfrBreadcrumb/DsfrBreadcrumb.md index c6f7cecb..a8ce53a6 100644 --- a/src/components/DsfrBreadcrumb/DsfrBreadcrumb.md +++ b/src/components/DsfrBreadcrumb/DsfrBreadcrumb.md @@ -22,7 +22,7 @@ Dans l’ordre, il se compose des éléments suivants : | Nom | Type | Défaut | Description | |---------------------|--------|---------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------| -| breadcrumbId | String | () => getRandomId('breadcrumb') | Identifiant unique pour le composant breadcrumb, généré automatiquement pour assurer l'accessibilité. | +| breadcrumbId | String | () => useRandomId('breadcrumb') | Identifiant unique pour le composant breadcrumb, généré automatiquement pour assurer l'accessibilité. | | links | Array | () => [{ text: '' }] | Un tableau d'objets représentant les liens dans le fil d'Ariane. Chaque objet peut avoir une propriété 'text' et, optionnellement, 'to' pour les routes. | | navigationLabel | String | `'vous êtes ici :'` | Label affiché sur la balise `nav` du fil d’Ariane. | | showBreadcrumbLabel | String | `'Voir le fil d’Ariane'` | Label du bouton d'affichage du fil d’Ariane. | diff --git a/src/components/DsfrBreadcrumb/DsfrBreadcrumb.vue b/src/components/DsfrBreadcrumb/DsfrBreadcrumb.vue index d56f64b4..b23abec8 100644 --- a/src/components/DsfrBreadcrumb/DsfrBreadcrumb.vue +++ b/src/components/DsfrBreadcrumb/DsfrBreadcrumb.vue @@ -2,14 +2,14 @@ import { ref, watch } from 'vue' import { useCollapsable } from '../../composables' -import { getRandomId } from '../../utils/random-utils' +import { useRandomId } from '../../utils/random-utils' import type { DsfrBreadcrumbProps } from './DsfrBreadcrumb.types' export type { DsfrBreadcrumbProps } withDefaults(defineProps(), { - breadcrumbId: () => getRandomId('breadcrumb'), + breadcrumbId: () => useRandomId('breadcrumb'), links: () => [{ text: '' }], navigationLabel: 'vous êtes ici :', showBreadcrumbLabel: 'Voir le fil d’Ariane', diff --git a/src/components/DsfrCheckbox/DsfrCheckbox.vue b/src/components/DsfrCheckbox/DsfrCheckbox.vue index 3fccfb0e..2938f15e 100644 --- a/src/components/DsfrCheckbox/DsfrCheckbox.vue +++ b/src/components/DsfrCheckbox/DsfrCheckbox.vue @@ -1,7 +1,7 @@ diff --git a/src/components/DsfrNavigation/DsfrNavigationMegaMenu.vue b/src/components/DsfrNavigation/DsfrNavigationMegaMenu.vue index fb4b2e8f..5465570e 100644 --- a/src/components/DsfrNavigation/DsfrNavigationMegaMenu.vue +++ b/src/components/DsfrNavigation/DsfrNavigationMegaMenu.vue @@ -2,7 +2,7 @@ import { computed, onMounted, watch } from 'vue' import { useCollapsable } from '../../composables' -import { getRandomId } from '../../utils/random-utils' +import { useRandomId } from '../../utils/random-utils' import DsfrNavigationMegaMenuCategory from './DsfrNavigationMegaMenuCategory.vue' import type { DsfrNavigationMegaMenuProps } from './DsfrNavigation.types' @@ -10,7 +10,7 @@ import type { DsfrNavigationMegaMenuProps } from './DsfrNavigation.types' export type { DsfrNavigationMegaMenuProps } const props = withDefaults(defineProps(), { - id: () => getRandomId('mega-menu'), + id: () => useRandomId('mega-menu'), description: '', link: () => ({ to: '#', text: 'Voir toute la rubrique' }), menus: () => [], diff --git a/src/components/DsfrNavigation/DsfrNavigationMenu.vue b/src/components/DsfrNavigation/DsfrNavigationMenu.vue index b1513888..55bc7d29 100644 --- a/src/components/DsfrNavigation/DsfrNavigationMenu.vue +++ b/src/components/DsfrNavigation/DsfrNavigationMenu.vue @@ -2,7 +2,7 @@ import { computed, onMounted, watch } from 'vue' import { useCollapsable } from '../../composables' -import { getRandomId } from '../../utils/random-utils' +import { useRandomId } from '../../utils/random-utils' import DsfrNavigationMenuItem from './DsfrNavigationMenuItem.vue' import DsfrNavigationMenuLink from './DsfrNavigationMenuLink.vue' @@ -11,7 +11,7 @@ import type { DsfrNavigationMenuProps } from './DsfrNavigation.types' export type { DsfrNavigationMenuProps } const props = withDefaults(defineProps(), { - id: () => getRandomId('menu'), + id: () => useRandomId('menu'), links: () => [], expandedId: '', }) diff --git a/src/components/DsfrNavigation/DsfrNavigationMenuItem.vue b/src/components/DsfrNavigation/DsfrNavigationMenuItem.vue index 62a91b66..3375dd70 100644 --- a/src/components/DsfrNavigation/DsfrNavigationMenuItem.vue +++ b/src/components/DsfrNavigation/DsfrNavigationMenuItem.vue @@ -1,12 +1,12 @@ diff --git a/src/components/DsfrNavigation/DsfrNavigationMenuLink.vue b/src/components/DsfrNavigation/DsfrNavigationMenuLink.vue index 329685a1..27af3d44 100644 --- a/src/components/DsfrNavigation/DsfrNavigationMenuLink.vue +++ b/src/components/DsfrNavigation/DsfrNavigationMenuLink.vue @@ -1,7 +1,7 @@