Skip to content

Commit 7dd83b2

Browse files
authored
Merge pull request #501 from klee-contrib/validite-html
fix(Validité HTML): 🐛 Correction validité HTML
2 parents 86ac1b3 + 0140788 commit 7dd83b2

File tree

4 files changed

+9
-13
lines changed

4 files changed

+9
-13
lines changed

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"conventionalCommits.scopes": [
33
"releases",
4-
"dx"
4+
"dx",
55
],
66
"editor.bracketPairColorization.enabled": true,
77
"emmet.includeLanguages": {

src/components/DsfrFileUpload/DsfrFileUpload.vue

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ export default defineComponent({
1414
type: String,
1515
default: 'Ajouter un fichier',
1616
},
17+
accept: {
18+
type: Array,
19+
default: () => [],
20+
},
1721
hint: {
1822
type: String,
1923
default: '',
@@ -69,10 +73,11 @@ export default defineComponent({
6973
:id="id"
7074
class="fr-upload"
7175
type="file"
72-
:aria-describedby="`${id}-desc`"
76+
:aria-describedby="error || validMessage ? `${id}-desc` : null"
7377
v-bind="$attrs"
7478
:value="modelValue"
7579
:disabled="disabled"
80+
:accept="accept.join(',')"
7681
@change="onChange($event)"
7782
>
7883
<div
@@ -84,16 +89,9 @@ export default defineComponent({
8489
:id="`${id}-desc`"
8590
class="fr-error-text fr-mt-3v"
8691
>
87-
{{ error }}
92+
{{ error ?? validMessage }}
8893
</p>
8994
</div>
90-
<p
91-
v-if="validMessage"
92-
:id="`${id}-desc`"
93-
class="fr-valid-text fr-mt-3v"
94-
>
95-
{{ validMessage }}
96-
</p>
9795
</div>
9896
</template>
9997

src/components/DsfrFooter/DsfrFooter.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ export default defineComponent({
258258
<component
259259
:is="isExternalLink ? 'a' : 'RouterLink'"
260260
class="fr-link-licence no-content-after"
261-
:to="routerLinkLicenceTo"
261+
:to="isExternalLink ? routerLinkLicenceTo : null"
262262
:href="aLicenceHref"
263263
:target="isExternalLink ? '_blank' : undefined"
264264
rel="noopener noreferrer"

src/components/DsfrRadioButton/DsfrRadioButton.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,10 @@ export default defineComponent({
5656
<input
5757
:id="id"
5858
type="radio"
59-
role="radio"
6059
:name="name"
6160
:value="value"
6261
:checked="modelValue === value"
6362
v-bind="$attrs"
64-
:aria-checked="modelValue === value"
6563
@click="$emit('update:modelValue', value)"
6664
>
6765
<label

0 commit comments

Comments
 (0)