Skip to content

Commit 3a3d7ba

Browse files
committed
fix: 💄 Anime la fermeture des sous-menus
Concerne : - DsfrLanguageSelector - DsfrTranscription
1 parent 86ada61 commit 3a3d7ba

File tree

3 files changed

+23
-12
lines changed

3 files changed

+23
-12
lines changed

src/components/DsfrLanguageSelector/DsfrLanguageSelector.vue

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,28 @@ export default defineComponent({
2525
data () {
2626
return {
2727
expanded: false,
28+
collapsing: false,
2829
}
2930
},
3031
computed: {
3132
collapseStyle () {
3233
const baseStyle = {
3334
'--collapse': `-${this.languages.length * 114}px`,
3435
}
35-
if (this.expanded) {
36+
if (this.expanded || this.collapsing) {
3637
baseStyle['--collapse-max-height'] = 'none'
3738
}
3839
return baseStyle
3940
},
4041
},
42+
watch: {
43+
expanded (isExpanded) {
44+
if (!isExpanded) {
45+
this.collapsing = true
46+
setTimeout(() => { this.collapsing = false }, 300)
47+
}
48+
},
49+
},
4150
methods: {
4251
selectLanguage (language) {
4352
this.expanded = false
@@ -67,7 +76,7 @@ export default defineComponent({
6776
<div
6877
:id="id"
6978
class="fr-collapse fr-translate__menu fr-menu"
70-
:class="{'fr-collapse--expanded': expanded}"
79+
:class="{ 'fr-collapse--expanded': expanded, 'fr-collapsing': collapsing }"
7180
:style="collapseStyle"
7281
>
7382
<ul class="fr-menu__list">
@@ -91,10 +100,3 @@ export default defineComponent({
91100
</template>
92101

93102
<style src="@gouvfr/dsfr/dist/component/translate/translate.main.min.css" />
94-
95-
<style scoped>
96-
.fr-menu {
97-
position: relative;
98-
top: -1rem;
99-
}
100-
</style>

src/components/DsfrTranscription/DsfrTranscription.stories.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ Transcription.args = {
4343
dark: false,
4444
title: 'Chats hiver',
4545
content: 'Des chatons jouant dans la neige',
46-
collapseValue: '-114',
46+
collapseValue: '-114px',
4747
}

src/components/DsfrTranscription/DsfrTranscription.vue

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export default defineComponent({
2222
return {
2323
opened: false,
2424
expanded: false,
25+
collapsing: false,
2526
}
2627
},
2728
@@ -30,12 +31,20 @@ export default defineComponent({
3031
const baseStyle = {
3132
'--collapse': this.collapseValue,
3233
}
33-
if (this.expanded) {
34+
if (this.expanded || this.collapsing) {
3435
baseStyle['--collapse-max-height'] = 'none'
3536
}
3637
return baseStyle
3738
},
3839
},
40+
watch: {
41+
expanded (isExpanded) {
42+
if (!isExpanded) {
43+
this.collapsing = true
44+
setTimeout(() => { this.collapsing = false }, 300)
45+
}
46+
},
47+
},
3948
})
4049
</script>
4150

@@ -52,7 +61,7 @@ export default defineComponent({
5261
<div
5362
id="fr-transcription__collapse-transcription-1354"
5463
class="fr-collapse"
55-
:class="{ 'fr-collapse--expanded': expanded }"
64+
:class="{ 'fr-collapse--expanded': expanded, 'fr-collapsing': collapsing }"
5665
:style="collapseStyle"
5766
>
5867
<dialog

0 commit comments

Comments
 (0)