Merge pull request #793 from dnum-mi/develop

Develop
dnum-mi · Apr 19, 2024 · e976e42 · e976e42
2 parents d0387e2 + 2ff3875
commit e976e42
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 4 deletions.
diff --git a/src/components/DsfrCheckbox/DsfrCheckboxSet.vue b/src/components/DsfrCheckbox/DsfrCheckboxSet.vue
@@ -71,6 +71,7 @@ const onChange = ({ name, checked }: { name: string, checked: boolean }) => {
           :name="option.name"
           :label="option.label"
           :disabled="option.disabled"
+          :aria-disabled="option.disabled"
           :small="small"
           :inline="inline"
           :model-value="modelValue.includes(option.name)"

diff --git a/src/components/DsfrFileUpload/DsfrFileUpload.vue b/src/components/DsfrFileUpload/DsfrFileUpload.vue
@@ -59,6 +59,7 @@ const onChange = ($event: InputEvent) => {
       v-bind="$attrs"
       :value="modelValue"
       :disabled="disabled"
+      :aria-disabled="disabled"
       :accept="accept.join(',')"
       @change="onChange($event as InputEvent)"
     >

diff --git a/src/components/DsfrPagination/DsfrPagination.vue b/src/components/DsfrPagination/DsfrPagination.vue
@@ -48,7 +48,8 @@ const isCurrentPage = (page: Page) => props.pages.indexOf(page) === props.curren
           :href="pages[0]?.href"
           class="fr-pagination__link fr-pagination__link--first"
           :title="firstPageTitle"
-          :disabled="currentPage === 0 ? true : null"
+          :disabled="currentPage === 0 ? true : undefined"
+          :aria-disabled="currentPage === 0 ? true : undefined"
           @click.prevent="tofirstPage()"
         />
       </li>
@@ -57,7 +58,8 @@ const isCurrentPage = (page: Page) => props.pages.indexOf(page) === props.curren
           :href="pages[Math.max(currentPage - 1, 0)]?.href"
           class="fr-pagination__link fr-pagination__link--prev fr-pagination__link--lg-label"
           :title="prevPageTitle"
-          :disabled="currentPage === 0 ? true : null"
+          :disabled="currentPage === 0 ? true : undefined"
+          :aria-disabled="currentPage === 0 ? true : undefined"
           @click.prevent="toPreviousPage()"
         >{{ prevPageTitle }}</a>
       </li>
@@ -82,7 +84,8 @@ const isCurrentPage = (page: Page) => props.pages.indexOf(page) === props.curren
           :href="pages[Math.min(currentPage + 1, pages.length - 1)]?.href"
           class="fr-pagination__link fr-pagination__link--next fr-pagination__link--lg-label"
           :title="nextPageTitle"
-          :disabled="currentPage === pages.length - 1 ? true : null"
+          :disabled="currentPage === pages.length - 1 ? true : undefined"
+          :aria-disabled="currentPage === pages.length - 1 ? true : undefined"
           @click.prevent="toNextPage()"
         >{{ nextPageTitle }}</a>
       </li>
@@ -92,6 +95,7 @@ const isCurrentPage = (page: Page) => props.pages.indexOf(page) === props.curren
           :href="pages[pages.length - 1]?.href"
           :title="lastPageTitle"
           :disabled="currentPage === pages.length - 1 ? true : null"
+          :aria-disabled="currentPage === pages.length - 1 ? true : undefined"
           @click.prevent="toLastPage()"
         />
       </li>

diff --git a/src/components/DsfrRadioButton/DsfrRadioButton.types.ts b/src/components/DsfrRadioButton/DsfrRadioButton.types.ts
@@ -2,6 +2,7 @@ export type DsfrRadioButtonProps = {
   id?: string
   name?: string
   modelValue: string | number | boolean | undefined
+  disabled?: boolean
   small?: boolean
   inline?: boolean
   value: string | number | boolean

diff --git a/src/components/DsfrRadioButton/DsfrRadioButton.vue b/src/components/DsfrRadioButton/DsfrRadioButton.vue
@@ -37,6 +37,7 @@ const rich = computed(() => !!props.img)
         :name="name"
         :value="value"
         :checked="modelValue === value"
+        :disabled="disabled"
         v-bind="$attrs"
         @click="$emit('update:modelValue', value)"
       >

diff --git a/src/components/DsfrRadioButton/DsfrRadioButtonSet.spec.ts b/src/components/DsfrRadioButton/DsfrRadioButtonSet.spec.ts
@@ -2,6 +2,7 @@ import { OhVueIcon as VIcon } from 'oh-vue-icons'
 import { fireEvent, render } from '@testing-library/vue'
 
 import RadioButtonSet from './DsfrRadioButtonSet.vue'
+import { DsfrRadioButtonProps } from './DsfrRadioButton.types'
 
 describe('DsfrRadioButtonSet', () => {
   it('should render a set of radio buttons with label in div', () => {
@@ -38,7 +39,7 @@ describe('DsfrRadioButtonSet', () => {
     const selectedValue = 1
     const toClickLabel = 'Label 3'
     const errorMessage = 'Message d’erreur'
-    const options = [
+    const options: Omit<DsfrRadioButtonProps, 'modelValue'>[] = [
       {
         label: selectedLabel,
         value: selectedValue,

diff --git a/src/components/DsfrRadioButton/DsfrRadioButtonSet.vue b/src/components/DsfrRadioButton/DsfrRadioButtonSet.vue
@@ -64,6 +64,7 @@ const onChange = ($event: string) => {
           v-for="(option, i) of options"
           :key="typeof option.value === 'boolean' ? i : (option.value || i)"
           :name="name"
+          :aria-disabled="option.disabled"
           v-bind="option"
           :small="small"
           :inline="inline"

diff --git a/src/components/DsfrRange/DsfrRange.vue b/src/components/DsfrRange/DsfrRange.vue
@@ -120,6 +120,7 @@ onMounted(() => {
         :step="step"
         :value="lowerValue"
         :disabled="disabled"
+        :aria-disabled="disabled"
         :aria-labelledby="`${id}-label`"
         :aria-describedby="`${id}-messages`"
         @input="emit('update:lowerValue', +($event.target as HTMLInputElement)?.value)"
@@ -133,6 +134,7 @@ onMounted(() => {
         :step="step"
         :value="modelValue"
         :disabled="disabled"
+        :aria-disabled="disabled"
         :aria-labelledby="`${id}-label`"
         :aria-describedby="`${id}-messages`"
         @input="emit('update:modelValue', +($event.target as HTMLInputElement)?.value)"

diff --git a/src/components/DsfrSearchBar/DsfrSearchBar.vue b/src/components/DsfrSearchBar/DsfrSearchBar.vue
@@ -37,12 +37,14 @@ const emit = defineEmits<{
       :label-visible="labelVisible"
       :label="label"
       :disabled="disabled"
+      :aria-disabled="disabled"
       @update:model-value="emit('update:modelValue', $event)"
       @keydown.enter="emit('search', modelValue)"
     />
     <DsfrButton
       title="Rechercher"
       :disabled="disabled"
+      :aria-disabled="disabled"
       @click="emit('search', modelValue)"
     >
       {{ buttonText }}

diff --git a/src/components/DsfrSegmented/DsfrSegmented.vue b/src/components/DsfrSegmented/DsfrSegmented.vue
@@ -37,6 +37,7 @@ const dsfrIcon = computed(() => {
       :value="value"
       :checked="modelValue === value"
       :disabled="disabled"
+      :aria-disabled="disabled"
       v-bind="$attrs"
       @click="$emit('update:modelValue', value)"
     >

diff --git a/src/components/DsfrSelect/DsfrSelect.vue b/src/components/DsfrSelect/DsfrSelect.vue
@@ -65,6 +65,7 @@ const messageType = computed(() => {
       class="fr-select"
       :name="name || selectId"
       :disabled="disabled"
+      :aria-disabled="disabled"
       :required="required"
       @change="$emit('update:modelValue',($event.target as HTMLInputElement)?.value)"
     >
@@ -83,6 +84,7 @@ const messageType = computed(() => {
         :selected="modelValue === option || (typeof option === 'object' && option.value === modelValue)"
         :value="typeof option === 'object' ? option.value : option"
         :disabled="!!(typeof option === 'object' && option.disabled)"
+        :aria-disabled="!!(typeof option === 'object' && option.disabled)"
       >
         {{ typeof option === 'object' ? option.text : option }}
       </option>

diff --git a/src/components/DsfrToggleSwitch/DsfrToggleSwitch.vue b/src/components/DsfrToggleSwitch/DsfrToggleSwitch.vue
@@ -33,6 +33,7 @@ const labelId = computed(() => {
     <input
       :id="inputId"
       :disabled="disabled"
+      :aria-disabled="disabled"
       type="checkbox"
       :checked="modelValue"
       :data-testid="inputId"