Skip to content

Commit e02e394

Browse files
authored
Merge pull request #1010 from MaitreManuel/dsfr-accordion-ontransitionend-composable
fix: 🐛 DsfrAccordion shouldn't focus on toggle
2 parents 236d118 + e515ec9 commit e02e394

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/components/DsfrAccordion/DsfrAccordion.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ watch(isActive, (newValue, oldValue) => {
7676
'fr-collapse--expanded': cssExpanded, // Need to use a separate data to add/remove the class after a RAF
7777
'fr-collapsing': collapsing,
7878
}"
79-
@transitionend="onTransitionEnd(isActive)"
79+
@transitionend="onTransitionEnd(isActive, false)"
8080
>
8181
<!-- @slot Slot par défaut pour le contenu de l’accordéon: sera dans `<div class="fr-collapse">` -->
8282
<slot />

src/composables/useCollapsable.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,16 @@ export const useCollapsable = () => {
4848
}
4949

5050
/**
51-
* @see https://github.com/GouvernementFR/dsfr/blob/main/src/core/script/collapse/collapse.js#L25
51+
* @see https://github.com/GouvernementFR/dsfr/blob/main/src/dsfr/core/script/collapse/collapse.js#L25
5252
* @param {boolean} expanded
53+
* @param {boolean} focusFirstAnchor
5354
* @return void
5455
*/
55-
const onTransitionEnd = (expanded: boolean): void => {
56+
const onTransitionEnd = (expanded: boolean, focusFirstAnchor: boolean = true): void => {
5657
collapsing.value = false
57-
collapse.value?.querySelector('a')?.focus()
58+
if (focusFirstAnchor) {
59+
collapse.value?.querySelector('a')?.focus()
60+
}
5861
if (collapse.value && expanded === false) {
5962
collapse.value.style.removeProperty('--collapse-max-height')
6063
}

0 commit comments

Comments
 (0)