Skip to content

Commit 21056c1

Browse files
authored
Merge pull request #619 from dnum-mi/develop
Develop
2 parents 8bd9ce3 + f6d5fe7 commit 21056c1

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

src/components/DsfrInput/DsfrInputGroup.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ const props = withDefaults(defineProps<{
2323
labelClass: '',
2424
modelValue: '',
2525
wrapperClass: '',
26+
placeholder: undefined,
2627
errorMessage: undefined,
2728
validMessage: undefined,
2829
})
@@ -50,7 +51,7 @@ const messageClass = computed(() => props.errorMessage ? 'fr-error-text' : 'fr-v
5051
:is-invalid="!!errorMessage"
5152
:label="label"
5253
:hint="hint"
53-
:description-id="descriptionId"
54+
:description-id="(message && descriptionId) || undefined"
5455
:label-visible="labelVisible"
5556
:model-value="modelValue"
5657
:placeholder="placeholder"

src/components/DsfrModal/DsfrModal.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ async function close () {
120120
<DsfrButtonGroup
121121
align="right"
122122
:buttons="actions"
123-
inline
123+
inline-layout-when="large"
124124
reverse
125125
/>
126126
</div>

src/components/DsfrTabs/DsfrTabItem.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,10 @@ watch(() => props.selected, (newValue) => {
4141
class="fr-tabs__tab"
4242
:tabindex="selected ? 0 : -1"
4343
role="tab"
44+
type="button"
4445
:aria-selected="selected"
4546
:aria-controls="panelId"
46-
@click="$emit('click', $event)"
47+
@click.prevent="$emit('click', $event)"
4748
@keydown.right="$emit('next')"
4849
@keydown.left="$emit('previous')"
4950
@keydown.down="$emit('next')"

0 commit comments

Comments
 (0)