Merge pull request #272 from dnum-mi/fix/header

Fix/header

Author: DaBadBunny

src/components/DsfrCheckbox/DsfrCheckboxSet.stories.js

@@ -73,7 +73,7 @@ CheckboxSet.args = {
   inline: false,
   errorMessage: '',
   validMessage: '',
-  modelValue: [],
+  modelValue: ['name1'],
   options: [
     {
       label: 'Valeur 1',
@@ -122,7 +122,7 @@ CheckboxSetAvecErreur.args = {
   disabled: false,
   inline: false,
   errorMessage: 'Message d\'erreur',
-  modelValue: [],
+  modelValue: ['name1'],
   options: [
     {
       label: 'Valeur 1',
@@ -172,7 +172,7 @@ export const CheckboxSetAvecSucces = (args) => ({
 CheckboxSetAvecSucces.args = {
   dark: false,
   legend: 'Légende des champs',
-  modelValue: [],
+  modelValue: ['name1'],
   inline: false,
   validMessage: 'Message de succès',
   options: [
@@ -224,7 +224,7 @@ export const CheckboxSetInline = (args) => ({
 CheckboxSetInline.args = {
   dark: false,
   legend: 'Légende des champs en ligne',
-  modelValue: [],
+  modelValue: ['name1'],
   inline: true,
   errorMessage: '',
   validMessage: '',
@@ -277,7 +277,7 @@ export const CheckboxSetInlineAvecErreur = (args) => ({
 CheckboxSetInlineAvecErreur.args = {
   dark: false,
   legend: 'Légende des champs en ligne',
-  modelValue: [],
+  modelValue: ['name1'],
   inline: true,
   errorMessage: 'Message d\'erreur',
   validMessage: '',
@@ -330,7 +330,7 @@ export const CheckboxSetInlineAvecSucces = (args) => ({
 CheckboxSetInlineAvecSucces.args = {
   dark: false,
   legend: 'Légende des champs en ligne',
-  modelValue: [],
+  modelValue: ['name1'],
   inline: true,
   errorMessage: '',
   validMessage: 'Message de succès',

src/components/DsfrCheckbox/DsfrCheckboxSet.vue

@@ -94,7 +94,7 @@ export default defineComponent({
           :name="option.name"
           :label="option.label"
           :disabled="option.disabled"
-          :model-value="modelValue.includes(option.value)"
+          :model-value="modelValue.includes(option.name)"
           :hint="option.hint"
           @update:model-value="onChange({ name: option.name, checked: $event })"
         />

src/components/DsfrHeader/DsfrHeader.vue

@@ -112,10 +112,11 @@ export default defineComponent({
                 <slot name="operator" />
               </div>
               <div
-                v-if="showSearch || (quickLinks && quickLinks.length)"
+                v-if="showSearch || quickLinks?.length"
                 class="fr-header__navbar"
               >
                 <button
+                  v-if="showSearch"
                   class="fr-btn"
                   aria-controls="header-search"
                   aria-label="Recherche"
@@ -128,6 +129,7 @@ export default defineComponent({
                   />
                 </button>
                 <button
+                  v-if="quickLinks?.length"
                   id="button-menu"
                   class="fr-btn--menu  fr-btn"
                   :data-fr-opened="showMenu"

src/components/DsfrHeader/DsfrHeaderMenuLink.vue

@@ -92,7 +92,6 @@ export default defineComponent({
 </template>
 
 <style scoped>
-
 .icon-left {
   margin-right: 0.5rem
 }
@@ -105,7 +104,7 @@ export default defineComponent({
   align-items: center;
 }
 
-.reverse {
+.fr-header .fr-links-group .reverse {
   flex-direction: row-reverse;
 }
 </style>

src/components/DsfrInput/DsfrInput.vue

@@ -29,6 +29,7 @@ export default defineComponent({
       type: String,
       default: '',
     },
+    isWithWrapper: Boolean,
     labelVisible: Boolean,
     modelValue: {
       type: String,
@@ -62,8 +63,13 @@ export default defineComponent({
     >{{ hint }}</span>
   </label>
   <div
-    class="fr-input-wrap"
-    :class="[wrapperClass, { 'fr-fi-calendar-line': $attrs.type === 'date' }]"
+    :class="[
+      {
+        'fr-input-wrap': isWithWrapper || $attrs.type === 'date',
+        'fr-fi-calendar-line': $attrs.type === 'date',
+      },
+      wrapperClass,
+    ]"
   >
     <component
       :is="isComponent"